Fix the tcpdump collection

[integration/test.git] / csit / libraries / DevstackUtils.robot

diff --git a/csit/libraries/DevstackUtils.robot b/csit/libraries/DevstackUtils.robot
index 5609cf68f139313546943ad88216ee65f61939a4..08168c0ae734cac1296cc0ec91e79910245d8c3a 100644 (file)
--- a/csit/libraries/DevstackUtils.robot
+++ b/csit/libraries/DevstackUtils.robot
@@ -173,7 +173,6 @@ Devstack Suite Setup
 Write Commands Until Prompt
     [Arguments]    ${cmd}    ${timeout}=${default_devstack_prompt_timeout}
     [Documentation]    quick wrapper for Write and Read Until Prompt Keywords to make test cases more readable
-    Log    ${cmd}
     SSHLibrary.Set Client Configuration    timeout=${timeout}
     SSHLibrary.Read
     SSHLibrary.Write    ${cmd};echo Command Returns $?
@@ -201,6 +200,10 @@ Get DevStack Hostnames
     BuiltIn.Set Suite Variable    ${OS_CMP1_HOSTNAME}
     BuiltIn.Set Suite Variable    ${OS_CMP2_HOSTNAME}
 
+Set Node Data For AllinOne Setup
+    [Documentation]    Assign global variables for DevStack nodes where the Control Node enables Compute service also.
+    BuiltIn.Set Suite Variable    @{OS_ALL_IPS}    ${OS_CNTL_IP}
+
 Set Node Data For Control And Compute Node Setup
     [Documentation]    Assign global variables for DevStack nodes where the control node is also the compute
     BuiltIn.Set Suite Variable    ${OS_CMP1_IP}    ${OS_CNTL_IP}
@@ -218,7 +221,8 @@ Set Node Data For Control Only Node Setup
 Get DevStack Nodes Data
     [Documentation]    Assign global variables for DevStack nodes
     BuiltIn.Set Suite Variable    ${OS_CNTL_IP}    ${OS_CONTROL_NODE_IP}
-    Run Keyword If    '${OS_COMPUTE_2_IP}' == '${EMPTY}'    Set Node Data For Control And Compute Node Setup
-    ...    ELSE    Set Node Data For Control Only Node Setup
+    Run Keyword If    ${NUM_OS_SYSTEM} == 1    Set Node Data For AllinOne Setup
+    ...    ELSE IF    ${NUM_OS_SYSTEM} == 2    Set Node Data For Control And Compute Node Setup
+    ...    ELSE IF    ${NUM_OS_SYSTEM} == 3    Set Node Data For Control Only Node Setup
     Get DevStack Hostnames
     Log Devstack Nodes Data