|
|
@@ -118,29 +118,28 @@ t_multiple_nodes_api(_) ->
|
|
|
net_kernel:start(['node_api@127.0.0.1', longnames]),
|
|
|
ct:timetrap({seconds, 120}),
|
|
|
snabbkaffe:fix_ct_logging(),
|
|
|
- Cluster = [{Name, Opts}, {Name1, Opts1}] = cluster([core, core]),
|
|
|
+ Seq1 = list_to_atom(atom_to_list(?MODULE) ++ "1"),
|
|
|
+ Seq2 = list_to_atom(atom_to_list(?MODULE) ++ "2"),
|
|
|
+ Cluster = [{Name, Opts}, {Name1, Opts1}] = cluster([{core, Seq1}, {core, Seq2}]),
|
|
|
ct:pal("Starting ~p", [Cluster]),
|
|
|
Node1 = emqx_common_test_helpers:start_slave(Name, Opts),
|
|
|
Node2 = emqx_common_test_helpers:start_slave(Name1, Opts1),
|
|
|
try
|
|
|
- NodesPath = emqx_mgmt_api_test_util:api_path(["nodes"]),
|
|
|
- {ok, Nodes} = emqx_mgmt_api_test_util:request_api(get, NodesPath),
|
|
|
- NodesResponse = emqx_json:decode(Nodes, [return_maps]),
|
|
|
- All = [Node1, Node2, node()],
|
|
|
+ {200, NodesList} = rpc:call(Node1, emqx_mgmt_api_nodes, nodes, [get, #{}]),
|
|
|
+ All = [Node1, Node2],
|
|
|
lists:map(
|
|
|
fun(N) ->
|
|
|
- N1 = binary_to_atom(maps:get(<<"node">>, N), utf8),
|
|
|
+ N1 = maps:get(node, N),
|
|
|
?assertEqual(true, lists:member(N1, All))
|
|
|
end,
|
|
|
- NodesResponse
|
|
|
+ NodesList
|
|
|
),
|
|
|
- ?assertEqual(3, length(NodesResponse)),
|
|
|
+ ?assertEqual(2, length(NodesList)),
|
|
|
|
|
|
- NodePath = emqx_mgmt_api_test_util:api_path(["nodes", atom_to_list(Node1)]),
|
|
|
- {ok, NodeInfo} = emqx_mgmt_api_test_util:request_api(get, NodePath),
|
|
|
- NodeNameResponse =
|
|
|
- binary_to_atom(maps:get(<<"node">>, emqx_json:decode(NodeInfo, [return_maps])), utf8),
|
|
|
- ?assertEqual(Node1, NodeNameResponse)
|
|
|
+ {200, Node11} = rpc:call(Node1, emqx_mgmt_api_nodes, node, [
|
|
|
+ get, #{bindings => #{node => Node1}}
|
|
|
+ ]),
|
|
|
+ ?assertMatch(#{node := Node1}, Node11)
|
|
|
after
|
|
|
emqx_common_test_helpers:stop_slave(Node1),
|
|
|
emqx_common_test_helpers:stop_slave(Node2)
|
|
|
@@ -148,10 +147,7 @@ t_multiple_nodes_api(_) ->
|
|
|
ok.
|
|
|
|
|
|
cluster(Specs) ->
|
|
|
- Env = [
|
|
|
- {emqx, init_config_load_done, false},
|
|
|
- {emqx, boot_modules, []}
|
|
|
- ],
|
|
|
+ Env = [{emqx, boot_modules, []}],
|
|
|
emqx_common_test_helpers:emqx_cluster(Specs, [
|
|
|
{env, Env},
|
|
|
{apps, [emqx_conf]},
|