Merge branch 'maint'

3 files changed, 20 insertions, 4 deletions

diff --git a/lib/common_test/src/ct_netconfc.erl b/lib/common_test/src/ct_netconfc.erl
index 14ee55703f..af82f2dcbf 100644
--- a/lib/common_test/src/ct_netconfc.erl
+++ b/lib/common_test/src/ct_netconfc.erl
@@ -794,8 +794,9 @@ action(Client,Action) ->
       Client :: client(),
       Action :: simple_xml(),
       Timeout :: timeout(),
-      Result :: {ok,[simple_xml()]} | {error,error_reason()}.
-%% @doc Execute an action.
+      Result :: ok | {ok,[simple_xml()]} | {error,error_reason()}.
+%% @doc Execute an action. If the return type is void, <c>ok</c> will
+%%      be returned instead of <c>{ok,[simple_xml()]}</c>.
 %%
 %% @end
 %%----------------------------------------------------------------------
@@ -1606,6 +1607,9 @@ decode_ok(Other) ->
 
 decode_data([{Tag,Attrs,Content}]) ->
     case get_local_name_atom(Tag) of
+	ok ->
+	    %% when action has return type void
+	    ok;	
 	data ->
 	    %% Since content of data has nothing from the netconf
 	    %% namespace, we remove the parent's xmlns attribute here
diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
index 332e54d1a7..4580528f1b 100644
--- a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
@@ -486,8 +486,15 @@ action(Config) ->
     DataDir = ?config(data_dir,Config),
     {ok,Client} = open_success(DataDir),
     Data = [{myactionreturn,[{xmlns,"myns"}],["value"]}],
-    ?NS:expect_reply(action,{data,Data}),
-    {ok,Data} = ct_netconfc:action(Client,{myaction,[{xmlns,"myns"}],[]}),
+    %% test either to receive {data,Data} or {ok,Data},
+    %% both need to be handled
+    {Reply,RetVal} = case element(3, now()) rem 2 of
+			 0 -> {{data,Data},{ok,Data}};
+			 1 -> {{ok,Data},ok}
+		     end,
+    ct:log("Client will receive {~w,Data}", [element(1,Reply)]),
+    ?NS:expect_reply(action,Reply),
+    RetVal = ct_netconfc:action(Client,{myaction,[{xmlns,"myns"}],[]}),
     ?NS:expect_do_reply('close-session',close,ok),
     ?ok = ct_netconfc:close_session(Client),
     ok.
diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl b/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
index f7c7b891bb..3c419c8164 100644
--- a/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
@@ -548,8 +548,13 @@ make_msg({hello,SessionId,Stuff}) ->
 	  SessionIdXml/binary,"</hello>">>);
 make_msg(ok) ->
     xml(rpc_reply("<ok/>"));
+
+make_msg({ok,Data}) ->
+    xml(rpc_reply(from_simple({ok,Data})));
+
 make_msg({data,Data}) ->
     xml(rpc_reply(from_simple({data,Data})));
+
 make_msg(event) ->
     xml(<<"<notification xmlns=\"",?NETCONF_NOTIF_NAMESPACE,"\">"
 	  "<eventTime>2012-06-14T14:50:54+02:00</eventTime>"