From 55581cb2db3cc8b518bb255ecbda0af3ca89c08e Mon Sep 17 00:00:00 2001
From: Casandra Qiu <cxhong@us.ibm.com>
Date: Thu, 17 May 2018 15:04:53 -0400
Subject: [PATCH] Modify output message for PDU outlet state

---
 xCAT-server/lib/xcat/plugins/openbmc.pm  |  8 +++++++
 xCAT-server/lib/xcat/plugins/openbmc2.pm |  8 +++++++
 xCAT-server/lib/xcat/plugins/pdu.pm      | 27 ++++++++++++++++++------
 3 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index e6cdb8533..7841afcde 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -803,6 +803,14 @@ sub preprocess_request {
         return;
     }
 
+    #pdu commands will be handled in the pdu plugin
+    if ($command eq "rpower") {
+        my $subcmd = $exargs[0];
+        if(($subcmd eq 'pduoff') || ($subcmd eq 'pduon') || ($subcmd eq 'pdustat') || ($subcmd eq 'pdureset')){
+            return;
+        }
+    }
+
     my $parse_result = parse_args($command, $extrargs, $noderange);
     if (ref($parse_result) eq 'ARRAY') {
         my $error_data;
diff --git a/xCAT-server/lib/xcat/plugins/openbmc2.pm b/xCAT-server/lib/xcat/plugins/openbmc2.pm
index cae8d1363..524c0b634 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc2.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc2.pm
@@ -86,6 +86,14 @@ sub preprocess_request {
         return;
     }
 
+    #pdu commands will be handled in the pdu plugin
+    if ($command eq "rpower") {
+        my $subcmd = $exargs[0];
+        if(($subcmd eq 'pduoff') || ($subcmd eq 'pduon') || ($subcmd eq 'pdustat') || ($subcmd eq 'pdureset')){
+             return;
+        }
+    }
+
     my $parse_result = parse_args($command, $extrargs, $noderange);
     if (ref($parse_result) eq 'ARRAY') {
         my $error_data;
diff --git a/xCAT-server/lib/xcat/plugins/pdu.pm b/xCAT-server/lib/xcat/plugins/pdu.pm
index 5d7857991..e5d0798bf 100644
--- a/xCAT-server/lib/xcat/plugins/pdu.pm
+++ b/xCAT-server/lib/xcat/plugins/pdu.pm
@@ -404,7 +404,7 @@ sub powerpduoutlet {
             if ($session->{ErrorStr}) { 
                 $callback->({ errorcode => [1],error => "$node: $pdu outlet $outlet has error = $session->{ErrorStr}"});
             } else {
-                $output = "$pdu outlet $outlet is $statstr"; 
+                $output = "$pdu operational state for outlet $outlet is $statstr"; 
                 xCAT::SvrUtils::sendmsg($output, $callback, $node, %allerrornodes);
             }
         }
@@ -508,7 +508,7 @@ sub powerstat {
         for (my $outlet =1; $outlet <= $count; $outlet++)
         {
             my $statstr = outletstat($session, $outlet);
-            my $msg = " outlet $outlet is $statstr";
+            my $msg = " operational state for the outlet $outlet is $statstr";
             xCAT::SvrUtils::sendmsg($msg, $callback, $pdu, %allerrornodes);
         }
     }
@@ -519,6 +519,13 @@ sub powerstat {
 =head3  outletstat 
 
     Process command to query status of one pdu outlet
+    ibmPduOutletState defined from mib file
+         off(0) 
+         on(1)
+         cycling(2)
+         delaySwitch10(3)
+         delaySwitch30(4)
+         delaySwitch60(5)
 
 =cut
 
@@ -535,12 +542,20 @@ sub outletstat {
     }
 
     $output = $session->get("$oid.$outlet");
-    if ($output eq 1) {
-        $statstr = "on";
-    } elsif ($output eq 0) {
+    if ($output eq 0) {
         $statstr = "off";
+    } elsif ($output eq 1) {
+        $statstr = "on";
+    } elsif ($output eq 2) {
+        $statstr = "cycling";
+    } elsif ($output eq 3) {
+        $statstr = "delaySwitch10";
+    } elsif ($output eq 4) {
+        $statstr = "delaySwitch30";
+    } elsif ($output eq 5) {
+        $statstr = "delaySwitch60";
     } else {
-        return;
+        $statstr = "$output(unknown state)" ;
     }
     return $statstr;
 }