From c3e51d1da89c181ebafe8e30a9b8e33e9f5fe667 Mon Sep 17 00:00:00 2001
From: wanghuaz <wanghuaz@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 25 Jan 2010 09:12:14 +0000
Subject: [PATCH] Correct some errors in the stanza and xml output of lsslp

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

diff --git a/xCAT-server/lib/xcat/plugins/lsslp.pm b/xCAT-server/lib/xcat/plugins/lsslp.pm
index 3737b491b..9bfac8c35 100644
--- a/xCAT-server/lib/xcat/plugins/lsslp.pm
+++ b/xCAT-server/lib/xcat/plugins/lsslp.pm
@@ -96,7 +96,7 @@ my %mgt = (
     lc(TYPE_RSA) => "blade"
 );
 
-my @attribs    = qw(nodetype model serial groups node mgt mpa id side);
+my @attribs    = qw(nodetype model serial groups node mgt mpa id side ip);
 my $verbose    = 0;
 my %ip_addr    = ();
 my %slp_result = ();
@@ -1479,8 +1479,8 @@ sub parse_responses {
         ###########################################
         # Strip commas from IP list
         ###########################################
-        $result[3] =~ s/,/ /g;
-        my $ip     = $result[3];
+        $result[4] =~ s/,/ /g;
+        my $ip     = $result[4];
 
         ###########################################
         # Process any extra attributes
@@ -1714,6 +1714,11 @@ sub format_stanza {
         my $side = $data[3]; 
         my $i = 0;
 
+        if ( $name =~ /^([^\(]+)\(([^\)]+)\)$/) {
+            $name = $1;
+            $ip  = $2;
+        }
+
         #################################
         # Node attributes
         #################################
@@ -1776,6 +1781,11 @@ sub format_xml {
         my $side = $data[3];
         my $i = 0;
 
+        if ( $name =~ /^([^\(]+)\(([^\)]+)\)$/) {
+            $name = $1;
+            $ip  = $2;
+        }
+
         #################################
         # Initialize hash reference
         #################################