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=07faee29f1366175ead9e78b9fc13c688b24c4a5;hpb=380b7a2a46087a054ebfac57f3dbf7949d318cc6;p=ric-plt%2Fe2mgr.git

diff --git a/Automation/Tests/KeepAlive/keep_alive_test.robot b/Automation/Tests/KeepAlive/keep_alive_test.robot
index 07faee2..e7c7ae8 100644
--- a/Automation/Tests/KeepAlive/keep_alive_test.robot
+++ b/Automation/Tests/KeepAlive/keep_alive_test.robot
@@ -16,89 +16,69 @@ 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 ***
 
-X2 - Setup Test
-    Post Request setup node b x-2
-    Integer     response status       204
-
-X2 - Get Nodeb
-    Get Request Node B Enb test1
+Get request gnb
+    Sleep    2s
+    Get Request nodeb
     Integer  response status  200
-    String   response body ranName    test1
-    String   response body ip    ${ip_gnb_simu}
-    Integer  response body port     5577
+    String   response body ranName    ${ranname}
     String   response body connectionStatus    CONNECTED
-    String   response body nodeType     ENB
-    String   response body associatedE2tInstanceAddress     e2t.att.com:38000
-    String   response body enb enbType     MACRO_ENB
-    Integer  response body enb servedCells 0 pci  99
-    String   response body enb servedCells 0 cellId   02f829:0007ab00
-    String   response body enb servedCells 0 tac    0102
-    String   response body enb servedCells 0 broadcastPlmns 0   "02f829"
-    Integer  response body enb servedCells 0 choiceEutraMode fdd ulearFcn    1
-    Integer  response body enb servedCells 0 choiceEutraMode fdd dlearFcn    1
-    String   response body enb servedCells 0 choiceEutraMode fdd ulTransmissionBandwidth   BW50
-    String   response body enb servedCells 0 choiceEutraMode fdd dlTransmissionBandwidth   BW50
-
-#prepare logs for tests
-#    Remove log files
-#    Save logs
-
-X2 - RAN Connected message going to be sent
-    ${result}    find_rmr_message.verify_logs     ${EXECDIR}   ${e2mgr_log_filename}  ${RAN_CONNECTED_message_type}    ${Meid_test1}
-    Should Be Equal As Strings    ${result}      True
+    String   response body nodeType     GNB
+    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
+    Integer  response body gnb ranFunctions 1 ranFunctionRevision  1
+    Integer  response body gnb ranFunctions 2 ranFunctionId  3
+    Integer  response body gnb ranFunctions 2 ranFunctionRevision  1
 
-RSM RESOURCE STATUS REQUEST message sent
-    ${result}    find_rmr_message.verify_logs     ${EXECDIR}    ${rsm_log_filename}  ${RIC_RES_STATUS_REQ_message_type_successfully_sent}    ${RAN_NAME_test1}
-    Should Be Equal As Strings    ${result}      True
 
-Verify RSM RAN info exists in redis
-   ${result}=   rsmscripts.verify_rsm_ran_info_start_false
-   Should Be Equal As Strings  ${result}    True
+prepare logs for tests
+    Remove log files
+    Save logs
 
 Verify RAN is associated with E2T instance
-   ${result}    e2mdbscripts.verify_ran_is_associated_with_e2t_instance     test1    e2t.att.com:38000
+   ${result}    e2mdbscripts.verify_ran_is_associated_with_e2t_instance      ${ranname}    ${e2t_alpha_address}
    Should Be True    ${result}
 
 Stop E2T
-    stop_e2
-    Sleep  3s
+    Stop E2
 
-prepare logs for tests
+Prepare logs
     Remove log files
     Save logs
 
-Verify Is Dead Message Printed
-    ${result}    find_error_script.find_error     ${EXECDIR}    ${e2mgr_log_filename}  ${e2_is_dead_message_printed}
-    Should Be Equal As Strings    ${result}      True
-
 Verify RAN is not associated with E2T instance
-    Get Request node b enb test1
+    Sleep  6m
+    Get Request nodeb
     Integer  response status  200
-    String   response body ranName    test1
+    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     e2t.att.com:38000
+    ${result}    e2mdbscripts.verify_e2t_instance_key_exists     ${e2t_alpha_address}
     Should Be True    ${result} == False
 
-    ${result}    e2mdbscripts.verify_e2t_instance_exists_in_addresses     e2t.att.com:38000
+    ${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