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

Fix bug 3364752: makedhcp error with 7/11 build, add the lsslp -z/-x output including hwtype.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10095 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
yinle
2011-07-15 09:10:54 +00:00
parent fb52e5b25a
commit ab377053db
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;