Fixed data for GBP CSIT tests for Li and Master branch.

[integration/test.git] / csit / suites / groupbasedpolicy / GBP / 3-node / __init__.robot

diff --git a/csit/suites/groupbasedpolicy/GBP/3-node/__init__.robot b/csit/suites/groupbasedpolicy/GBP/3-node/__init__.robot
index a8a880eb8864a4447ccfbc5a59a462cba05e98b8..e296ab0363e72f02dcadb8bf6c7da7cc6ebe3118 100755 (executable)
--- a/csit/suites/groupbasedpolicy/GBP/3-node/__init__.robot
+++ b/csit/suites/groupbasedpolicy/GBP/3-node/__init__.robot
@@ -9,19 +9,16 @@ Resource          ../../../../libraries/GBP/ConnUtils.robot
 Variables         ../../../../variables/Variables.py
 Resource          Variables.robot
 
-
 *** Variables ***
-${timeout} =     10s
-
+${timeout}        10s
 
 *** Keywords ***
 Setup Everything
     Log    start_suite_in_3_node
     Create Session    session    http://${ODL}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
-    Wait Until Keyword Succeeds    10x    30 s    Get Data From URI
-    ...    session    ${OF_OVERLAY_CONFIG_PATH}    headers=${headers}
+    Wait Until Keyword Succeeds    10x    30 s    Get Data From URI    session    ${OF_OVERLAY_CONFIG_PATH}    headers=${headers}
     Delete All Sessions
-    :FOR    ${GBP}    IN    @{GBPs}
+    : FOR    ${GBP}    IN    @{GBPs}
     \    ConnUtils.Connect and Login    ${GBP}    timeout=${timeout}
     \    ${stderr}    SSHLibrary.Execute Command    virtualenv --system-site-packages ${VE_DIR}    return_stdout=False    return_stderr=True    return_rc=False
     \    Should Be Empty    ${stderr}
@@ -29,10 +26,11 @@ Setup Everything
     \    ${stdout}    ${stderr}    ${rc}    ConnUtils.Execute in VE    pip freeze | grep ipaddr -q || pip install ipaddr    timeout=${timeout}
     \    Should Be Equal As Numbers    ${rc}    0
     \    SSHLibrary.Close Connection
+    Init Variables
 
 Teardown Everything
     Log    stop_suite_in_3_node
-    :FOR    ${GBP}    IN    @{GBPs}
+    : FOR    ${GBP}    IN    @{GBPs}
     \    ConnUtils.Connect and Login    ${GBP}    timeout=${timeout}
     \    SSHLibrary.Execute Command    sudo rm -rf ${VM_SCRIPTS_FOLDER}
     \    SSHLibrary.Close Connection