From ea5005a365d6baf9128c93cf13118b507bb67f5e Mon Sep 17 00:00:00 2001 From: Tom Pantelis Date: Mon, 19 Nov 2018 12:27:17 -0500 Subject: [PATCH] Fix Global Rpc Kill et al failures Global Rpc (Kill|Freeze|Isolate) have been failing for quite some time (in Neon and Fluorine) with a 500 response when executing RPC /restconf/operations/basic-rpc-test:basic-global. It's a no-input RPC and the robot code passes an empty strng for the content-type and accept parans to Post_To_Uri. In comparing with another RPC that has no input, that code passes the ${HEADERS_XML} and ${ACCEPT_XML} constants so I did the same in the Glocal Rpc tests. It seems something changed in Fluorine where passng empty content-type/accept headers no longer works. Change-Id: Iaa4e9ef9dddde8291d1cae7d09f878be0b781ae0 Signed-off-by: Tom Pantelis --- .../suites/controller/singleton_service/global_rpc_freeze.robot | 2 +- .../controller/singleton_service/global_rpc_isolate.robot | 2 +- csit/suites/controller/singleton_service/global_rpc_kill.robot | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/csit/suites/controller/singleton_service/global_rpc_freeze.robot b/csit/suites/controller/singleton_service/global_rpc_freeze.robot index 5e7c02a98f..567362a2a7 100644 --- a/csit/suites/controller/singleton_service/global_rpc_freeze.robot +++ b/csit/suites/controller/singleton_service/global_rpc_freeze.robot @@ -95,7 +95,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} member_index_list=${active_nodes} - 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} diff --git a/csit/suites/controller/singleton_service/global_rpc_isolate.robot b/csit/suites/controller/singleton_service/global_rpc_isolate.robot index 960c25139e..1d820af1ee 100644 --- a/csit/suites/controller/singleton_service/global_rpc_isolate.robot +++ b/csit/suites/controller/singleton_service/global_rpc_isolate.robot @@ -103,7 +103,7 @@ Run_Rpc ... Logging the details was a developer's request during the implementation to improve debugging. ${session} = Resolve_Http_Session_For_Member member_index=${node_idx} Get_And_Log_EOS_Output_To_Karaf_Log ${session} - 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} diff --git a/csit/suites/controller/singleton_service/global_rpc_kill.robot b/csit/suites/controller/singleton_service/global_rpc_kill.robot index 3b105fa494..4dd5d9793d 100644 --- a/csit/suites/controller/singleton_service/global_rpc_kill.robot +++ b/csit/suites/controller/singleton_service/global_rpc_kill.robot @@ -94,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} -- 2.36.6