[RIC-571] Support new eNB setup request + fix non-deterministic unit tests

[ric-plt/e2mgr.git] / Automation / Tests / Lost_Connection / LostConnectionTestConnectedRan.robot

diff --git a/Automation/Tests/Lost_Connection/LostConnectionTestConnectedRan.robot b/Automation/Tests/Lost_Connection/LostConnectionTestConnectedRan.robot
index e19efed..3d9a0ef 100644 (file)
--- a/Automation/Tests/Lost_Connection/LostConnectionTestConnectedRan.robot
+++ b/Automation/Tests/Lost_Connection/LostConnectionTestConnectedRan.robot
@@ -20,31 +20,37 @@
 #   platform project (RICP).
 #
 *** Settings ***
 #   platform project (RICP).
 #
 *** Settings ***

-Suite Setup   Prepare Enviorment
+Variables  ../Scripts/variables.py
+Suite Setup   Prepare Enviorment    ${True}

 Resource   ../Resource/resource.robot
 Resource   ../Resource/Keywords.robot
 Resource   ../Resource/resource.robot
 Resource   ../Resource/Keywords.robot

-Resource   ../Resource/scripts_variables.robot

 Library    ../Scripts/find_error_script.py
 Library     ../Scripts/e2mdbscripts.py
 Library    ../Scripts/find_error_script.py
 Library     ../Scripts/e2mdbscripts.py

+Library     ../Scripts/log_scripts.py

 Library     OperatingSystem
 Library    Collections
 Library     REST      ${url}
 
 Library     OperatingSystem
 Library    Collections
 Library     REST      ${url}
 

+*** Variables ***
+${url}  ${e2mgr_address}

 
 *** Test Cases ***
 
 
 *** Test Cases ***
 

+Prepare Redis Monitor Log
+    Start Redis Monitor
+

 Setup Ran and verify it's CONNECTED and associated
     Get Request node b gnb
     Integer  response status  200
     String   response body ranName    ${ranname}
     String   response body connectionStatus    CONNECTED
 Setup Ran and verify it's CONNECTED and associated
     Get Request node b gnb
     Integer  response status  200
     String   response body ranName    ${ranname}
     String   response body connectionStatus    CONNECTED

-    String   response body associatedE2tInstanceAddress  ${e2tinstanceaddress}
+    String   response body associatedE2tInstanceAddress  ${e2t_alpha_address}

 
 Stop simulator
    Stop Simulator
 
 Verify connection status is DISCONNECTED and RAN is not associated with E2T instance
 
 Stop simulator
    Stop Simulator
 
 Verify connection status is DISCONNECTED and RAN is not associated with E2T instance

-    Sleep    2s
+    Sleep    30s

     GET      ${getNodeb}
     Integer  response status  200
     String   response body ranName    ${ranname}
     GET      ${getNodeb}
     Integer  response status  200
     String   response body ranName    ${ranname}


@@ -56,9 +62,13 @@ prepare logs for tests
     Save logs
 
 Verify E2T instance is NOT associated with RAN
     Save logs
 
 Verify E2T instance is NOT associated with RAN

-   ${result}    e2mdbscripts.verify_ran_is_associated_with_e2t_instance     ${ranname}  ${e2tinstanceaddress}
+   ${result}    e2mdbscripts.verify_ran_is_associated_with_e2t_instance     ${ranname}  ${e2t_alpha_address}

    Should Be True    ${result} == False
 
    Should Be True    ${result} == False
 

-Verify e2mgr logs - Set and Publish Disconnect True
-  ${result}    find_error_script.find_error     ${EXECDIR}  ${e2mgr_log_filename}    ${set_and_publish_disconnect}
-   Should Be Equal As Strings    ${result}      True
\ No newline at end of file
+Redis Monitor Logs - Verify Publish
+    Redis Monitor Logs - Verify Publish To Connection Status Channel   ${ran_name}    DISCONNECTED
+
+[Teardown]    Run Keywords
+              Start Simulator
+              AND wait until keyword succeeds  1 min    10 sec    Validate Required Dockers
+              AND Stop Redis Monitor
\ No newline at end of file