From 691e0ee4645e86dda474d00087e636c06996f8db Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Wed, 24 Jan 2018 03:04:01 -0500
Subject: [PATCH] fix issue 4705, modify usage output

---
 perl-xCAT/xCAT/Usage.pm                  | 12 ++++++++++++
 xCAT-server/lib/xcat/plugins/AAAusage.pm |  6 +++++-
 xCAT-server/lib/xcat/plugins/blade.pm    |  4 +++-
 xCAT-server/lib/xcat/plugins/kvm.pm      |  4 +++-
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/perl-xCAT/xCAT/Usage.pm b/perl-xCAT/xCAT/Usage.pm
index f5b8eaaff..40e510247 100755
--- a/perl-xCAT/xCAT/Usage.pm
+++ b/perl-xCAT/xCAT/Usage.pm
@@ -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",
 );
 
diff --git a/xCAT-server/lib/xcat/plugins/AAAusage.pm b/xCAT-server/lib/xcat/plugins/AAAusage.pm
index 910292a6e..6c297142d 100644
--- a/xCAT-server/lib/xcat/plugins/AAAusage.pm
+++ b/xCAT-server/lib/xcat/plugins/AAAusage.pm
@@ -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',
     };
 }
 
diff --git a/xCAT-server/lib/xcat/plugins/blade.pm b/xCAT-server/lib/xcat/plugins/blade.pm
index c621b8f5a..1f731ab3c 100644
--- a/xCAT-server/lib/xcat/plugins/blade.pm
+++ b/xCAT-server/lib/xcat/plugins/blade.pm
@@ -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;
     }
diff --git a/xCAT-server/lib/xcat/plugins/kvm.pm b/xCAT-server/lib/xcat/plugins/kvm.pm
index 7df93472a..c8bc03a1f 100755
--- a/xCAT-server/lib/xcat/plugins/kvm.pm
+++ b/xCAT-server/lib/xcat/plugins/kvm.pm
@@ -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;
     }