File 1696-diameter-use-CT_PEER-instead-of-ct_slave.p... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1696-diameter-use-CT_PEER-instead-of-ct_slave.patch of Package erlang (Revision 21279eedff14f2022951e8c37fab2e73)

Currently displaying revision 21279eedff14f2022951e8c37fab2e73 , Show latest

From 96d28d7ddcaa805911a37b322b9f8cfc6eddcb77 Mon Sep 17 00:00:00 2001
From: Maxim Fedorov <maximfca@gmail.com>
Date: Wed, 22 Sep 2021 21:11:05 -0700
Subject: [PATCH 6/7] [diameter] use ?CT_PEER instead of ct_slave

Replace ct_slave invocations with ?CT_PEER. This ensures no rogue nodes
are left after test suite completes, and allows running multiple copies
of the suite concurrently (or, run both on the same host in parallel).

This patch also improves diameter_dist_SUITE, diameter_distribution_SUITE
and diameters_examples_SUITE resilience. Previously these tests suites
depended on a specific order of test case execution, making it impossible
to run a single test case independently of another.
---
 lib/diameter/test/diameter_dist_SUITE.erl     | 314 ++++++------------
 .../test/diameter_distribution_SUITE.erl      | 281 ++++++----------
 lib/diameter/test/diameter_examples_SUITE.erl | 124 ++-----
 3 files changed, 215 insertions(+), 504 deletions(-)

diff --git a/lib/diameter/test/diameter_dist_SUITE.erl b/lib/diameter/test/diameter_dist_SUITE.erl
index 2fda2830ae..cc8e4ad794 100644
--- a/lib/diameter/test/diameter_dist_SUITE.erl
+++ b/lib/diameter/test/diameter_dist_SUITE.erl
@@ -25,16 +25,15 @@
 
 -module(diameter_dist_SUITE).
 
--export([suite/0,
-         all/0]).
+-export([
+    suite/0,
+    all/0,
+    init_per_suite/1,
+    end_per_suite/1
+]).
 
 %% testcases
--export([enslave/1, enslave/0,
-         ping/1,
-         start/1,
-         connect/1,
-         send/1,
-         stop/1, stop/0]).
+-export([send/1]).
 
 %% diameter callbacks
 -export([peer_up/3,
@@ -46,214 +45,61 @@
          handle_error/4,
          handle_request/3]).
 
--export([call/1]).
+%% Internal export for RPC
+-export([start_server/5, start_client/6]).
 
 -include("diameter.hrl").
 -include("diameter_gen_base_rfc6733.hrl").
 
-%% ===========================================================================
+-include_lib("common_test/include/ct.hrl").
 
--define(util, diameter_util).
+%% ===========================================================================
 
 -define(CLIENT, 'CLIENT').
 -define(SERVER, 'SERVER').
 -define(REALM, "erlang.org").
 -define(DICT, diameter_gen_base_rfc6733).
 -define(ADDR, {127,0,0,1}).
-
-%% Config for diameter:start_service/2.
--define(SERVICE(Host),
-        [{'Origin-Host', Host ++ [$.|?REALM]},
-         {'Origin-Realm', ?REALM},
-         {'Host-IP-Address', [?ADDR]},
-         {'Vendor-Id', 12345},
-         {'Product-Name', "OTP/diameter"},
-         {'Auth-Application-Id', [?DICT:id()]},
-         {'Origin-State-Id', origin()},
-         {spawn_opt, {diameter_dist, route_session, [#{id => []}]}},
-         {sequence, fun sequence/0},
-         {string_decode, false},
-         {application, [{dictionary, ?DICT},
-                        {module, ?MODULE},
-                        {request_errors, callback},
-                        {answer_errors, callback}]}]).
-
 -define(SUCCESS, 2001).
 -define(BUSY,    3004).
 -define(LOGOUT,  ?'DIAMETER_BASE_TERMINATION-CAUSE_LOGOUT').
 -define(MOVED,   ?'DIAMETER_BASE_TERMINATION-CAUSE_USER_MOVED').
 -define(TIMEOUT, ?'DIAMETER_BASE_TERMINATION-CAUSE_SESSION_TIMEOUT').
 
--define(L, atom_to_list).
--define(A, list_to_atom).
-
-%% The order here is significant and causes the server to listen
-%% before the clients connect. The server listens on the first node,
-%% and distributes requests to the other two.
--define(NODES, [{server0, ?SERVER},
-                {server1, ?SERVER},
-                {server2, ?SERVER},
-                {client, ?CLIENT}]).
-
-%% Options to ct_slave:start/2.
--define(TIMEOUTS, [{T, 15000} || T <- [boot_timeout,
-                                       init_timeout,
-                                       start_timeout]]).
-
 %% ===========================================================================
 
 suite() ->
-    [{timetrap, {seconds, 60}}].
+    [{timetrap, {seconds, 30}}].
 
 all() ->
-    [enslave,
-     ping,
-     start,
-     connect,
-     send,
-     stop].
-
-%% ===========================================================================
-%% start/stop testcases
-
-%% enslave/1
-%%
-%% Start four slave nodes, three to implement a Diameter server,
-%% one to implement a client.
-
-enslave() ->
-    [{timetrap, {seconds, 30*length(?NODES)}}].
-
-enslave(Config) ->
-    Here = filename:dirname(code:which(?MODULE)),
-    Ebin = filename:join([Here, "..", "ebin"]),
-    Dirs = [Here, Ebin],
-    Nodes = [{N,S} || {M,S} <- ?NODES, N <- [slave(M, Dirs)]],
-    ?util:write_priv(Config, nodes, [{N,S} || {{N,ok},S} <- Nodes]),
-    [] = [{T,S} || {{_,E} = T, S} <- Nodes, E /= ok].
-
-slave(Name, Dirs) ->
-    add_pathsa(Dirs, ct_slave:start(Name, ?TIMEOUTS)).
-
-add_pathsa(Dirs, {ok, Node}) ->
-    {Node, rpc:call(Node, code, add_pathsa, [Dirs])};
-add_pathsa(_, No) ->
-    {No, error}.
-
-%% ping/1
-%%
-%% Ensure the server nodes are connected so that diameter_dist can attach.
-
-ping({S, Nodes}) ->
-    ?SERVER = S,
-    [N || {N,_} <- Nodes,
-          node() /= N,
-          pang <- [net_adm:ping(N)]];
-
-ping(Config) ->
-    Nodes = lists:droplast(?util:read_priv(Config, nodes)),
-    [] = [{N,RC} || {N,S} <- Nodes,
-                    RC <- [rpc:call(N, ?MODULE, ping, [{S,Nodes}])],
-                    RC /= []].
-
-%% start/1
-%%
-%% Start diameter services.
-
-%% There's no need to start diameter on a node that only services
-%% diameter_dist as a handler of incoming requests, but the
-%% diameter_dist server must be started since the servers communicate
-%% to determine who services what. The typical case is probably that
-%% handler nodes also want to be able to send Diameter requests, in
-%% which case the application needs to be started and diameter_dist is
-%% started as a part of this, but only start the server here to ensure
-%% everything still works as expected.
-start({_SvcName, [_, {S1, _}, {S2, _}, _]}) 
-  when node() == S1;    %% server1
-       node() == S2 ->  %% server2
-    Mod = diameter_dist,
-    {ok, _} = gen_server:start({local, Mod}, Mod, _Args = [], _Opts  = []),
-    ok;
-
-start({SvcName, [{S0, _}, _, _, {C, _}]})
-  when node() == S0;    %% server0
-       node() == C ->   %% client
-    ok = diameter:start(),
-    ok = diameter:start_service(SvcName, ?SERVICE((?L(SvcName))));
-
-start(Config)
-  when is_list(Config) ->
-    Nodes = ?util:read_priv(Config, nodes),
-    [] = [{N,RC} || {N,S} <- Nodes,
-                    RC <- [rpc:call(N, ?MODULE, start, [{S, Nodes}])],
-                    RC /= ok].
-
-sequence() ->
-    sequence(sname()).
-
-sequence(client) ->
-    {0,32};
-sequence(Server) ->
-    "server" ++ N = ?L(Server),
-    {list_to_integer(N), 30}.
-
-origin() ->
-    origin(sname()).
-
-origin(client) ->
-    99;
-origin(Server) ->
-    "server" ++ N = ?L(Server),
-    list_to_integer(N).
-
-%% connect/1
-%%
-%% Establish one connection from the client, terminated on the first
-%% server node, the others handling requests.
-
-connect({?SERVER, Config, [{Node, _} | _]})
-  when Node == node() ->  %% server0
-    ok = ?util:write_priv(Config, lref, {Node, ?util:listen(?SERVER, tcp)});
-
-connect({?SERVER, _Config, _}) -> %% server[12]: register to receive requests
-    ok = diameter_dist:attach([?SERVER]);
-
-connect({?CLIENT, Config, _}) ->
-    ?util:connect(?CLIENT, tcp, ?util:read_priv(Config, lref)),
-    ok;
-
-connect(Config) ->
-    Nodes = ?util:read_priv(Config, nodes),
-    [] = [{N,RC} || {N,S} <- Nodes,
-                    RC <- [rpc:call(N, ?MODULE, connect, [{S, Config, Nodes}])],
-                    RC /= ok].
-
-%% stop/1
-%%
-%% Stop the slave nodes.
-
-stop() ->
-    [{timetrap, {seconds, 30*length(?NODES)}}].
-
-stop(_Config) ->
-    [] = [{N,E} || {N,_} <- ?NODES,
-                   {error, _, _} = E <- [ct_slave:stop(N)]].
-
-%% ===========================================================================
-%% traffic testcases
-
-%% send/1
-%%
-%% Send 100 requests and ensure the node name sent as User-Name isn't
-%% the node terminating transport.
-
-send(Config) ->
-    send(Config, 100, dict:new()).
-
-%% send/2
-
-send(Config, 0, Dict) ->
-    [{Server0, _} | _] = ?util:read_priv(Config, nodes) ,
+    [send].
+
+init_per_suite(Config) ->
+    {ok, ServerPeer, ServerNode} = ?CT_PEER(),
+    ListenPort = erpc:call(ServerNode, ?MODULE, start_server, [?SERVER, "server0", 0, 0, 30]),
+    %% Distributed workers
+    Peer1 = start_worker(?SERVER),
+    Peer2 = start_worker(?SERVER),
+    %% Diameter client
+    {ok, ClientPeer, ClientNode} = ?CT_PEER(),
+    ok = erpc:call(ClientNode, ?MODULE, start_client, [?CLIENT, ListenPort, "client", 99, 0, 32]),
+    %% unlink peers, assuming end_per_suite is executed reliably
+    Peers = [ServerPeer, Peer1, Peer2, ClientPeer],
+    [unlink(P) || P <- Peers],
+    [{server, ServerNode}, {client, ClientNode}, {peers, Peers} | Config].
+
+end_per_suite(Config) ->
+    [peer:stop(P) || P <- proplists:get_value(peers, Config)].
+
+%% Basic test
+send(Config) when is_list(Config) ->
+    ServerNode = proplists:get_value(server, Config),
+    ClientNode = proplists:get_value(client, Config),
+    %% Send 100 requests and ensure the node name sent as User-Name isn't
+    %% the node terminating transport.
+    send(ServerNode, ClientNode, 100, dict:new()).
+
+send(Server0, _Client, 0, Dict) ->
     Node = atom_to_binary(Server0, utf8),
     {false, _} = {dict:is_key(Node, Dict), dict:to_list(Dict)},
     %% Check that counters have been incremented as expected on server0.
@@ -268,35 +114,69 @@ send(Config, 0, Dict) ->
         = {[{D,R,N,C} || {{{0,275,R}, D, {'Result-Code', C}}, N} <- Stats],
            Stats};
 
-send(Config, N, Dict) ->
+send(Server0, Client, N, Dict) ->
+    Req = #diameter_base_STR{'Destination-Realm'   = ?REALM,
+        'Auth-Application-Id' = ?DICT:id(),
+        'Termination-Cause'   = ?LOGOUT},
     #diameter_base_STA{'Result-Code' = ?SUCCESS,
                        'User-Name' = [ServerNode]}
-        = send(Config, str(?LOGOUT)),
+        = rpc:call(Client, diameter, call, [?CLIENT, ?DICT, Req, []]),
     true = is_binary(ServerNode),
-    send(Config, N-1, dict:update_counter(ServerNode, 1, Dict)).
+    send(Server0, Client, N-1, dict:update_counter(ServerNode, 1, Dict)).
 
 %% ===========================================================================
+%% Utilities
 
-str(Cause) ->
-    #diameter_base_STR{'Destination-Realm'   = ?REALM,
-                       'Auth-Application-Id' = ?DICT:id(),
-                       'Termination-Cause'   = Cause}.
-
-%% send/2
-
-send(Config, Req) ->
-    {Node, _} = lists:last(?util:read_priv(Config, nodes)),
-    rpc:call(Node, ?MODULE, call, [Req]).
-
-%% call/1
-
-call(Req) ->
-    diameter:call(?CLIENT, ?DICT, Req, []).
-
-%% sname/0
-
-sname() ->
-    ?A(hd(string:tokens(?L(node()), "@"))).
+%% Starts a peer node with Diameter server running
+start_server(Server, Host, Origin, SeqFrom, SeqTo) ->
+    ok = diameter:start(),
+    ok = diameter:start_service(Server, service_opt(Host, Origin, SeqFrom, SeqTo)),
+    %% Listener config
+    ListenConfig = [{transport_module, diameter_tcp}, {transport_config, [{ip, ?ADDR},
+        {port, 0}, {accept, {256, 0, 0, 1}}, {accept, ["256.0.0.1", ["^.+$"]]}]}],
+    %% start listener on Server0, get the listener port number
+    {ok, ListenRef} = diameter:add_transport(Server, {listen, ListenConfig}),
+    %% wait for listener to be up
+    [_] = diameter_reg:wait({diameter_tcp, listener, {ListenRef, '_'}}),
+    [{listen, ListenPort, _}] = diameter_tcp:ports(),
+    ListenPort.
+
+%% Starts Diameter client node connected to Server
+start_client(Client, ServerPort, Host, Origin, SeqFrom, SeqTo) ->
+    ok = diameter:start(),
+    ok = diameter:start_service(Client, service_opt(Host, Origin, SeqFrom, SeqTo)),
+    %% Establish connection to the server
+    ConnectConfig = [{transport_module, diameter_tcp},
+        {transport_config, [{raddr, ?ADDR}, {rport, ServerPort}]}],
+    true = diameter:subscribe(Client),
+    {ok, Ref} = diameter:add_transport(Client, {connect, ConnectConfig}),
+    receive
+        {diameter_event, Client, {up, Ref, _, _, _}} -> ok
+    end.
+
+%% Returns config for diameter:start_service/2.
+service_opt(Host, Origin, SeqFrom, SeqTo) ->
+    [{'Origin-Host', Host ++ [$.|?REALM]},
+        {'Origin-Realm', ?REALM},
+        {'Host-IP-Address', [?ADDR]},
+        {'Vendor-Id', 12345},
+        {'Product-Name', "OTP/diameter"},
+        {'Auth-Application-Id', [?DICT:id()]},
+        {'Origin-State-Id', Origin},
+        {spawn_opt, {diameter_dist, route_session, [#{id => []}]}},
+        {sequence, fun () -> {SeqFrom, SeqTo} end}, %% use 'fun' for fun and piggy-back testing
+        {string_decode, false},
+        {application, [{dictionary, ?DICT},
+            {module, ?MODULE},
+            {request_errors, callback},
+            {answer_errors, callback}]}].
+
+%% Starts a distributed worker node
+start_worker(AttachTo) ->
+    {ok, Peer, Node} = ?CT_PEER(),
+    {ok, _} = erpc:call(Node, gen_server, start, [{local, diameter_dist}, diameter_dist, [], []]),
+    ok = erpc:call(Node, diameter_dist, attach, [[AttachTo]]),
+    Peer.
 
 %% ===========================================================================
 %% diameter callbacks
diff --git a/lib/diameter/test/diameter_distribution_SUITE.erl b/lib/diameter/test/diameter_distribution_SUITE.erl
index 5fe02284ae..6ba001f7d2 100644
--- a/lib/diameter/test/diameter_distribution_SUITE.erl
+++ b/lib/diameter/test/diameter_distribution_SUITE.erl
@@ -25,19 +25,18 @@
 
 -module(diameter_distribution_SUITE).
 
--export([suite/0,
-         all/0]).
+-export([
+    suite/0,
+    all/0,
+    init_per_suite/1,
+    end_per_suite/1
+]).
 
 %% testcases
--export([enslave/1, enslave/0,
-         ping/1,
-         start/1,
-         connect/1,
-         send_local/1,
+-export([send_local/1,
          send_remote/1,
          send_timeout/1,
-         send_failover/1,
-         stop/1, stop/0]).
+         send_failover/1]).
 
 %% diameter callbacks
 -export([peer_up/3,
@@ -49,193 +48,59 @@
          handle_error/5,
          handle_request/3]).
 
--export([call/1]).
+%% Internal export for RPC
+-export([start_server/5, start_client/6, call/1]).
 
 -include("diameter.hrl").
 -include("diameter_gen_base_rfc6733.hrl").
 
-%% ===========================================================================
+-include_lib("common_test/include/ct.hrl").
 
--define(util, diameter_util).
+%% ===========================================================================
 
 -define(CLIENT, 'CLIENT').
 -define(SERVER, 'SERVER').
 -define(REALM, "erlang.org").
 -define(DICT, diameter_gen_base_rfc6733).
 -define(ADDR, {127,0,0,1}).
-
-%% Config for diameter:start_service/2.
--define(SERVICE(Host),
-        [{'Origin-Host', Host ++ [$.|?REALM]},
-         {'Origin-Realm', ?REALM},
-         {'Host-IP-Address', [?ADDR]},
-         {'Vendor-Id', 12345},
-         {'Product-Name', "OTP/diameter"},
-         {'Auth-Application-Id', [?DICT:id()]},
-         {'Origin-State-Id', origin()},
-         {share_peers, peers()},
-         {use_shared_peers, peers()},
-         {restrict_connections, false},
-         {spawn_opt, {diameter_dist, spawn_local, []}},
-         {sequence, fun sequence/0},
-         {application, [{dictionary, ?DICT},
-                        {module, ?MODULE},
-                        {request_errors, callback},
-                        {answer_errors, callback}]}]).
-
 -define(SUCCESS, 2001).
 -define(BUSY,    3004).
 -define(LOGOUT,  ?'DIAMETER_BASE_TERMINATION-CAUSE_LOGOUT').
 -define(MOVED,   ?'DIAMETER_BASE_TERMINATION-CAUSE_USER_MOVED').
 -define(TIMEOUT, ?'DIAMETER_BASE_TERMINATION-CAUSE_SESSION_TIMEOUT').
 
--define(L, atom_to_list).
--define(A, list_to_atom).
-
-%% The order here is significant and causes the server to listen
-%% before the clients connect.
--define(NODES, [{server, ?SERVER},
-                {client0, ?CLIENT},
-                {client1, ?CLIENT},
-                {client2, ?CLIENT}]).
-
-%% Options to ct_slave:start/2.
--define(TIMEOUTS, [{T, 15000} || T <- [boot_timeout,
-                                       init_timeout,
-                                       start_timeout]]).
-
 %% ===========================================================================
 
 suite() ->
-    [{timetrap, {seconds, 60}}].
+    [{timetrap, {seconds, 30}}].
 
 all() ->
-    [enslave,
-     ping,
-     start,
-     connect,
-     send_local,
+    [send_local,
      send_remote,
      send_timeout,
-     send_failover,
-     stop].
-
-%% ===========================================================================
-%% start/stop testcases
-
-%% enslave/1
-%%
-%% Start four slave nodes, one to implement a Diameter server,
-%% three to implement a client.
-
-enslave() ->
-    [{timetrap, {seconds, 30*length(?NODES)}}].
-
-enslave(Config) ->
-    Here = filename:dirname(code:which(?MODULE)),
-    Ebin = filename:join([Here, "..", "ebin"]),
-    Dirs = [Here, Ebin],
-    Nodes = [{N,S} || {M,S} <- ?NODES, N <- [slave(M, Dirs)]],
-    ?util:write_priv(Config, nodes, [{N,S} || {{N,ok},S} <- Nodes]),
-    [] = [{T,S} || {{_,E} = T, S} <- Nodes, E /= ok].
-
-slave(Name, Dirs) ->
-    add_pathsa(Dirs, ct_slave:start(Name, ?TIMEOUTS)).
-
-add_pathsa(Dirs, {ok, Node}) ->
-    {Node, rpc:call(Node, code, add_pathsa, [Dirs])};
-add_pathsa(_, No) ->
-    {No, error}.
-
-%% ping/1
-%%
-%% Ensure the client nodes are connected since the sharing of
-%% transports is only between connected nodes.
-
-ping({?SERVER, _Nodes}) ->
-    [];
-
-ping({?CLIENT, Nodes}) ->
-    [N || {N,_} <- Nodes,
-          node() /= N,
-          pang <- [net_adm:ping(N)]];
-
-ping(Config) ->
-    Nodes = ?util:read_priv(Config, nodes),
-    [] = [{N,RC} || {N,S} <- Nodes,
-                    RC <- [rpc:call(N, ?MODULE, ping, [{S, Nodes}])],
-                    RC /= []].
-
-%% start/1
-%%
-%% Start diameter services.
-
-start(SvcName)
-  when is_atom(SvcName) ->
-    ok = diameter:start(),
-    ok = diameter:start_service(SvcName, ?SERVICE((?L(SvcName))));
-
-start(Config) ->
-    Nodes = ?util:read_priv(Config, nodes),
-    [] = [{N,RC} || {N,S} <- Nodes,
-                    RC <- [rpc:call(N, ?MODULE, start, [S])],
-                    RC /= ok].
-
-sequence() ->
-    sequence(sname()).
-
-sequence(server) ->
-    {0,32};
-sequence(Client) ->
-    "client" ++ N = ?L(Client),
-    {list_to_integer(N), 30}.
-
-origin() ->
-    origin(sname()).
-
-origin(server) ->
-    99;
-origin(Client) ->
-    "client" ++ N = ?L(Client),
-    list_to_integer(N).
-
-peers() ->
-    peers(sname()).
-
-peers(server)  -> true;
-peers(client0) -> [node() | nodes()];
-peers(client1) -> fun erlang:nodes/0;
-peers(client2) -> nodes().
-
-%% connect/1
-%%
-%% Establish one connection to the server from each of the client
-%% nodes.
-
-connect({?SERVER, Config}) ->
-    ?util:write_priv(Config, lref, {node(), ?util:listen(?SERVER, tcp)}),
-    ok;
-
-connect({?CLIENT, Config}) ->
-    ?util:connect(?CLIENT, tcp, ?util:read_priv(Config, lref)),
-    ok;
-
-connect(Config) ->
-    Nodes = ?util:read_priv(Config, nodes),
-    [] = [{N,RC} || {N,S} <- Nodes,
-                    RC <- [rpc:call(N, ?MODULE, connect, [{S,Config}])],
-                    RC /= ok].
-
-%% stop/1
-%%
-%% Stop the slave nodes.
-
-stop() ->
-    [{timetrap, {seconds, 30*length(?NODES)}}].
-
-stop(_Config) ->
-    [] = [{N,E} || {N,_} <- ?NODES,
-                   {error, _, _} = E <- [ct_slave:stop(N)]].
+     send_failover].
+
+init_per_suite(Config) ->
+    {ok, ServerPeer, ServerNode} = ?CT_PEER(),
+    ListenPort = erpc:call(ServerNode, ?MODULE, start_server, [?SERVER, "server0", 99, 0, 32]),
+    %% client nodes
+    Indices = lists:seq(0, 2),
+    {_Ok, ClientPeers, Nodes} = lists:unzip3([{ok, _P, _N} = ?CT_PEER() || _ <- Indices]),
+    %% Ensure the client nodes are connected since the sharing of
+    %% transports is only between connected nodes.
+    [pong = erpc:call(N, net_adm, ping, [M]) || N <- Nodes, M <- Nodes, N < M],
+    %% Start diameter clients
+    %% not exactly multi-call, call args are different
+    [ok = erpc:call(N, ?MODULE, start_client,
+        [?CLIENT, ListenPort, "client" ++ integer_to_list(Seq), Seq, Seq, 30])
+        || {N, Seq} <- lists:zip(Nodes, Indices)],
+    %% unlink peers, assuming end_per_suite is executed reliably
+    Peers = [ServerPeer | ClientPeers],
+    [unlink(P) || P <- Peers],
+    [{server, ServerNode}, {clients, Nodes}, {peers, Peers} | Config].
+
+end_per_suite(Config) ->
+    [peer:stop(P) || P <- proplists:get_value(peers, Config)].
 
 %% ===========================================================================
 %% traffic testcases
@@ -283,18 +148,65 @@ str(Cause) ->
 %% send/2
 
 send(Config, Where, Req) ->
-    [_, {Node, _} | _] = ?util:read_priv(Config, nodes) ,
+    [Node | _] = proplists:get_value(clients, Config) ,
     rpc:call(Node, ?MODULE, call, [{Where, Req}]).
 
 %% call/1
 
 call({Where, Req}) ->
-    diameter:call(?CLIENT, ?DICT, Req, [{extra, [{Where, sname()}]}]).
+    diameter:call(?CLIENT, ?DICT, Req, [{extra, [{Where, node()}]}]).
 
-%% sname/0
 
-sname() ->
-    ?A(hd(string:tokens(?L(node()), "@"))).
+%% Starts a peer node with Diameter server running
+start_server(Server, Host, Origin, SeqFrom, SeqTo) ->
+    ok = diameter:start(),
+    ok = diameter:start_service(Server, service_opt(Host, Origin, SeqFrom, SeqTo)),
+    %% Listener config
+    ListenConfig = [{transport_module, diameter_tcp}, {transport_config, [{ip, ?ADDR},
+        {port, 0}, {accept, {256, 0, 0, 1}}, {accept, ["256.0.0.1", ["^.+$"]]}]}],
+    %% start listener on Server0, get the listener port number
+    {ok, ListenRef} = diameter:add_transport(Server, {listen, ListenConfig}),
+    %% wait for listener to be up
+    [_] = diameter_reg:wait({diameter_tcp, listener, {ListenRef, '_'}}),
+    [{listen, ListenPort, _}] = diameter_tcp:ports(),
+    ListenPort.
+
+%% Starts Diameter client node connected to Server
+start_client(Client, ServerPort, Host, Origin, SeqFrom, SeqTo) ->
+    ok = diameter:start(),
+    ok = diameter:start_service(Client, service_opt(Host, Origin, SeqFrom, SeqTo)),
+    %% Establish connection to the server
+    ConnectConfig = [{transport_module, diameter_tcp},
+        {transport_config, [{ip, ?ADDR}, {port, 0}, {raddr, ?ADDR}, {rport, ServerPort}]}],
+    true = diameter:subscribe(Client),
+    {ok, Ref} = diameter:add_transport(Client, {connect, ConnectConfig}),
+    receive
+        {diameter_event, Client, {up, Ref, _, _, _}} -> ok
+    end.
+
+%% Config for diameter:start_service/2.
+service_opt(Host, Origin, SeqFrom, SeqTo) ->
+    [{'Origin-Host', Host ++ [$.|?REALM]},
+        {'Origin-Realm', ?REALM},
+        {'Host-IP-Address', [?ADDR]},
+        {'Vendor-Id', 12345},
+        {'Product-Name', "OTP/diameter"},
+        {'Auth-Application-Id', [?DICT:id()]},
+        {'Origin-State-Id', Origin},
+        {share_peers, peers(Host)},
+        {use_shared_peers, peers(Host)},
+        {restrict_connections, false},
+        {spawn_opt, {diameter_dist, spawn_local, []}},
+        {sequence, fun () -> {SeqFrom, SeqTo} end},
+        {application, [{dictionary, ?DICT},
+            {module, ?MODULE},
+            {request_errors, callback},
+            {answer_errors, callback}]}].
+
+peers("server0")  -> true;
+peers("client0") -> [node() | nodes()];
+peers("client1") -> fun erlang:nodes/0;
+peers("client2") -> nodes().
 
 %% ===========================================================================
 %% diameter callbacks
@@ -311,18 +223,18 @@ peer_down(_SvcName, _Peer, State) ->
 
 %% pick_peer/4
 
-pick_peer([LP], [_, _], ?CLIENT, _State, {local, client0}) ->
+pick_peer([LP], [_, _], ?CLIENT, _State, {local, _Client0Node}) ->
     {ok, LP};
 
-pick_peer([_], [RP | _], ?CLIENT, _State, {remote, client0}) ->
+pick_peer([_], [RP | _], ?CLIENT, _State, {remote, _Client0Node}) ->
     {ok, RP};
 
-pick_peer([LP], [], ?CLIENT, _State, {remote, client0}) ->
+pick_peer([LP], [], ?CLIENT, _State, {remote, _Client0Node}) ->
     {ok, LP}.
 
 %% prepare_request/4
 
-prepare_request(Pkt, ?CLIENT, {_Ref, Caps}, {_, client0}) ->
+prepare_request(Pkt, ?CLIENT, {_Ref, Caps}, {_, _Client0Node}) ->
     #diameter_packet{msg = Req}
         = Pkt,
     #diameter_caps{origin_host  = {OH, _},
@@ -334,26 +246,25 @@ prepare_request(Pkt, ?CLIENT, {_Ref, Caps}, {_, client0}) ->
 
 %% prepare_retransmit/4
 
-prepare_retransmit(Pkt, ?CLIENT, _, {_, client0}) ->
+prepare_retransmit(Pkt, ?CLIENT, _, {_, _Client0Node}) ->
     #diameter_packet{msg = #diameter_base_STR{'Termination-Cause' = ?MOVED}}
         = Pkt,  %% assert
     {send, Pkt}.
 
 %% handle_answer/5
 
-handle_answer(Pkt, _Req, ?CLIENT, _Peer, {_, client0}) ->
+handle_answer(Pkt, _Req, ?CLIENT, _Peer, {_, _Client0Node}) ->
     #diameter_packet{msg = Rec, errors = []} = Pkt,
     Rec.
 
 %% handle_error/5
 
-handle_error(Reason, _Req, ?CLIENT, _Peer, {_, client0}) ->
+handle_error(Reason, _Req, ?CLIENT, _Peer, {_, _Client0Node}) ->
     {error, Reason}.
 
 %% handle_request/3
 
 handle_request(Pkt, ?SERVER, Peer) ->
-    server = sname(),  %% assert
     #diameter_packet{msg = Req}
         = Pkt,
     request(Req, Peer).
diff --git a/lib/diameter/test/diameter_examples_SUITE.erl b/lib/diameter/test/diameter_examples_SUITE.erl
index 7d47efd527..78044858cc 100644
--- a/lib/diameter/test/diameter_examples_SUITE.erl
+++ b/lib/diameter/test/diameter_examples_SUITE.erl
@@ -33,31 +33,19 @@
          end_per_group/2]).
 
 %% testcases
--export([dict/1, dict/0,
+-export([dict/1,
          code/1,
-         slave/1, slave/0,
-         enslave/1,
          start/1,
-         traffic/1,
-         stop/1]).
+         traffic/1]).
 
 -export([install/1,
          call/1]).
 
 -include("diameter.hrl").
 
-%% ===========================================================================
-
--define(util, diameter_util).
+-include_lib("common_test/include/ct.hrl").
 
-%% The order here is significant and causes the server to listen
-%% before the clients connect.
--define(NODES, [server, client]).
-
-%% Options to ct_slave:start/2.
--define(TIMEOUTS, [{T, 15000} || T <- [boot_timeout,
-                                       init_timeout,
-                                       start_timeout]]).
+%% ===========================================================================
 
 %% @inherits dependencies between example dictionaries. This is needed
 %% in order compile them in the right order. Can't compile to erl to
@@ -101,7 +89,7 @@ init_per_group(tcp = N, Config) ->
     [{group, N} | Config];
 
 init_per_group(sctp = N, Config) ->
-    case ?util:have_sctp() of
+    case diameter_util:have_sctp() of
         true ->
             [{group, N} | Config];
         false->
@@ -112,20 +100,13 @@ end_per_group(_, _) ->
     ok.
 
 tc() ->
-    [slave,
-     enslave,
-     start,
-     traffic,
-     stop].
+    [traffic].
 
 %% ===========================================================================
 %% dict/1
 %%
 %% Compile example dictionaries in examples/dict.
 
-dict() ->
-    [{timetrap, {minutes, 10}}].
-
 dict(_Config) ->
     Dirs = [filename:join(H ++ ["examples", "dict"])
             || H <- [[code:lib_dir(diameter)], [here(), ".."]]],
@@ -225,14 +206,12 @@ make_name(Dict) ->
 %% Compile example code under examples/code.
 
 code(Config) ->
-    try
-        [] = rpc:call(slave(compile, here()),
-                      ?MODULE,
-                      install,
-                      [proplists:get_value(priv_dir, Config)])
-    after
-        {ok, _} = ct_slave:stop(compile)
-    end.
+    {ok, Peer, Node} = ?CT_PEER(),
+    [] = rpc:call(Node,
+                  ?MODULE,
+                  install,
+                  [proplists:get_value(priv_dir, Config)]),
+    peer:stop(Peer).
 
 %% Compile on another node since the code path may be modified.
 install(PrivDir) ->
@@ -252,7 +231,7 @@ install(PrivDir) ->
 %% under include in an installation. ("Installing" them locally is
 %% anathema.)
 install(Dir, PrivDir) ->
-    %% Remove the path added by slave/1 (needed for the rpc:call/4 in
+    %% Remove the path added to the peer (needed for the rpc:call/4 in
     %% compile/1 to find ?MODULE) so the call to code:lib_dir/2 below
     %% returns the installed path.
     [Ebin | _] = code:get_path(),
@@ -296,50 +275,6 @@ store(Path, Dict) ->
 
 %% ===========================================================================
 
-%% slave/1
-%%
-%% Return how long slave start/stop is taking since it seems to be
-%% ridiculously long on some hosts.
-
-slave() ->
-    [{timetrap, {minutes, 10}}].
-
-slave(_) ->
-    T0 = diameter_lib:now(),
-    {ok, Node} = ct_slave:start(?MODULE, ?TIMEOUTS),
-    T1 = diameter_lib:now(),
-    T2 = rpc:call(Node, diameter_lib, now, []),
-    {ok, Node} = ct_slave:stop(?MODULE),
-    now_diff([T0, T1, T2, diameter_lib:now()]).
-
-now_diff([T1,T2|_] = Ts) ->
-    [diameter_lib:micro_diff(T2,T1) | now_diff(tl(Ts))];
-now_diff(_) ->
-    [].
-
-%% ===========================================================================
-
-%% enslave/1
-%%
-%% Start two nodes: one for the server, one for the client.
-
-enslave(Config) ->
-    Prot = proplists:get_value(group, Config),
-    Dir = here(),
-    Nodes = [{S, slave(N, Dir)} || S <- ?NODES, N <- [concat(Prot, S)]],
-    ?util:write_priv(Config, Prot, Nodes).
-
-slave(Name, Dir) ->
-    {ok, Node} = ct_slave:start(Name, ?TIMEOUTS),
-    ok = rpc:call(Node,
-                  code,
-                  add_pathsa,
-                  [[Dir, filename:join([Dir, "..", "ebin"])]]),
-    Node.
-
-concat(Prot, Svc) ->
-    list_to_atom(atom_to_list(Prot) ++ atom_to_list(Svc)).
-
 here() ->
     filename:dirname(code:which(?MODULE)).
 
@@ -356,7 +291,7 @@ start({server, Prot}) ->
     ok = diameter:start(),
     ok = server:start(),
     {ok, Ref} = server:listen({Prot, any, 3868}),
-    [_] = ?util:lport(Prot, Ref),
+    [_] = diameter_util:lport(Prot, Ref),
     ok;
 
 start({client = Svc, Prot}) ->
@@ -364,14 +299,7 @@ start({client = Svc, Prot}) ->
     true = diameter:subscribe(Svc),
     ok = client:start(),
     {ok, Ref} = client:connect({Prot, loopback, loopback, 3868}),
-    receive #diameter_event{info = {up, Ref, _, _, _}} -> ok end;
-
-start(Config) ->
-    Prot = proplists:get_value(group, Config),
-    Nodes = ?util:read_priv(Config, Prot),
-    [] = [RC || {T,N} <- Nodes,
-                RC <- [rpc:call(N, ?MODULE, start, [{T, Prot}])],
-                RC /= ok].
+    receive #diameter_event{info = {up, Ref, _, _, _}} -> ok end.
 
 %% traffic/1
 %%
@@ -386,10 +314,13 @@ traffic(client) ->
 
 traffic(Config) ->
     Prot = proplists:get_value(group, Config),
-    Nodes = ?util:read_priv(Config, Prot),
-    [] = [RC || {T,N} <- Nodes,
-                RC <- [rpc:call(N, ?MODULE, traffic, [T])],
-                RC /= ok].
+    {ok, ServerPeer, ServerNode} = ?CT_PEER(),
+    ok = rpc:call(ServerNode, ?MODULE, start, [{server, Prot}]),
+    {ok, ClientPeer, ClientNode} = ?CT_PEER(),
+    ok = rpc:call(ClientNode, ?MODULE, start, [{client, Prot}]),
+    ok = rpc:call(ClientNode, ?MODULE, traffic, [client]),
+    peer:stop(ClientPeer),
+    peer:stop(ServerPeer).
 
 call(0) ->
     exit(ok);
@@ -397,14 +328,3 @@ call(0) ->
 call(N) ->
     {ok, _} = client:call(),
     call(N-1).
-
-%% stop/1
-
-stop(Name)
-  when is_atom(Name) ->
-    {ok, _Node} = ct_slave:stop(Name),
-    ok;
-
-stop(Config) ->
-    Prot = proplists:get_value(group, Config),
-    [] = [RC || N <- ?NODES, RC <- [catch stop(concat(Prot, N))], RC /= ok].
-- 
2.31.1

Places

File 1696-diameter-use-CT_PEER-instead-of-ct_slave.patch of Package erlang (Revision 21279eedff14f2022951e8c37fab2e73)

Places