X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=Automation%2FTests%2FKeepAlive%2Fkeep_alive_test.robot;h=e7c7ae869468da15aee5afd3c99a240f7fe2d569;hb=dbc719cd2dfa73363386114c9e85c8c42a441489;hp=89e1b87e6fc1740c5bc6c8a739a7ad2c19853eda;hpb=514e6041ca6b9b92cb887c941767f298a746e315;p=ric-plt%2Fe2mgr.git

diff --git a/Automation/Tests/KeepAlive/keep_alive_test.robot b/Automation/Tests/KeepAlive/keep_alive_test.robot
index 89e1b87..e7c7ae8 100644
--- a/Automation/Tests/KeepAlive/keep_alive_test.robot
+++ b/Automation/Tests/KeepAlive/keep_alive_test.robot
@@ -16,29 +16,30 @@ robot###########################################################################
 #
 ##############################################################################
 *** Settings ***
-Suite Setup   Prepare Enviorment
+Variables  ../Scripts/variables.py
+Suite Setup   Prepare Enviorment    ${True}    ${False}
 Resource   ../Resource/resource.robot
 Resource   ../Resource/Keywords.robot
-Resource   ../Resource/scripts_variables.robot
 Library    ../Scripts/find_error_script.py
 Library     ../Scripts/find_rmr_message.py
-Library     ../Scripts/rsmscripts.py
 Library     ../Scripts/e2mdbscripts.py
 Library    OperatingSystem
 Library    Collections
 Library     REST      ${url}
 
+*** Variables ***
+${url}  ${e2mgr_address}
 
 *** Test Cases ***
 
 Get request gnb
     Sleep    2s
-    Get Request node b gnb
+    Get Request nodeb
     Integer  response status  200
     String   response body ranName    ${ranname}
     String   response body connectionStatus    CONNECTED
     String   response body nodeType     GNB
-    String   response body associatedE2tInstanceAddress  ${e2tinstanceaddress}
+    String   response body associatedE2tInstanceAddress  ${e2t_alpha_address}
     Integer  response body gnb ranFunctions 0 ranFunctionId  1
     Integer  response body gnb ranFunctions 0 ranFunctionRevision  1
     Integer  response body gnb ranFunctions 1 ranFunctionId  2
@@ -52,30 +53,32 @@ prepare logs for tests
     Save logs
 
 Verify RAN is associated with E2T instance
-   ${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}
 
 Stop E2T
     Stop E2
-    Sleep  3s
 
 Prepare logs
     Remove log files
     Save logs
 
 Verify RAN is not associated with E2T instance
-    Get Request node b gnb
+    Sleep  6m
+    Get Request nodeb
     Integer  response status  200
     String   response body ranName    ${ranname}
     Missing  response body associatedE2tInstanceAddress
     String   response body connectionStatus    DISCONNECTED
 
 Verify E2T instance removed from db
-    ${result}    e2mdbscripts.verify_e2t_instance_key_exists     ${e2tinstanceaddress}
+    ${result}    e2mdbscripts.verify_e2t_instance_key_exists     ${e2t_alpha_address}
     Should Be True    ${result} == False
 
-    ${result}    e2mdbscripts.verify_e2t_instance_exists_in_addresses     ${e2tinstanceaddress}
+    ${result}    e2mdbscripts.verify_e2t_instance_exists_in_addresses     ${e2t_alpha_address}
     Should Be True    ${result} == False
 
-Start E2T
-    Start E2
\ No newline at end of file
+
+[Teardown]    Run Keywords
+              Start E2
+              AND wait until keyword succeeds  2 min    10 sec    Validate Required Dockers
\ No newline at end of file