From ee32d14d7f71c4622ba1f42babcbeafd47403e94 Mon Sep 17 00:00:00 2001 From: gvrangan Date: Thu, 5 Jan 2017 01:14:26 +0000 Subject: [PATCH 1/1] Eliminate getting model dumps when 2 ODL nodes are down This will reduce the delay in CSIT Change-Id: Ifb944b8cf8cfad7a0b79a223d19e636ed646a0d6 Signed-off-by: gvrangan --- csit/suites/openstack/clustering/01_l2_tests.robot | 4 ++++ csit/suites/openstack/clustering/02_l3_tests.robot | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/csit/suites/openstack/clustering/01_l2_tests.robot b/csit/suites/openstack/clustering/01_l2_tests.robot index a5b8218f35..604b0fba3a 100644 --- a/csit/suites/openstack/clustering/01_l2_tests.robot +++ b/csit/suites/openstack/clustering/01_l2_tests.robot @@ -183,18 +183,22 @@ Bring Up ODL3 Take Down ODL1 and ODL2 [Documentation] Kill the karaf in First and Second Controller ClusterManagement.Kill Members From List Or All ${cluster_down_list} + [Teardown] Get OvsDebugInfo Connectivity Tests From Vm Instance1 In l2_net_2 [Documentation] Logging to the vm instance using generated key pair. OpenStackOperations.Test Operations From Vm Instance l2_net_2 @{NET_2_VM_IPS}[0] ${NET_2_VM_IPS} + [Teardown] Get OvsDebugInfo Connectivity Tests From Vm Instance2 In l2_net_2 [Documentation] Logging to the vm instance using generated key pair. OpenStackOperations.Test Operations From Vm Instance l2_net_2 @{NET_2_VM_IPS}[1] ${NET_2_VM_IPS} + [Teardown] Get OvsDebugInfo Connectivity Tests From Vm Instance3 In l2_net_2 [Documentation] Logging to the vm instance using generated key pair. OpenStackOperations.Test Operations From Vm Instance l2_net_2 @{NET_2_VM_IPS}[2] ${NET_2_VM_IPS} + [Teardown] Get OvsDebugInfo Bring Up ODL1 and ODL2 [Documentation] Bring up ODL1 and ODL2 again. diff --git a/csit/suites/openstack/clustering/02_l3_tests.robot b/csit/suites/openstack/clustering/02_l3_tests.robot index ea62bfbcfc..f32b2d8dba 100644 --- a/csit/suites/openstack/clustering/02_l3_tests.robot +++ b/csit/suites/openstack/clustering/02_l3_tests.robot @@ -148,24 +148,28 @@ Ping Vm Instance3 In l3_net_1 From l3_net_2 Take Down ODL1 and ODL2 [Documentation] Kill the karaf in First and Second Controller ClusterManagement.Kill Members From List Or All ${odl_1_and_2_down} + [Teardown] Get OvsDebugInfo Connectivity Tests From Vm Instance1 In l3_net_1 [Documentation] ssh to the VM instance and test operations. ${dst_ip_list}= Create List @{NET2_L3_VM_IPS} @{NET1_L3_VM_IPS} Log ${dst_ip_list} OpenStackOperations.Test Operations From Vm Instance l3_net_1 @{NET1_L3_VM_IPS}[0] ${dst_ip_list} + [Teardown] Get OvsDebugInfo Connectivity Tests From Vm Instance2 In l3_net_1 [Documentation] ssh to the VM instance and test operations. ${dst_ip_list}= Create List @{NET2_L3_VM_IPS} @{NET1_L3_VM_IPS} Log ${dst_ip_list} OpenStackOperations.Test Operations From Vm Instance l3_net_1 @{NET1_L3_VM_IPS}[1] ${dst_ip_list} + [Teardown] Get OvsDebugInfo Connectivity Tests From Vm Instance3 In l3_net_1 [Documentation] ssh to the VM instance and test operations. ${dst_ip_list}= Create List @{NET2_L3_VM_IPS} @{NET1_L3_VM_IPS} Log ${dst_ip_list} OpenStackOperations.Test Operations From Vm Instance l3_net_1 @{NET1_L3_VM_IPS}[2] ${dst_ip_list} + [Teardown] Get OvsDebugInfo Bring Up ODL1 and ODL2 [Documentation] Bring up ODL1 and ODL2 again @@ -174,24 +178,28 @@ Bring Up ODL1 and ODL2 Take Down ODL2 and ODL3 [Documentation] Kill the karaf in First and Second Controller ClusterManagement.Kill Members From List Or All ${odl_2_and_3_down} + [Teardown] Get OvsDebugInfo Connectivity Tests From Vm Instance1 In l3_net_2 [Documentation] ssh to the VM instance and test operations. ${dst_ip_list}= Create List @{NET2_L3_VM_IPS} @{NET1_L3_VM_IPS} Log ${dst_ip_list} OpenStackOperations.Test Operations From Vm Instance l3_net_2 @{NET2_L3_VM_IPS}[0] ${dst_ip_list} + [Teardown] Get OvsDebugInfo Connectivity Tests From Vm Instance2 In l3_net_2 [Documentation] ssh to the VM instance and test operations. ${dst_ip_list}= Create List @{NET2_L3_VM_IPS} @{NET1_L3_VM_IPS} Log ${dst_ip_list} OpenStackOperations.Test Operations From Vm Instance l3_net_2 @{NET2_L3_VM_IPS}[1] ${dst_ip_list} + [Teardown] Get OvsDebugInfo Connectivity Tests From Vm Instance3 In l3_net_2 [Documentation] ssh to the VM instance and test operations. ${dst_ip_list}= Create List @{NET2_L3_VM_IPS} @{NET1_L3_VM_IPS} Log ${dst_ip_list} OpenStackOperations.Test Operations From Vm Instance l3_net_2 @{NET2_L3_VM_IPS}[2] ${dst_ip_list} + [Teardown] Get OvsDebugInfo Bring Up ODL2 and ODL3 [Documentation] Bring up ODL2 and ODL3 again. -- 2.36.6