Fix Mininet Start multiple connections

[integration/test.git] / csit / suites / openflowplugin / EntityOwnership / 030_Cluster_Sync_Problems.robot

diff --git a/csit/suites/openflowplugin/EntityOwnership/030_Cluster_Sync_Problems.robot b/csit/suites/openflowplugin/EntityOwnership/030_Cluster_Sync_Problems.robot
index 1fa67339b4f28958e1c56339c6056c6d91f6eec4..802e0a17a8dd7e6f544501cc28da8385d9c655f5 100644 (file)
--- a/csit/suites/openflowplugin/EntityOwnership/030_Cluster_Sync_Problems.robot
+++ b/csit/suites/openflowplugin/EntityOwnership/030_Cluster_Sync_Problems.robot
@@ -2,11 +2,14 @@
 Documentation     Test suite for entity ownership service and openflowplugin. Makes changes on controller side (isolating cluster node)
 Suite Setup       Start Suite
 Suite Teardown    End Suite
+Test Setup        SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
 Test Template     Isolating Node Scenario
 Library           SSHLibrary
 Library           RequestsLibrary
 Library           XML
+Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
 Resource          ${CURDIR}/../../../libraries/Utils.robot
+Resource          ${CURDIR}/../../../libraries/FlowLib.robot
 Resource          ${CURDIR}/../../../libraries/OvsManager.robot
 Resource          ${CURDIR}/../../../libraries/ClusterManagement.robot
 Resource          ${CURDIR}/../../../libraries/ClusterOpenFlow.robot
@@ -14,8 +17,7 @@ Library           Collections
 
 *** Variables ***
 ${SWITCHES}       1
-# this is for mininet 2.2.1 ${START_CMD}    sudo mn --controller=remote,ip=${ODL_SYSTEM_1_IP} --controller=remote,ip=${ODL_SYSTEM_2_IP} --controller=remote,ip=${ODL_SYSTEM_3_IP} --topo linear,${SWITCHES} --switch ovsk,protocols=OpenFlow13
-${START_CMD}      sudo mn --topo linear,${SWITCHES} --switch ovsk,protocols=OpenFlow13
+${START_CMD}      sudo mn --topo linear,${SWITCHES}
 @{CONTROLLER_NODES}    ${ODL_SYSTEM_1_IP}    ${ODL_SYSTEM_2_IP}    ${ODL_SYSTEM_3_IP}
 @{cntls_idx_list}    ${1}    ${2}    ${3}
 
@@ -37,7 +39,7 @@ Start Mininet To All Nodes
     \    Collections.Append To List    ${switch_list}    s${sid}
     BuiltIn.Set Suite Variable    ${active_member}    1
     OvsManager.Setup Clustered Controller For Switches    ${switch_list}    ${cntls_list}
-    BuiltIn.Wait Until Keyword Succeeds    15s    1s    Are Switches Connected Topo
+    BuiltIn.Wait Until Keyword Succeeds    15s    1s    ClusterOpenFlow.Verify Switch Connections Running On Member    ${SWITCHES}    1
 
 Switches To Be Connected To All Nodes
     [Documentation]    Initial check for correct connected topology.
@@ -61,19 +63,12 @@ Stop Mininet And Verify No Owners
 
 *** Keywords ***
 Start Suite
-    ClusterManagement.ClusterManagement Setup
+    SetupUtils.Setup_Utils_For_Setup_And_Teardown
 
 End Suite
     ClusterManagement.Flush Iptables From List Or All
     RequestsLibrary.Delete All Sessions
 
-Are Switches Connected Topo
-    [Documentation]    Checks wheather switches are connected to controller
-    ${resp}=    ClusterManagement.Get From Member    ${OPERATIONAL_TOPO_API}/topology/flow:1    ${active_member}    access=${ACCEPT_XML}
-    BuiltIn.Log    ${resp}
-    ${count}=    XML.Get Element Count    ${resp}    xpath=node
-    BuiltIn.Should Be Equal As Numbers    ${count}    ${SWITCHES}
-
 Check All Switches Connected To All Cluster Nodes
     [Documentation]    Verifies all switches are connected to all cluster nodes
     OvsManager.Get Ovsdb Data