arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change flexdiscover to separate imm and cmm search

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.8@16668 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2013-06-18 17:07:34 +00:00
parent be3e25ce00
commit cd406905a8
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
xCAT-server/lib/xcat/plugins/lsslp.pm
View File

@ -539,9 +539,16 @@ sub invoke_dodiscover {
my %arg;
if ($globalopt{flexdiscover}) {
$arg{SrvTypes} = [ qw/service:management-hardware.IBM:chassis-management-module service:management-hardware.IBM:management-module service:management-hardware.IBM:integrated-management-module2/ ];
if ($globalopt{flexdiscover}) { #we do two SLP passes, one to hopefully catch the less numerous management modules reliably, a separate one to best-effort catch imms
$arg{SrvTypes} = [ qw/service:management-hardware.IBM:chassis-management-module service:management-hardware.IBM:management-module/ ];
my ($searchmacsref,$sendcount,$rsp) = xCAT::SLP::dodiscover(SrvTypes=>$arg{SrvTypes},Callback=>\&bt_handle_new_slp_entity);
$arg{SrvTypes} = [ qw/service:management-hardware.IBM:integrated-management-module2/ ];
my ($newsearchmacsref,$newsendcount,$newrsp) = xCAT::SLP::dodiscover(SrvTypes=>$arg{SrvTypes},Callback=>\&bt_handle_new_slp_entity);
foreach (keys %$newsearchmacsref) {
$searchmacsref{$_}=$newsearchmacsref->{$_};
}
$sendcount += $newsendcount;
$rsp+=$newrsp;
return ($searchmacsref,$sendcount,$rsp);
}
$arg{SrvTypes} = $services;