Fix the tcpdump collection

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

diff --git a/csit/libraries/OpenStackOperations.robot b/csit/libraries/OpenStackOperations.robot
index 18928012aa062fcf400c9142f4a5a79a17fe1750..41b4a5e0ed932285cbadcba2832dede69462a2a2 100644 (file)
--- a/csit/libraries/OpenStackOperations.robot
+++ b/csit/libraries/OpenStackOperations.robot
@@ -133,8 +133,6 @@ Create And Associate Floating IPs
     ${ip_list} =    BuiltIn.Create List    @{EMPTY}
     : FOR    ${vm}    IN    @{vm_list}
     \    ${output} =    OpenStack CLI    openstack floating ip create ${external_net}
-    \    BuiltIn.Log    ${output}
-    \    BuiltIn.Should Be True    '${rc}' == '0'
     \    @{ip} =    String.Get Regexp Matches    ${output}    [0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}
     \    ${ip_length} =    BuiltIn.Get Length    ${ip}
     \    BuiltIn.Run Keyword If    ${ip_length}>0    Collections.Append To List    ${ip_list}    @{ip}[0]
@@ -1018,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