From b2a0709e44ad5e3531d9f68c5f783438fe70e688 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 23 Jul 2008 13:45:25 +0000
Subject: [PATCH] -Correct assumption made in previous fix, have rpower stat
 work on blades again

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@1935 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/blade.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xCAT-server/lib/xcat/plugins/blade.pm b/xCAT-server/lib/xcat/plugins/blade.pm
index 8ff6c7630..6967160f9 100644
--- a/xCAT-server/lib/xcat/plugins/blade.pm
+++ b/xCAT-server/lib/xcat/plugins/blade.pm
@@ -1076,6 +1076,7 @@ sub power {
   my $subcommand = shift;
   my $data;
   my $stat;
+  my $validsub=0;
   unless ($slot > 0) {
      if ($subcommand eq "reset" or $subcommand eq "boot") {
         $data = $session->set(new SNMP::Varbind([".1.3.6.1.4.1.2.3.51.2.7.4",0,1,'INTEGER']));
@@ -1086,6 +1087,7 @@ sub power {
      }
   }
   if ($subcommand eq "stat" or $subcommand eq "boot") {
+    $validsub=1;
     $data = $session->get([$powerstatoid.".".$slot]);
     if ($data == 1) {
       $stat = "on";
@@ -1095,6 +1097,7 @@ sub power {
       $stat= "error";
     }
   } elsif ($subcommand eq "off") {
+    $validsub=1;
     $data = $session->set(new SNMP::Varbind([".".$powerchangeoid,$slot,0,'INTEGER']));
     unless ($data) { return (1,$session->{ErrorStr}); }
     $stat = "off";
@@ -1107,7 +1110,7 @@ sub power {
     $data = $session->set(new SNMP::Varbind([".".$powerresetoid,$slot ,1,'INTEGER']));
     unless ($data) { return (1,$session->{ErrorStr}); }
     $stat = "on reset";
-  } else {
+  } elsif (not $validsub) {
       return 1,"Unknown/Unsupported power command $subcommand";
   }
   if ($session->{ErrorStr}) { return (1,$session->{ErrorStr}); }