From: Luis Gomez <ecelgp@gmail.com>
Date: Mon, 27 Feb 2017 22:44:36 +0000 (-0800)
Subject: Change Entity Owner suite to new cluster behavior
X-Git-Tag: release/boron-sr3~119
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=cc779f39cf407cf324a74c3a692b9bce80ba6f19;p=integration%2Ftest.git

Change Entity Owner suite to new cluster behavior

New cluster behavior: only entities the switch connects to show
as candidates in the entity owner API.

Change-Id: I8d16a737c31bd4f12bb892eab45b88030f5a237f
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
---

diff --git a/csit/suites/openflowplugin/EntityOwnership/010_Switch_Disconnect.robot b/csit/suites/openflowplugin/EntityOwnership/010_Switch_Disconnect.robot
index 196809d81e..2e1109af3c 100644
--- a/csit/suites/openflowplugin/EntityOwnership/010_Switch_Disconnect.robot
+++ b/csit/suites/openflowplugin/EntityOwnership/010_Switch_Disconnect.robot
@@ -84,7 +84,7 @@ Disconnect Switchs Old Master
     OvsManager.Disconnect Switch From Controller And Verify Disconnected    ${switch_name}    ${old_master}
     BuiltIn.Set Test Variable    ${disc_cntl}    ${old_master}
     ${new_master}=    BuiltIn.Wait Until Keyword Succeeds    5x    3s    Verify New Master Controller Node    ${switch_name}    ${old_master}
-    ${owner}    ${successors}=    ClusterOpenFlow.Get OpenFlow Entity Owner Status For One Device    openflow:${idx}    ${active_member}    ${old_successors}
+    ${owner}    ${successors}=    ClusterOpenFlow.Get OpenFlow Entity Owner Status For One Device    openflow:${idx}    ${active_member}    ${old_successors}    after_stop=True
     BuiltIn.Should Be Equal As Strings    ${new_master}    ${ODL_SYSTEM_${owner}_IP}
     BuiltIn.Set Test Variable    ${old_owner}
     BuiltIn.Set Test Variable    ${old_successors}
@@ -108,7 +108,7 @@ Disconnect Switchs Slave
     BuiltIn.Set Test Variable    ${disc_cntl}    ${old_slave}
     ${tmp_candidates}=    BuiltIn.Create List    @{ClusterManagement__member_index_list}
     Collections.Remove Values From List    ${tmp_candidates}    ${old_successor}
-    ${owner}    ${successors}=    ClusterOpenFlow.Get OpenFlow Entity Owner Status For One Device    openflow:${idx}    ${active_member}    ${tmp_candidates}
+    ${owner}    ${successors}=    ClusterOpenFlow.Get OpenFlow Entity Owner Status For One Device    openflow:${idx}    ${active_member}    ${tmp_candidates}    after_stop=True
     BuiltIn.Should Be Equal    ${owner}    ${old_owner}
     BuiltIn.Should Be Equal As Strings    ${new_master}    ${ODL_SYSTEM_${owner}_IP}
     BuiltIn.Set Test Variable    ${old_owner}
diff --git a/csit/suites/openflowplugin/Reconciliation/010_Group_Flows.robot b/csit/suites/openflowplugin/Reconciliation/010_Group_Flows.robot
index 906e230a1f..d9ae8331b2 100644
--- a/csit/suites/openflowplugin/Reconciliation/010_Group_Flows.robot
+++ b/csit/suites/openflowplugin/Reconciliation/010_Group_Flows.robot
@@ -17,7 +17,7 @@ ${VAR_DIR}        ${CURDIR}/../../../variables/openflowplugin
 
 *** Test Cases ***
 Enable Stale Flow Entry
-    [Documentation]    Check Flows after mininet starts.
+    [Documentation]    Enable stale flow entry feature.
     # Stale flows/groups feature is only available in Boron onwards.
     CompareStream.Run Keyword If At Least Boron    TemplatedRequests.Put As Json Templated    folder=${VAR_DIR}/frm-config    mapping={"STALE":"true"}    session=session