From f0f4929e6be172f7fee08623add3b72d8b80b96d Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Tue, 15 May 2018 15:20:59 -0400
Subject: [PATCH] Display only OpenBMC usage

---
 perl-xCAT/xCAT/Usage.pm                  | 3 ---
 xCAT-server/lib/xcat/plugins/openbmc2.pm | 8 +++++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/perl-xCAT/xCAT/Usage.pm b/perl-xCAT/xCAT/Usage.pm
index 3abcf53b2..608f8db77 100755
--- a/perl-xCAT/xCAT/Usage.pm
+++ b/perl-xCAT/xCAT/Usage.pm
@@ -618,7 +618,6 @@ $usage{"rspconfig.openbmc"} = $usage{"rspconfig.common"} .
 $usage{"rinv"} = $usage{"rinv.common"} . 
                       $usage{"rinv.begin"} .
                       $usage{"rinv.openbmc"} .
-                      "   " .
                       $usage{"rinv.end"};
 
 $usage{"rinv.openbmc"} = $usage{"rinv.common"} .
@@ -634,7 +633,6 @@ $usage{"rbeacon.openbmc"} = $usage{"rbeacon.common"} .
 $usage{"rvitals"} = $usage{"rvitals.common"} . 
                       $usage{"rvitals.begin"} .
                       $usage{"rvitals.openbmc"} .
-                      "   " .
                       $usage{"rvitals.end"};
 
 $usage{"rvitals.openbmc"} = $usage{"rvitals.common"} .
@@ -652,7 +650,6 @@ $usage{"rflash.openbmc"} = $usage{"rflash.common"} .
 $usage{"rpower"} = $usage{"rpower.common"} . 
                       $usage{"rpower.begin"} .
                       $usage{"rpower.openbmc"} .
-                      "   " .
                       $usage{"rpower.end"};
 
 $usage{"rpower.openbmc"} = $usage{"rpower.common"} .
diff --git a/xCAT-server/lib/xcat/plugins/openbmc2.pm b/xCAT-server/lib/xcat/plugins/openbmc2.pm
index 84b952049..4525c0acb 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc2.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc2.pm
@@ -73,8 +73,14 @@ sub preprocess_request {
     if (ref($extrargs)) {
         @exargs = @$extrargs;
     }
-    my $usage_string = xCAT::Usage->parseCommand($command, @exargs);
+    # Request usage for openbmc sections only
+    my $usage_string = xCAT::Usage->parseCommand($command . ".openbmc", @exargs);
+ 
     if ($usage_string) {
+        if ($usage_string =~ /cannot be found/) {
+            # Could not find usage for openbmc section, try getting usage for all sections
+            $usage_string = xCAT::Usage->parseCommand($command, @exargs);
+        }
         $callback->({ data => [$usage_string] });
         $request = {};
         return;