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

Fix bug 3371048: rmhwconn cec -s not remove all connection

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10262 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
yinle 2011-08-10 10:54:38 +00:00
parent 4760c03321
commit 00c488b407
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
perl-xCAT/xCAT/PPCconn.pm
View File

@ -662,6 +662,12 @@ sub rmhwconn
my @value = ();
my $Rc = undef;
my $nodes_found = xCAT::PPCcli::lssysconn ($exp, "all");
if ( @$nodes_found[0] eq SUCCESS ) {
$Rc = shift(@$nodes_found);
} else {
return undef;
}
for my $cec_bpa ( keys %$hash)
{
my $node_hash = $hash->{$cec_bpa};
@ -674,14 +680,30 @@ sub rmhwconn
############################
# Get IP address
############################
my $node_ip = xCAT::PPCcli::getHMCcontrolIP($node_name, $exp);
if (!$node_ip)
#get node ip from hmc
#my $node_ip = xCAT::PPCcli::getHMCcontrolIP($node_name, $exp);
my $tab = xCAT::Table->new("vpd");
my $ent;
if ($tab) {
$ent = $tab->getNodeAttribs($node_name, ['serial', 'mtm']);
}
my $serial = $ent->{'serial'};
my $mtm = $ent->{'mtm'};
my $node_ip;
my @ips;
foreach my $entry ( @$nodes_found ) {
if ( $entry =~ /$mtm\*$serial/) {
$entry =~ /ipaddr=(\d+\.\d+\.\d+\.\d+),/;
push @ips, $1;
}
}
if (!@ips)
{
push @value, [$node_name, $node_ip, $Rc];
next;
}
my @newnodes = split(/,/, $node_ip);
for my $nn ( @newnodes )
for my $nn ( @ips )
{
my $res = xCAT::PPCcli::rmsysconn( $exp, $type, $nn);
$Rc = shift @$res;