Upgrade RF syntax for v3.2 compatibility

[integration/test.git] / csit / suites / groupbasedpolicy / GBP / 3-node / gbp1 / 001_set_odl.robot

diff --git a/csit/suites/groupbasedpolicy/GBP/3-node/gbp1/001_set_odl.robot b/csit/suites/groupbasedpolicy/GBP/3-node/gbp1/001_set_odl.robot
index 20a4e57931537871f3fe2342bb75be522268118c..a7609a2c0045dd667865b2435f046b0b66b21535 100644 (file)
--- a/csit/suites/groupbasedpolicy/GBP/3-node/gbp1/001_set_odl.robot
+++ b/csit/suites/groupbasedpolicy/GBP/3-node/gbp1/001_set_odl.robot
@@ -1,8 +1,8 @@
 *** Settings ***
 Documentation     Test suite for GBP Tenants, Operates functions from Restconf APIs.
-Default Tags      single-tenant    setup    single-tenant-setup
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
 Suite Teardown    Delete All Sessions
+Default Tags      single-tenant    setup    single-tenant-setup
 Library           RequestsLibrary
 Library           OperatingSystem
 Variables         ../../../../../variables/Variables.py
@@ -15,18 +15,18 @@ Resource          ../Variables.robot
 Put Tunnels
     [Documentation]    Send tunnel augmentation to ODL
     ${json_to_edit}    OperatingSystem.Get File    ${TUNNELS_FILE}
-    ${edited_json}     Replace String    ${json_to_edit}    _CLASSIFIER1    ${GBP1}
-    ${edited_json}     Replace String    ${edited_json}     _CLASSIFIER2    ${GBP2}
-    ${edited_json}     Replace String    ${edited_json}     _CLASSIFIER3    ${GBP3}
-    ${resp}    RequestsLibrary.Put Request    session    ${TUNNELS_PATH}    ${edited_json}    ${HEADERS}
-    Should Be Equal As Strings    ${resp.status_code}    200
+    ${edited_json}    Replace String    ${json_to_edit}    _CLASSIFIER1    ${GBP1}
+    ${edited_json}    Replace String    ${edited_json}    _CLASSIFIER2    ${GBP2}
+    ${edited_json}    Replace String    ${edited_json}    _CLASSIFIER3    ${GBP3}
+    Add Elements To URI And Verify    ${TUNNELS_PATH}    ${edited_json}    ${HEADERS_YANG_JSON}
 
 Register Endpoints
     [Documentation]    Endpoints registration
-    @{endpoint_files} =  OperatingSystem.List Files In Directory    ${ENDPOINTS_GBP1_DIR}    vethl*.*json    absolute
-    :FOR    ${endpoint_file}    IN    @{endpoint_files}
-    \    Post Elements To URI From File    ${ENDPOINT_REG_PATH}    ${endpoint_file}
+    @{endpoint_files} =    OperatingSystem.List Files In Directory    ${ENDPOINTS_GBP1_DIR}    vethl*.*json    absolute
+    FOR    ${endpoint_file}    IN    @{endpoint_files}
+        Post Elements To URI From File    ${ENDPOINT_REG_PATH}    ${endpoint_file}    ${HEADERS_YANG_JSON}
+    END
 
 Put Tenant
     [Documentation]    Send GBP policy to ODL
-    Add Elements To URI From File    ${TENANT1_PATH}    ${TENANT1_FILE}
+    Add Elements To URI From File    ${TENANT1_PATH}    ${TENANT1_FILE}    ${HEADERS_YANG_JSON}