Cluster Library consolidation 3

[integration/test.git] / csit / suites / netvirt / Netvirt_Cluster / 010_Ovsdb_Netvirt_flow.robot

diff --git a/csit/suites/netvirt/Netvirt_Cluster/010_Ovsdb_Netvirt_flow.robot b/csit/suites/netvirt/Netvirt_Cluster/010_Ovsdb_Netvirt_flow.robot
index 2e1b54859336b82180790fcb64447072bd1d974f..6a6bdf3fcce0f42585e056c9b586636edda6314c 100644 (file)
--- a/csit/suites/netvirt/Netvirt_Cluster/010_Ovsdb_Netvirt_flow.robot
+++ b/csit/suites/netvirt/Netvirt_Cluster/010_Ovsdb_Netvirt_flow.robot
@@ -1,16 +1,14 @@
 *** Settings ***
 Documentation     Test suite for Ovsdb Southbound Cluster
-Suite Setup       Create Controller Sessions
+Suite Setup       ClusterManagement Setup
 Suite Teardown    Delete All Sessions
 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/OVSDB.robot
 Resource          ../../../libraries/KarafKeywords.robot
+Variables         ../../../variables/Variables.py
 
 *** Variables ***
 ${OVSDB_CONFIG_DIR}    ${CURDIR}/../../../variables/ovsdb
@@ -20,50 +18,50 @@ ${EXT_SUBNET1_ID}    00289199-e288-464a-ab2f-837ca67101a7
 ${TNT1_ID}        cde2563ead464ffa97963c59e002c0cf
 
 *** 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]    Check 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 netvirt is loaded
     [Documentation]    Check if the netvirt piece has been loaded into the karaf instance
     [Tags]    Check netvirt is loaded
     ${netvirt}=    Create Dictionary    netvirt:1=1
-    Wait Until Keyword Succeeds    6s    1s    Check Item Occurrence At URI In Cluster    ${original_cluster_list}    ${netvirt}    ${OPERATIONAL_NODES_NETVIRT}
+    Wait Until Keyword Succeeds    6s    1s    ClusterManagement.Check_Item_Occurrence_Member_List_Or_All    uri=${OPERATIONAL_NODES_NETVIRT}    dictionary=${netvirt}
 
 Check External Net for Tenant
     [Documentation]    Check External Net for Tenant
     [Tags]    OpenStack Call Flow
     ${resp}=    Create Dictionary    "networks" : [ ]=1
-    Check Item Occurrence At URI In Cluster    ${original_cluster_list}    ${resp}    ${NEUTRON_NETWORKS_API}
+    ClusterManagement.Check_Item_Occurrence_Member_List_Or_All    uri=${NEUTRON_NETWORKS_API}    dictionary=${resp}
 
 Create External Net for Tenant
     [Documentation]    Create External Net for Tenant
     [Tags]    OpenStack Call Flow
+    ${session} =    Resolve_Http_Session_For_Member    member_index=1
     ${Data}    OperatingSystem.Get File    ${OVSDB_CONFIG_DIR}/create_ext_net.json
     ${Data}    Replace String    ${Data}    {netId}    ${EXT_NET1_ID}
     ${Data}    Replace String    ${Data}    {tntId}    ${TNT1_ID}
     Log    ${Data}
-    Post And Check At URI In Cluster    ${original_cluster_list}    1    ${NEUTRON_NETWORKS_API}    ${Data}
+    ${resp}    RequestsLibrary.Post Request    ${session}    ${NEUTRON_NETWORKS_API}    data=${Data}    headers=${HEADERS}
+    Log    ${resp.content}
+    Log    ${resp.status_code}
+    ${status_code}=    Convert To String    ${resp.status_code}
+    Should Match Regexp    ${status_code}    20(0|1)
+    ClusterManagement.Check_Json_Member_List_Or_All    ${NEUTRON_NETWORKS_API}    ${Data}