Add functions for adding and removing config handlers

This is a draft version.

3 files changed, 34 insertions, 36 deletions

diff --git a/lib/common_test/src/ct.erl b/lib/common_test/src/ct.erl
index bee5c920a9..caae2326b6 100644
--- a/lib/common_test/src/ct.erl
+++ b/lib/common_test/src/ct.erl
@@ -66,12 +66,14 @@
 	 fail/1, comment/1,
 	 testcases/2, userdata/2, userdata/3]).
 
+%% New API for manipulating with config handlers
+-export([add_config/2, remove_config/2]).
+
 %% Other interface functions
 -export([get_status/0, abort_current_testcase/1,
 	 encrypt_config_file/2, encrypt_config_file/3,
 	 decrypt_config_file/2, decrypt_config_file/3]).
 
-
 -export([get_target_name/1]).
 -export([parse_table/1, listenv/1]).
 
@@ -805,3 +807,8 @@ decrypt_config_file(EncryptFileName, TargetFileName) ->
 decrypt_config_file(EncryptFileName, TargetFileName, KeyOrFile) ->
     ct_config:decrypt_config_file(EncryptFileName, TargetFileName, KeyOrFile).
 
+add_config(Callback, Config)->
+    ct_config:add_config(Callback, Config).
+
+remove_config(Callback, Config)->
+    ct_config:remove_config(Callback, Config).
diff --git a/lib/common_test/src/ct_config.erl b/lib/common_test/src/ct_config.erl
index 0ae178ef02..6fd89c5617 100755
--- a/lib/common_test/src/ct_config.erl
+++ b/lib/common_test/src/ct_config.erl
@@ -36,7 +36,7 @@
 
 -export([set_default_config/2, set_default_config/3]).
 
--export([delete_config/1, delete_default_config/1]).
+-export([delete_default_config/1]).
 
 -export([reload_config/1, update_config/2]).
 
@@ -50,6 +50,8 @@
 
 -export([check_config_files/1, prepare_config_list/1]).
 
+-export([add_config/2, remove_config/2]).
+
 -include("ct_util.hrl").
 
 -define(cryptfile, ".ct_config.crypt").
@@ -133,7 +135,7 @@ loop(StartDir) ->
 	    return(From,ok),
 	    loop(StartDir);
 	{{delete_default_config,Scope},From} ->
-	    ct_config:delete_config({true,Scope}),
+	    delete_config({true,Scope}),
 	    return(From,ok),
 	    loop(StartDir);
 	{{update_config,{Name,NewConfig}},From} ->
@@ -242,40 +244,26 @@ store_config(Config, Callback, File)->
 			 default=false}) ||
 	{Key,Val} <- Config].
 
-keyfindall(Key, N, List)->
-    keyfindall(Key, N, List, []).
-
-keyfindall(Key, N, List, Acc)->
-    case lists:keytake(Key, N, List) of
-	false->
-	    Acc;
-	{value, Row, Rest}->
-	    keyfindall(Key, N, Rest, [Row|Acc])
-    end.
+keyfindall(Key, Pos, List)->
+    [E || E <- List, element(Pos, E) =:= Key].
 
 rewrite_config(Config, Callback, File)->
-    % 1) read the old config for this callback/file from the table
     OldRows = ets:match_object(?attr_table,
 				#ct_conf{handler=Callback,
 					 config=File,_='_'}),
-    % 2) remove all config data loaded from this callback/file
     ets:match_delete(?attr_table,
 		     #ct_conf{handler=Callback,
 			      config=File,_='_'}),
-    % prepare function that will
-    %   1. find records with this key in the old config, including aliases
-    %   2. update values
-    %   3. put them back to the table
     Updater = fun({Key, Value})->
 	case keyfindall(Key, #ct_conf.key, OldRows) of
-	    []-> % if variable is new, just insert it
+	    []->
 		ets:insert(?attr_table,
 			   #ct_conf{key=Key,
 				   value=Value,
 				   handler=Callback,
 				   config=File,
 				   ref=ct_util:ct_make_ref()});
-	    RowsToUpdate -> % else update all occurrencies of the key
+	    RowsToUpdate ->
 		Inserter = fun(Row)->
 		    ets:insert(?attr_table,
 				Row#ct_conf{value=Value,
@@ -285,7 +273,6 @@ rewrite_config(Config, Callback, File)->
 	end
     end,
 
-    % run it key-by-key from the new config
     [Updater({Key, Value})||{Key, Value}<-Config].
 
 set_config(Config,Default) ->
@@ -438,23 +425,12 @@ update_conf(Name, NewConfig) ->
 		  end, Old),
     ok.
 
-remove_duplicates([], Acc)->
-    Acc;
-remove_duplicates([{Handler, File}|Rest], Acc)->
-    case lists:member({Handler, File}, Acc) of
-	false->
-	    remove_duplicates(Rest, [{Handler, File}|Acc]);
-	true->
-	    remove_duplicates(Rest, Acc)
-    end.
-
 reload_conf(KeyOrName) ->
     case lookup_handler_for_config(KeyOrName) of
 	[]->
 	    undefined;
 	HandlerList->
-	    % if aliases set, config will be reloaded several times
-	    HandlerList2 = remove_duplicates(HandlerList, []),
+	    HandlerList2 = lists:usort(HandlerList),
 	    read_config_files_int(HandlerList2, fun rewrite_config/3),
 	    get_config(KeyOrName)
     end.
@@ -763,3 +739,19 @@ prepare_config_list(Args)->
 	    []
     end,
     ConfigFiles ++ UserConfigs.
+
+add_config(Callback, [])->
+    read_config_files_int([{Callback, []}], fun store_config/3);
+add_config(Callback, [File|_Files]=Config) when is_list(File)->
+    lists:foreach(fun(CfgStr)->
+	read_config_files_int([{Callback, CfgStr}], fun store_config/3) end,
+	Config);
+add_config(Callback, [C|_]=Config) when is_integer(C)->
+    read_config_files_int([{Callback, Config}], fun store_config/3),
+    ok.
+
+remove_config(Callback, Config)->
+    ets:match_delete(?attr_table,
+		     #ct_conf{handler=Callback,
+			      config=Config,_='_'}),
+    ok.
diff --git a/lib/common_test/test/ct_config_SUITE.erl b/lib/common_test/test/ct_config_SUITE.erl
index 9a0177c2ec..168225feff 100644
--- a/lib/common_test/test/ct_config_SUITE.erl
+++ b/lib/common_test/test/ct_config_SUITE.erl
@@ -134,7 +134,6 @@ testspec_dynamic(Config) when is_list(Config) ->
 %%%-----------------------------------------------------------------
 %%% HELP FUNCTIONS
 %%%-----------------------------------------------------------------
-% {suites, "ct_config_SUITE_data/config/test", config_dynamic_SUITE}.
 make_spec(DataDir, Filename, Suites, Config)->
     {ok, Fd} = file:open(filename:join(DataDir, Filename), [write]),
     ok = file:write(Fd,
@@ -240,4 +239,4 @@ expected_events(config_dynamic_SUITE)->
  {?eh,tc_done,{config_dynamic_SUITE,end_per_suite,ok}},
  {?eh,test_done,{'DEF','STOP_TIME'}},
  {?eh,stop_logging,[]}
-].
\ No newline at end of file
+].