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

there may be performance issue in the fix for 3524241, I made the fix again.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@12549 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jjhua 2012-05-07 14:06:40 +00:00
parent 72817fcb81
commit 59ae04e6da
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
perl-xCAT/xCAT/FSPUtils.pm
View File

@ -145,9 +145,7 @@ sub getIPaddress
my $vpd = $request->{vpd};
# only need to parse IP addresses for Frame/CEC/BPA/FSP
if ($type eq "lpar") {
$type = xCAT::DBobjUtils->getnodetype($nodetocheck);
}
#my $type = xCAT::DBobjUtils->getnodetype($nodetocheck);
#my $type = $$attrs[4];
if ($type) {
@ -167,7 +165,15 @@ sub getIPaddress
} else {
return -3;
}
} elsif ($type eq "frame" or $type eq "cec") {
} elsif ($type eq "frame" or $type eq "cec" or $type eq "lpar") {
#In DFM
#1. when the node type is frame, its hcp( $nodetocheck ) is frame,
#and it will get the BPAs IPs for the Frame.
#2. when the node type is CEC, its hcp( $nodetocheck ) is CEC,
#and it will get the FSPs IPs for the CEC.
#3. when the node type is lpar, its hcp is the CEC.
#the $nodetocheck is its' hcp. So set $nodetocheck to $parent variable.
#And then get the FSPs IPs for the CEC.
$parent = $nodetocheck;
} else {
return undef;
@ -447,8 +453,8 @@ sub fsp_state_action {
############################
$fsp_ip = getIPaddress($request, $$attrs[4], $fsp_name );
if(!defined($fsp_ip) or ($fsp_ip == -3)) {
$res[0] = ["Failed to get IP address for $fsp_name."];
return ([$node_name, @res, -1]);
$res[0] = "Failed to get IP address for $fsp_name or the related FSPs/BPAs.";
return ([-1, $res[0]]);
}
#print "fsp name: $fsp_name\n";