[ct_netconfc] Add optional parameters to edit-config

Earlier there was no way to add optional parameters like
default-operation to an edit-config request sent with
ct_netconfc:edit_config/3,4, you had to use
ct_netconfc:send_rpc/2,3. For simplicity and completion, a new
optional argument, OptParams, is now added to the edit_config
function.

1 files changed, 11 insertions, 3 deletions

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 fb0734d48e..f7c7b891bb 100644
--- a/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
@@ -1,7 +1,7 @@
 %%--------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2012-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2012-2014. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -382,6 +382,7 @@ event({startElement,_,Name,_,Attrs},[ignore,{se,Name,As}|Match]) ->
 event({startPrefixMapping,_,Ns},[{ns,Ns}|Match]) -> Match;
 event({startPrefixMapping,_,Ns},[ignore,{ns,Ns}|Match]) -> Match;
 event({endPrefixMapping,_},Match) -> Match;
+event({characters,Chs},[{characters,Chs}|Match]) -> Match;
 event({endElement,_,Name,_},[{ee,Name}|Match]) -> Match;
 event({endElement,_,Name,_},[ignore,{ee,Name}|Match]) -> Match;
 event(endDocument,Match) when Match==[]; Match==[ignore] -> ok;
@@ -471,14 +472,17 @@ capabilities(no_caps) ->
 %%% expect_do_reply/3.
 %%%
 %%% match(term()) -> [Match].
-%%% Match = ignore | {se,Name} | {se,Name,Attrs} | {ee,Name} | {ns,Namespace}
+%%% Match = ignore | {se,Name} | {se,Name,Attrs} | {ee,Name} |
+%%%         {ns,Namespace} | {characters,Chs}
 %%% Name = string()
+%%% Chs = string()
 %%% Attrs = [{atom(),string()}]
 %%% Namespace = string()
 %%%
 %%% 'se' means start element, 'ee' means end element - i.e. to match
 %%% an XML element you need one 'se' entry and one 'ee' entry with the
-%%% same name in the match list.
+%%% same name in the match list. 'characters' can be used for matching
+%%% character data (cdata) inside an element.
 match(hello) ->
     [ignore,{se,"hello"},ignore,{ee,"hello"},ignore];
 match('close-session') ->
@@ -487,6 +491,10 @@ match('close-session') ->
 match('edit-config') ->
     [ignore,{se,"rpc"},{se,"edit-config"},{se,"target"},ignore,{ee,"target"},
      {se,"config"},ignore,{ee,"config"},{ee,"edit-config"},{ee,"rpc"},ignore];
+match({'edit-config',{'default-operation',DO}}) ->
+    [ignore,{se,"rpc"},{se,"edit-config"},{se,"target"},ignore,{ee,"target"},
+     {se,"default-operation"},{characters,DO},{ee,"default-operation"},
+     {se,"config"},ignore,{ee,"config"},{ee,"edit-config"},{ee,"rpc"},ignore];
 match('get') ->
     match({get,subtree});
 match({'get',FilterType}) ->