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

fix issue 4705, modify usage output

Browse Source
This commit is contained in:
XuWei 2018-01-24 03:04:01 -05:00
parent 78dbe4274b
commit 691e0ee464
4 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
perl-xCAT/xCAT/Usage.pm
View File

@ -221,6 +221,9 @@ my %usage = (
rspconfig <noderange> [sshcfg]
rspconfig <noderange> [sshcfg=<enable|disable>]
",
"rspreset" =>
"Usage:
rspreset <noderange>",
"getmacs" =>
"Usage:
Common:
@ -534,6 +537,13 @@ Options:
"clonevm" =>
"Usage:
clonevm noderange [-t createmaster -f | -b basemaster -d | -h]",
"rmigrate" =>
"Usage:
Common:
rmigrate <noderange> target_host
zVM specific:
rmigrate <noderange> [destination=target_host|action=action|force=force|immediate=yes_no|max_total=total|max_quiesce=quiesce]
",
);
# Rebuild full command usage from its components
@ -558,6 +568,7 @@ my %version = (
"rbootseq" => "$vers",
"rscan" => "$vers",
"rspconfig" => "$vers",
"rspreset" => "$vers",
"getmacs" => "$vers",
"mkvm" => "$vers",
"lsvm" => "$vers",
@ -576,6 +587,7 @@ my %version = (
"cfgve" => "$vers",
"chhypervisor" => "$vers",
"rmhypervisor" => "$vers",
"rmigrate" => "$vers",
"clonevm" => "$vers",
);

6
xCAT-server/lib/xcat/plugins/AAAusage.pm
View File

@ -37,7 +37,11 @@ sub handled_commands {
rmhwconn => 'AAAusage',
lshwconn => 'AAAusage',
renergy => 'AAAusage',
nodeset => 'AAAusage'
nodeset => 'AAAusage',
rspreset => 'AAAusage',
rmhypervisor => 'AAAusage',
rmigrate => 'AAAusage',
rshutdown => 'AAAusage',
};
}

4
xCAT-server/lib/xcat/plugins/blade.pm
View File

@ -4157,7 +4157,9 @@ sub preprocess_request {
my $usage_string = xCAT::Usage->parseCommand($command, @exargs);
if ($usage_string) {
$callback->({ data => $usage_string });
if ($command !~ /renergy|rspconfig/) {
$callback->({ data => $usage_string });
}
$request = {};
return;
}

4
xCAT-server/lib/xcat/plugins/kvm.pm
View File

@ -3671,7 +3671,9 @@ sub preprocess_request {
my $usage_string = xCAT::Usage->parseCommand($command, @exargs);
if ($usage_string) {
$callback->({ data => $usage_string });
if ($command ne "rscan") {
$callback->({ data => $usage_string });
}
$request = {};
return;
}