From: Vishal Thapar <vthapar@redhat.com>
Date: Tue, 9 Oct 2018 06:33:19 +0000 (+0530)
Subject: Fix teardowns for netvirt/ha tests
X-Git-Tag: pre-potassium~526
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=8aca28de56771e7689ec57985c82ed879da8e91a;p=integration%2Ftest.git

Fix teardowns for netvirt/ha tests

Some of Netvirt HA Tests are not collecting
all the dumps, only OVS debugs. This makes them
impossible to debug. Bug is due to using the wrong
teardown method. This fixes them by using correct
one.

Change-Id: I126fd30f2ff92b3890f0c581a70f7c8c4f63f917
Signed-off-by: Vishal Thapar <vthapar@redhat.com>
---

diff --git a/csit/suites/openstack/clustering/ha_l3.robot b/csit/suites/openstack/clustering/ha_l3.robot
index fe8caa4385..d4d15a0448 100644
--- a/csit/suites/openstack/clustering/ha_l3.robot
+++ b/csit/suites/openstack/clustering/ha_l3.robot
@@ -165,19 +165,19 @@ Connectivity Tests From Vm Instance1 In net_1
     [Documentation]    ssh to the VM instance and test operations.
     ${dst_list} =    BuiltIn.Create List    @{NET_2_L3_VM_IPS}    @{NET_1_L3_VM_IPS}
     OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS}[0]    @{NET_1_L3_VM_IPS}[0]    ${dst_list}
-    [Teardown]    OpenStackOperations.Get OvsDebugInfo
+    [Teardown]    OpenStackOperations.Get Test Teardown Debugs    fail=False
 
 Connectivity Tests From Vm Instance2 In net_1
     [Documentation]    ssh to the VM instance and test operations.
     ${dst_list} =    BuiltIn.Create List    @{NET_2_L3_VM_IPS}    @{NET_1_L3_VM_IPS}
     OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS}[0]    @{NET_1_L3_VM_IPS}[1]    ${dst_list}
-    [Teardown]    OpenStackOperations.Get OvsDebugInfo
+    [Teardown]    OpenStackOperations.Get Test Teardown Debugs    fail=False
 
 Connectivity Tests From Vm Instance3 In net_1
     [Documentation]    ssh to the VM instance and test operations.
     ${dst_list} =    BuiltIn.Create List    @{NET_2_L3_VM_IPS}    @{NET_1_L3_VM_IPS}
     OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS}[0]    @{NET_1_L3_VM_IPS}[2]    ${dst_list}
-    [Teardown]    OpenStackOperations.Get OvsDebugInfo
+    [Teardown]    OpenStackOperations.Get Test Teardown Debugs    fail=False
 
 Bring Up ODL1 and ODL2
     [Documentation]    Bring up ODL1 and ODL2 again. Do not check for cluster sync until all nodes are
@@ -196,19 +196,19 @@ Connectivity Tests From Vm Instance1 In net_2
     [Documentation]    ssh to the VM instance and test operations.
     ${dst_list} =    BuiltIn.Create List    @{NET_2_L3_VM_IPS}    @{NET_1_L3_VM_IPS}
     OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS}[1]    @{NET_2_L3_VM_IPS}[0]    ${dst_list}
-    [Teardown]    OpenStackOperations.Get OvsDebugInfo
+    [Teardown]    OpenStackOperations.Get Test Teardown Debugs    fail=False
 
 Connectivity Tests From Vm Instance2 In net_2
     [Documentation]    ssh to the VM instance and test operations.
     ${dst_list} =    BuiltIn.Create List    @{NET_2_L3_VM_IPS}    @{NET_1_L3_VM_IPS}
     OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS}[1]    @{NET_2_L3_VM_IPS}[1]    ${dst_list}
-    [Teardown]    OpenStackOperations.Get OvsDebugInfo
+    [Teardown]    OpenStackOperations.Get Test Teardown Debugs    fail=False
 
 Connectivity Tests From Vm Instance3 In net_2
     [Documentation]    ssh to the VM instance and test operations.
     ${dst_list} =    BuiltIn.Create List    @{NET_2_L3_VM_IPS}    @{NET_1_L3_VM_IPS}
     OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS}[1]    @{NET_2_L3_VM_IPS}[2]    ${dst_list}
-    [Teardown]    OpenStackOperations.Get OvsDebugInfo
+    [Teardown]    OpenStackOperations.Get Test Teardown Debugs    fail=False
 
 Bring Up ODL2 and ODL3
     [Documentation]    Bring up ODL2 and ODL3 again. Do not check for cluster sync until all nodes are
@@ -236,13 +236,13 @@ Connectivity Tests From Vm Instance2 In net_2 after recovering all nodes
     [Documentation]    ssh to the VM instance and test operations.
     ${dst_list} =    BuiltIn.Create List    @{NET_2_L3_VM_IPS}    @{NET_1_L3_VM_IPS}
     OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS}[1]    @{NET_2_L3_VM_IPS}[1]    ${dst_list}
-    [Teardown]    OpenStackOperations.Get OvsDebugInfo
+    [Teardown]    OpenStackOperations.Get Test Teardown Debugs    fail=False
 
 Connectivity Tests From Vm Instance3 In net_2 after recovering all nodes
     [Documentation]    ssh to the VM instance and test operations.
     ${dst_list} =    BuiltIn.Create List    @{NET_2_L3_VM_IPS}    @{NET_1_L3_VM_IPS}
     OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS}[1]    @{NET_2_L3_VM_IPS}[2]    ${dst_list}
-    [Teardown]    OpenStackOperations.Get OvsDebugInfo
+    [Teardown]    OpenStackOperations.Get Test Teardown Debugs    fail=False
 
 Delete Vm Instances In net_1
     [Documentation]    Delete Vm instances using instance names in net_1.
diff --git a/csit/suites/openstack/clustering/ha_l3_block_port.robot b/csit/suites/openstack/clustering/ha_l3_block_port.robot
index 9c981ea1cd..283e02b537 100644
--- a/csit/suites/openstack/clustering/ha_l3_block_port.robot
+++ b/csit/suites/openstack/clustering/ha_l3_block_port.robot
@@ -144,30 +144,30 @@ Ping Vm Instance3 In net_1 From net_2
 Block Port On ODL1 Again
     [Documentation]    Block connection on first controller the second time
     ClusterManagement.Isolate_Member_From_List_Or_All    ${1}    protocol=tcp    port=${ODL_AKKA_PORT}
-    [Teardown]    OpenStackOperations.Get OvsDebugInfo
+    [Teardown]    OpenStackOperations.Get Test Teardown Debugs    fail=False
 
 Block Port On ODL2 Again
     [Documentation]    Block connection on second controller the second time
     ClusterManagement.Isolate_Member_From_List_Or_All    ${2}    protocol=tcp    port=${ODL_AKKA_PORT}
-    [Teardown]    OpenStackOperations.Get OvsDebugInfo
+    [Teardown]    OpenStackOperations.Get Test Teardown Debugs    fail=False
 
 Connectivity Tests From Vm Instance1 In net_1
     [Documentation]    ssh to the VM instance and test operations.
     ${dst_list} =    BuiltIn.Create List    @{NET_2_L3_VM_IPS}    @{NET_1_L3_VM_IPS}
     OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS}[0]    @{NET_1_L3_VM_IPS}[0]    ${dst_list}
-    [Teardown]    OpenStackOperations.Get OvsDebugInfo
+    [Teardown]    OpenStackOperations.Get Test Teardown Debugs    fail=False
 
 Connectivity Tests From Vm Instance2 In net_1
     [Documentation]    ssh to the VM instance and test operations.
     ${dst_list} =    BuiltIn.Create List    @{NET_2_L3_VM_IPS}    @{NET_1_L3_VM_IPS}
     OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS}[0]    @{NET_1_L3_VM_IPS}[1]    ${dst_list}
-    [Teardown]    OpenStackOperations.Get OvsDebugInfo
+    [Teardown]    OpenStackOperations.Get Test Teardown Debugs    fail=False
 
 Connectivity Tests From Vm Instance3 In net_1
     [Documentation]    ssh to the VM instance and test operations.
     ${dst_list} =    BuiltIn.Create List    @{NET_2_L3_VM_IPS}    @{NET_1_L3_VM_IPS}
     OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS}[0]    @{NET_1_L3_VM_IPS}[2]    ${dst_list}
-    [Teardown]    OpenStackOperations.Get OvsDebugInfo
+    [Teardown]    OpenStackOperations.Get Test Teardown Debugs    fail=False
 
 Allow Port On ODL1 Again
     [Documentation]    Allow connection on first controller the second time
@@ -180,30 +180,30 @@ Allow Port On ODL2 Again
 Block Port On ODL2 Finally
     [Documentation]    Block connection on second controller for the last time
     ClusterManagement.Isolate_Member_From_List_Or_All    ${2}    protocol=tcp    port=${ODL_AKKA_PORT}
-    [Teardown]    OpenStackOperations.Get OvsDebugInfo
+    [Teardown]    OpenStackOperations.Get Test Teardown Debugs    fail=False
 
 Block Port On ODL3 Again
     [Documentation]    Block connection on the third controller for the second time
     ClusterManagement.Isolate_Member_From_List_Or_All    ${3}    protocol=tcp    port=${ODL_AKKA_PORT}
-    [Teardown]    OpenStackOperations.Get OvsDebugInfo
+    [Teardown]    OpenStackOperations.Get Test Teardown Debugs    fail=False
 
 Connectivity Tests From Vm Instance1 In net_2
     [Documentation]    ssh to the VM instance and test operations.
     ${dst_list} =    BuiltIn.Create List    @{NET_2_L3_VM_IPS}    @{NET_1_L3_VM_IPS}
     OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS}[1]    @{NET_2_L3_VM_IPS}[0]    ${dst_list}
-    [Teardown]    OpenStackOperations.Get OvsDebugInfo
+    [Teardown]    OpenStackOperations.Get Test Teardown Debugs    fail=False
 
 Connectivity Tests From Vm Instance2 In net_2
     [Documentation]    ssh to the VM instance and test operations.
     ${dst_list} =    BuiltIn.Create List    @{NET_2_L3_VM_IPS}    @{NET_1_L3_VM_IPS}
     OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS}[1]    @{NET_2_L3_VM_IPS}[1]    ${dst_list}
-    [Teardown]    OpenStackOperations.Get OvsDebugInfo
+    [Teardown]    OpenStackOperations.Get Test Teardown Debugs    fail=False
 
 Connectivity Tests From Vm Instance3 In net_2
     [Documentation]    ssh to the VM instance and test operations.
     ${dst_list} =    BuiltIn.Create List    @{NET_2_L3_VM_IPS}    @{NET_1_L3_VM_IPS}
     OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS}[1]    @{NET_2_L3_VM_IPS}[2]    ${dst_list}
-    [Teardown]    OpenStackOperations.Get OvsDebugInfo
+    [Teardown]    OpenStackOperations.Get Test Teardown Debugs    fail=False
 
 Allow Port On ODL2 Finally
     [Documentation]    Allow connection on second controller for the last time