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

Solving bug #3390338

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10275 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
otubo 2011-08-12 03:08:14 +00:00
parent a5b4437573
commit a4f4df9ed6
1 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
perl-xCAT/xCAT/PPCscan.pm
View File

@ -177,28 +177,30 @@ sub enumerate {
#########################################
# Save hardware connections
#########################################
$filter = "type_model_serial_num,ipaddr,sp,side";
my $conns = xCAT::PPCcli::lssysconn( $exp, "alls", $filter );
$Rc = shift(@$conns);
if ( $hwtype ne "ivm" ) { #Not applicable for IVM
$filter = "type_model_serial_num,ipaddr,sp,side";
my $conns = xCAT::PPCcli::lssysconn( $exp, "alls", $filter );
$Rc = shift(@$conns);
#########################################
# Return error
#########################################
if ( $Rc != SUCCESS ) {
return( @$conns[0] );
}
foreach my $con ( @$conns ) {
my ($mtms,$ipaddr,$sp,$side) = split /,/,$con;
my $value = undef;
if ( $sp =~ /^primary$/ or $side =~ /^a$/ ) {
$value = "A";
} elsif ($sp =~ /^secondary$/ or $side =~ /^b$/ ) {
$value = "B";
#########################################
# Return error
#########################################
if ( $Rc != SUCCESS ) {
return( @$conns[0] );
}
$hwconn{$ipaddr} = "$mtms,$value";
foreach my $con ( @$conns ) {
my ($mtms,$ipaddr,$sp,$side) = split /,/,$con;
my $value = undef;
if ( $sp =~ /^primary$/ or $side =~ /^a$/ ) {
$value = "A";
} elsif ($sp =~ /^secondary$/ or $side =~ /^b$/ ) {
$value = "B";
}
$hwconn{$ipaddr} = "$mtms,$value";
}
}
#########################################
@ -332,7 +334,9 @@ sub enumerate {
}
my $mtmss = $hwconn{$ips};
my ($mtms,$side) = split /,/, $mtmss;
if ( $hwtype ne "ivm" ) { #Not applicable for IVM
my ($mtms,$side) = split /,/, $mtmss;
}
push @values, join( ",",
"cec",$fsp,$cageid,$model,$serial,"",$server,$prof,$fname,"" );