Update redfish host graceful restart boot type
Changes:
- Modify "Redfish Host Reboot" to "RF SYS GracefulRestart".
- Update lib and test cases with new boot type name.
Change-Id: I8fe9c9569bb20810604a792263eb9f76eec66d16
Signed-off-by: George Keishing <gkeishin@in.ibm.com>
diff --git a/data/applytime_table.json b/data/applytime_table.json
index 3452f18..f94df9a 100644
--- a/data/applytime_table.json
+++ b/data/applytime_table.json
@@ -4,7 +4,7 @@
"Immediate": "Wait For Reboot start_boot_seconds=${state['epoch_seconds']}"
},
"Host image": {
- "OnReset": "Redfish Host Reboot",
+ "OnReset": "RF SYS GracefulRestart",
"Immediate": "Wait State os_running_match_state 10 mins"
}
}
diff --git a/data/boot_lists/All b/data/boot_lists/All
index b44e899..8a3acd3 100755
--- a/data/boot_lists/All
+++ b/data/boot_lists/All
@@ -60,8 +60,8 @@
Auto Reboot (mfg)
Host Reboot
Host Reboot (mfg)
-Redfish Host Reboot
-Redfish Host Reboot (mfg)
+RF SYS GracefulRestart
+RF SYS GracefulRestart (mfg)
RF SYS ForceRestart
pflash
Out of Band Code Update
diff --git a/data/boot_lists/Manufacturing b/data/boot_lists/Manufacturing
index 51143b3..5ec1095 100755
--- a/data/boot_lists/Manufacturing
+++ b/data/boot_lists/Manufacturing
@@ -29,5 +29,5 @@
IPMI Power Reset (mfg)
Auto Reboot (mfg)
Host Reboot (mfg)
-Redfish Host Reboot (mfg)
+RF SYS GracefulRestart (mfg)
RF SYS ForceRestart (mfg)
diff --git a/data/boot_lists/OS_reboot b/data/boot_lists/OS_reboot
index 28eaec6..f023a49 100755
--- a/data/boot_lists/OS_reboot
+++ b/data/boot_lists/OS_reboot
@@ -8,6 +8,6 @@
Auto Reboot (mfg)
Host Reboot
Host Reboot (mfg)
-Redfish Host Reboot
-Redfish Host Reboot (mfg)
+RF SYS GracefulRestart
+RF SYS GracefulRestart (mfg)
RF SYS ForceRestart
diff --git a/data/boot_table.json b/data/boot_table.json
index 3b049f8..b38a9fb 100644
--- a/data/boot_table.json
+++ b/data/boot_table.json
@@ -739,7 +739,7 @@
"lib_file_path": "utils.robot"
},
# Initiate host reboot using the Redfish API interface (GracefulRestart).
- "Redfish Host Reboot": {
+ "RF SYS GracefulRestart": {
"start": {
"rest": "^1$",
"chassis": "^On$",
diff --git a/lib/boot_utils.robot b/lib/boot_utils.robot
index 61bc876..ee50d4b 100644
--- a/lib/boot_utils.robot
+++ b/lib/boot_utils.robot
@@ -824,8 +824,8 @@
Run Key U ${cmd_buf}
-Redfish Host Reboot
- [Documentation] Do "Redfish Host Reboot" boot test.
+RF SYS GracefulRestart
+ [Documentation] Do "RF SYS GracefulRestart" boot test.
[Arguments] ${stack_mode}=${stack_mode} ${quiet}=${quiet}
# Description of argument(s):
@@ -845,7 +845,7 @@
# information. The default value is the
# global value of "${quiet}"
- ${cmd_buf} Catenate OBMC Boot Test \ loc_boot_stack=Redfish Host Reboot
+ ${cmd_buf} Catenate OBMC Boot Test \ loc_boot_stack=RF SYS GracefulRestart
... \ loc_stack_mode=${stack_mode} \ loc_quiet=${quiet}
Run Key U ${cmd_buf}
diff --git a/lib/utils.robot b/lib/utils.robot
index 152b9b7..f05ff31 100755
--- a/lib/utils.robot
+++ b/lib/utils.robot
@@ -726,7 +726,7 @@
# Immediate: Wait For Reboot start_boot_seconds=${state['epoch_seconds']}
# },
# Host image: {
- # OnReset: Redfish Host Reboot,
+ # OnReset: RF SYS GracefulRestart,
# Immediate: Wait State os_running_match_state 10 mins
# }
# }
diff --git a/redfish/extended/test_occ_power.robot b/redfish/extended/test_occ_power.robot
index 3efc077..61fc3ee 100644
--- a/redfish/extended/test_occ_power.robot
+++ b/redfish/extended/test_occ_power.robot
@@ -53,7 +53,7 @@
${occ_count_before}= Count OCC Object Entry
Verify OCC State ${1}
- Redfish Host Reboot
+ RF SYS GracefulRestart
Verify OCC State ${1}
${occ_count_after}= Count OCC Object Entry
Should be Equal ${occ_count_before} ${occ_count_after}
diff --git a/redfish/extended/test_os_reboot.robot b/redfish/extended/test_os_reboot.robot
index f2ce7a5..ad2316a 100644
--- a/redfish/extended/test_os_reboot.robot
+++ b/redfish/extended/test_os_reboot.robot
@@ -31,7 +31,7 @@
# Note: Host Reboot is implemented by the OBMC Boot Test tool.
# OBMC Boot Test will take the necessary steps to get the OBMC
# to a host powered on state before attempting the Host Reboot.
- Repeat Keyword ${BOOT_LOOP_COUNT} times Redfish Host Reboot
+ Repeat Keyword ${BOOT_LOOP_COUNT} times RF SYS GracefulRestart
*** Keywords ***
diff --git a/redfish/systems/test_power_operations.robot b/redfish/systems/test_power_operations.robot
index 6fc7c22..bcfc854 100644
--- a/redfish/systems/test_power_operations.robot
+++ b/redfish/systems/test_power_operations.robot
@@ -46,7 +46,7 @@
[Documentation] Verify Redfish host graceful restart operation.
[Tags] Verify_Redfish_Host_GracefulRestart
- Redfish Host Reboot
+ RF SYS GracefulRestart
Verify Redfish BMC PowerOff