From 25172d66c506259f7c753ddf2683ea3d8316fdbd Mon Sep 17 00:00:00 2001 From: Peter Gubka Date: Wed, 17 May 2017 12:35:45 +0200 Subject: [PATCH] Remove restconf verify in ddb elm tests Change-Id: I360a15290581fef99019f171830d158c873cccfd Signed-off-by: Peter Gubka --- csit/libraries/ClusterManagement.robot | 4 ++-- csit/libraries/controller/DdbCommons.robot | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/csit/libraries/ClusterManagement.robot b/csit/libraries/ClusterManagement.robot index e366ff0907..43136bf08d 100644 --- a/csit/libraries/ClusterManagement.robot +++ b/csit/libraries/ClusterManagement.robot @@ -145,10 +145,10 @@ Get_Raft_State_Of_Shard_At_Member [Return] ${raft_state} Verify_Shard_Leader_Elected - [Arguments] ${shard_name} ${shard_type} ${new_elected} ${old_leader} ${member_index_list}=${EMPTY} + [Arguments] ${shard_name} ${shard_type} ${new_elected} ${old_leader} ${member_index_list}=${EMPTY} ${verify_restconf}=True [Documentation] Verify new leader was elected or remained the same. Bool paramter ${new_elected} indicates if ... new leader is elected or should remained the same as ${old_leader} - ${leader} ${followers}= Get_Leader_And_Followers_For_Shard shard_name=${shard_name} shard_type=${shard_type} member_index_list=${member_index_list} + ${leader} ${followers}= Get_Leader_And_Followers_For_Shard shard_name=${shard_name} shard_type=${shard_type} member_index_list=${member_index_list} verify_restconf=${verify_restconf} BuiltIn.Run_Keyword_If ${new_elected} BuiltIn.Should_Not_Be_Equal_As_Numbers ${old_leader} ${leader} BuiltIn.Run_Keyword_Unless ${new_elected} BuiltIn.Should_Be_Equal_As_numbers ${old_leader} ${leader} BuiltIn.Return_From_Keyword ${leader} ${followers} diff --git a/csit/libraries/controller/DdbCommons.robot b/csit/libraries/controller/DdbCommons.robot index f22374b8ff..0a560fc813 100644 --- a/csit/libraries/controller/DdbCommons.robot +++ b/csit/libraries/controller/DdbCommons.robot @@ -49,7 +49,7 @@ Explicit_Leader_Movement_Test_Templ MdsalLowlevelPy.Start_Write_Transactions_On_Nodes ${ip_trans_as_list} ${idx_trans_as_list} ${ID_PREFIX} ${DURATION_30S} ${TRANSACTION_RATE_1K} chained_flag=${CHAINED_TX} ClusterAdmin.Make_Leader_Local ${idx_to} ${shard_name} ${shard_type} ${new_leader} ${new_followers} = BuiltIn.Wait_Until_Keyword_Succeeds 30s 5s ClusterManagement.Verify_Shard_Leader_Elected ${shard_name} - ... ${shard_type} ${True} ${idx_from} + ... ${shard_type} ${True} ${idx_from} verify_restconf=False BuiltIn.Should_Be_Equal ${idx_to} ${new_leader} ${resp_list} = MdsalLowlevelPy.Wait_For_Transactions TemplatedRequests.Check_Status_Code @{resp_list}[0] @@ -64,7 +64,7 @@ Explicit_Leader_Movement_PrefBasedShard_Test_Templ MdsalLowlevelPy.Start_Produce_Transactions_On_Nodes ${ip_trans_as_list} ${idx_trans_as_list} ${ID_PREFIX} ${DURATION_30S} ${TRANSACTION_RATE_1K} MdsalLowlevel.Become_Prefix_Leader ${idx_to} ${shard_name} ${ID_PREFIX} ${new_leader} ${new_followers} = BuiltIn.Wait_Until_Keyword_Succeeds 30s 5s ClusterManagement.Verify_Shard_Leader_Elected ${shard_name}!! - ... ${shard_type} ${True} ${idx_from} + ... ${shard_type} ${True} ${idx_from} verify_restconf=False BuiltIn.Should_Be_Equal ${idx_to} ${new_leader} ${resp_list} = MdsalLowlevelPy.Wait_For_Transactions TemplatedRequests.Check_Status_Code @{resp_list}[0] -- 2.36.6