Tidied new and updated test suites

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

diff --git a/csit/suites/groupbasedpolicy/GBP/3-node/Variables.robot b/csit/suites/groupbasedpolicy/GBP/3-node/Variables.robot
index d6a18524ce58a16e0b3b901aa64c44e6ab5e91c9..45716c940f1c6c5b31f21a5317d07c7b8d544403 100755 (executable)
--- a/csit/suites/groupbasedpolicy/GBP/3-node/Variables.robot
+++ b/csit/suites/groupbasedpolicy/GBP/3-node/Variables.robot
@@ -1,49 +1,43 @@
 *** Settings ***
-Documentation    Global variables for GBPSFC 6-node topology
+Documentation     Global variables for GBPSFC 6-node topology
 Variables         ../../../../variables/Variables.py
 
 *** Variables ***
-${VM_HOME_FOLDER} =  ${WORKSPACE}
-${VM_SCRIPTS_FOLDER} =  scripts
-${ODL} =     ${ODL_SYSTEM_IP}
-${GBP1} =    ${TOOLS_SYSTEM_IP}
-${GBP2} =    ${TOOLS_SYSTEM_2_IP}
-${GBP3} =    ${TOOLS_SYSTEM_3_IP}
-@{GBPs} =    ${GBP1}    ${GBP2}    ${GBP3}
-
-${GBP_TENANT1_ID}          f5c7d344-d1c7-4208-8531-2c2693657e12
-${GBP_TENANT2_ID}          25c7d344-d1c7-4208-8531-2c2693657e12
-${TENANT1_PATH}            ${GBP_TENANTS_API}/tenant/${GBP_TENANT1_ID}
-${TENANT2_PATH}            ${GBP_TENANTS_API}/tenant/${GBP_TENANT2_ID}
-${TUNNELS_PATH}            ${CONFIG_NODES_API}
-${ENDPOINT_REG_PATH}       ${GBP_REGEP_API}
-${ENDPOINT_UNREG_PATH}     ${GBP_UNREGEP_API}
-${ENDPOINTS_OPER_PATH}     /restconf/operational/endpoint:endpoints
-${OF_OVERLAY_CONFIG_PATH}  /restconf/config/ofoverlay:of-overlay-config
-${TENANT1_FILE}            ${CURDIR}/../../../../variables/gbp/3node/tenant1.json
-${TENANT2_FILE}            ${CURDIR}/../../../../variables/gbp/3node/tenant2.json
-${TUNNELS_FILE}            ${CURDIR}/../../../../variables/gbp/3node/tunnels.json
-${ENDPOINTS_GBP1_DIR}      ${CURDIR}/../../../../variables/gbp/3node/demo-gbp1
-${ENDPOINTS_GBP2_DIR}      ${CURDIR}/../../../../variables/gbp/3node/demo-gbp2
+${VM_HOME_FOLDER}    ${WORKSPACE}
+${VM_SCRIPTS_FOLDER}    scripts
+${ODL}            ${ODL_SYSTEM_IP}
+${GBP1}           ${TOOLS_SYSTEM_IP}
+${GBP2}           ${TOOLS_SYSTEM_2_IP}
+${GBP3}           ${TOOLS_SYSTEM_3_IP}
+@{GBPs}           ${GBP1}    ${GBP2}    ${GBP3}
+${GBP_TENANT1_ID}    f5c7d344-d1c7-4208-8531-2c2693657e12
+${GBP_TENANT2_ID}    25c7d344-d1c7-4208-8531-2c2693657e12
+${TENANT1_PATH}    ${GBP_TENANTS_API}/tenant/${GBP_TENANT1_ID}
+${TENANT2_PATH}    ${GBP_TENANTS_API}/tenant/${GBP_TENANT2_ID}
+${TUNNELS_PATH}    ${CONFIG_NODES_API}
+${ENDPOINT_REG_PATH}    ${GBP_REGEP_API}
+${ENDPOINT_UNREG_PATH}    ${GBP_UNREGEP_API}
+${ENDPOINTS_OPER_PATH}    /restconf/operational/endpoint:endpoints
+${OF_OVERLAY_CONFIG_PATH}    /restconf/config/ofoverlay:of-overlay-config
+${TENANT1_FILE}    ${CURDIR}/../../../../variables/gbp/3node/tenant1.json
+${TENANT2_FILE}    ${CURDIR}/../../../../variables/gbp/3node/tenant2.json
+${TUNNELS_FILE}    ${CURDIR}/../../../../variables/gbp/3node/tunnels.json
+${ENDPOINTS_GBP1_DIR}    ${CURDIR}/../../../../variables/gbp/3node/demo-gbp1
+${ENDPOINTS_GBP2_DIR}    ${CURDIR}/../../../../variables/gbp/3node/demo-gbp2
 
 *** Keywords ***
 Set Test Variables
-    [Documentation]  Sets variables used in 3node test cases.
-    [Arguments]   ${client_switch_ip}    ${client_docker}    ${client_ip}    ${client_mac}
-    ...    ${same_webserver_docker}    ${same_webserver_ip}    ${same_webserver_mac}
-    ...    ${diff_webserver_switch_ip}    ${diff_webserver_docker}    ${diff_webserver_ip}
-    ...    ${diff_webserver_mac}
+    [Arguments]    ${client_switch_ip}    ${client_docker}    ${client_ip}    ${client_mac}    ${same_webserver_docker}    ${same_webserver_ip}
+    ...    ${same_webserver_mac}    ${diff_webserver_switch_ip}    ${diff_webserver_docker}    ${diff_webserver_ip}    ${diff_webserver_mac}
+    [Documentation]    Sets variables used in 3node test cases.
     Set Global Variable    ${CLIENT_SWITCH_IP}    ${client_switch_ip}
-    Set Global Variable    ${CLIENT_DOCKER}       ${client_docker}
-    Set Global Variable    ${CLIENT_IP}           ${client_ip}
-    Set Global Variable    ${CLIENT_MAC}          ${client_mac}
-
+    Set Global Variable    ${CLIENT_DOCKER}    ${client_docker}
+    Set Global Variable    ${CLIENT_IP}    ${client_ip}
+    Set Global Variable    ${CLIENT_MAC}    ${client_mac}
     Set Global Variable    ${SAME_WEBSERVER_DOCKER}    ${same_webserver_docker}
-    Set Global Variable    ${SAME_WEBSERVER_IP}        ${same_webserver_ip}
-    Set Global Variable    ${SAME_WEBSERVER_MAC}       ${same_webserver_mac}
-
-    Set Global Variable    ${DIFF_WEBSERVER_SWITCH_IP}   ${diff_webserver_switch_ip}
-    Set Global Variable    ${DIFF_WEBSERVER_DOCKER}      ${diff_webserver_docker}
-    Set Global Variable    ${DIFF_WEBSERVER_IP}          ${diff_webserver_ip}
-    Set Global Variable    ${DIFF_WEBSERVER_MAC}         ${diff_webserver_mac}
-
+    Set Global Variable    ${SAME_WEBSERVER_IP}    ${same_webserver_ip}
+    Set Global Variable    ${SAME_WEBSERVER_MAC}    ${same_webserver_mac}
+    Set Global Variable    ${DIFF_WEBSERVER_SWITCH_IP}    ${diff_webserver_switch_ip}
+    Set Global Variable    ${DIFF_WEBSERVER_DOCKER}    ${diff_webserver_docker}
+    Set Global Variable    ${DIFF_WEBSERVER_IP}    ${diff_webserver_ip}
+    Set Global Variable    ${DIFF_WEBSERVER_MAC}    ${diff_webserver_mac}