Revert AES changes to old code
Resolves openbmc/openbmc-test-automation#328
Change-Id: Ie95118b39ad45da80b371f5288ec5ad275c6b6f9
Signed-off-by: George Keishing <gkeishin@in.ibm.com>
diff --git a/extended/standby_bmc.robot b/extended/standby_bmc.robot
index 995ed01..d53f669 100644
--- a/extended/standby_bmc.robot
+++ b/extended/standby_bmc.robot
@@ -14,7 +14,6 @@
Resource ../lib/boot/boot_resource_master.robot
Resource ../lib/utils.robot
Resource ../lib/pdu/pdu.robot
-Resource ../lib/state_manager.robot
*** Variables ***
${HOST_SETTING} /org/openbmc/settings/host0
@@ -38,15 +37,16 @@
Wait For Host To Ping ${OPENBMC_HOST} 1 mins
Open Connection And Log In host=${OPENBMC_HOST}
- ${rest_status}= Run Keyword And Return Status Initialize OpenBMC
- Run Keyword If '${rest_status}' == '${False}'
- ... Reboot and Wait for BMC Online
+ ${l_rest}= Run Keyword And Return Status
+ ... Initialize OpenBMC
+ Run Keyword If '${l_rest}' == '${False}'
+ ... Reboot and Wait for BMC Online
- ${ready_status}= Run Keyword And Return Status Is BMC Ready
- Run Keyword If '${ready_status}' == '${False}' Put BMC State Ready
+ ${l_ready}= Run Keyword And Return Status
+ ... Get BMC State and Expect Standby
- ${hostoff_status}= Run Keyword And Return Status Is Host Off
- Run Keyword If '${hostoff_status}' == '${False}' Initiate Host PowerOff
+ Run Keyword If '${l_ready}' == '${False}'
+ ... Initiate Power Off
Prune Journal Log
@@ -83,6 +83,14 @@
... 10 min 10 sec Verify BMC State ${states}
+Get BMC State and Expect Standby
+ [Documentation] Get BMC state and should be at standby
+
+ @{states}= Create List BMC_READY HOST_POWERED_OFF
+ ${bmc_state}= Get BMC State Deprecated
+ Should Contain ${states} ${bmc_state}
+
+
Update Policy Setting
[Documentation] Update the given restore policy
[Arguments] ${policy}