removing ejabberd_domain from test.config

test/ejabberd_tests/src/ct_mongoose_hook.erl

@@ -154,7 +154,7 @@ check_registered_users() ->
     end.
 
 check_registered_users_count() ->
-    D = escalus_ct:get_config(ejabberd_domain),
+    D = ct:get_config({hosts, mim, domain}),
     case ?RPC(ejabberd_auth, get_vh_registered_users_number, [D]) of
         0 -> [];
         N -> [{registered_users_count, N}]
@@ -179,7 +179,7 @@ check_roster() ->
     generic_via_mongoose_helper(total_roster_items).
 
 check_carboncopy() ->
-    D = escalus_ct:get_config(ejabberd_domain),
+    D = ct:get_config({hosts, mim, domain}),
     case ?RPC(gen_mod, is_loaded, [D, mod_carboncopy]) of
         true ->
             do_check_carboncopy();

test/ejabberd_tests/test.config

@@ -7,14 +7,8 @@
 %%       See s2s_SUITE for example on using `hosts` to RPC into nodes (uses CT "require").
 %% the Erlang node name of tested ejabberd/MongooseIM
 {ejabberd_node, 'mongooseim@localhost'}.
-{ejabberd2_node, 'ejabberd2@localhost'}.
 {ejabberd_cookie, ejabberd}.
-%% the main XMPP domain served by the tested ejabberd/MongooseIM
-{ejabberd_domain, <<"localhost">>}.
-{ejabberd_secondary_domain, <<"localhost.bis">>}.
-{ejabberd_reloaded_domain, <<"sogndal">>}.
-{ejabberd_metrics_rest_port, 5288}.
-{ejabberd2_metrics_rest_port, 5289}.
+%% the main XMPP domain served by the tested ejabberd/MongooseIM.
 {ejabberd_string_format, bin}.
 
 %% TODO: in every new use case this should be used instead
@@ -25,7 +19,11 @@
 {hosts, [{mim,  [{node, mongooseim@localhost},
                  {domain, <<"localhost">>},
                  {vars, "node1_vars.config"},
-                 {cluster, mim}]},
+                 {cluster, mim},
+                 {secondary_domain, <<"localhost.bis">>},
+                 {reloaded_domain, <<"sogndal">>},
+                 {metrics_rest_port, 5288},
+                 {metrics_rest_port2, 5289}]},
          {mim2, [{node, ejabberd2@localhost},
                  {domain, <<"localhost">>},
                  {vars, "node2_vars.config"},

test/ejabberd_tests/tests/adhoc_SUITE.erl

@@ -55,12 +55,14 @@ end_per_testcase(CaseName, Config) ->
 ping(Config) ->
     escalus:story(Config, [{alice, 1}],
                   fun(Alice) ->
-                          %% Alice pings the server using adhoc command
-                          escalus_client:send(Alice, escalus_stanza:to(escalus_stanza:adhoc_request(<<"ping">>),
-                                                                       ct:get_config(ejabberd_domain))),
+                      Host = ct:get_config({hosts, mim, domain}),
+                      %% Alice pings the server using adhoc command
+                      escalus_client:send(Alice, escalus_stanza:to(
+                                      escalus_stanza:adhoc_request(<<"ping">>),
+                                      Host)),
 
-                          %% Server replies to Alice with pong
-                          AdHocResp = escalus_client:wait_for_stanza(Alice),
-                          escalus:assert(is_adhoc_response, [<<"ping">>, <<"completed">>],
-                                         AdHocResp)
+                      %% Server replies to Alice with pong
+                      AdHocResp = escalus_client:wait_for_stanza(Alice),
+                      escalus:assert(is_adhoc_response, [<<"ping">>, <<"completed">>],
+                                     AdHocResp)
                   end).

test/ejabberd_tests/tests/amp_SUITE.erl

@@ -736,10 +736,10 @@ client_receives_notification(Client, IntendedRecipient, Rule) ->
     assert_notification(Client, IntendedRecipient, Msg, Rule).
 
 disco_info(Config) ->
-    Server = escalus_config:get_config(ejabberd_domain, Config),
+    Server = ct:get_config({hosts, mim, domain}),
     escalus_stanza:disco_info(Server).
 disco_info_amp_node(Config) ->
-    Server = escalus_config:get_config(ejabberd_domain, Config),
+    Server = ct:get_config({hosts, mim, domain}),
     escalus_stanza:disco_info(Server, ns_amp()).
 
 assert_amp_error(Client, Response, Rules, AmpErrorKind) when is_list(Rules) ->

test/ejabberd_tests/tests/bosh_SUITE.erl

@@ -152,7 +152,7 @@ create_and_terminate_session(Config) ->
     %% Assert there are no BOSH sessions on the server.
     0 = length(get_bosh_sessions()),
 
-    Domain = escalus_config:get_config(ejabberd_domain, Config),
+    Domain = ct:get_config({hosts, mim, domain}),
     Body = escalus_bosh:session_creation_body(get_bosh_rid(Conn), Domain),
     ok = escalus_bosh:send_raw(Conn, Body),
     escalus_connection:get_stanza(Conn, session_creation_response),

test/ejabberd_tests/tests/component_SUITE.erl

@@ -543,7 +543,7 @@ cluster_users() ->
     [proplists:lookup(alice, AllUsers), proplists:lookup(clusterguy, AllUsers)].
 
 default_node(Config) ->
-    Node = escalus_config:get_config(ejabberd_node, Config),
+    Node = ct:get_config({hosts, mim, node}),
     Node == undefined andalso error(node_undefined, [Config]),
     Node.
 
@@ -565,7 +565,7 @@ common(Config) ->
     common(Config, 8888).
 
 common(Config, Port) ->
-    [{server, ct:get_config(ejabberd_domain, Config)},
-     {host, ct:get_config(ejabberd_domain, Config)},
+    [{server, ct:get_config({hosts, mim, domain})},
+     {host, ct:get_config({hosts, mim, domain})},
      {password, <<"secret">>},
      {port, Port}].

test/ejabberd_tests/tests/conf_reload_SUITE.erl

@@ -23,7 +23,7 @@
 
 -import(reload_helper, [reload_through_ctl/2]).
 
--define(RELOADED_DOMAIN, ct:get_config(ejabberd_reloaded_domain)).
+-define(RELOADED_DOMAIN, ct:get_config({hosts, mim, reloaded_domain})).
 
 -define(SAMPLE_USERNAME, <<"astrid">>).
 -define(RELOADED_DOMAIN_USER, astrid).
@@ -46,7 +46,7 @@ groups() ->
        ]}].
 
 suite() ->
-    [{required, ejabberd_reloaded_domain} | escalus:suite()].
+    [{required, {hosts, mim, reloaded_domain}} | escalus:suite()].
 
 %%--------------------------------------------------------------------
 %% Init & teardown
@@ -185,6 +185,6 @@ delete_user(User, Config) ->
     escalus_users:delete_user(Config, {User, UserSpec}).
 
 default_node(Config) ->
-    Node = escalus_config:get_config(ejabberd_node, Config),
+    Node = ct:get_config({hosts, mim, node}),
     Node == undefined andalso error(node_undefined, [Config]),
     Node.

test/ejabberd_tests/tests/dynamic_modules.erl

@@ -66,7 +66,7 @@ restart(Domain, Mod, Args) ->
     start(Domain, Mod, Args).
 
 start_running(Config) ->
-    Domain = escalus_config:get_config(ejabberd_domain, Config),
+    Domain = ct:get_config({hosts, mim, domain}),
     case ?config(running, Config) of
         List when is_list(List) ->
             _ = [start(Domain, Mod, Args) || {Mod, Args} <- List];
@@ -77,7 +77,7 @@ start_running(Config) ->
 stop_running(Mod, Config) ->
     ModL = atom_to_list(Mod),
     Domain = escalus_ejabberd:unify_str_arg(
-               escalus_config:get_config(ejabberd_domain, Config)),
+               ct:get_config({hosts, mim, domain})),
     Modules = escalus_ejabberd:rpc(ejabberd_config,
                                    get_local_option,
                                    [{modules, Domain}]),

test/ejabberd_tests/tests/ejabberdctl_SUITE.erl

@@ -121,8 +121,8 @@ end_per_suite(Config) ->
     escalus:end_per_suite(Config1).
 
 init_per_group(vcard, Config) ->
-    case escalus_ejabberd:rpc(gen_mod,get_module_opt,
-                              [ct:get_config(ejabberd_domain),
+    case escalus_ejabberd:rpc(gen_mod, get_module_opt,
+                              [ct:get_config({hosts, mim, domain}),
                                mod_vcard, backend, mnesia]) of
         ldap ->
             {skip, vcard_set_not_supported_with_ldap};
@@ -131,7 +131,9 @@ init_per_group(vcard, Config) ->
     end;
 
 init_per_group(roster_advanced, Config) ->
-    case escalus_ejabberd:rpc(gen_mod,get_module_opt,[ct:get_config(ejabberd_domain), mod_roster, backend, mnesia]) of
+    case escalus_ejabberd:rpc(gen_mod, get_module_opt,
+                             [ct:get_config({hosts, mim, domain}),
+                             mod_roster, backend, mnesia]) of
         mnesia ->
             Config;
         _ ->
@@ -273,7 +275,7 @@ delete_old_users(Config) ->
 delete_old_users_vhost(Config) ->
     {AliceName, Domain, _} = get_user_data(alice, Config),
     {KateName, Domain, KatePass} = get_user_data(kate, Config),
-    SecDomain = escalus_config:get_config(ejabberd_secondary_domain, Config),
+    SecDomain = ct:get_config({hosts, mim, secondary_domain}),
 
     {Mega, Secs, _} = erlang:now(),
     Now = Mega*1000000+Secs,
@@ -314,7 +316,7 @@ kick_session(Config) ->
 status(Config) ->
     escalus:story(Config, [{alice, 1}, {mike, 1}, {bob, 1}], fun(User1, User2, User3) ->
                 PriDomain = escalus_client:server(User1),
-                SecDomain = escalus_config:get_config(ejabberd_secondary_domain, Config),
+                SecDomain = ct:get_config({hosts, mim, secondary_domain}),
                 AwayPresence = escalus_stanza:presence_show(<<"away">>),
                 escalus_client:send(User2, AwayPresence),
 
@@ -335,7 +337,7 @@ sessions_info(Config) ->
     escalus:story(Config, [{alice, 1}, {bob, 1}, {kate, 1}], fun(User1, User2, User3) ->
                 Username1 = escalus_client:username(User1),
                 PriDomain = escalus_client:server(User1),
-                SecDomain = escalus_config:get_config(ejabberd_secondary_domain, Config),
+                SecDomain = ct:get_config({hosts, mim, secondary_domain}),
                 AwayPresence = escalus_stanza:presence_show(<<"away">>),
                 escalus_client:send(User2, AwayPresence),
 
@@ -814,7 +816,7 @@ stats_host(Config) ->
                 Registered = integer_to_list(RegisteredCount) ++ "\n",
 
                 PriDomain = escalus_client:server(Alice),
-                SecDomain = escalus_config:get_config(ejabberd_secondary_domain, Config),
+                SecDomain = ct:get_config({hosts, mim, secondary_domain}),
 
                 {Registered, 0} = ejabberdctl("stats_host", ["registeredusers", PriDomain], Config),
                 {"0\n", 0} = ejabberdctl("stats_host", ["registeredusers", SecDomain], Config),
@@ -833,7 +835,7 @@ stats_host(Config) ->
 
 simple_register(Config) ->
     %% given
-    Domain = escalus_ct:get_config(ejabberd_domain),
+    Domain = ct:get_config({hosts, mim, domain}),
     {Name, Password} = {<<"tyler">>, <<"durden">>},
     %% when
     {_, 0} = ejabberdctl("register", [Name, Domain, Password], Config),
@@ -843,7 +845,7 @@ simple_register(Config) ->
 
 simple_unregister(Config) ->
     %% given
-    Domain = escalus_ct:get_config(ejabberd_domain),
+    Domain = ct:get_config({hosts, mim, domain}),
     {Name, _} = {<<"tyler">>, <<"durden">>},
     %% when
     {_, 0} = ejabberdctl("unregister", [Name, Domain], Config),
@@ -853,7 +855,7 @@ simple_unregister(Config) ->
 
 register_twice(Config) ->
     %% given
-    Domain = escalus_ct:get_config(ejabberd_domain),
+    Domain = ct:get_config({hosts, mim, domain}),
     {Name,  Password} = {<<"tyler">>, <<"durden">>},
     %% when
     {_, 0} = ejabberdctl("register", [Name, Domain, Password], Config),
@@ -1000,7 +1002,7 @@ fallback_timestamp(Days, {MegaSecs, Secs, _MicroSecs}) ->
 
 
 start_mod_admin_extra() ->
-    Domain = ct:get_config(ejabberd_domain),
+    Domain = ct:get_config({hosts, mim, domain}),
     ok = dynamic_modules:restart(Domain, mod_admin_extra, []).
 
 get_user_data(User, Config) when is_atom(User) ->

test/ejabberd_tests/tests/katt_helper.erl

@@ -41,7 +41,7 @@ run(BlueprintName, Config) ->
 run(BlueprintName, Config, Params) ->
     Blueprint = blueprint(BlueprintName, Config),
     Params1 = [{hostname, "localhost"},
-               {port, ct:get_config(ejabberd_metrics_rest_port)}],
+               {port, ct:get_config({hosts, mim, metrics_rest_port})}],
     Params2 = lists:ukeymerge(1, lists:keysort(1, Params), lists:keysort(1, Params1)),
     {TestResult, _, _, _, TransResults} = Result = katt:run(Blueprint, Params2),
     case TestResult of

test/ejabberd_tests/tests/login_SUITE.erl

@@ -558,13 +558,13 @@ get_client_details(Identifier) ->
 
 get_store_type() ->
     XMPPDomain = escalus_ejabberd:unify_str_arg(
-                   ct:get_config(ejabberd_domain)),
+                   ct:get_config({hosts, mim, domain})),
     escalus_ejabberd:rpc(ejabberd_auth, store_type,
                          [XMPPDomain]).
 
 set_store_password(Type) ->
     XMPPDomain = escalus_ejabberd:unify_str_arg(
-                   ct:get_config(ejabberd_domain)),
+                   ct:get_config({hosts, mim, domain})),
     AuthOpts = escalus_ejabberd:rpc(ejabberd_config, get_local_option,
                                     [{auth_opts, XMPPDomain}]),
     NewAuthOpts = lists:keystore(password_format, 1, AuthOpts, {password_format, Type}),
@@ -610,7 +610,7 @@ bad_cancelation_stanza() ->
                     #xmlel{name = <<"foo">>}]}]).
 
 restart_mod_register_with_option(Config, Name, Value) ->
-    Domain = escalus_config:get_config(ejabberd_domain, Config),
+    Domain = ct:get_config({hosts, mim, domain}),
     ModuleOptions = escalus_ejabberd:rpc(gen_mod, loaded_modules_with_opts, [Domain]),
     {mod_register, OldRegisterOptions} = lists:keyfind(mod_register, 1, ModuleOptions),
     {atomic, ok} = dynamic_modules:stop(Domain, mod_register),
@@ -619,7 +619,7 @@ restart_mod_register_with_option(Config, Name, Value) ->
     [{old_mod_register_opts, OldRegisterOptions}|Config].
 
 restore_mod_register_options(Config0) ->
-    Domain = escalus_config:get_config(ejabberd_domain, Config0),
+    Domain = ct:get_config({hosts, mim, domain}),
     {value, {old_mod_register_opts, RegisterOpts}, Config1} =
         lists:keytake(old_mod_register_opts, 1, Config0),
     {atomic, ok} = dynamic_modules:stop(Domain, mod_register),
@@ -646,4 +646,3 @@ modify_acl_for_blocking(Method, Spec) ->
     User = proplists:get_value(username, Spec),
     Lower = escalus_utils:jid_to_lower(User),
     escalus_ejabberd:rpc(acl, Method, [Domain, blocked, {user, Lower}]).
-

test/ejabberd_tests/tests/mam_SUITE.erl

@@ -1981,7 +1981,7 @@ mam_service_discovery(Config) ->
 muc_service_discovery(Config) ->
     P = ?config(props, Config),
     F = fun(Alice) ->
-        Domain = escalus_config:get_config(ejabberd_domain, Config),
+        Domain = ct:get_config({hosts, mim, domain}),
         Server = escalus_client:server(Alice),
         escalus:send(Alice, escalus_stanza:service_discovery(Server)),
         Stanza = escalus:wait_for_stanza(Alice),

test/ejabberd_tests/tests/mam_helper.erl

@@ -40,7 +40,7 @@ rpc_apply(M, F, Args) ->
     end.
 
 rpc_call(M, F, A) ->
-    Node = escalus_ct:get_config(ejabberd_node),
+    Node = ct:get_config({hosts, mim, node}),
     Cookie = escalus_ct:get_config(ejabberd_cookie),
     escalus_ct:rpc_call(Node, M, F, A, 10000, Cookie).
 
@@ -1000,7 +1000,7 @@ put_msg({{MsgIdOwner, MsgIdRemote},
          {_FromBin, FromJID, FromArcID},
          {_ToBin, ToJID, ToArcID},
          {_, Source, _}, Packet}) ->
-    Host = escalus_ct:get_config(ejabberd_domain),
+    Host = ct:get_config({hosts, mim, domain}),
     archive_message([Host, MsgIdOwner, FromArcID, FromJID, ToJID, Source, outgoing, Packet]),
     archive_message([Host, MsgIdRemote, ToArcID, ToJID, FromJID, Source, incoming, Packet]).
 

test/ejabberd_tests/tests/metrics_api_SUITE.erl

@@ -89,7 +89,7 @@ end_per_testcase(CaseName, Config) ->
 message_flow(Config) ->
     case metrics_helper:all_metrics_are_global(Config) of
         true -> katt_helper:run(metrics_only_global, Config,
-                                [{port, escalus_ct:get_config(ejabberd2_metrics_rest_port)}]);
+                                [{port, ct:get_config({hosts, mim, metrics_rest_port2})}]);
         _ -> katt_helper:run(metrics, Config)
     end.
 
@@ -254,7 +254,8 @@ find(CounterName, CounterList) ->
         {CounterName, Val} -> Val end.
 
 fetch_counter_value(Counter, Config) ->
-    Params = [{metric, atom_to_list(Counter)}, {host, ct:get_config(ejabberd_domain)}],
+    Params = [{metric, atom_to_list(Counter)},
+              {host, ct:get_config({hosts, mim, domain})}],
     {_, _, _, Vars, _} = katt_helper:run(metric, Config, Params),
     HostValue = proplists:get_value("value_host", Vars),
     HostValueList = proplists:get_value("value_host_list", Vars),
@@ -286,7 +287,7 @@ fetch_global_spiral_values(Counter, Config) ->
 
 fetch_global_counter_values(Blueprint, Counter, Config) ->
     ParamsBase = case metrics_helper:all_metrics_are_global(Config) of
-                     true -> [{port, escalus_ct:get_config(ejabberd2_metrics_rest_port)}];
+                     true -> [{port, ct:get_config({hosts, mim, metrics_rest_port2})}];
                      _ -> []
                  end,
     Params = [{metric, atom_to_list(Counter)} | ParamsBase],
@@ -308,6 +309,5 @@ assert_counter_inc(Name, Inc, Counters1, Counters2) when is_list(Counters1) ->
 assert_counter_inc(_Name, Inc, Counter1, Counter2) when Counter1 + Inc =:= Counter2 ->
     ok.
 
-get_diffs(L1,L2) ->
+get_diffs(L1, L2) ->
     lists:zip(L1, L2).
-

test/ejabberd_tests/tests/metrics_helper.erl

@@ -10,7 +10,7 @@
 -define(ONLY_GLOBAL_METRICS_GROUP_USERS, [clusterguy, clusterbuddy]).
 
 get_counter_value(CounterName) ->
-    get_counter_value(ct:get_config(ejabberd_domain), CounterName).
+    get_counter_value(ct:get_config({hosts, mim, domain}), CounterName).
 
 get_counter_value(Host, Metric) ->
     case escalus_ejabberd:rpc(mongoose_metrics, get_metric_value, [Host, Metric]) of
@@ -25,8 +25,8 @@ get_counter_value(Host, Metric) ->
     end.
 
 assert_counter(Value, CounterName) ->
-    assert_counter(escalus_ct:get_config(ejabberd_domain), Value, CounterName).
-    
+    assert_counter(ct:get_config({hosts, mim, domain}), Value, CounterName).
+
 assert_counter(Host, Value, CounterName) ->
     {value, Value} = get_counter_value(Host, CounterName).
 
@@ -83,4 +83,3 @@ user_ids(Config) ->
         true -> ?ONLY_GLOBAL_METRICS_GROUP_USERS;
         _ -> ?METRICS_GROUP_USERS
     end.
-

test/ejabberd_tests/tests/metrics_register_SUITE.erl

@@ -61,7 +61,7 @@ init_per_testcase(unregister, Config) ->
     escalus_users:create_user(Config, Alice),
     Config;
 init_per_testcase(registered_users, Config) ->
-    XMPPDomain = ct:get_config(ejabberd_domain),
+    XMPPDomain = ct:get_config({hosts, mim, domain}),
     case escalus_ejabberd:rpc(ejabberd_config, get_local_option,
                               [{auth_method, XMPPDomain}]) of
         external ->
@@ -100,4 +100,3 @@ unregister(Config) ->
     escalus_users:delete_user(Config, Alice),
 
     assert_counter(Deregistarations + 1, modUnregisterCount).
-