Add wuks for new leader after replica removed

Change-Id: I377d4b7fb2f084960f5e0261a51e9089e20a6974
Signed-off-by: Peter Gubka <pgubka@cisco.com>

diff --git a/csit/libraries/controller/DdbCommons.robot b/csit/libraries/controller/DdbCommons.robot
index 5c013af78d1dbf18f84b1f81604f491fc5f0f972..dd343c07c3a3d2eeb349888d54f52e3d224f1b09 100644 (file)
--- a/csit/libraries/controller/DdbCommons.robot
+++ b/csit/libraries/controller/DdbCommons.robot
@@ -87,7 +87,9 @@ Clean_Leader_Shutdown_Test_Templ
     ${removed} =    BuiltIn.Set_Variable    ${True}
     ${resp_list} =    MdsalLowlevelPy.Wait_For_Transactions
     TemplatedRequests.Check_Status_Code    @{resp_list}[0]
-    [Teardown]    ClusterAdmin.Add_Shard_Replica    ${actual_leader}    ${shard_name}    ${shard_type}
+    [Teardown]    BuiltIn.Run_Keywords    BuiltIn.Run_Keyword_And_Ignore_Error    BuiltIn.Wait_Until_Keyword_Succeeds    30s    3s    ClusterManagement.Get_Leader_And_Followers_For_Shard
+    ...    shard_name=${shard_name}    shard_type=${shard_type}    member_index_list=${follower_list}
+    ...    AND    ClusterAdmin.Add_Shard_Replica    ${actual_leader}    ${shard_name}    ${shard_type}
 
 Clean_Leader_Shutdown_PrefBasedShard_Test_Templ
     [Arguments]    ${leader_location}    ${shard_name}=${PREF_BASED_SHARD}    ${shard_type}=${SHARD_TYPE}
@@ -102,7 +104,9 @@ Clean_Leader_Shutdown_PrefBasedShard_Test_Templ
     WaitForFailure.Confirm_Keyword_Fails_Within_Timeout    10s    2s    ClusterManagement.Get_Raft_State_Of_Shard_At_Member    shard_name=${shard_name}!!    shard_type=${shard_type}    member_index=${actual_leader}
     ${resp_list} =    MdsalLowlevelPy.Wait_For_Transactions
     TemplatedRequests.Check_Status_Code    @{resp_list}[0]
-    [Teardown]    ClusterAdmin.Add_Prefix_Shard_Replica    ${actual_leader}    ${shard_name}    ${shard_type}
+    [Teardown]    BuiltIn.Run_Keywords    BuiltIn.Run_Keyword_And_Ignore_Error    BuiltIn.Wait_Until_Keyword_Succeeds    30s    3s    ClusterManagement.Get_Leader_And_Followers_For_Shard
+    ...    shard_name=${shard_name}!!    shard_type=${shard_type}    member_index_list=${follower_list}
+    ...    AND    ClusterAdmin.Add_Prefix_Shard_Replica    ${actual_leader}    ${shard_name}    ${shard_type}
 
 Get_Node_Indexes_For_Clean_Leader_Shutdown_Test
     [Arguments]    ${leader_location}    ${shard_name}    ${shard_type}

diff --git a/csit/suites/controller/dom_data_broker/clean_leader_shutdown.robot b/csit/suites/controller/dom_data_broker/clean_leader_shutdown.robot
index 13c0f21d2a84b5458b9e6284683c2913a1075ee9..f9bdb94a6bed40bf65693c4403f82ecbe05bf8e9 100644 (file)
--- a/csit/suites/controller/dom_data_broker/clean_leader_shutdown.robot
+++ b/csit/suites/controller/dom_data_broker/clean_leader_shutdown.robot
@@ -20,6 +20,7 @@ Default Tags      critical
 Test Template     DdbCommons.Clean_Leader_Shutdown_Test_Templ
 Library           SSHLibrary
 Resource          ${CURDIR}/../../../libraries/controller/DdbCommons.robot
+Resource          ${CURDIR}/../../../libraries/ClusterManagement.robot
 Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
 
 *** Test Cases ***

diff --git a/csit/suites/controller/dom_data_broker/clean_leader_shutdown_prefbasedshard.robot b/csit/suites/controller/dom_data_broker/clean_leader_shutdown_prefbasedshard.robot
index c494f497c4e9552901a48ccc62272cdaf9241d8f..aef3db120cb5cefda9699e8cc78e6e62b3411502 100644 (file)
--- a/csit/suites/controller/dom_data_broker/clean_leader_shutdown_prefbasedshard.robot
+++ b/csit/suites/controller/dom_data_broker/clean_leader_shutdown_prefbasedshard.robot
@@ -22,6 +22,7 @@ Default Tags      critical
 Test Template     DdbCommons.Clean_Leader_Shutdown_PrefBasedShard_Test_Templ
 Library           SSHLibrary
 Resource          ${CURDIR}/../../../libraries/controller/DdbCommons.robot
+Resource          ${CURDIR}/../../../libraries/ClusterManagement.robot
 Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
 
 *** Test Cases ***

diff --git a/csit/testplans/controller-clustering.txt b/csit/testplans/controller-clustering.txt
index 4e911ec31890afd9d6833a29705a5b8e8eba5d1c..bf7cbc2c83c2501cecc6f25aaa68b3cc3e1913ef 100644 (file)
--- a/csit/testplans/controller-clustering.txt
+++ b/csit/testplans/controller-clustering.txt
@@ -7,7 +7,6 @@ integration/test/csit/suites/controller/dom_rpc_broker/rpc_provider_precedence.r
 integration/test/csit/suites/controller/dom_rpc_broker/rpc_provider_partition_and_heal.robot
 integration/test/csit/suites/controller/dom_rpc_broker/action_provider_precedence.robot
 integration/test/csit/suites/controller/dom_rpc_broker/action_provider_partition_and_heal.robot
-integration/test/csit/suites/controller/dom_data_broker/clean_leader_shutdown.robot
 integration/test/csit/suites/controller/dom_data_broker/explicit_leader_movement.robot
 integration/test/csit/suites/controller/dom_data_broker/leader_isolation.robot
 integration/test/csit/suites/controller/dom_data_broker/client_isolation.robot
@@ -16,6 +15,7 @@ integration/test/csit/suites/controller/dom_data_broker/leader_isolation_prefbas
 integration/test/csit/suites/controller/dom_data_broker/explicit_leader_movement_prefbasedshard.robot
 integration/test/csit/suites/controller/dom_data_broker/remote_listener_prefbasedshard.robot
 integration/test/csit/suites/controller/dom_data_broker/client_isolation_prefbasedshard.robot
+integration/test/csit/suites/controller/dom_data_broker/clean_leader_shutdown.robot
 integration/test/csit/suites/controller/dom_data_broker/clean_leader_shutdown_prefbasedshard.robot
 integration/test/csit/suites/controller/dom_data_broker/restart_odl_with_tell_based_true.robot
 integration/test/csit/suites/controller/dom_data_broker/ddb-sanity-prefix-based.robot
@@ -24,7 +24,6 @@ integration/test/csit/suites/controller/Clustering_Datastore/cluster_ready.robot
 integration/test/csit/suites/controller/cluster_singleton/master_stability.robot
 integration/test/csit/suites/controller/cluster_singleton/partition_and_heal.robot
 integration/test/csit/suites/controller/cluster_singleton/chasing_the_leader.robot
-integration/test/csit/suites/controller/dom_data_broker/clean_leader_shutdown.robot
 integration/test/csit/suites/controller/dom_data_broker/explicit_leader_movement.robot
 integration/test/csit/suites/controller/dom_data_broker/leader_isolation.robot
 integration/test/csit/suites/controller/dom_data_broker/client_isolation.robot
@@ -33,6 +32,7 @@ integration/test/csit/suites/controller/dom_data_broker/leader_isolation_prefbas
 integration/test/csit/suites/controller/dom_data_broker/explicit_leader_movement_prefbasedshard.robot
 integration/test/csit/suites/controller/dom_data_broker/remote_listener_prefbasedshard.robot
 integration/test/csit/suites/controller/dom_data_broker/client_isolation_prefbasedshard.robot
+integration/test/csit/suites/controller/dom_data_broker/clean_leader_shutdown.robot
 integration/test/csit/suites/controller/dom_data_broker/clean_leader_shutdown_prefbasedshard.robot
 integration/test/csit/suites/controller/dom_data_broker/restart_odl_with_tell_based_false.robot
 integration/test/csit/suites/controller/Clustering_Datastore/cluster_ready.robot