X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=Automation%2FTests%2FRedButton%2Fred_button_keywords.robot;h=23d0875ecda8f679a4b02b2392736012f7d3b2d1;hb=ef8e7b290c648ce0655c0fc0e8d0882fe31f2abc;hp=34bd6ef5b7054142d8d5a38d04550e0a37e6f76c;hpb=32d7f427aab3ca627b8c9c5ded15b9517200cde3;p=ric-plt%2Fe2mgr.git

diff --git a/Automation/Tests/RedButton/red_button_keywords.robot b/Automation/Tests/RedButton/red_button_keywords.robot
index 34bd6ef..23d0875 100644
--- a/Automation/Tests/RedButton/red_button_keywords.robot
+++ b/Automation/Tests/RedButton/red_button_keywords.robot
@@ -17,6 +17,7 @@
 ##############################################################################
 
 *** Settings ***
+Variables  ../Scripts/variables.py
 Documentation   Keywords file
 Resource    ../Resource/resource.robot
 Resource    ../Resource/Keywords.robot
@@ -26,42 +27,27 @@ Library    OperatingSystem
 Library    json
 Library    REST      ${url}
 
-*** Keywords ***
-Execute setup and verify connected and associated
-    Post Request setup node b x-2
-    Integer  response status       204
-    Get Request node b enb test1
-    Integer  response status  200
-    String   response body ranName    test1
-    String   response body connectionStatus    CONNECTED
-    String   response body associatedE2tInstanceAddress     e2t.att.com:38000
-
-Execute setup twice and verify connected setup failed
-    Post Request setup node b x-2
-    Sleep    1s
-    Post Request setup node b x-2
-    Get Request node b enb test1
-    String     response body connectionStatus     CONNECTED_SETUP_FAILED
-
-
-Verify shutdown for enb
-    Get Request node b enb test1
-    Integer  response status  200
-    String   response body ranName    test1
-    String   response body connectionStatus    SHUT_DOWN
-    Missing  response body associatedE2tInstanceAddress
-    ${result}    e2mdbscripts.verify_ran_is_associated_with_e2t_instance     test1    e2t.att.com:38000
-    Should Be True    ${result} == False
+*** Variables ***
+${url}  ${e2mgr_address}
 
+*** Keywords ***
+Verify 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  ${e2t_alpha_address}
 
 Verify shutdown for gnb
-    Get Request node b gnb test2
+    Get Request node b gnb
     Integer  response status  200
-    String   response body ranName    test2
+    String   response body ranName    ${ranName}
     String   response body connectionStatus    SHUT_DOWN
     Missing  response body associatedE2tInstanceAddress
-    ${result}    e2mdbscripts.verify_ran_is_associated_with_e2t_instance     test2    e2t.att.com:38000
-    Should Be True    ${result} == False
+
+Verify E2T instance has no associated RANs
+    ${result}    e2mdbscripts.verify_e2t_instance_has_no_associated_rans     ${e2t_alpha_address}
+    Should Be True    ${result}
 
 Execute Shutdown
    PUT       /v1/nodeb/shutdown