Merge branch 'anders/diameter/DOIC/OTP-14588' into maint

* anders/diameter/DOIC/OTP-14588:
  Exercise avp_dictionaries in traffic suite
  Let generic AVPs be encoded/decoded in alternate dictionaries
  Rename field in codec map: dictionary -> app_dictionary
  Add RFC 7683 Diameter Overload Indicator Conveyance text and dictionary
  Fix decode undef
  Fix dictionary compilation error message

4 files changed, 32 insertions, 8 deletions

diff --git a/lib/diameter/test/diameter_codec_SUITE.erl b/lib/diameter/test/diameter_codec_SUITE.erl
index c79b642c09..17112794e4 100644
--- a/lib/diameter/test/diameter_codec_SUITE.erl
+++ b/lib/diameter/test/diameter_codec_SUITE.erl
@@ -291,7 +291,7 @@ recode(Msg, Dict) ->
     recode(#diameter_packet{msg = Msg}, Dict).
 
 opts(Mod) ->
-    #{dictionary => Mod,
+    #{app_dictionary => Mod,
       decode_format => record,
       string_decode => false,
       strict_mbit => true,
diff --git a/lib/diameter/test/diameter_codec_SUITE_data/diameter_test_unknown.erl b/lib/diameter/test/diameter_codec_SUITE_data/diameter_test_unknown.erl
index 735339ebb9..c6bba75f09 100644
--- a/lib/diameter/test/diameter_codec_SUITE_data/diameter_test_unknown.erl
+++ b/lib/diameter/test/diameter_codec_SUITE_data/diameter_test_unknown.erl
@@ -77,7 +77,7 @@ dec('BR', #diameter_packet
     ok.
 
 opts(Mod) ->
-    #{dictionary => Mod,
+    #{app_dictionary => Mod,
       decode_format => record,
       string_decode => true,
       strict_mbit => true,
diff --git a/lib/diameter/test/diameter_codec_test.erl b/lib/diameter/test/diameter_codec_test.erl
index 22fb0550ea..70e910ffa6 100644
--- a/lib/diameter/test/diameter_codec_test.erl
+++ b/lib/diameter/test/diameter_codec_test.erl
@@ -44,7 +44,8 @@ base() ->
     [] = run([[fun base/1, T] || T <- [zero, decode]]).
 
 gen(Mod) ->
-    Fs = [{Mod, F, []} || F <- [name, id, vendor_id, vendor_name]],
+    Fs = [{Mod, F, []} || Mod /= diameter_gen_doic_rfc7683,
+                          F <- [name, id, vendor_id, vendor_name]],
     [] = run(Fs ++ [[fun gen/2, Mod, T] || T <- [messages,
                                                  command_codes,
                                                  avp_types,
@@ -216,7 +217,7 @@ avp(Mod, encode = X, V, Name, _) ->
 
 opts(Mod) ->
     (opts())#{module => Mod,
-              dictionary => Mod}.
+              app_dictionary => Mod}.
 
 opts() ->
     #{decode_format => record,
diff --git a/lib/diameter/test/diameter_traffic_SUITE.erl b/lib/diameter/test/diameter_traffic_SUITE.erl
index 8f2549c8b6..91c9fbb420 100644
--- a/lib/diameter/test/diameter_traffic_SUITE.erl
+++ b/lib/diameter/test/diameter_traffic_SUITE.erl
@@ -20,6 +20,7 @@
 
 %%
 %% Tests of traffic between two Diameter nodes, one client, one server.
+%% The traffic isn't meant to be sensible, just to exercise code.
 %%
 
 -module(diameter_traffic_SUITE).
@@ -217,6 +218,7 @@
          {'Acct-Application-Id', [3]},  %% base accounting
          {restrict_connections, false},
          {string_decode, Grp#group.strings},
+         {avp_dictionaries, [diameter_gen_doic_rfc7683]},
          {incoming_maxlen, 1 bsl 21}
          | [{application, [{dictionary, D},
                            {module, [?MODULE, Grp]},
@@ -638,7 +640,6 @@ result_codes(_Config) ->
 send_ok(Config) ->
     Req = ['ACR', {'Accounting-Record-Type', ?EVENT_RECORD},
                   {'Accounting-Record-Number', 1}],
-
     ['ACA' | #{'Result-Code' := ?SUCCESS,
                'Session-Id' := _}]
         = call(Config, Req).
@@ -675,8 +676,21 @@ send_protocol_error(Config) ->
     Req = ['ACR', {'Accounting-Record-Type', ?EVENT_RECORD},
                   {'Accounting-Record-Number', 4}],
 
-    ?answer_message(?TOO_BUSY)
-        = call(Config, Req).
+    ['answer-message' | #{'Result-Code' := ?TOO_BUSY,
+                          'AVP' := [OLR]}]
+        = call(Config, Req),
+
+    #diameter_avp{name = 'OC-OLR',
+                  value = #{'OC-Sequence-Number' := 1,
+                            'OC-Report-Type' := 0,  %% HOST_REPORT
+                            'OC-Reduction-Percentage' := [25],
+                            'OC-Validity-Duration' := [60],
+                            'AVP' := [OSF]}}
+        = OLR,
+    #diameter_avp{name = 'OC-Supported-Features',
+                  value = #{} = Fs}
+        = OSF,
+    0 = maps:size(Fs).
 
 %% Send a 3xxx Experimental-Result in an answer not setting the E-bit
 %% and missing a Result-Code.
@@ -1165,6 +1179,7 @@ to_map(#diameter_packet{header = H,
              strings = B}) ->
     Opts = #{decode_format => map,
              string_decode => B,
+             avp_dictionaries => [diameter_gen_doic_rfc7683],
              strict_mbit => true,
              rfc => 6733},
     #diameter_packet{msg = [MsgName | _Map] = Msg}
@@ -1730,9 +1745,17 @@ request(['ACR' | #{'Session-Id' := SId,
 request(['ACR' | #{'Accounting-Record-Number' := 4}],
         #diameter_caps{origin_host = {OH, _},
                        origin_realm = {OR, _}}) ->
+    %% Include a DOIC AVP that will be encoded/decoded because of
+    %% avp_dictionaries config.
+    OLR = #{'OC-Sequence-Number' => 1,
+            'OC-Report-Type' => 0,  %% HOST_REPORT
+            'OC-Reduction-Percentage' => [25],
+            'OC-Validity-Duration' => [60],
+            'AVP' => [{'OC-Supported-Features', []}]},
     Ans = ['answer-message', {'Result-Code', ?TOO_BUSY},
                              {'Origin-Host', OH},
-                             {'Origin-Realm', OR}],
+                             {'Origin-Realm', OR},
+                             {'AVP', [{'OC-OLR', OLR}]}],
     {reply, Ans};
 
 %% send_proxy_info