swx: Rename diameter related parameters

Change-Id: I63fe4c7acc7460575a921b254adf066134c0527f
---
M config/sys.config
M src/epdg_diameter_swx.erl
2 files changed, 28 insertions(+), 19 deletions(-)


git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/98/35598/1

diff --git a/config/sys.config b/config/sys.config
index b3ce69f..bffa289 100755
--- a/config/sys.config
+++ b/config/sys.config
@@ -6,18 +6,18 @@
    {gsup_local_ip, "0.0.0.0"},
    {gsup_local_port, 4222},
    % Diameter SWx Connection parameters
-   {diameter_remote_ip, "127.0.0.1"},
-   {diameter_remote_port, 3868},
-   {diameter_proto, sctp},
-   {diameter_connect_timer, 30000},
-   {diameter_watchdog_timer, 30000},
-   {diameter_watchdog_config,
+   {dia_swx_remote_ip, "127.0.0.1"},
+   {dia_swx_remote_port, 3868},
+   {dia_swx_proto, sctp},
+   {dia_swx_connect_timer, 30000},
+   {dia_swx_watchdog_timer, 30000},
+   {dia_swx_watchdog_config,
     [{okay, 3},
      {suspect, 1}]},
-   {vendor_id, 0},
-   {origin_host, "epdg.localdomain"},
-   {origin_realm, "localdomain"},
-   {context_id, "epdg@localdomain"},
+   {dia_swx_vendor_id, 0},
+   {dia_swx_origin_host, "epdg.localdomain"},
+   {dia_swx_origin_realm, "localdomain"},
+   {dia_swx_context_id, "epdg@localdomain"},
    % Diameter s6b Connection parameters
    {dia_s6b_local_ip, "127.0.0.10"},
    {dia_s6b_local_port, 3868},
diff --git a/src/epdg_diameter_swx.erl b/src/epdg_diameter_swx.erl
index a2a040c..5c2ebca 100644
--- a/src/epdg_diameter_swx.erl
+++ b/src/epdg_diameter_swx.erl
@@ -79,9 +79,9 @@
 %% supporting multiple Diameter applications may or may not want to
 %% configure a common callback module on all applications.
 -define(SERVICE,
-        [{'Origin-Host', application:get_env(?ENV_APP_NAME, origin_host, ?ENV_DEFAULT_ORIG_HOST)},
-         {'Origin-Realm', application:get_env(?ENV_APP_NAME, origin_realm, ?ENV_DEFAULT_ORIG_REALM)},
-         {'Vendor-Id', application:get_env(?ENV_APP_NAME, vendor_id, ?ENV_DEFAULT_VENDOR_ID)},
+        [{'Origin-Host', application:get_env(?ENV_APP_NAME, dia_swx_origin_host, ?ENV_DEFAULT_ORIG_HOST)},
+         {'Origin-Realm', application:get_env(?ENV_APP_NAME, dia_swx_origin_realm, ?ENV_DEFAULT_ORIG_REALM)},
+         {'Vendor-Id', application:get_env(?ENV_APP_NAME, dia_swx_vendor_id, ?ENV_DEFAULT_VENDOR_ID)},
          {'Vendor-Specific-Application-Id',
                 [#'diameter_base_Vendor-Specific-Application-Id'{
                  'Vendor-Id'           = ?VENDOR_ID_3GPP,
@@ -121,12 +121,12 @@
     ok.
 
 init(State) ->
-    Proto = application:get_env(?ENV_APP_NAME, diameter_proto, ?ENV_DEFAULT_DIAMETER_PROTO),
-    Ip = application:get_env(?ENV_APP_NAME, diameter_remote_ip, ?ENV_DEFAULT_DIAMETER_REMOTE_IP),
-    Port = application:get_env(?ENV_APP_NAME, diameter_remote_port, ?ENV_DEFAULT_DIAMETER_REMOTE_PORT),
-    ConnectTimer = application:get_env(?ENV_APP_NAME, diameter_connect_timer, ?ENV_DEFAULT_DIAMETER_CONNECT_TIMER_MS),
-    WatchdogTimer = application:get_env(?ENV_APP_NAME, diameter_watchdog_timer, ?ENV_DEFAULT_DIAMETER_WATCHDOG_TIMER_MS),
-    WatchdogConfig = application:get_env(?ENV_APP_NAME, diameter_watchdog_config, ?ENV_DEFAULT_DIAMETER_WATCHDOG_CFG),
+    Proto = application:get_env(?ENV_APP_NAME, dia_swx_proto, ?ENV_DEFAULT_DIAMETER_PROTO),
+    Ip = application:get_env(?ENV_APP_NAME, dia_swx_remote_ip, ?ENV_DEFAULT_DIAMETER_REMOTE_IP),
+    Port = application:get_env(?ENV_APP_NAME, dia_swx_remote_port, ?ENV_DEFAULT_DIAMETER_REMOTE_PORT),
+    ConnectTimer = application:get_env(?ENV_APP_NAME, dia_swx_connect_timer, ?ENV_DEFAULT_DIAMETER_CONNECT_TIMER_MS),
+    WatchdogTimer = application:get_env(?ENV_APP_NAME, dia_swx_watchdog_timer, ?ENV_DEFAULT_DIAMETER_WATCHDOG_TIMER_MS),
+    WatchdogConfig = application:get_env(?ENV_APP_NAME, dia_swx_watchdog_config, ?ENV_DEFAULT_DIAMETER_WATCHDOG_CFG),
     ok = diameter:start_service(?MODULE, ?SERVICE),
     % lager:info("DiaServices is ~p~n", [DiaServ]),
     {ok, _} = connect({address, Proto, Ip, Port}, {timer, ConnectTimer, WatchdogTimer, WatchdogConfig}),

