From 8dba31f0596a57e0fbb8f459fa6277353a742dde Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 18 Jun 2013 15:35:07 +0000
Subject: [PATCH] Change flexdiscover to separate imm and cmm search

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@16664 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/lsslp.pm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/lsslp.pm b/xCAT-server/lib/xcat/plugins/lsslp.pm
index 0ca1939f2..343932d74 100644
--- a/xCAT-server/lib/xcat/plugins/lsslp.pm
+++ b/xCAT-server/lib/xcat/plugins/lsslp.pm
@@ -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;