diff options
| author | Anders Svensson <[email protected]> | 2013-03-19 13:17:40 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2013-03-19 13:17:40 +0100 |
| commit | a457557653b15b2f8e08954d96b0a0c0ec04b04c (patch) | |
| tree | 7c66f3ec57b9db9c2a5fed70b87f5a4a66d581bf /lib/diameter/test/diameter_capx_SUITE.erl | |
| parent | 53375f432c3ba5aa5a03bcbd2cb89caba6754113 (diff) | |
| parent | 16da847bc882eaaf69dffd5cdaaeddf26592ca8a (diff) | |
| download | otp-a457557653b15b2f8e08954d96b0a0c0ec04b04c.tar.gz otp-a457557653b15b2f8e08954d96b0a0c0ec04b04c.tar.bz2 otp-a457557653b15b2f8e08954d96b0a0c0ec04b04c.zip | |
Merge branch 'anders/diameter/vendor_specific_app_id/OTP-10942' into maint-r16
* anders/diameter/vendor_specific_app_id/OTP-10942:
Minor capx suite fix
Update appup, vsn -> 1.4.1.1
Deal with RFC 6733 change to Vendor-Specific-Application-Id
Diffstat (limited to 'lib/diameter/test/diameter_capx_SUITE.erl')
| -rw-r--r-- | lib/diameter/test/diameter_capx_SUITE.erl | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/lib/diameter/test/diameter_capx_SUITE.erl b/lib/diameter/test/diameter_capx_SUITE.erl index a4e4195a19..9e6619ecdd 100644 --- a/lib/diameter/test/diameter_capx_SUITE.erl +++ b/lib/diameter/test/diameter_capx_SUITE.erl @@ -34,6 +34,7 @@ %% testcases -export([start/1, + vendor_id/1, start_services/1, add_listeners/1, s_no_common_application/1, @@ -69,7 +70,7 @@ -define(HOST(Name), Name ++ "." ++ ?REALM). %% Config for diameter:start_service/2. --define(SERVICE(Name), +-define(SERVICE, [{'Origin-Realm', ?REALM}, {'Host-IP-Address', [?ADDR]}, {'Vendor-Id', 12345}, @@ -103,6 +104,7 @@ suite() -> [{timetrap, {seconds, 60}}]. all() -> [start, + vendor_id, start_services, add_listeners] ++ [{group, D, P} || D <- ?DICTS, P <- [[], [parallel]]] @@ -128,6 +130,7 @@ end_per_group(_, _) -> end_per_testcase(N, _) when N == start; + N == vendor_id; N == start_services; N == add_listeners; N == remove_listeners; @@ -156,9 +159,27 @@ tc() -> start(_Config) -> ok = diameter:start(). +%% Ensure that both integer and list-valued vendor id's can be +%% configured in a 'Vendor-Specific-Application-Id, the arity having +%% changed between RFC 3588 and RFC 6733. +vendor_id(_Config) -> + [] = ?util:run([[fun vid/1, V] || V <- [1, [1], [1,2], x]]). + +vid(V) -> + RC = diameter:start_service(make_ref(), + [{'Vendor-Specific-Application-Id', + [[{'Vendor-Id', V}]]} + | ?SERVICE]), + vid(V, RC). + +vid(x, {error, _}) -> + ok; +vid(_, ok) -> + ok. + start_services(_Config) -> - ok = diameter:start_service(?SERVER, ?SERVICE(?SERVER)), - ok = diameter:start_service(?CLIENT, ?SERVICE(?CLIENT)). + ok = diameter:start_service(?SERVER, ?SERVICE), + ok = diameter:start_service(?CLIENT, ?SERVICE). %% One server that responds only to base accounting, one that responds %% to both this and the common application. Share a common service just |