[RICPLT-2584,2789] Code fixes + tests for E2T instance shutdown flow

[ric-plt/e2mgr.git] / Automation / Tests / Resource / Keywords.robot

diff --git a/Automation/Tests/Resource/Keywords.robot b/Automation/Tests/Resource/Keywords.robot
index 2593c5f..eea1ce6 100644 (file)
--- a/Automation/Tests/Resource/Keywords.robot
+++ b/Automation/Tests/Resource/Keywords.robot
@@ -26,21 +26,15 @@ Library     ../Scripts/cleanup_db.py
 Resource   ../Resource/resource.robot
 Library     OperatingSystem
 
-
-
-
-
 *** Keywords ***
 Post Request setup node b x-2
     Set Headers     ${header}
     POST        /v1/nodeb/x2-setup    ${json}
 
-
 Put Request Resource Status Start
     Set Headers     ${header}
     PUT        /v1/general/resourcestatus  ${resource_status_start_json}
 
-
 Put Request Resource Status Stop
     Set Headers     ${header}
     PUT        /v1/general/resourcestatus  ${resource_status_stop_json}
@@ -49,12 +43,10 @@ Get Request node b enb test1
     Sleep    1s
     GET      /v1/nodeb/test1
 
-
-Get Request node b enb test2
+Get Request node b gnb test2
     Sleep    1s
     GET      /v1/nodeb/test2
 
-
 Remove log files
     Remove File  ${EXECDIR}/${gnb_log_filename}
     Remove File  ${EXECDIR}/${e2mgr_log_filename}
@@ -83,7 +75,6 @@ Stop Simulator
     Run And Return Rc And Output    ${stop_simu}
 
 
-
 Prepare Simulator For Load Information
      Run And Return Rc And Output    ${stop_simu}
      Run And Return Rc And Output    ${docker_Remove}
@@ -94,6 +85,7 @@ Prepare Simulator For Load Information
      Should Be Equal As Integers    ${result[1]}    ${docker_number}
 
 Prepare Enviorment
+     Log To Console  Starting preparations
      ${starting_timestamp}    Evaluate   datetime.datetime.now(datetime.timezone.utc).isoformat("T")   modules=datetime 
      ${e2t_log_filename}      Evaluate      "e2t.${SUITE NAME}.log".replace(" ","-")
      ${e2mgr_log_filename}    Evaluate      "e2mgr.${SUITE NAME}.log".replace(" ","-")
@@ -123,7 +115,8 @@ Prepare Enviorment
      Set Suite Variable  ${Save_e2e_simu_log}
      Set Suite Variable  ${Save_rm_sim_log}
      Set Suite Variable  ${Save_e2adapter_log}
-       
+
+        Log To Console  Ready to flush db
      ${flush}  cleanup_db.flush
      Should Be Equal As Strings  ${flush}  True
      Run And Return Rc And Output    ${stop_simu}
@@ -133,7 +126,8 @@ Prepare Enviorment
      Run And Return Rc And Output    ${run_simu_regular}
      Run And Return Rc And Output    ${run_e2e_simu_regular}
      Run And Return Rc And Output    ${restart_e2adapter}
-     Sleep  2s
+     Sleep  3s
+     Log To Console  Validating dockers are up
      ${result}=  Run And Return Rc And Output     ${docker_command}
      Should Be Equal As Integers    ${result[1]}    ${docker_number}
 
@@ -166,7 +160,11 @@ Restart simulator
     ${result}=  Run And Return Rc And Output     ${docker_command}
     Should Be Equal As Integers    ${result[1]}    ${docker_number}
 
+Start RoutingManager Simulator
+    Run And Return Rc And Output    ${start_routingmanager_sim}
 
+Stop RoutingManager Simulator
+    Run And Return Rc And Output    ${stop_routingmanager_sim}