To provide better feedback to the RebootNodeWithPCU() API call:

[pcucontrol.git] / pcucontrol / models / HPiLO.py

diff --git a/pcucontrol/models/HPiLO.py b/pcucontrol/models/HPiLO.py
index 0f00f55..2037ab7 100644 (file)
--- a/pcucontrol/models/HPiLO.py
+++ b/pcucontrol/models/HPiLO.py
@@ -48,7 +48,22 @@ class HPiLO(PCUControl):
         if locfg.s.returncode != 0:
             return cmd_out.strip() + cmd_err.strip()
 
-        cmd = "grep 'MESSAGE' | grep -v 'No error'"
+        if dryrun: 
+            return 0
+
+        locfg = command.CMD()
+        cmd = cmd_str + "locfg.pl -s %s -f %s -u %s -p '%s'" % (
+                    self.host, cmd_str+"iloxml/PowerOn_Server.xml", 
+                    self.username, self.password)
+        cmd_out, cmd_err = locfg.run_noexcept(cmd)
+
+        locfg = command.CMD()
+        cmd = cmd_str + "locfg.pl -s %s -f %s -u %s -p '%s'" % (
+                    self.host, cmd_str+"iloxml/Reset_Server.xml", 
+                    self.username, self.password)
+        cmd_out, cmd_err = locfg.run_noexcept(cmd)
+
+        cmd = "grep 'MESSAGE' | grep -v 'No error' | grep -v 'Server being reset.'"
         p = subprocess.Popen(cmd, shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, 
                             stderr=subprocess.STDOUT, close_fds=True)
         (grep_in, grep_out ) = (p.stdin, p.stdout)