From: Anil Vishnoi <vishnoianil@gmail.com>
Date: Thu, 30 Aug 2018 20:48:13 +0000 (-0700)
Subject: Fix for OPNFLWPLUG-1022 requires Topology Manager
X-Git-Tag: pre-potassium~575
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F93%2F75593%2F3;p=integration%2Ftest.git

Fix for OPNFLWPLUG-1022 requires Topology Manager

module to register for singleton clustering service.
That introduces application entity in the EOS output.
In the current cluster tests, after disconnecting all
the OpenFlow devices, test checks that no openflow
 device should have owner, by grepping the "member"
string, and expect that it should be 0. After
introducing topology manager entity, EOS output
will always have one entity with all the 3 controllers
as a candidates, so greppign the "member" string
will always return 3. This patch take care of this
change."

Change-Id: Id2d3c0905ec3cd02c2098c1c1aee61c081dfe629
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
---

diff --git a/csit/suites/openflowplugin/EntityOwnership/030_Cluster_Sync_Problems.robot b/csit/suites/openflowplugin/EntityOwnership/030_Cluster_Sync_Problems.robot
index 495e3f9fd8..7b979deb2d 100644
--- a/csit/suites/openflowplugin/EntityOwnership/030_Cluster_Sync_Problems.robot
+++ b/csit/suites/openflowplugin/EntityOwnership/030_Cluster_Sync_Problems.robot
@@ -58,7 +58,7 @@ Switches Still Be Connected To All Nodes
 Stop Mininet And Verify No Owners
     [Template]    NONE
     Utils.Stop Mininet
-    BuiltIn.Wait Until Keyword Succeeds    15x    1s    Check No Owners In Controller
+    BuiltIn.Wait Until Keyword Succeeds    15x    1s    Check No Device Owners In Controller
     [Teardown]    Report_Failure_Due_To_Bug    6177
 
 *** Keywords ***
@@ -153,11 +153,14 @@ Isolate Controller From The Cluster
     ClusterManagement.Isolate Member From List Or All    ${isolated_node}
     [Teardown]    SSHLibrary.Switch Connection    ${mininet_conn_id}
 
-Check No Owners In Controller
+Check No Device Owners In Controller
     [Documentation]    Check there is no owners in controllers
     ${session} =    Resolve_Http_Session_For_Member    member_index=${active_member}
     ${data} =    TemplatedRequests.Get_As_Json_From_Uri    uri=${ENTITY_OWNER_URI}    session=${session}
-    BuiltIn.Should Not Contain    ${data}    member
+    #ofp-topology-manager entity is introduced in the OPNFLWPLUG-1022 bug fix, and this entity will
+    #always be present in the EOS output. All 3 controller nodes will be candidate, so EOS output will
+    #contain 3 members.
+    BuiltIn.Should Contain X Times    ${data}    member    3
 
 Verify New Master Controller Node
     [Arguments]    ${switch_name}    ${old_master}