commit 65b12540147f6975d3a873d4a7ddb21fe9457221
author Michael Walsh <micwalsh@us.ibm.com> Fri Feb 03 15:34:38 2017 -0600
committer Andrew Geissler <geissonator@yahoo.com> Wed Feb 08 15:48:06 2017 +0000
tree f286fd1294774c69f5c6890cd3f387558f25505f
parent df9ad3916718b3cb43bfb3fdb3b8e92eae4d6640

More changes to handle new style state processing:

- Changed the bmc state expected values from
  HOST_BOOTED/HOST_POWERED_OFF to Ready/Ready.
- Commented out expectations for boot_progress until we have
  host ipmi enabled.

Change-Id: I7df4c0bc01ca500b59592a1eb6380c7392f5c7d4
Signed-off-by: Michael Walsh <micwalsh@us.ibm.com>

lib/boot/poweroffs.py

diff --git a/lib/boot/poweroffs.py b/lib/boot/poweroffs.py
index d72fd81..ec2673c 100755
--- a/lib/boot/poweroffs.py
+++ b/lib/boot/poweroffs.py
@@ -44,8 +44,10 @@
         cmd_buf = ["Create Dictionary", "power=${0}",
                    "bmc=HOST_POWERED_OFF", "boot_progress=Off"]
     else:
+        # TODO: Add back boot_progress when ipmi is enabled on Witherspoon.
         cmd_buf = ["Create Dictionary", "chassis=Off",
-                   "bmc=HOST_POWERED_OFF", "boot_progress=Off",
+                   "bmc=Ready",
+                   #  "boot_progress=Off",
                    "host=Off"]
     grp.rdpissuing_keyword(cmd_buf)
     final_state = BuiltIn().run_keyword(*cmd_buf)

lib/boot/powerons.py

diff --git a/lib/boot/powerons.py b/lib/boot/powerons.py
index 94ee1b1..0977d4c 100755
--- a/lib/boot/powerons.py
+++ b/lib/boot/powerons.py
@@ -45,9 +45,10 @@
                    "bmc=HOST_BOOTED",
                    "boot_progress=FW Progress, Starting OS"]
     else:
+        # TODO: Add back boot_progress when ipmi is enabled on Witherspoon.
         cmd_buf = ["Create Dictionary", "chassis=On",
-                   "bmc=HOST_BOOTED",
-                   "boot_progress=FW Progress, Starting OS",
+                   "bmc=Ready",
+                   #  "boot_progress=FW Progress, Starting OS",
                    "host=Running"]
     grp.rdpissuing_keyword(cmd_buf)
     final_state = BuiltIn().run_keyword(*cmd_buf)

lib/state.py

diff --git a/lib/state.py b/lib/state.py
index 612753e..33690d4 100755
--- a/lib/state.py
+++ b/lib/state.py
@@ -9,9 +9,10 @@
 some test output showing machine state:
 
 default_state:
-  default_state[power]:                           1
-  default_state[bmc]:                             HOST_BOOTED
+  default_state[chassis]:                         On
+  default_state[bmc]:                             Ready
   default_state[boot_progress]:                   FW Progress, Starting OS
+  default_state[host]:                            Running
   default_state[os_ping]:                         1
   default_state[os_login]:                        1
   default_state[os_run_cmd]:                      1
@@ -62,9 +63,9 @@
                              ('os_run_cmd', '1')])
 else:
     default_state = DotDict([('chassis', 'On'),
-                             ('bmc', 'HOST_BOOTED'),
+                             ('bmc', 'Ready'),
                              ('boot_progress', 'FW Progress, Starting OS'),
-                             ('host', 'Ready'),
+                             ('host', 'Running'),
                              ('os_ping', '1'),
                              ('os_login', '1'),
                              ('os_run_cmd', '1')])
@@ -366,9 +367,11 @@
                        "bmc=^HOST_BOOTED$",
                        "boot_progress=^FW Progress, Starting OS$"]
         else:
+            # TODO: Add back boot_progress when ipmi is enabled on
+            # Witherspoon.
             cmd_buf = ["Create Dictionary", "chassis=^On$",
-                       "bmc=^HOST_BOOTED$",
-                       "boot_progress=^FW Progress, Starting OS$"]
+                       "bmc=^Ready$"]
+            #           "boot_progress=^FW Progress, Starting OS$"]
         grp.rdpissuing_keyword(cmd_buf)
         os_up_match = BuiltIn().run_keyword(*cmd_buf)
         os_up = compare_states(state, os_up_match)