Fix netvirt openstack failures as per recent changes in pipelines

[integration/test.git] / csit / suites / netvirt / Netvirt_Cluster / 030_Ovsdb_Southbound_NetVirt.robot

diff --git a/csit/suites/netvirt/Netvirt_Cluster/030_Ovsdb_Southbound_NetVirt.robot b/csit/suites/netvirt/Netvirt_Cluster/030_Ovsdb_Southbound_NetVirt.robot
index df24790fbd0718f89468cfe53d870afed683cce5..f307596d7baa47f7ede1477be4b4292d495c0817 100644 (file)
--- a/csit/suites/netvirt/Netvirt_Cluster/030_Ovsdb_Southbound_NetVirt.robot
+++ b/csit/suites/netvirt/Netvirt_Cluster/030_Ovsdb_Southbound_NetVirt.robot
@@ -1,79 +1,72 @@
 *** Settings ***
 Documentation     Test suite for Ovsdb Southbound Cluster
-Suite Setup       Create Controller Sessions
+Suite Setup       SetupUtils.Setup_Utils_For_Setup_And_Teardown
 Suite Teardown    Delete All Sessions
+Test Setup        SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
 Library           RequestsLibrary
+Resource          ../../../libraries/ClusterManagement.robot
 Resource          ../../../libraries/ClusterOvsdb.robot
-Resource          ../../../libraries/ClusterKeywords.robot
-Resource          ../../../libraries/MininetKeywords.robot
-Variables         ../../../variables/Variables.py
-Library           ../../../libraries/Common.py
-Resource          ../../../libraries/Utils.robot
+Resource          ../../../libraries/SetupUtils.robot
 Resource          ../../../libraries/OVSDB.robot
-Resource          ../../../libraries/KarafKeywords.robot
+Resource          ../../../libraries/Utils.robot
+Variables         ../../../variables/Variables.py
 
 *** Variables ***
-@{FLOW_TABLE_LIST}    actions=goto_table:20    actions=CONTROLLER:65535    actions=goto_table:30    actions=goto_table:40    actions=goto_table:50    actions=goto_table:60    actions=goto_table:70
-...               actions=goto_table:80    actions=goto_table:90    actions=goto_table:100    actions=goto_table:110    actions=drop
+@{FLOW_TABLE_LIST}    actions=goto_table:20    actions=CONTROLLER:65535    actions=goto_table:30    actions=goto_table:31    actions=resubmit(,39),resubmit(,40)    actions=goto_table:50    actions=goto_table:60
+...               actions=goto_table:70    actions=goto_table:80    actions=goto_table:90    actions=goto_table:100    actions=goto_table:105    actions=goto_table:110    actions=drop
 
 *** Test Cases ***
-Create Original Cluster List
-    [Documentation]    Create original cluster list.
-    ${original_cluster_list}    Create Controller Index List
-    Set Suite Variable    ${original_cluster_list}
-    Log    ${original_cluster_list}
-
 Verify Net-virt Features
     [Documentation]    Installing Net-virt Console related features (odl-ovsdb-openstack)
-    Verify Feature Is Installed    odl-ovsdb-openstack    ${ODL_SYSTEM_1_IP}
-    Verify Feature Is Installed    odl-ovsdb-openstack    ${ODL_SYSTEM_2_IP}
-    Verify Feature Is Installed    odl-ovsdb-openstack    ${ODL_SYSTEM_3_IP}
+    KarafKeywords.Verify Feature Is Installed    odl-ovsdb-openstack    ${ODL_SYSTEM_1_IP}
+    KarafKeywords.Verify Feature Is Installed    odl-ovsdb-openstack    ${ODL_SYSTEM_2_IP}
+    KarafKeywords.Verify Feature Is Installed    odl-ovsdb-openstack    ${ODL_SYSTEM_3_IP}
 
 Check Shards Status Before Fail
     [Documentation]    Check Status for all shards in Ovsdb application.
-    Check Ovsdb Shards Status    ${original_cluster_list}
+    ClusterOvsdb.Check Ovsdb Shards Status
 
 Start Mininet Multiple Connections
     [Documentation]    Start mininet with connection to all cluster instances.
-    ${mininet_conn_id}    Add Multiple Managers to OVS    ${TOOLS_SYSTEM_IP}    ${original_cluster_list}
+    ${mininet_conn_id}    Ovsdb.Add Multiple Managers to OVS
     Set Suite Variable    ${mininet_conn_id}
     Log    ${mininet_conn_id}
 
 Get manager connection
     [Documentation]    This will verify if the OVS manager is connected
     [Tags]    OVSDB netvirt
-    Verify OVS Reports Connected
+    Ovsdb.Verify OVS Reports Connected
 
 Check Operational topology
     [Documentation]    Check Operational topology
     ${dictionary}=    Create Dictionary    ovsdb://uuid/=5
-    Wait Until Keyword Succeeds    20s    2s    Check Item Occurrence At URI In Cluster    ${original_cluster_list}    ${dictionary}    ${OPERATIONAL_TOPO_API}
+    Wait Until Keyword Succeeds    20s    2s    ClusterManagement.Check_Item_Occurrence_Member_List_Or_All    uri=${OPERATIONAL_TOPO_API}    dictionary=${dictionary}
 
 Get bridge setup
     [Documentation]    This request is verifying that the br-int bridge has been created
     [Tags]    OVSDB netvirt
-    ${output}    Run Command On Remote System    ${TOOLS_SYSTEM_IP}    sudo ovs-vsctl show
+    ${output}    Utils.Run Command On Mininet    ${TOOLS_SYSTEM_IP}    sudo ovs-vsctl show
     Log    ${output}
     Should Contain    ${output}    Bridge br-int
 
 Get port setup
     [Documentation]    This will check the port br-int has been created
     [Tags]    OVSDB netvirt
-    ${output}    Run Command On Remote System    ${TOOLS_SYSTEM_IP}    sudo ovs-vsctl show
+    ${output}    Utils.Run Command On Mininet    ${TOOLS_SYSTEM_IP}    sudo ovs-vsctl show
     Log    ${output}
     Should Contain    ${output}    Port br-int
 
 Get interface setup
     [Documentation]    This verify the interface br-int has been created
     [Tags]    OVSDB netvirt
-    ${output}    Run Command On Remote System    ${TOOLS_SYSTEM_IP}    sudo ovs-vsctl show
+    ${output}    Utils.Run Command On Mininet    ${TOOLS_SYSTEM_IP}    sudo ovs-vsctl show
     Log    ${output}
     Should Contain    ${output}    Interface br-int
 
 Get the bridge flows
     [Documentation]    This request fetch the OF13 flow tables to verify the flows are correctly added
     [Tags]    OVSDB netvirt
-    ${output}    Run Command On Remote System    ${TOOLS_SYSTEM_IP}    sudo ovs-ofctl -O Openflow13 dump-flows br-int
+    ${output}    Utils.Run Command On Mininet    ${TOOLS_SYSTEM_IP}    sudo ovs-ofctl -O Openflow13 dump-flows br-int
     Log    ${output}
     : FOR    ${flows}    IN    @{FLOW_TABLE_LIST}
     \    Should Contain    ${output}    ${flows}