New 'REST OBMC Reboot (off)'/'REST OBMC Reboot (run)'.
Change-Id: I62e9f4cd3491616eb818aa128e742bf408f0be3e
Signed-off-by: Michael Walsh <micwalsh@us.ibm.com>
diff --git a/data/boot_lists/All b/data/boot_lists/All
index c75b10b..21b7da2 100755
--- a/data/boot_lists/All
+++ b/data/boot_lists/All
@@ -18,8 +18,12 @@
APOR (mfg)
OBMC Reboot (run)
OBMC Reboot (run) (mfg)
+REST OBMC Reboot (run)
+REST OBMC Reboot (run) (mfg)
OBMC Reboot (off)
OBMC Reboot (off) (mfg)
+REST OBMC Reboot (off)
+REST 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 ea07c75..8a8bdd0 100755
--- a/data/boot_lists/Manufacturing
+++ b/data/boot_lists/Manufacturing
@@ -7,7 +7,9 @@
Host Power Off (mfg)
APOR (mfg)
OBMC Reboot (run) (mfg)
+REST OBMC Reboot (run) (mfg)
OBMC Reboot (off) (mfg)
+REST 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 9fef87e..ba2ed82 100755
--- a/data/boot_lists/OBMC_reboot
+++ b/data/boot_lists/OBMC_reboot
@@ -2,8 +2,12 @@
APOR (mfg)
OBMC Reboot (run)
OBMC Reboot (run) (mfg)
+REST OBMC Reboot (run)
+REST OBMC Reboot (run) (mfg)
OBMC Reboot (off)
OBMC Reboot (off) (mfg)
+REST OBMC Reboot (off)
+REST 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 4c81f8a..e518690 100644
--- a/data/boot_table.json
+++ b/data/boot_table.json
@@ -206,6 +206,31 @@
"method_type": "keyword",
"method": "BMC Execute Command /sbin/reboot fork=${1}"
},
+ # Run a REST "reboot" on the OBMC while host is running.
+ "REST OBMC Reboot (run)": {
+ "start": {
+ "rest": "^1$",
+ "chassis": "^On$",
+ "boot_progress": "^FW Progress, Starting OS|OSStart$",
+ "host": "^Running$",
+ "os_ping": "^1$",
+ "os_login": "^1$",
+ "os_run_cmd": "^1$"
+ },
+ "end": {
+ "rest": "^1$",
+ "chassis": "^On$",
+ "boot_progress": "^FW Progress, Starting OS|OSStart$",
+ "host": "^Running$",
+ "os_ping": "^1$",
+ "os_login": "^1$",
+ "os_run_cmd": "^1$"
+ },
+ "bmc_reboot": 1,
+ "method_type": "keyword",
+ "method": "Initiate BMC Reboot wait=${0}",
+ "lib_file_path": "state_manager.robot"
+ },
# Run a "reboot" on the OBMC while host is off.
"OBMC Reboot (off)": {
"start": {
@@ -222,6 +247,23 @@
"method_type": "keyword",
"method": "BMC Execute Command /sbin/reboot fork=${1}"
},
+ # Run a "reboot" on the OBMC while host is off.
+ "REST OBMC Reboot (off)": {
+ "start": {
+ "rest": "^1$",
+ "chassis": "^Off$"
+ },
+ "end": {
+ "rest": "^1$",
+ "chassis": "^Off$",
+ "boot_progress": "^Off|Unspecified$",
+ "host": "^Off$"
+ },
+ "bmc_reboot": 1,
+ "method_type": "keyword",
+ "method": "Initiate BMC Reboot wait=${0}",
+ "lib_file_path": "state_manager.robot"
+ },
# Cycle AC via the PDU while host is off.
"PDU AC Cycle (run)": {
"start": {