xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-08-09 04:50:15 +00:00
Code Issues Releases Wiki Activity

modified depending on comments

Browse Source
This commit is contained in:
XuWei
2018-03-20 02:17:04 -04:00
parent 0d5317df7f
commit 3f31da4351
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
xCAT-server/lib/xcat/plugins/ipmi.pm
View File

@@ -8275,9 +8275,9 @@ sub preprocess_request {
my $error_data = "";
foreach (@$all_noderange) {
$error_data .= "\n" if ($error_data);
$error_data .= "$_: Please enter an action (eg: boot,off,on, etc)";
$error_data .= "$_: Please enter an action (eg: boot,off,on, etc) for ipmi management method";
}
$callback->({ errorcode => [1], data => [ $error_data, $usage_string ] });
$callback->({ errorcode => [1], data => [ $error_data ] });
$request = {};
return 0;
}
@@ -8294,9 +8294,9 @@ sub preprocess_request {
my $error_data = "";
foreach (@$all_noderange) {
$error_data .= "\n" if ($error_data);
$error_data .= "$_: Error: Unsupported command: $command $subcmd";
$error_data .= "$_: Error: Unsupported command: $command $subcmd for ipmi management method";
}
$callback->({ errorcode => [1], data => [ $error_data, $usage_string ] });
$callback->({ errorcode => [1], data => [ $error_data ] });
$request = {};
return;
}
@@ -8335,7 +8335,7 @@ sub preprocess_request {
if ($optset eq 0) {
foreach (@$all_noderange) {
$error_data .= "\n" if ($error_data);
$error_data .= "$_: Usage Error: Cannot display and change attributes on the same command.";
$error_data .= "$_: Usage Error: Cannot display and change attributes on the same command for ipmi management method.";
}
$callback->({ errorcode => [1], data => [ $error_data] });
$request = {};
@@ -8347,7 +8347,7 @@ sub preprocess_request {
if ($optset eq 1) {
foreach (@$all_noderange) {
$error_data .= "\n" if ($error_data);
$error_data .= "$_: Usage Error: Cannot display and change attributes on the same command.";
$error_data .= "$_: Usage Error: Cannot display and change attributes on the same command for ipmi management method.";
}
$callback->({ errorcode => [1], data => [ $error_data] });
$request = {};
@@ -8359,7 +8359,7 @@ sub preprocess_request {
unless ($option =~ /^USERID$|^ip$|^netmask$|^gateway$|^vlan$|^userid$|^username$|^password$|^snmpdest|^thermprofile$|^alert$|^garp$|^community$|^backupgateway$/) {
foreach (@$all_noderange) {
$error_data .= "\n" if ($error_data);
$error_data .= "$_: Error: Unsupported command: $command $option";
$error_data .= "$_: Error: Unsupported command: $command $option for ipmi management method";
}
$callback->({ errorcode => [1], data => [ $error_data ] });
$request = {};
@@ -8374,7 +8374,7 @@ sub preprocess_request {
my $error_data = "";
foreach (@$all_noderange) {
$error_data .= "\n" if ($error_data);
$error_data .= "$_: option '-t' can only work with 'all' or 'vpd";
$error_data .= "$_: option '-t' can only work with 'all' or 'vpd' for ipmi management method";
}
$callback->({ errorcode => [1], data => [ $error_data ] });
$request = {};