Upgrade RF syntax for v3.2 compatibility

[integration/test.git] / csit / suites / groupbasedpolicy / GBPSFC / 6-node / demo-symmetric-chain / 010_set_odl.robot

diff --git a/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-symmetric-chain/010_set_odl.robot b/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-symmetric-chain/010_set_odl.robot
index 80cdc88410b3ddf58db0fd2265d180b997db6cff..18ea63ba30814b0d55cb1f4aacf71320c5117a40 100644 (file)
--- a/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-symmetric-chain/010_set_odl.robot
+++ b/csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-symmetric-chain/010_set_odl.robot
@@ -1,11 +1,11 @@
 *** Settings ***
 Documentation     Test suite for setting up infrastructure for demo-symmetric-chain
-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
 Library           RequestsLibrary
 Library           OperatingSystem
 Variables         ../../../../../variables/Variables.py
-Resource          ../../../../../libraries/Utils.robot
+Resource          ../../../../../libraries/SSHKeywords.robot
 Resource          ../Variables.robot
 Resource          ../../../../../libraries/GBP/OpenFlowUtils.robot
 
@@ -27,14 +27,14 @@ Put Service Function Forwarders
 Wait For Manager and Switch Connected on GBPSFC2
     [Documentation]    Making sure that manager is connected for further processing.
     SSHLibrary.Open Connection    ${GBPSFC2}
-    Utils.Flexible Mininet Login
+    SSHKeywords.Flexible Mininet Login
     Wait Until Keyword Succeeds    2min    3s    Manager and Switch Connected    sw_name=sw2
     SSHLibrary.Close Connection
 
 Wait For Manager and Switch Connected on GBPSFC4
     [Documentation]    Making sure that manager is connected for further processing.
     SSHLibrary.Open Connection    ${GBPSFC4}
-    Utils.Flexible Mininet Login
+    SSHKeywords.Flexible Mininet Login
     Wait Until Keyword Succeeds    2min    3s    Manager and Switch Connected    sw_name=sw4
     SSHLibrary.Close Connection
 
@@ -60,7 +60,8 @@ Put Tenant
 Register Endpoints
     [Documentation]    Endpoints registration
     @{endpoint_files} =    OperatingSystem.List Files In Directory    ${ENDPOINTS_SYMM_DIR}    vethl*.*json    absolute
-    : FOR    ${endpoint_file}    IN    @{endpoint_files}
-    \    Post Elements To URI From File    ${ENDPOINT_REG_PATH}    ${endpoint_file}    ${HEADERS_YANG_JSON}
+    FOR    ${endpoint_file}    IN    @{endpoint_files}
+        Post Elements To URI From File    ${ENDPOINT_REG_PATH}    ${endpoint_file}    ${HEADERS_YANG_JSON}
+    END
     ${resp}    RequestsLibrary.Get Request    session    ${ENDPOINTS_OPER_PATH}
     Log    ${resp.content}