cleaning up system variables

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

diff --git a/csit/suites/groupbasedpolicy/GBP/3-node/gbp2-multitenant/001_set_odl.robot b/csit/suites/groupbasedpolicy/GBP/3-node/gbp2-multitenant/001_set_odl.robot
index 3ec1c83b2e90009e1b907b3206bc4847cf0222fa..e8a8a17886083c2a3b6cfc467d2962e04008783d 100644 (file)
--- a/csit/suites/groupbasedpolicy/GBP/3-node/gbp2-multitenant/001_set_odl.robot
+++ b/csit/suites/groupbasedpolicy/GBP/3-node/gbp2-multitenant/001_set_odl.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for GBP Tenants, Operates functions from Restconf APIs.
-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      multi-tenant    setup    multi-tenant-setup
 Library           RequestsLibrary
@@ -18,16 +18,15 @@ Put Tunnels
     ${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
+    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_GBP2_DIR}    vethl*.*json    absolute
     : FOR    ${endpoint_file}    IN    @{endpoint_files}
-    \    Post Elements To URI From File    ${ENDPOINT_REG_PATH}    ${endpoint_file}
+    \    Post Elements To URI From File    ${ENDPOINT_REG_PATH}    ${endpoint_file}    ${HEADERS_YANG_JSON}
 
 Put Tenants
     [Documentation]    Send GBP policy to ODL
-    Add Elements To URI From File    ${TENANT1_PATH}    ${TENANT1_FILE}
-    Add Elements To URI From File    ${TENANT2_PATH}    ${TENANT2_FILE}
+    Add Elements To URI From File    ${TENANT1_PATH}    ${TENANT1_FILE}    ${HEADERS_YANG_JSON}
+    Add Elements To URI From File    ${TENANT2_PATH}    ${TENANT2_FILE}    ${HEADERS_YANG_JSON}