From d605a39c45fbe00bdfcfc513c6478d7f45344e62 Mon Sep 17 00:00:00 2001 From: Victor Hu Date: Thu, 5 Oct 2017 21:47:15 -0400 Subject: [PATCH] For IPMI and OpenBMC managed nodes, rbeacon can only perform the on or off action, nothing else is supported. --- xCAT-server/lib/xcat/plugins/ipmi.pm | 2 +- xCAT-server/lib/xcat/plugins/openbmc.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/ipmi.pm b/xCAT-server/lib/xcat/plugins/ipmi.pm index 77cfdab7e..f6842ebc7 100644 --- a/xCAT-server/lib/xcat/plugins/ipmi.pm +++ b/xCAT-server/lib/xcat/plugins/ipmi.pm @@ -3048,7 +3048,7 @@ sub beacon { $ipmiv2 = 1; } if ($subcommand ne "on" and $subcommand ne "off") { - xCAT::SvrUtils::sendmsg([ 1, "please specify on or off for ipmi nodes (stat impossible)" ], $callback, $sessdata->{node}, %allerrornodes); + xCAT::SvrUtils::sendmsg([ 1, "Only 'on' or 'off' is supported for IPMI managed nodes."], $callback, $sessdata->{node}, %allerrornodes); } #if stuck with 1.5, say light for 255 seconds. In 2.0, specify to turn it on forever diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm index 1b61a501c..42249927c 100644 --- a/xCAT-server/lib/xcat/plugins/openbmc.pm +++ b/xCAT-server/lib/xcat/plugins/openbmc.pm @@ -559,7 +559,7 @@ sub parse_args { if ($command eq "rbeacon") { unless ($subcommand =~ /^on$|^off$/) { - return ([ 1, "Unsupported command: $command $subcommand" ]); + return ([ 1, "Only 'on' or 'off' is supported for OpenBMC managed nodes."]); } } elsif ($command eq "rpower") { unless ($subcommand =~ /^on$|^off$|^softoff$|^reset$|^boot$|^bmcreboot$|^bmcstate$|^status$|^stat$|^state$/) {