Use vm instance names for Show Debugs

Change-Id: Ia13f0dd5bcc5ef0633cecb38462e42ef0f7994c7
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/csit/suites/openstack/clustering/01_l2_tests.robot b/csit/suites/openstack/clustering/01_l2_tests.robot
index d12d06c96ab5575418f2dfd6c905dd8d38ac9381..075a7c865b5457ec1280522d1aa98b1c2ceec08e 100644 (file)
--- a/csit/suites/openstack/clustering/01_l2_tests.robot
+++ b/csit/suites/openstack/clustering/01_l2_tests.robot
@@ -2,8 +2,8 @@
 Documentation     Test suite to verify packet flows between vm instances.
 Suite Setup       Devstack Suite Setup Tests    source_pwd=yes
 Suite Teardown    Close All Connections
-Test Teardown     Run Keywords    Show Debugs    ${NET_1_VM_IPS}
-...               AND    Show Debugs    ${NET_2_VM_IPS}
+Test Teardown     Run Keywords    Show Debugs    ${NET_1_VM_INSTANCES}
+...               AND    Show Debugs    ${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 be849e8185d2e6c0fe717e86e1d0432325e8e5af..88c9835d9f5d517cfd80963a32eb147712d65042 100644 (file)
--- a/csit/suites/openstack/clustering/02_l3_tests.robot
+++ b/csit/suites/openstack/clustering/02_l3_tests.robot
@@ -2,8 +2,8 @@
 Documentation     Test suite to check connectivity in L3 using routers.
 Suite Setup       Devstack Suite Setup Tests    source_pwd=yes
 Suite Teardown    Close All Connections
-Test Teardown     Run Keywords    Show Debugs    ${NET_1_VM_IPS}
-...               AND    Show Debugs    ${NET_2_VM_IPS}
+Test Teardown     Run Keywords    Show Debugs    ${NET_1_VM_INSTANCES}
+...               AND    Show Debugs    ${NET_2_VM_INSTANCES}
 ...               AND    Get OvsDebugInfo
 Library           SSHLibrary
 Library           OperatingSystem
@@ -51,7 +51,6 @@ Take Down ODL1
 Create Vm Instances For l3_net_1
     [Documentation]    Create Four Vm instances using flavor and image names for a network.
     OpenStackOperations.Create Vm Instances    l3_net_1    ${NET_1_VM_INSTANCES}     sg=csit
-    [Teardown]    OpenStackOperations.Show Debugs    ${NET_1_VM_INSTANCES}
 
 Bring Up ODL1
     [Documentation]    Bring up ODL1 again
@@ -64,7 +63,6 @@ Take Down ODL2
 Create Vm Instances For l3_net_2
     [Documentation]    Create Four Vm instances using flavor and image names for a network.
     OpenStackOperations.Create Vm Instances    l3_net_2    ${NET_2_VM_INSTANCES}     sg=csit
-    [Teardown]    Show Debugs    ${NET_2_VM_INSTANCES}
 
 Bring Up ODL2
     [Documentation]    Bring up ODL2 again

diff --git a/csit/suites/openstack/connectivity/01_l2_tests.robot b/csit/suites/openstack/connectivity/01_l2_tests.robot
index 459ef1d0ece8a310d8f0f11217a10b2e4d26d80f..4ff01b4f0f720053d1d4471604e9c1e99ca1a654 100644 (file)
--- a/csit/suites/openstack/connectivity/01_l2_tests.robot
+++ b/csit/suites/openstack/connectivity/01_l2_tests.robot
@@ -3,8 +3,8 @@ Documentation     Test suite to verify packet flows between vm instances.
 Suite Setup       Devstack Suite Setup Tests
 Suite Teardown    Close All Connections
 Test Setup        Log Testcase Start To Controller Karaf
-Test Teardown     Run Keywords    Show Debugs    ${NET_1_VM_IPS}
-...               AND    Show Debugs    ${NET_2_VM_IPS}
+Test Teardown     Run Keywords    Show Debugs    ${NET_1_VM_INSTANCES}
+...               AND    Show Debugs    ${NET_2_VM_INSTANCES}
 ...               AND    Get OvsDebugInfo
 Library           SSHLibrary
 Library           OperatingSystem

diff --git a/csit/suites/openstack/connectivity/02_l3_tests.robot b/csit/suites/openstack/connectivity/02_l3_tests.robot
index d5bb5f9ae52dba8f457aee3e2bfe8ba2e0e7d9b5..a13b529fdecc38e332aebe0086726178d716ed46 100644 (file)
--- a/csit/suites/openstack/connectivity/02_l3_tests.robot
+++ b/csit/suites/openstack/connectivity/02_l3_tests.robot
@@ -3,8 +3,8 @@ Documentation     Test suite to check connectivity in L3 using routers.
 Suite Setup       Devstack Suite Setup Tests
 Suite Teardown    Close All Connections
 Test Setup        Log Testcase Start To Controller Karaf
-Test Teardown     Run Keywords    Show Debugs    ${NET_1_VM_IPS}
-...               AND    Show Debugs    ${NET_2_VM_IPS}
+Test Teardown     Run Keywords    Show Debugs    ${NET_1_VM_INSTANCES}
+...               AND    Show Debugs    ${NET_2_VM_INSTANCES}
 ...               AND    Get OvsDebugInfo
 Library           SSHLibrary
 Library           OperatingSystem