X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Fsuites%2Fcontroller%2Fsingleton_service%2Fglobal_rpc_kill.robot;h=764fb6c2a88ba855e90d583e04442c7bd49017ce;hb=94651ca9711d8eb316721775561e815830bc6c7e;hp=bdf4303696b133023d36b0654d2515fd95a78d58;hpb=197d624d58b6595a2ef07847fd10eeb6ee651ef3;p=integration%2Ftest.git

diff --git a/csit/suites/controller/singleton_service/global_rpc_kill.robot b/csit/suites/controller/singleton_service/global_rpc_kill.robot
index bdf4303696..764fb6c2a8 100644
--- a/csit/suites/controller/singleton_service/global_rpc_kill.robot
+++ b/csit/suites/controller/singleton_service/global_rpc_kill.robot
@@ -32,18 +32,19 @@ Get_Basic_Rpc_Test_Owner
     [Documentation]    Find a service owner and successors.
     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}
+    FOR    ${idx}    IN    @{brt_successors}
+        Run_Rpc    ${idx}
+    END
 
-Kill_Current_Owner_Member
-    [Documentation]    Kill cluster node which is the owner.
-    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}
 
@@ -55,11 +56,12 @@ Verify_New_Basic_Rpc_Test_Owner_Elected
 
 Rpc_On_Remained_Cluster_Nodes
     [Documentation]    Run rpc on remained cluster nodes.
-    : FOR    ${idx}    IN    @{old_brt_successors}
-    \    BuiltIn.Wait_Until_Keyword_Succeeds    60s    5s    Run_Rpc    ${idx}
+    FOR    ${idx}    IN    @{old_brt_successors}
+        BuiltIn.Wait_Until_Keyword_Succeeds    60s    5s    Run_Rpc    ${idx}
+    END
 
-Restart_Killed_Member
-    [Documentation]    Restart killed node
+Restart_Stopped_Member
+    [Documentation]    Restart stopped node
     ClusterManagement.Start_Single_Member    ${old_brt_owner}
 
 Verify_New_Owner_Remained_After_Rejoin
@@ -78,8 +80,9 @@ Rpc_After_Rejoin_On_Old_Owner
 Rpc_After_Rejoin_On_All
     [Documentation]    Run rpc again on all nodes.
     Run_Rpc    ${brt_owner}
-    : FOR    ${idx}    IN    @{brt_successors}
-    \    Run_Rpc    ${idx}
+    FOR    ${idx}    IN    @{brt_successors}
+        Run_Rpc    ${idx}
+    END
 
 *** Keywords ***
 Setup_Suite
@@ -94,7 +97,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}