FSP/BPA redundancy: add process of the wrong condition, fix some mistakes.
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8891 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
parent
12888d9815
commit
99f4de86e3
@ -2095,16 +2095,21 @@ sub getchildren
|
||||
}
|
||||
}
|
||||
}
|
||||
unless ( $port )
|
||||
if ( !defined($port ))
|
||||
{
|
||||
return \@children;
|
||||
} else
|
||||
{
|
||||
my $vpdtab = xCAT::Table->new( 'vpd' );
|
||||
my $sides = $vpdtab->getNodesAttribs(\@children, ['side']);
|
||||
if(!$sides)
|
||||
{
|
||||
return undef;
|
||||
}
|
||||
for my $n (@children)
|
||||
{
|
||||
if ($sides->{$n}->{side} =~ /$port/)
|
||||
my $nside = $sides->{$n}->[0];
|
||||
if ($nside->{side} =~ /$port/)
|
||||
{
|
||||
push @children_prot, $n;
|
||||
}
|
||||
@ -2299,7 +2304,7 @@ sub judge_node
|
||||
}
|
||||
|
||||
if ($type =~ /^fsp$/) {
|
||||
if ($nodeparent->{parent} =~ /^cec$/)
|
||||
if ($parenttype =~ /^cec$/)
|
||||
{
|
||||
$flag = 1;
|
||||
} else
|
||||
@ -2307,9 +2312,9 @@ sub judge_node
|
||||
$flag = 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ($type =~ /^bpa$/) {
|
||||
if ($nodeparent->{parent} =~ /^frame$/)
|
||||
if ($parenttype =~ /^frame$/)
|
||||
{
|
||||
$flag = 1;
|
||||
} else
|
||||
|
Loading…
Reference in New Issue
Block a user