From ab377053db6679b7b56dbca94bc5da86bb06005b Mon Sep 17 00:00:00 2001
From: yinle <yinle@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 15 Jul 2011 09:10:54 +0000
Subject: [PATCH] Fix bug 3364752: makedhcp error with 7/11 build, add the
 lsslp -z/-x output including hwtype.

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

diff --git a/xCAT-server/lib/xcat/plugins/lsslp.pm b/xCAT-server/lib/xcat/plugins/lsslp.pm
index e63ac2939..95a843f99 100644
--- a/xCAT-server/lib/xcat/plugins/lsslp.pm
+++ b/xCAT-server/lib/xcat/plugins/lsslp.pm
@@ -128,7 +128,7 @@ my %mgt = (
     lc(TYPE_RSA)   => "blade"
 );
 
-my @attribs    = qw(nodetype mtm serial side ip groups mgt id parent mac hidden otherinterfaces);
+my @attribs    = qw(nodetype mtm serial side ip groups mgt id parent mac hidden otherinterfaces hwtype);
 my $verbose    = 0;
 my %ip_addr    = ();
 my %slp_result = ();
@@ -144,6 +144,15 @@ my $enter_time = 0;
 my @filternodes;
 my %otherinterfacehash;
 my $TRACE = 0;
+my %globlehwtype = (
+    fsp   => $::NODETYPE_FSP,
+    bpa   => $::NODETYPE_BPA,
+    lpar  => $::NODETYPE_LPAR,
+    hmc   => $::NODETYPE_HMC,
+    ivm   => $::NODETYPE_IVM,
+    frame => $::NODETYPE_FRAME,
+    cec   => $::NODETYPE_CEC,
+);
 ##########################################################################
 # Command handler method from tables
 ##########################################################################
@@ -2932,6 +2941,8 @@ sub format_stanza {
                 }
             } elsif (/^otherinterfaces$/) {
                 $d = $otherinterfacehash{$name}{otherinterfaces};
+            } elsif (/^hwtype$/) {
+                $d = $globlehwtype{$type}
             }
             if ( !defined($d) ) {
                 next;
@@ -3027,6 +3038,8 @@ sub format_xml {
                 }
             } elsif (/^otherinterfaces$/) {
                 $d = $otherinterfacehash{$name}{otherinfterfaces};
+            } elsif (/^hwtype$/) {
+                $d = $globlehwtype{$type}
             }
             if ( !defined($d) ) {
                 next;