Support for new 'Redfish OBMC Reboot' tests
Change-Id: Id11cdb5c8f6469c4d246903aeec6a708c38341cf
Signed-off-by: Michael Walsh <micwalsh@us.ibm.com>
diff --git a/data/boot_lists/All b/data/boot_lists/All
index 1ab8605..eeba815 100755
--- a/data/boot_lists/All
+++ b/data/boot_lists/All
@@ -26,10 +26,14 @@
OBMC Reboot (run) (mfg)
REST OBMC Reboot (run)
REST OBMC Reboot (run) (mfg)
+Redfish OBMC Reboot (run)
+Redfish OBMC Reboot (run) (mfg)
OBMC Reboot (off)
OBMC Reboot (off) (mfg)
REST OBMC Reboot (off)
REST OBMC Reboot (off) (mfg)
+Redfish OBMC Reboot (off)
+Redfish OBMC Reboot (off) (mfg)
PDU AC Cycle (run)
PDU AC Cycle (run) (mfg)
PDU AC Cycle (off)
diff --git a/data/boot_lists/Manufacturing b/data/boot_lists/Manufacturing
index 6075329..c837437 100755
--- a/data/boot_lists/Manufacturing
+++ b/data/boot_lists/Manufacturing
@@ -11,8 +11,10 @@
APOR (mfg)
OBMC Reboot (run) (mfg)
REST OBMC Reboot (run) (mfg)
+Redfish OBMC Reboot (run) (mfg)
OBMC Reboot (off) (mfg)
REST OBMC Reboot (off) (mfg)
+Redfish OBMC Reboot (off) (mfg)
PDU AC Cycle (run) (mfg)
PDU AC Cycle (off) (mfg)
IPMI MC Reset Warm (run) (mfg)
diff --git a/data/boot_lists/OBMC_reboot b/data/boot_lists/OBMC_reboot
index 29637d1..3d6bbcf 100755
--- a/data/boot_lists/OBMC_reboot
+++ b/data/boot_lists/OBMC_reboot
@@ -4,10 +4,14 @@
OBMC Reboot (run) (mfg)
REST OBMC Reboot (run)
REST OBMC Reboot (run) (mfg)
+Redfish OBMC Reboot (run)
+Redfish OBMC Reboot (run) (mfg)
OBMC Reboot (off)
OBMC Reboot (off) (mfg)
REST OBMC Reboot (off)
REST OBMC Reboot (off) (mfg)
+Redfish OBMC Reboot (off)
+Redfish OBMC Reboot (off) (mfg)
PDU AC Cycle (run)
PDU AC Cycle (run) (mfg)
PDU AC Cycle (off)
diff --git a/data/boot_table.json b/data/boot_table.json
index fb5bd80..df1a4b2 100644
--- a/data/boot_table.json
+++ b/data/boot_table.json
@@ -313,6 +313,33 @@
"method": "Initiate BMC Reboot wait=${0}",
"lib_file_path": "state_manager.robot"
},
+ # Run a Redfish "reboot" on the OBMC while host is running.
+ "Redfish OBMC Reboot (run)": {
+ "start": {
+ "rest": "^1$",
+ "chassis": "^On$",
+ "boot_progress": "^FW Progress, Starting OS|OSStart$",
+ "operating_system": "^BootComplete$",
+ "host": "^Running$",
+ "os_ping": "^1$",
+ "os_login": "^1$",
+ "os_run_cmd": "^1$"
+ },
+ "end": {
+ "rest": "^1$",
+ "chassis": "^On$",
+ "boot_progress": "^FW Progress, Starting OS|OSStart$",
+ "operating_system": "^BootComplete$",
+ "host": "^Running$",
+ "os_ping": "^1$",
+ "os_login": "^1$",
+ "os_run_cmd": "^1$"
+ },
+ "bmc_reboot": 1,
+ "method_type": "keyword",
+ "method": "Redfish BMC Reset Operation",
+ "lib_file_path": "bmc_redfish_utils.robot"
+ },
# Run a "reboot" on the OBMC while host is off.
"OBMC Reboot (off)": {
"start": {
@@ -348,6 +375,24 @@
"method": "Initiate BMC Reboot wait=${0}",
"lib_file_path": "state_manager.robot"
},
+ # Run a "reboot" on the OBMC while host is off.
+ "Redfish OBMC Reboot (off)": {
+ "start": {
+ "rest": "^1$",
+ "chassis": "^Off$"
+ },
+ "end": {
+ "rest": "^1$",
+ "chassis": "^Off$",
+ "boot_progress": "^Off|Unspecified$",
+ "operating_system": "^Inactive$",
+ "host": "^Off$"
+ },
+ "bmc_reboot": 1,
+ "method_type": "keyword",
+ "method": "Redfish BMC Reset Operation",
+ "lib_file_path": "bmc_redfish_utils.robot"
+ },
# Cycle AC via the PDU while host is off.
"PDU AC Cycle (run)": {
"start": {