From 7cffb5cc3d49f1a2d35c62647226cb75eb611b9e Mon Sep 17 00:00:00 2001
From: Andreas Schultz <andreas.schultz@travelping.com>
Date: Thu, 22 Jul 2021 12:21:39 +0200
Subject: [PATCH] update config compat handler

* correct `dns` option in node_selection
* correct options in AAA service config
---
 apps/ergw/src/ergw_compat.erl | 38 +++++++++++++++--------------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/apps/ergw/src/ergw_compat.erl b/apps/ergw/src/ergw_compat.erl
index 09c0b4c3..d3f93e1b 100644
--- a/apps/ergw/src/ergw_compat.erl
+++ b/apps/ergw/src/ergw_compat.erl
@@ -357,10 +357,13 @@ translate_handlers_option(Opt, Values0)
 translate_handlers_option(Opt, Values) ->
     throw({error, {options, {Opt, Values}}}).
 
-translate_node_selection_option(Key, {Type, Opts0})
-  when is_atom(Key), is_atom(Type) ->
-    Entries = ergw_node_selection_translate_options(Type, Opts0),
-    #{type => Type, entries => Entries};
+translate_node_selection_option(Key, {static, Opts})
+  when is_atom(Key), is_list(Opts), length(Opts) > 0 ->
+    Entries = lists:map(fun ergw_node_selection_translate_static_option/1, Opts),
+    #{type => static, entries => Entries};
+translate_node_selection_option(Key, {dns, Opts})
+  when is_atom(Key) ->
+    ergw_node_selection_translate_dns(Opts);
 translate_node_selection_option(Opt, Values) ->
     throw({error, {options, {Opt, Values}}}).
 
@@ -522,7 +525,7 @@ translate_apn_option({Opt, Value})
 translate_apn_option({'Idle-Timeout', Timer})
   when (is_integer(Timer) andalso Timer > 0)
        orelse Timer =:= infinity->
-    {'Idle-Timeout', Timer};
+    {inactivity_timeout, Timer};
 translate_apn_option({Opt, Value}) ->
     throw({error, {options, {Opt, Value}}}).
 
@@ -984,18 +987,13 @@ ergw_node_selection_translate_static_option({Host, IP4, IP6})
 ergw_node_selection_translate_static_option(Opt) ->
     throw({error, {options, {static, Opt}}}).
 
-ergw_node_selection_translate_options(static, Opts)
-  when is_list(Opts), length(Opts) > 0 ->
-    lists:map(fun ergw_node_selection_translate_static_option/1, Opts);
-ergw_node_selection_translate_options(dns, undefined) ->
-    undefined;
-ergw_node_selection_translate_options(dns, IP) when ?IS_IP(IP) ->
-    {IP, 53};
-ergw_node_selection_translate_options(dns, {IP, Port} = Server)
+ergw_node_selection_translate_dns(IP) when ?IS_IP(IP) ->
+    #{type => dns, server => IP, port => 53};
+ergw_node_selection_translate_dns({IP, Port})
   when ?IS_IP(IP) andalso is_integer(Port) ->
-    Server;
-ergw_node_selection_translate_options(Type, Opts) ->
-    throw({error, {options, {Type, Opts}}}).
+    #{type => dns, server => IP, port => Port};
+ergw_node_selection_translate_dns(Opts) ->
+    throw({error, {dns, Opts}}).
 
 vrf_translate_name(Name) ->
     try
@@ -1316,12 +1314,8 @@ aaa_translate_handler_option(_, Opts) ->
     Opts.
 
 aaa_translate_service(_Service, Opts, _Config) ->
-    translate_options(fun aaa_translate_service_option/2, Opts, [], map).
-
-aaa_translate_service_option(answers, Answers) ->
-    aaa_translate_answers(Answers);
-aaa_translate_service_option(_, Opts) ->
-    Opts.
+    Handler = proplists:get_value(handler, Opts),
+    aaa_translate_handler(Handler, Opts).
 
 aaa_translate_app(App, Opts, Config) ->
     AppDef = translate_options(aaa_translate_app_option(App, _, _, Config), Opts, [], map),