Use different prefix for become-shard-leader rpc

than are used for produce-transactions rpc.

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

diff --git a/csit/libraries/MdsalLowlevel.robot b/csit/libraries/MdsalLowlevel.robot
index dd3333361e00ef13ce1b6b2b74214b1f41bf032b..7f5e1807fd437198dde0d2281b0f60c5af3d8355 100644 (file)
--- a/csit/libraries/MdsalLowlevel.robot
+++ b/csit/libraries/MdsalLowlevel.robot
@@ -148,10 +148,10 @@ Remove_Prefix_Shard
     ${text} =    TemplatedRequests.Post_As_Xml_Templated    ${REMOVE_PREFIX_SHARD_DIR}    mapping=${mapping}    session=${session}
 
 Become_Prefix_Leader
-    [Arguments]    ${member_index}    ${shard_name}    ${id_prefix}
+    [Arguments]    ${member_index}    ${shard_name}
     [Documentation]    Given node ask to become a shard leader.
     ${session} =    ClusterManagement.Resolve_Http_Session_For_Member    member_index=${member_index}
-    &{mapping}    BuiltIn.Create_Dictionary    SHARD_NAME=${shard_name}    ID=${id_prefix}${member_index}
+    &{mapping}    BuiltIn.Create_Dictionary    SHARD_NAME=${shard_name}    ID=prefix-0
     ${text} =    TemplatedRequests.Post_As_Xml_Templated    ${BECOME_PREFIX_LEADER_DIR}    mapping=${mapping}    session=${session}
 
 Subscribe_Dtcl

diff --git a/csit/libraries/controller/DdbCommons.robot b/csit/libraries/controller/DdbCommons.robot
index 3555b3a99d6a281af3604e85b6d5250b70fe11a8..af25d52b339f8a74213dbb84defecb4d79a51d80 100644 (file)
--- a/csit/libraries/controller/DdbCommons.robot
+++ b/csit/libraries/controller/DdbCommons.robot
@@ -65,7 +65,7 @@ Explicit_Leader_Movement_PrefBasedShard_Test_Templ
     ${idx_trans_as_list} =    BuiltIn.Create_List    ${idx_trans}
     MdsalLowlevelPy.Start_Produce_Transactions_On_Nodes    ${ip_trans_as_list}    ${idx_trans_as_list}    ${ID_PREFIX}    ${DURATION_30S}    ${TRANSACTION_RATE_1K}
     BuiltIn.Sleep    5s
-    MdsalLowlevel.Become_Prefix_Leader    ${idx_to}    ${shard_name}    ${ID_PREFIX}
+    MdsalLowlevel.Become_Prefix_Leader    ${idx_to}    ${shard_name}
     ${new_leader}    ${new_followers} =    BuiltIn.Wait_Until_Keyword_Succeeds    30s    5s    ClusterManagement.Verify_Shard_Leader_Elected    ${shard_name}!!
     ...    ${shard_type}    ${True}    ${idx_from}    verify_restconf=False
     BuiltIn.Should_Be_Equal    ${idx_to}    ${new_leader}

diff --git a/csit/suites/controller/dom_data_broker/ddb-sanity-prefix-based.robot b/csit/suites/controller/dom_data_broker/ddb-sanity-prefix-based.robot
index 3270948a5fc8ce0d7f6bcc652fd74d1ec40d29df..1e598181b0e1c7fae326ae68e8d0b865b5a29696 100644 (file)
--- a/csit/suites/controller/dom_data_broker/ddb-sanity-prefix-based.robot
+++ b/csit/suites/controller/dom_data_broker/ddb-sanity-prefix-based.robot
@@ -100,7 +100,7 @@ Become_Prefix_Leader
     ${all_indices} =    ClusterManagement.List_All_Indices
     ${old_leader}    ${follower_list} =    ClusterManagement.Get_Leader_And_Followers_For_Shard    shard_name=${shard_name}!!    shard_type=${shard_type}    member_index_list=${all_indices}    verify_restconf=False
     ${follower1} =    Collections.Get_From_List    ${follower_list}    ${0}
-    MdsalLowlevel.Become_Prefix_Leader    ${follower1}    ${shard_name}    ${ID_PREFIX}
+    MdsalLowlevel.Become_Prefix_Leader    ${follower1}    ${shard_name}
     ${leader}    ${follower_list} =    BuiltIn.Wait_Until_Keyword_Succeeds    30s    3s    ClusterManagement.Verify_Shard_Leader_Elected    ${shard_name}!!
     ...    ${shard_type}    ${True}    ${old_leader}    member_index_list=${EMPTY}
     BuiltIn.Should_Be_Equal_As_Numbers    ${follower1}    ${leader}