Update reset reload test

Fixes:
   - Rename keyword.
   - Replace old logic with new wait on OS booted stat.

Note: Due to default power policy default to "AlwaysOff", test needs
to wait for host to boot prior to reset and also wait for host to boot
back post reset to complete "reset reload" verification.

Change-Id: Ie7227b3bbd88b0bd5f3333fe25ee6ace6c4dca4b
Signed-off-by: George Keishing <gkeishin@in.ibm.com>
diff --git a/tests/test_reset_reload.robot b/tests/test_reset_reload.robot
index 89eb407..a19e8ce 100644
--- a/tests/test_reset_reload.robot
+++ b/tests/test_reset_reload.robot
@@ -7,7 +7,7 @@
 Resource            ../lib/openbmc_ffdc.robot
 
 Test Setup          Open Connection And Log In
-Test Teardown       Post Testcase Execution
+Test Teardown       Test Teardown Execution
 
 *** Variables ***
 
@@ -20,19 +20,13 @@
     [Tags]  Verify_BMC_Reset_Reload_With_System_On
 
     Initiate Host Boot
-    Wait Until Keyword Succeeds  5 min  10 sec  Is Chassis On
-    ${chassis_state_before}=  Run Keyword  Get Chassis Power State
 
     Trigger Reset Reload via BMC Reboot
 
-    ${chassis_state_after}=  Run Keyword  Get Chassis Power State
-    ${rr_status}=  Run Keyword  Check Reset Reload Status
-
-    Should Be Equal  ${chassis_state_before}  ${chassis_state_after}
+    ${rr_status}=  Check Reset Reload Status
     Should Be Equal  ${rr_status}  Yes
 
-    ${host_state}=  Run Keyword  Get Host State
-    Should Be Equal  ${host_state}  Running
+    Wait Until Keyword Succeeds  5 min  10 sec  Is OS Booted
 
 
 *** Keywords ***
@@ -52,7 +46,7 @@
     Wait Until Keyword Succeeds  10 min  10 sec  Is BMC Ready
 
 
-Post Testcase Execution
+Test Teardown Execution
     [Documentation]  Do the post test teardown.
     ...  1. Capture FFDC on test failure.
     ...  2. Close all open SSH connections.