Fix the tcpdump collection

VTN jobs does not have compute nodes.
So the tests are failing. This patch will ensure only tcpdumps
for available nodes.

Change-Id: Id9b7243bf3f1c148fca731408660ca20f45c1839
Signed-off-by: gvrangan <venkatrangang@hcl.com>

diff --git a/csit/libraries/DevstackUtils.robot b/csit/libraries/DevstackUtils.robot
index fd595c9dd599812b02e0d75fc769cb2ec892d561..08168c0ae734cac1296cc0ec91e79910245d8c3a 100644 (file)
--- a/csit/libraries/DevstackUtils.robot
+++ b/csit/libraries/DevstackUtils.robot
@@ -200,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}
@@ -217,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

diff --git a/csit/libraries/OpenStackOperations.robot b/csit/libraries/OpenStackOperations.robot
index cc6003c0012730f9c1ae831540be858d65c39a39..41b4a5e0ed932285cbadcba2832dede69462a2a2 100644 (file)
--- a/csit/libraries/OpenStackOperations.robot
+++ b/csit/libraries/OpenStackOperations.robot
@@ -1016,10 +1016,10 @@ Cleanup Router
 OpenStack Suite Setup
     [Documentation]    Wrapper teardown keyword that can be used in any suite running in an openstack environement
     SetupUtils.Setup_Utils_For_Setup_And_Teardown
-    @{tcpdump_port_6653_conn_ids} =    OpenStackOperations.Start Packet Capture On Nodes    tcpdump_port_6653    port 6653    ${OS_CONTROL_NODE_IP}    ${OS_COMPUTE_1_IP}    ${OS_COMPUTE_2_IP}
+    DevstackUtils.Devstack Suite Setup
+    @{tcpdump_port_6653_conn_ids} =    OpenStackOperations.Start Packet Capture On Nodes    tcpdump_port_6653    port 6653    @{OS_ALL_IPS}
     BuiltIn.Set Suite Variable    @{tcpdump_port_6653_conn_ids}
     BuiltIn.Run Keyword If    "${PRE_CLEAN_OPENSTACK_ALL}"=="True"    OpenStack Cleanup All
-    DevstackUtils.Devstack Suite Setup
     OpenStackOperations.Add OVS Logging On All OpenStack Nodes
 
 OpenStack Suite Teardown