Fix Netvirt Tests by splitting the single node and three node tests

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

diff --git a/csit/suites/ovsdb/Ovsdb_Net-virt/020_Ovsdb_Southbound_Net-Virt.robot b/csit/suites/ovsdb/Netvirt_Cluster/030_Ovsdb_Southbound_NetVirt.robot
similarity index 69%
rename from csit/suites/ovsdb/Ovsdb_Net-virt/020_Ovsdb_Southbound_Net-Virt.robot
rename to csit/suites/ovsdb/Netvirt_Cluster/030_Ovsdb_Southbound_NetVirt.robot
index b9a15ca431428d866731f2058749c53acef7d70e..489baf96d8ecade9615edb7b87f111309f0186fb 100644 (file)
--- a/csit/suites/ovsdb/Ovsdb_Net-virt/020_Ovsdb_Southbound_Net-Virt.robot
+++ b/csit/suites/ovsdb/Netvirt_Cluster/030_Ovsdb_Southbound_NetVirt.robot
@@ -10,10 +10,10 @@ Variables         ../../../variables/Variables.py
 Library           ../../../libraries/Common.py
 Resource          ../../../libraries/Utils.robot
 Resource          ../../../libraries/OVSDB.robot
+Resource          ../../../libraries/KarafKeywords.robot
 
 *** 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: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
 
 *** Test Cases ***
 Create Original Cluster List
@@ -22,16 +22,32 @@ Create Original Cluster 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}
+
 Check Shards Status Before Fail
     [Documentation]    Check Status for all shards in Ovsdb application.
     Check Ovsdb Shards Status    ${original_cluster_list}
 
 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}    Add Multiple Managers to OVS  ${TOOLS_SYSTEM_IP}    ${original_cluster_list}
     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
+
+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}
+
 Get bridge setup
     [Documentation]    This request is verifying that the br-int bridge has been created
     [Tags]    OVSDB netvirt
@@ -53,10 +69,11 @@ Get interface setup
     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
     Log    ${output}
     : FOR    ${flows}    IN    @{FLOW_TABLE_LIST}
-    \    Should Contain    ${output}    ${flows}
+    \    Should Contain    ${output}    ${flows}
\ No newline at end of file