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

Start of fix for SF3519602

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@12280 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
lissav
2012-04-19 18:47:36 +00:00
parent 5cfc522107
commit 9bda95f579
1 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
perl-xCAT/xCAT/Utils.pm
View File

@@ -2887,7 +2887,8 @@ sub getNodeIPaddress
Node name only one at a time
Returns: ip address(s)
Globals:
none
%PPCHASH - HASH of nodename -> array of ip addresses
Error:
none
Example: my $c1 = xCAT::Utils::getIPaddress($nodetocheck);
@@ -2895,7 +2896,7 @@ sub getNodeIPaddress
=cut
#-------------------------------------------------------------------------------
my %PPCHASH;
sub getIPaddress
{
require xCAT::Table;
@@ -2949,12 +2950,13 @@ sub getIPaddress
} else {
return undef;
}
my @ps = $ppctab->getAllNodeAttribs(['node','parent','nodetype']);
my $tmp_parent;
my $tmp_node;
my $tmp_type;
#search for $nodetocheck's children or brothers
for my $entry ( @ps ) {
if (!%PPCHASH) {
my @ps = $ppctab->getAllNodeAttribs(['node','parent','nodetype']);
my $tmp_parent;
my $tmp_node;
my $tmp_type;
#search for $nodetocheck's children or brothers
for my $entry ( @ps ) {
$tmp_parent = $entry->{parent};
$tmp_node = $entry->{node};
$tmp_type = $entry->{nodetype};
@@ -2963,9 +2965,21 @@ sub getIPaddress
$tmp_type = xCAT::DBobjUtils->getnodetype($tmp_node);
}
if ($tmp_type and ($tmp_type eq 'fsp' or $tmp_type eq 'bpa')) {
push @children, $tmp_node;
# push @children, $tmp_node;
push @{$PPCHASH{$tmp_parent}}, $tmp_node;
}
}
}
# Find parent in the hash and build return values
foreach (@{$PPCHASH{$parent}}) {
push @children, $_;
}
} else { #PPCHASH exists
if (exists($PPCHASH{$parent})) {
foreach (@{$PPCHASH{$parent}}) {
push @children, $_;
}
}
}
foreach my $tmp_n( @children) {
my $ent = $vpdtab->getNodeAttribs($tmp_n, ['side']);