xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-22 11:42:05 +00:00
Code Issues Releases Wiki Activity

Modify output message for PDU outlet state

Browse Source
This commit is contained in:
Casandra Qiu 2018-05-17 15:04:53 -04:00
parent eaa784e1e4
commit 55581cb2db
3 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xCAT-server/lib/xcat/plugins/openbmc.pm
View File

@ -803,6 +803,14 @@ sub preprocess_request {
return;
}
#pdu commands will be handled in the pdu plugin
if ($command eq "rpower") {
my $subcmd = $exargs[0];
if(($subcmd eq 'pduoff') || ($subcmd eq 'pduon') || ($subcmd eq 'pdustat') || ($subcmd eq 'pdureset')){
return;
}
}
my $parse_result = parse_args($command, $extrargs, $noderange);
if (ref($parse_result) eq 'ARRAY') {
my $error_data;

8
xCAT-server/lib/xcat/plugins/openbmc2.pm
View File

@ -86,6 +86,14 @@ sub preprocess_request {
return;
}
#pdu commands will be handled in the pdu plugin
if ($command eq "rpower") {
my $subcmd = $exargs[0];
if(($subcmd eq 'pduoff') || ($subcmd eq 'pduon') || ($subcmd eq 'pdustat') || ($subcmd eq 'pdureset')){
return;
}
}
my $parse_result = parse_args($command, $extrargs, $noderange);
if (ref($parse_result) eq 'ARRAY') {
my $error_data;

27
xCAT-server/lib/xcat/plugins/pdu.pm
View File

@ -404,7 +404,7 @@ sub powerpduoutlet {
if ($session->{ErrorStr}) {
$callback->({ errorcode => [1],error => "$node: $pdu outlet $outlet has error = $session->{ErrorStr}"});
} else {
$output = "$pdu outlet $outlet is $statstr";
$output = "$pdu operational state for outlet $outlet is $statstr";
xCAT::SvrUtils::sendmsg($output, $callback, $node, %allerrornodes);
}
}
@ -508,7 +508,7 @@ sub powerstat {
for (my $outlet =1; $outlet <= $count; $outlet++)
{
my $statstr = outletstat($session, $outlet);
my $msg = " outlet $outlet is $statstr";
my $msg = " operational state for the outlet $outlet is $statstr";
xCAT::SvrUtils::sendmsg($msg, $callback, $pdu, %allerrornodes);
}
}
@ -519,6 +519,13 @@ sub powerstat {
=head3 outletstat
Process command to query status of one pdu outlet
ibmPduOutletState defined from mib file
off(0)
on(1)
cycling(2)
delaySwitch10(3)
delaySwitch30(4)
delaySwitch60(5)
=cut
@ -535,12 +542,20 @@ sub outletstat {
}
$output = $session->get("$oid.$outlet");
if ($output eq 1) {
$statstr = "on";
} elsif ($output eq 0) {
if ($output eq 0) {
$statstr = "off";
} elsif ($output eq 1) {
$statstr = "on";
} elsif ($output eq 2) {
$statstr = "cycling";
} elsif ($output eq 3) {
$statstr = "delaySwitch10";
} elsif ($output eq 4) {
$statstr = "delaySwitch30";
} elsif ($output eq 5) {
$statstr = "delaySwitch60";
} else {
return;
$statstr = "$output(unknown state)" ;
}
return $statstr;
}