Tidied new and updated test suites

[integration/test.git] / csit / suites / groupbasedpolicy / GBPSFC / 6-node / GBPSFC_6node.robot

diff --git a/csit/suites/groupbasedpolicy/GBPSFC/6-node/GBPSFC_6node.robot b/csit/suites/groupbasedpolicy/GBPSFC/6-node/GBPSFC_6node.robot
index 1d4ed2d5444d0de7956e9442e13e4a0246e37334..850021477136d6804be0342bdbede2cf569d77e6 100644 (file)
--- a/csit/suites/groupbasedpolicy/GBPSFC/6-node/GBPSFC_6node.robot
+++ b/csit/suites/groupbasedpolicy/GBPSFC/6-node/GBPSFC_6node.robot
@@ -6,52 +6,43 @@ Resource          ../../../../libraries/GBP/ConnUtils.robot
 Variables         ../../../../variables/Variables.py
 
 *** Keywords ***
-
 Setup Node
+    [Arguments]    ${GBPSFC}    ${sw_index}    ${suite_dir}    ${timeout}=10s
     [Documentation]    Configures underlying infrastructure composed of Docker containers and OVS switches on remote VM.
     ...    Python and Bash scripts are used.
-    [Arguments]    ${GBPSFC}    ${sw_index}    ${suite_dir}    ${timeout}=10s
     ConnUtils.Connect and Login    ${GBPSFC}    timeout=${timeout}
     SSHLibrary.Put File    ${suite_dir}/*    ${VM_HOME_FOLDER}${/}${VM_SCRIPTS_FOLDER}/    mode=0755
-    ${stdout}    ${stderr}    ${rc}    Execute in VE    python ${VM_HOME_FOLDER}${/}${VM_SCRIPTS_FOLDER}/infrastructure_launch.py ${ODL} ${sw_index}
-    ...    timeout=${timeout}
+    ${stdout}    ${stderr}    ${rc}    Execute in VE    python ${VM_HOME_FOLDER}${/}${VM_SCRIPTS_FOLDER}/infrastructure_launch.py ${ODL} ${sw_index}    timeout=${timeout}
     Should Be Equal As Numbers    ${rc}    0
     ${stderr}    Set Variable
     # Flows for GBPSFC3 and GBPSFC5 have to be written manually.
     # GBPSFC2 is SFF for GBPSFC3 and GBPSFC4 is SFF for GBPSFC5
-    Run Keyword If    "${GBPSFC}" == "${GBPSFC3}"
-    ...    Write SF Flows    ${GBPSFC2}    ${stderr}
-    ...    ELSE IF    "${GBPSFC}" == "${GBPSFC5}"
-    ...    Write SF Flows    ${GBPSFC4}    ${stderr}
+    Run Keyword If    "${GBPSFC}" == "${GBPSFC3}"    Write SF Flows    ${GBPSFC2}    ${stderr}
+    ...    ELSE IF    "${GBPSFC}" == "${GBPSFC5}"    Write SF Flows    ${GBPSFC4}    ${stderr}
     Should Be Empty    ${stderr}
     SSHLibrary.Close Connection
 
 Write SF Flows
-    [Documentation]    Writes flows to SF node. SFF for given SF has to be specified in arguments.
     [Arguments]    ${SFF}    ${stderr}
-    ${stderr}    SSHLibrary.Execute Command    ${VM_HOME_FOLDER}${/}${VM_SCRIPTS_FOLDER}/sf-flows.sh ${SFF}
-    ...    return_stderr=True    return_stdout=False
+    [Documentation]    Writes flows to SF node. SFF for given SF has to be specified in arguments.
+    ${stderr}    SSHLibrary.Execute Command    ${VM_HOME_FOLDER}${/}${VM_SCRIPTS_FOLDER}/sf-flows.sh ${SFF}    return_stderr=True    return_stdout=False
 
 Teardown Node
+    [Arguments]    ${GBPSFC}    ${suite_dir}    ${timeout}=3s
     [Documentation]    Clears underlying infrastructure composed of Docker containers and OVS switches from remote VM.
     ...    Python and Bash scripts are used.
-    [Arguments]    ${GBPSFC}    ${suite_dir}    ${timeout}=3s
     ConnUtils.Connect and Login    ${GBPSFC}    timeout=${timeout}
-    ${stderr}    SSHLibrary.Execute Command    rm ${VM_HOME_FOLDER}${/}${VM_SCRIPTS_FOLDER}/infrastructure_config.py
-    ...    return_stderr=True    return_stdout=False
+    ${stderr}    SSHLibrary.Execute Command    rm ${VM_HOME_FOLDER}${/}${VM_SCRIPTS_FOLDER}/infrastructure_config.py    return_stderr=True    return_stdout=False
     Should Be Empty    ${stderr}
-    ${stderr}    SSHLibrary.Execute Command    rm ${VM_HOME_FOLDER}${/}${VM_SCRIPTS_FOLDER}/sf-flows.sh
-    ...    return_stderr=True    return_stdout=False
+    ${stderr}    SSHLibrary.Execute Command    rm ${VM_HOME_FOLDER}${/}${VM_SCRIPTS_FOLDER}/sf-flows.sh    return_stderr=True    return_stdout=False
     Should Be Empty    ${stderr}
-    ${stderr}    SSHLibrary.Execute Command    ${VM_HOME_FOLDER}${/}${VM_SCRIPTS_FOLDER}/clean-demo.sh
-    ...    return_stderr=True    return_stdout=False
+    ${stderr}    SSHLibrary.Execute Command    ${VM_HOME_FOLDER}${/}${VM_SCRIPTS_FOLDER}/clean-demo.sh    return_stderr=True    return_stdout=False
     Should Be Empty    ${stderr}
     SSHLibrary.Close Connection
 
 Setup Nodes
     [Arguments]    ${GBPSFCs}    ${init_scripts_dir}
     ${sw_index}    Set Variable    0
-    :FOR    ${GBPSFC}    IN    @{GBPSFCs}
+    : FOR    ${GBPSFC}    IN    @{GBPSFCs}
     \    Setup Node    ${GBPSFC}    ${sw_index}    ${init_scripts_dir}    timeout=10s
     \    ${sw_index}    Evaluate    ${sw_index} + 1
-