netvirt-csit: Show neutron debugs only once

Currently we do a Show Debug for each network VMs separately,
but each Show Debug does the same neutron shows.
This should speed things up a little bit.

Change-Id: Ib5c26f148b7d80990b8769aa03d99073ac014881
Signed-off-by: Alon Kochba <alonko@hpe.com>
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>

diff --git a/csit/libraries/OpenStackOperations.robot b/csit/libraries/OpenStackOperations.robot
index 3c9ca4bf0d34d4d9a845d49f36daf653070f7d3c..62185dd0c2b5b42fa244b6955fd228610c9ad69b 100644 (file)
--- a/csit/libraries/OpenStackOperations.robot
+++ b/csit/libraries/OpenStackOperations.robot
@@ -481,7 +481,7 @@ Get OvsDebugInfo
     Run Keyword If    2 < ${NUM_OS_SYSTEM}    Get DumpFlows And Ovsconfig    ${OS_COMPUTE_2_IP}
 
 Show Debugs
-    [Arguments]    ${vm_indices}
+    [Arguments]    @{vm_indices}
     [Documentation]    Run these commands for debugging, it can list state of VM instances and ip information in control node
     ${devstack_conn_id}=    Get ControlNode Connection
     Switch Connection    ${devstack_conn_id}

diff --git a/csit/suites/openstack/clustering/01_l2_tests.robot b/csit/suites/openstack/clustering/01_l2_tests.robot
index 9f1c76c23f08e7ac840195b341ac84146cd2bb6f..ea4f8070b3ec420fb53864b48ec15ba193c1978c 100644 (file)
--- a/csit/suites/openstack/clustering/01_l2_tests.robot
+++ b/csit/suites/openstack/clustering/01_l2_tests.robot
@@ -2,8 +2,7 @@
 Documentation     Test suite to verify packet flows between vm instances.
 Suite Setup       Devstack Suite Setup    source_pwd=yes
 Suite Teardown    Close All Connections
-Test Teardown     Run Keywords    Show Debugs    ${NET_1_VM_INSTANCES}
-...               AND    Show Debugs    ${NET_2_VM_INSTANCES}
+Test Teardown     Run Keywords    Show Debugs    @{NET_1_VM_INSTANCES}    @{NET_2_VM_INSTANCES}
 ...               AND    Get OvsDebugInfo
 Library           SSHLibrary
 Library           OperatingSystem

diff --git a/csit/suites/openstack/clustering/02_l3_tests.robot b/csit/suites/openstack/clustering/02_l3_tests.robot
index c9dae41bfee60e29f5e507cf5d7e70d657399cfc..a4362ceffda74933f8efd260f4b4966b3729e7f5 100644 (file)
--- a/csit/suites/openstack/clustering/02_l3_tests.robot
+++ b/csit/suites/openstack/clustering/02_l3_tests.robot
@@ -2,8 +2,7 @@
 Documentation     Test suite to check connectivity in L3 using routers.
 Suite Setup       Devstack Suite Setup    source_pwd=yes
 Suite Teardown    Close All Connections
-Test Teardown     Run Keywords    Show Debugs    ${NET_1_VM_INSTANCES}
-...               AND    Show Debugs    ${NET_2_VM_INSTANCES}
+Test Teardown     Run Keywords    Show Debugs    @{NET_1_VM_INSTANCES}    @{NET_2_VM_INSTANCES}
 ...               AND    Get OvsDebugInfo
 Library           SSHLibrary
 Library           OperatingSystem

diff --git a/csit/suites/openstack/connectivity/01_l2_tests.robot b/csit/suites/openstack/connectivity/01_l2_tests.robot
index fff7c56a1e2afe6ab828bd41ebaef33fedf12622..68e44c5a2007c49efdedf4ec426bb2ada5f14aaa 100644 (file)
--- a/csit/suites/openstack/connectivity/01_l2_tests.robot
+++ b/csit/suites/openstack/connectivity/01_l2_tests.robot
@@ -66,8 +66,7 @@ Check Vm Instances Have Ip Address
     Set Suite Variable    ${NET1_VM_IPS}
     Append To List    ${NET2_VM_IPS}    ${NET2_DHCP_IP}
     Set Suite Variable    ${NET2_VM_IPS}
-    [Teardown]    Run Keywords    Show Debugs    ${NET_1_VM_INSTANCES}
-    ...    AND    Show Debugs    ${NET_2_VM_INSTANCES}
+    [Teardown]    Run Keywords    Show Debugs    @{NET_1_VM_INSTANCES}    @{NET_2_VM_INSTANCES}
     ...    AND    Get OvsDebugInfo
 
 Ping Vm Instance1 In l2_network_1
@@ -135,8 +134,7 @@ Delete Vm Instances In l2_network_2
     [Documentation]    Delete Vm instances using instance names in l2_network_2.
     : FOR    ${VmElement}    IN    @{NET_2_VM_INSTANCES}
     \    Delete Vm Instance    ${VmElement}
-    [Teardown]    Run Keywords    Show Debugs    ${NET_1_VM_INSTANCES}
-    ...    AND    Show Debugs    ${NET_2_VM_INSTANCES}
+    [Teardown]    Run Keywords    Show Debugs    @{NET_1_VM_INSTANCES}    @{NET_2_VM_INSTANCES}
     ...    AND    Get OvsDebugInfo
 
 Delete Sub Networks In l2_network_1

diff --git a/csit/suites/openstack/connectivity/02_l3_tests.robot b/csit/suites/openstack/connectivity/02_l3_tests.robot
index 143cd24576dd7caacbf2b207d06244a2db541ae1..9ba71d1f6b9dae0f6c4486cbf43ed7592225cbd6 100644 (file)
--- a/csit/suites/openstack/connectivity/02_l3_tests.robot
+++ b/csit/suites/openstack/connectivity/02_l3_tests.robot
@@ -56,8 +56,7 @@ Check Vm Instances Have Ip Address
     Set Suite Variable    ${NET1_DHCP_IP}
     Set Suite Variable    ${NET2_L3_VM_IPS}
     Set Suite Variable    ${NET2_DHCP_IP}
-    [Teardown]    Run Keywords    Show Debugs    ${NET_1_VM_INSTANCES}
-    ...    AND    Show Debugs    ${NET_2_VM_INSTANCES}
+    [Teardown]    Run Keywords    Show Debugs    @{NET_1_VM_INSTANCES}    @{NET_2_VM_INSTANCES}
     ...    AND    Get OvsDebugInfo
 
 Create Routers
@@ -138,8 +137,7 @@ Delete Vm Instances In network_2
     [Documentation]    Delete Vm instances using instance names in network_2.
     : FOR    ${VmElement}    IN    @{NET_2_VM_INSTANCES}
     \    Delete Vm Instance    ${VmElement}
-    [Teardown]    Run Keywords    Show Debugs    ${NET_1_VM_INSTANCES}
-    ...    AND    Show Debugs    ${NET_2_VM_INSTANCES}
+    [Teardown]    Run Keywords    Show Debugs    @{NET_1_VM_INSTANCES}    @{NET_2_VM_INSTANCES}
     ...    AND    Get OvsDebugInfo
 
 Delete Router Interfaces