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

modify the output of rpower blade state

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11833 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
zhaoertao 2012-03-13 04:31:05 +00:00
parent 229618d4ed
commit 74e2960ed7
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
perl-xCAT/xCAT/FSPpower.pm
View File

@ -61,7 +61,14 @@ sub enumerate {
##############################
# No lparid for fsp/bpa
##############################
if ( $type =~ /^(fsp|bpa|cec|frame)$/ ) {
if ( $type =~ /^(fsp|bpa|cec|frame|blade)$/ ) {
if ($type eq 'blade') {
if ($state =~ /power-on-transition|power off/) {
$state = "off";
} else {
$state = "on";
}
}
$lparid = $type;
}
$outhash{ $lparid } = $state;
@ -370,7 +377,7 @@ sub state {
# Look up by lparid
##################################
my $type = @$d[4];
my $id = ($type=~/^(fsp|bpa|cec|frame)$/) ? $type : @$d[0];
my $id = ($type=~/^(fsp|bpa|cec|frame|blade)$/) ? $type : @$d[0];
##################################
# Output error
@ -387,7 +394,7 @@ sub state {
##################################
# Node not found
##################################
if ( !exists( $data->{$id} )) {
if ($type !~ /^blade$/ and !exists( $data->{$id} )) {
my $res = xCAT::FSPUtils::fsp_api_action($name, $d, "state");
my $rc = @$res[2];
my $val = @$res[1];
@ -411,13 +418,6 @@ sub state {
##############################
# Convert state to on/off
##############################
if ($type eq 'blade') {
if ($value =~ /^(power-on-transition|power off|off)$/) {
$value = "off";
} else {
$value = "on";
}
}
if ( defined( $convert )) {
$value = power_status( $value );
}