Fix Global Rpc Kill et al failures

[integration/test.git] / csit / suites / controller / singleton_service / global_rpc_kill.robot

diff --git a/csit/suites/controller/singleton_service/global_rpc_kill.robot b/csit/suites/controller/singleton_service/global_rpc_kill.robot
index 40a1934b21340ce4630481af8221b98e164577d3..4dd5d9793dc18900ef6b34e11699a04af3c32709 100644 (file)
--- a/csit/suites/controller/singleton_service/global_rpc_kill.robot
+++ b/csit/suites/controller/singleton_service/global_rpc_kill.robot
@@ -13,6 +13,7 @@ Test Teardown     SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed
 Default Tags      critical
 Resource          ${CURDIR}/../../../libraries/ClusterManagement.robot
 Resource          ${CURDIR}/../../../libraries/KarafKeywords.robot
+Resource          ${CURDIR}/../../../libraries/ShardStability.robot
 Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
 Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
 Resource          ${CURDIR}/../../../libraries/WaitForFailure.robot
@@ -25,49 +26,46 @@ ${SERVICE}        Basic-rpc-test']
 ${TEST_LOG_LEVEL}    info
 @{TEST_LOG_COMPONENTS}    org.opendaylight.controller.remote.rpc
 ${EOS_URL}        /restconf/operational/entity-owners:entity-owners
-@{NO_TAGS}
 
 *** Test Cases ***
 Get_Basic_Rpc_Test_Owner
     [Documentation]    Find a service owner and successors.
-    [Tags]    @{NO_TAGS}
     Get_Present_Brt_Owner_And_Successors    1    store=${True}
 
-Rpc_Before_Killing_On_Owner
+Rpc_Before_Stopping_On_Owner
     [Documentation]    Run rpc on the service owner.
     Run_Rpc    ${brt_owner}
 
-Rpc_Before_Kill_On_Successors
+Rpc_Before_Stop_On_Successors
     [Documentation]    Run rpc on non owher cluster nodes.
     : FOR    ${idx}    IN    @{brt_successors}
     \    Run_Rpc    ${idx}
 
-Kill_Current_Owner_Member
-    [Documentation]    Kill cluster node which is the owner.
-    [Tags]    @{NO_TAGS}
-    ClusterManagement.Kill_Single_Member    ${brt_owner}
+Stop_Current_Owner_Member
+    [Documentation]    Stop cluster node which is the owner.
+    ClusterManagement.Stop_Single_Member    ${brt_owner}
     BuiltIn.Set Suite variable    ${old_brt_owner}    ${brt_owner}
     BuiltIn.Set Suite variable    ${old_brt_successors}    ${brt_successors}
 
 Verify_New_Basic_Rpc_Test_Owner_Elected
     [Documentation]    Verify new owner of the service is elected.
     ${idx}=    Collections.Get_From_List    ${old_brt_successors}    0
-    BuiltIn.Wait_Until_Keyword_Succeeds    5x    2s    Verify_Owner_Elected    ${True}    ${old_brt_owner}    ${idx}
+    BuiltIn.Wait_Until_Keyword_Succeeds    60s    5s    Verify_Owner_Elected    ${True}    ${old_brt_owner}    ${idx}
     Get_Present_Brt_Owner_And_Successors    ${idx}    store=${True}
 
 Rpc_On_Remained_Cluster_Nodes
     [Documentation]    Run rpc on remained cluster nodes.
     : FOR    ${idx}    IN    @{old_brt_successors}
-    \    Run_Rpc    ${idx}
+    \    BuiltIn.Wait_Until_Keyword_Succeeds    60s    5s    Run_Rpc    ${idx}
 
-Restart_Killed_Member
-    [Documentation]    Restart killed node
-    [Tags]    @{NO_TAGS}
+Restart_Stopped_Member
+    [Documentation]    Restart stopped node
     ClusterManagement.Start_Single_Member    ${old_brt_owner}
 
 Verify_New_Owner_Remained_After_Rejoin
     [Documentation]    Verify no owner change happened after rejoin.
     WaitForFailure.Verify_Keyword_Does_Not_Fail_Within_Timeout    15s    2s    Verify_Owner_Elected    ${False}    ${brt_owner}    ${brt_owner}
+    BuiltIn.Wait_Until_Keyword_Succeeds    70s    10s    ShardStability.Shards_Stability_Get_Details    ${DEFAULT_SHARD_LIST}
 
 Rpc_After_Rejoin_On_New_Owner
     [Documentation]    Run rpc on the new service owner node.
@@ -85,7 +83,8 @@ Rpc_After_Rejoin_On_All
 
 *** Keywords ***
 Setup_Suite
-    SetupUtils.Setup_Utils_For_Setup_And_Teardown
+    [Documentation]    FIXME: Add a documentation.
+    SetupUtils.Setup_Utils_For_Setup_And_Teardown    http_timeout=30
     SetupUtils.Setup_Logging_For_Debug_Purposes_On_List_Or_All    ${TEST_LOG_LEVEL}    ${TEST_LOG_COMPONENTS}
 
 Run_Rpc
@@ -95,7 +94,7 @@ Run_Rpc
     ${session} =    Resolve_Http_Session_For_Member    member_index=${node_idx}
     ${out} =    TemplatedRequests.Get_From_Uri    ${EOS_URL}    session=${session}
     KarafKeywords.Log_Message_To_Controller_Karaf    EOS rest resp: ${out}
-    TemplatedRequests.Post_To_Uri    ${RPC_URL}    ${EMPTY}    ${EMPTY_DICT}    ${EMPTY_DICT}    session=${session}
+    TemplatedRequests.Post_To_Uri    ${RPC_URL}    ${EMPTY}    ${HEADERS_XML}    ${ACCEPT_XML}    session=${session}
 
 Verify_Owner_Elected
     [Arguments]    ${new_elected}    ${old_owner}    ${node_to_ask}