From 8b91ffa854f274ec1a13ea4349a16773c5039a09 Mon Sep 17 00:00:00 2001
From: yinle <yinle@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 23 May 2011 03:42:23 +0000
Subject: [PATCH] Improve the way of getHMCcontrolIP, so that it can handle
 different error conditions.

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9649 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 perl-xCAT/xCAT/PPCcli.pm | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/perl-xCAT/xCAT/PPCcli.pm b/perl-xCAT/xCAT/PPCcli.pm
index 15de06f6c..7a21f8eaa 100644
--- a/perl-xCAT/xCAT/PPCcli.pm
+++ b/perl-xCAT/xCAT/PPCcli.pm
@@ -1322,21 +1322,28 @@ sub getHMCcontrolIP
     }
     my $serial = $ent->{'serial'};
     my $mtm  = $ent->{'mtm'};
-    my $mtms = $mtm . '*' . $serial;
-    my $nodes_found = lssyscfg( $exp, "$type", "$mtms");
+    #my $mtms = $mtm . '*' . $serial;
+    #my $nodes_found = lssyscfg( $exp, "$type", "$mtms");
+    my $nodes_found = lssysconn ($exp, "all");
     my @ips;
     my $ip_result;
     if ( @$nodes_found[0] eq SUCCESS ) {
         my $Rc = shift(@$nodes_found);
-        #foreach my $mtms ( @$nodes_found ) {
-        my @newnodes = split(/,/, $nodes_found->[0]);
-        $Rc = shift(@newnodes);
-        for my $entry (@newnodes) {
-            if(xCAT::Utils->isIpaddr($entry)) {
-                push @ips,$entry;
-            }    
-            $ip_result = join( ",", @ips );
-        }    
+        #my @newnodes = split(/,/, $nodes_found->[0]);
+        #$Rc = shift(@newnodes);
+        #for my $entry (@newnodes) {
+        #    if(xCAT::Utils->isIpaddr($entry)) {
+        #        push @ips,$entry;
+        #    }    
+        #    $ip_result = join( ",", @ips );
+        #} 
+        foreach my $entry ( @$nodes_found ) {
+            if ( $entry =~ /$mtm\*$serial/)   {
+                $entry =~ /ipaddr=(\d+\.\d+\.\d+\.\d+),/;
+                push @ips, $1;
+            }
+        } 
+        $ip_result = join( ",", @ips );        
     }
     return $ip_result;
 }