Remove entity-ownership from shard list for Phosphorus or later

Entity ownership is not stored in operational data store any more
since Phosphorus. Remove entity-ownership from the operational
shard list if the controller version is at least Phosphorus.

Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>
Change-Id: I67a4eb2e2adcc95b5e1463e05ab7e65198271c0d

diff --git a/csit/libraries/ClusterOpenFlow.robot b/csit/libraries/ClusterOpenFlow.robot
index cd1ce15b06ccba421f5155609dae588faac26329..ac214ecefac2fea1bb21ecc24ad98f2cb6f6b40b 100644 (file)
--- a/csit/libraries/ClusterOpenFlow.robot
+++ b/csit/libraries/ClusterOpenFlow.robot
@@ -1,8 +1,10 @@
 *** Settings ***
 Documentation     Cluster OpenFlow library. So far this library is only to be used by OpenFlow cluster test as it is very specific for this test.
+Library           Collections
 Library           RequestsLibrary
 Library           ${CURDIR}/ScaleClient.py
 Resource          ClusterManagement.robot
+Resource          CompareStream.robot
 Resource          MininetKeywords.robot
 Resource          Utils.robot
 Variables         ../variables/Variables.py
@@ -26,6 +28,8 @@ Get InventoryConfig Shard Status
 Check OpenFlow Shards Status
     [Arguments]    ${controller_index_list}=${EMPTY}
     [Documentation]    Check Status for all shards in OpenFlow application.
+    CompareStream.Run_Keyword_If_At_Least_Phosphorus    Collections.Remove Values From List    ${SHARD_OPER_LIST}    entity-ownership
+    Log    ${SHARD_OPER_LIST}
     ClusterManagement.Verify_Leader_Exists_For_Each_Shard    shard_name_list=${SHARD_OPER_LIST}    shard_type=operational    member_index_list=${controller_index_list}
     ClusterManagement.Verify_Leader_Exists_For_Each_Shard    shard_name_list=${SHARD_CONF_LIST}    shard_type=config    member_index_list=${controller_index_list}
 

diff --git a/csit/libraries/ClusterOvsdb.robot b/csit/libraries/ClusterOvsdb.robot
index b34673e1d119fdcdaaa971aa41037cda686d9fbc..ba40f0e6714c48718a27ddd018b445db1772ff79 100644 (file)
--- a/csit/libraries/ClusterOvsdb.robot
+++ b/csit/libraries/ClusterOvsdb.robot
@@ -1,7 +1,9 @@
 *** Settings ***
 Documentation     Cluster Ovsdb library. So far this library is only to be used by Ovsdb cluster test as it is very specific for this test.
+Library           Collections
 Library           RequestsLibrary
 Resource          ClusterManagement.robot
+Resource          CompareStream.robot
 Resource          MininetKeywords.robot
 Resource          Utils.robot
 Resource          OVSDB.robot
@@ -17,6 +19,8 @@ ${OVSDB_CONFIG_DIR}    ${CURDIR}/../variables/ovsdb
 Check Ovsdb Shards Status
     [Arguments]    ${controller_index_list}=${EMPTY}
     [Documentation]    Check Status for all shards in Ovsdb application.
+    CompareStream.Run_Keyword_If_At_Least_Phosphorus    Collections.Remove Values From List    ${SHARD_OPER_LIST}    entity-ownership
+    Log    ${SHARD_OPER_LIST}
     ClusterManagement.Verify_Leader_Exists_For_Each_Shard    shard_name_list=${SHARD_OPER_LIST}    shard_type=operational    member_index_list=${controller_index_list}
     ClusterManagement.Verify_Leader_Exists_For_Each_Shard    shard_name_list=${SHARD_CONF_LIST}    shard_type=config    member_index_list=${controller_index_list}
 

diff --git a/csit/libraries/SxpClusterLib.robot b/csit/libraries/SxpClusterLib.robot
index 10bc9ef6b2dc2a2dc77cadb3c2a65f89479d2b51..edb25ef1a7acaeee05984fb27a79d97b358d8303 100644 (file)
--- a/csit/libraries/SxpClusterLib.robot
+++ b/csit/libraries/SxpClusterLib.robot
@@ -1,7 +1,9 @@
 *** Settings ***
 Documentation     Library containing Keywords used for SXP cluster testing
+Library           Collections
 Library           RequestsLibrary
 Resource          ./ClusterManagement.robot
+Resource          ./CompareStream.robot
 Resource          ./SetupUtils.robot
 Resource          ./SxpLib.robot
 
@@ -46,6 +48,8 @@ Clean SXP Cluster Session
 Check Shards Status
     [Documentation]    Check Status for all shards in SXP application.
     ClusterManagement.Check_Cluster_Is_In_Sync
+    CompareStream.Run_Keyword_If_At_Least_Phosphorus    Collections.Remove Values From List    ${SHARD_OPER_LIST}    entity-ownership
+    Log    ${SHARD_OPER_LIST}
     ClusterManagement.Verify_Leader_Exists_For_Each_Shard    shard_name_list=${SHARD_OPER_LIST}    shard_type=operational
     ClusterManagement.Verify_Leader_Exists_For_Each_Shard    shard_name_list=${SHARD_CONF_LIST}    shard_type=config