From 5131f51509275cb1330702fd87aa443b4bed996d Mon Sep 17 00:00:00 2001
From: daniceexi <wxp@cn.ibm.com>
Date: Mon, 29 Dec 2014 03:00:32 -0500
Subject: [PATCH] Remove the capping related information from man page and
 usage

---
 perl-xCAT/xCAT/Usage.pm                |  2 +-
 xCAT-client/pods/man1/renergy.1.pod    |  5 +++--
 xCAT-server/lib/xcat/plugins/energy.pm | 10 +++++-----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/perl-xCAT/xCAT/Usage.pm b/perl-xCAT/xCAT/Usage.pm
index e458cc8f8..6cbcaa4f9 100644
--- a/perl-xCAT/xCAT/Usage.pm
+++ b/perl-xCAT/xCAT/Usage.pm
@@ -341,7 +341,7 @@ my %usage = (
       renergy noderange [-V] { {savingstatus}={on | off} | {dsavingstatus}={on-norm | on-maxp | off} | {fsavingstatus}={on | off} | {ffovalue}=MHZ | {cappingstatus}={on | off} | {cappingwatt}=watt | {cappingperc}=percentage }
 
     Power 8 server specific :
-      renergy noderange [-V] { all | [savingstatus] [dsavingstatus] [cappingstatus] [cappingmaxmin] [cappingvalue] [cappingsoftmin] [averageAC] [averageAChistory] [averageDC] [averageDChistory] [ambienttemp] [ambienttemphistory] [exhausttemp] [exhausttemphistory] [fanspeed] [fanspeedhistory] [CPUspeed] [CPUspeedhistory] [syssbpower] [sysIPLtime] [fsavingstatus] [ffoMin] [ffoVmin] [ffoTurbo] [ffoNorm] [ffovalue]}
+      renergy noderange [-V] { all | [savingstatus] [dsavingstatus] [averageAC] [averageAChistory] [averageDC] [averageDChistory] [ambienttemp] [ambienttemphistory] [exhausttemp] [exhausttemphistory] [fanspeed] [fanspeedhistory] [CPUspeed] [CPUspeedhistory] [syssbpower] [sysIPLtime] [fsavingstatus] [ffoMin] [ffoVmin] [ffoTurbo] [ffoNorm] [ffovalue]}
       renergy noderange [-V] { savingstatus={on | off} | dsavingstatus={on-norm | on-maxp | off} | fsavingstatus={on | off} | ffovalue=MHZ }
 
     BladeCenter specific :
diff --git a/xCAT-client/pods/man1/renergy.1.pod b/xCAT-client/pods/man1/renergy.1.pod
index c6d5a0068..c036e9148 100644
--- a/xCAT-client/pods/man1/renergy.1.pod
+++ b/xCAT-client/pods/man1/renergy.1.pod
@@ -46,7 +46,6 @@ B<Power 8 server specific :>
 =over 2
 
 B<renergy> I<noderange> [-V] { all | [savingstatus] [dsavingstatus] 
-[cappingstatus] [cappingmaxmin] [cappingvalue] [cappingsoftmin] 
 [averageAC] [averageAChistory] [averageDC] [averageDChistory] 
 [ambienttemp] [ambienttemphistory] [exhausttemp] [exhausttemphistory] 
 [fanspeed] [fanspeedhistory] [CPUspeed] [CPUspeedhistory]
@@ -283,12 +282,14 @@ Display the version information.
 
 Verbose output.
 
-
 =item B<all>
 
 Query all energy attributes which supported by the specific 
 type of hardware.
 
+For I<Power8> machines, will not display the attributes
+for historical records.
+
 =item B<pd1all>
 
 Query all energy attributes of the power domain 1 for blade
diff --git a/xCAT-server/lib/xcat/plugins/energy.pm b/xCAT-server/lib/xcat/plugins/energy.pm
index 339a21804..c17b10371 100644
--- a/xCAT-server/lib/xcat/plugins/energy.pm
+++ b/xCAT-server/lib/xcat/plugins/energy.pm
@@ -234,23 +234,23 @@ sub preprocess_request
     my $callback = shift;
 
     # Exit if the packet has been preprocessed
-    if (defined ($req->{_xcatpreprocessed}) && $req->{_xcatpreprocessed}->[0] == 1) { return [$req]; }
+    if (defined ($req->{_xcatpreprocessed}->[0]) && $req->{_xcatpreprocessed}->[0] == 1) { return [$req]; }
 
     my ($rc, $args) = parse_args($req);
     if ($rc) {
         # error or message display happens
         xCAT::MsgUtils->message("E", {error => [$args], errorcode => [$rc]}, $callback);
-        return;
+        return [];
     } else {
         unless (ref($args)) {
             xCAT::MsgUtils->message("I", {data => [$args]}, $callback);
-            return;
+            return [];
         }
     }
 
     # do nothing if no query or setting required. 
     unless (defined ($args->{query_list}) || defined($args->{set_pair})) {
-        return;
+        return [];
     }
 
     # This plugin only handle the node which is 1. mgt=fsp, mtm=(p8); 2. mgt=ipmi, arch=ppc64le;
@@ -289,7 +289,7 @@ sub preprocess_request
         return \@requests;
     }
 
-    return;
+    return [];
 }