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

support lsslp -s CMM match hostname with switch table.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@16030 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
yinle
2013-04-22 10:13:45 +00:00
parent 19a7849178
commit 2151ea5130
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -954,6 +954,7 @@ sub parse_responses {
my %outhash;
my $host;
my @matchnode;
my @cmmnodes;
my %searchmacs = %$searchmacsref;
#get networks information for defining HMC
@@ -1036,6 +1037,7 @@ sub parse_responses {
$atthash{hostname} = $::OLD_DATA_CACHE{"mp*".$atthash{mtm}."*".$atthash{serial}};
push @matchnode,'Server-'.$atthash{mtm}.'-SN'.$atthash{serial};
}
push @cmmnodes, 'Server-'.$atthash{mtm}.'-SN'.$atthash{serial};
trace( $request, "Discover node $atthash{hostname}: type is $atthash{type}, \
mtm is $atthash{mtm}, sn is $atthash{serial}, side is $atthash{side}, \
ip is $atthash{ip}, mac is $atthash{mac}, mname is $atthash{mname},\
@@ -1317,8 +1319,23 @@ sub parse_responses {
trace( $request, "child is $child, fid is ${$outhash{$child}}{fid}, cid is ${$outhash{$child}}{cid}");
}
} # end - process fsp and bpa
} # end process responses loop
}
}
trace( $request, "\n\n\nBegin to find cmm hostname in switch table");
$macmap = xCAT::MacMap->new();
$macmap->refresh_table();
foreach my $cmmnode (@cmmnodes) {
my $macvalue = ${$outhash{$cmmnode}}{mac};
my $hostn = $macmap->find_mac($macvalue, 1);
if ($hostn) {
${$outhash{$cmmnode}}{hostname} = $hostn;
trace($request, "cmmnode $cmmnode find hostname $hostn");
}
}
##########################################################
# If there is -n flag, skip the matched nodes