add global node_id config setting and use it in PFCP

README.md

@@ -302,6 +302,7 @@ Then fill just created **ergw.config** file with content like described below pr
            {ip, {0,0,0,0}}
           ]},
 
+         {node_id, <<"pgw.$ORIGIN">>},
          {sockets,
           [{cp, [{type, 'gtp-u'},
              {vrf, cp},
@@ -314,9 +315,7 @@ Then fill just created **ergw.config** file with content like described below pr
                   {ip,  {127,0,0,1}},
                   {reuseaddr, true}
                  ]},
-           {sx, [{node, 'ergw'},
-                 {name, 'ergw'},
-                 {type, 'pfcp'},
+           {sx, [{type, 'pfcp'},
                  {socket, cp},
                  {ip,  {172,21,16,2}}
            ]}

config/ergw-c-node.config

@@ -4,6 +4,7 @@
 	  [{"ORIGIN", {value, "epc.mnc001.mcc001.3gppnetwork.org"}}]},
 
 	 {plmn_id, {<<"001">>, <<"01">>}},
+	 {node_id, <<"pgw.$ORIGIN">>},
 
 	 {sockets,
 	  [{cp, [{type, 'gtp-u'},

doc/walkthrough-saegw.config

@@ -23,6 +23,7 @@
 	   {ip, {0,0,0,0}}
 	  ]},
 
+	 {node_id, <<"saegw">>},
 	 {sockets,
 	   [{cp, [{type, 'gtp-u'},
 	      {vrf, cp},
@@ -34,9 +35,7 @@
 		  {ip,  {172,20,16,1}},
 		  {netdev, "vrf-irx"}
 		 ]},
-	   {sx, [{node, 'ergw'},
-	      {name, 'ergw'},
-	      {type, 'pfcp'},
+	   {sx, [{type, 'pfcp'},
 	      {socket, cp},
 	      {ip,  {172,21,16,2}}
 	   ]}

doc/walkthrough-saegw.md

@@ -125,6 +125,7 @@ erGW Installation
                   {ip, {0,0,0,0}}
                  ]},
 
+                {node_id, <<"saegw">>},
                 {sockets,
                  [{cp, [{type, 'gtp-u'},
                     {vrf, cp},
@@ -136,9 +137,7 @@ erGW Installation
                          {ip,  {172,20,16,1}},
                          {netdev, "vrf-irx"}
                         ]},
-                        {sx, [{node, 'ergw'},
-                           {name, 'ergw'},
-                           {type, 'pfcp'},
+                        {sx, [{type, 'pfcp'},
                            {socket, cp},
                            {ip,  {172,21,16,2}}
                         ]}

priv/dev.config

@@ -28,6 +28,7 @@
 	  [{port, 8080},
 	   {ip, {0,0,0,0}}
 	  ]},
+	 {node_id, <<"pgw.$ORIGIN">>},
 	 {sockets,
 	  [{cp, [{type, 'gtp-u'},
 		 {ip, {127,0,0,1}},
@@ -39,8 +40,6 @@
 		  {reuseaddr, true}
 		 ]},
 	   {sx, [
-	      {node, 'ergw'},
-	      {name, 'ergw'},
 	      {type, 'pfcp'},
 	      {socket, cp},
 	      {ip,  {0,0,0,0}},

priv/static/specs/http_api_spec.yaml

@@ -81,6 +81,9 @@ definitions:
       acceptNewRequests:
         type: "boolean"
         default: true
+      nodeId:
+        $ref:
+          "#/definitions/Fqdn"
       plmnId:
         $ref:
           "#/definitions/PLMN"
@@ -107,3 +110,6 @@ definitions:
     properties:
       version:
         type: "string"
+  Fqdn:
+    description: Fully Qualified Domain Name
+    type: "string"

src/ergw.erl

@@ -16,7 +16,7 @@
 	 attach_tdf/2, attach_protocol/5]).
 -export([handler/2]).
 -export([load_config/1]).
--export([get_plmn_id/0, get_accept_new/0]).
+-export([get_plmn_id/0, get_node_id/0, get_accept_new/0]).
 -export([system_info/0, system_info/1, system_info/2]).
 -export([i/0, i/1, i/2]).
 
@@ -45,15 +45,20 @@ start_link() ->
 get_plmn_id() ->
     [{config, plmn_id, MCC, MNC}] = ets:lookup(?SERVER, plmn_id),
     {MCC, MNC}.
+get_node_id() ->
+    {ok, Id} = application:get_env(ergw, node_id),
+    Id.
 get_accept_new() ->
     [{config, accept_new, Value}] = ets:lookup(?SERVER, accept_new),
     Value.
 
 system_info() ->
-    [{K,system_info(K)} || K <- [plmn_id, accept_new]].
+    [{K,system_info(K)} || K <- [plmn_id, node_id, accept_new]].
 
 system_info(accept_new) ->
     get_accept_new();
+system_info(node_id) ->
+    get_node_id();
 system_info(plmn_id) ->
     get_plmn_id();
 system_info(Arg) ->
@@ -82,7 +87,8 @@ load_config([{Key, Value} | T])
        Key =:= apns;
        Key =:= charging;
        Key =:= proxy_map;
-       Key =:= teid ->
+       Key =:= teid;
+       Key =:= node_id ->
     ok = application:set_env(ergw, Key, Value),
     load_config(T);
 load_config([_ | T]) ->

src/ergw_config.erl

@@ -24,6 +24,7 @@
 -endif.
 
 -define(DefaultOptions, [{plmn_id, {<<"001">>, <<"01">>}},
+			 {node_id, undefined},
 			 {teid, {0, 0}},
 			 {accept_new, true},
 			 {sockets, []},
@@ -204,6 +205,10 @@ validate_option(plmn_id, {MCC, MNC} = Value) ->
        ok -> Value;
        _  -> throw({error, {options, {plmn_id, Value}}})
     end;
+validate_option(node_id, Value) when is_binary(Value) ->
+    Value;
+validate_option(node_id, Value) when is_list(Value) ->
+    iolist_to_binary(Value);
 validate_option(accept_new, Value) when is_boolean(Value) ->
     Value;
 validate_option(sockets, Value) when ?is_opts(Value) ->
@@ -241,6 +246,7 @@ validate_option(teid, Value) ->
     ergw_tei_mngr:validate_option(Value);
 validate_option(Opt, Value)
   when Opt == plmn_id;
+       Opt == node_id;
        Opt == accept_new;
        Opt == sockets;
        Opt == handlers;

src/ergw_sx_node.erl

@@ -595,7 +595,7 @@ put_ie(IE, _IEs) ->
     [IE].
 
 put_node_id(R = #pfcp{ie = IEs}, #data{cp = #node{node = Node}}) ->
-    NodeId = #node_id{id = string:split(atom_to_binary(Node, utf8), ".", all)},
+    NodeId = #node_id{id = string:split(Node, ".", all)},
     R#pfcp{ie = put_ie(NodeId, IEs)}.
 
 put_build_id(R = #pfcp{ie = IEs}) ->

src/ergw_sx_socket.erl

@@ -28,7 +28,7 @@
 
 -record(state, {
 	  name,
-	  node,
+	  node           :: binary(),
 	  send_socket    :: socket:socket(),
 	  recv_socket    :: socket:socket(),
 	  burst_size = 1 :: non_neg_integer(),
@@ -105,8 +105,7 @@ seid() ->
 %%%===================================================================
 
 -define(SOCKET_OPTS, [netdev, netns, freebind, reuseaddr, rcvbuf]).
--define(SocketDefaults, [{node, "invalid"},
-			 {socket, "invalid"},
+-define(SocketDefaults, [{socket, "invalid"},
 			 {ip, invalid},
 			 {burst_size, 10}]).
 
@@ -116,7 +115,8 @@ validate_options(Name, Values) ->
 
 validate_option(type, pfcp = Value) ->
     Value;
-validate_option(node, Value) when is_atom(Value) ->
+validate_option(node, Value) ->
+    ?LOG(warning, "depreciated config key 'node' in Sx socket configuration"),
     Value;
 validate_option(name, Value) when is_atom(Value) ->
     Value;
@@ -152,8 +152,7 @@ validate_option(Opt, Value) ->
 %%% gen_server callbacks
 %%%===================================================================
 
-init(#{name := Name, node := Node, ip := IP,
-       socket := GtpSocketName, burst_size := BurstSize} = Opts) ->
+init(#{name := Name, ip := IP, socket := GtpSocketName, burst_size := BurstSize} = Opts) ->
     process_flag(trap_exit, true),
 
     SocketOpts = maps:with(?SOCKET_OPTS, Opts),
@@ -171,7 +170,7 @@ init(#{name := Name, node := Node, ip := IP,
 	       send_socket = SendSocket,
 	       recv_socket = RecvSocket,
 	       name = Name,
-	       node = Node,
+	       node = ergw:get_node_id(),
 	       burst_size = BurstSize,
 	       gtp_socket = GtpSocket,
 	       gtp_info = GtpSockInfo,

src/http_api_handler.erl

@@ -17,9 +17,6 @@
 %% cowboy handler methods, used in routes
 -ignore_xref([handle_request_json/2, handle_request_text/2]).
 
--define(FIELDS_MAPPING, [{accept_new, 'acceptNewRequests'},
-			 {plmn_id, 'plmnId'}]).
-
 init(Req, Opts) ->
     {cowboy_rest, Req, Opts}.
 
@@ -55,19 +52,19 @@ handle_request(<<"GET">>, <<"/api/v1/version">>, json, Req, State) ->
     {Response, Req, State};
 
 handle_request(<<"GET">>, <<"/api/v1/status">>, json, Req, State) ->
-    Response = ergw:system_info(),
-    MappedResponse = lists:map(fun({Key, Value}) ->
-					  {_, K} = lists:keyfind(Key, 1, ?FIELDS_MAPPING),
-					  {K, Value}
-			       end, Response),
-    ResponseMap = maps:from_list(MappedResponse),
-    Result = case maps:find('plmnId', ResponseMap) of
-        {ok, {Mcc, Mnc}} ->
-            maps:update('plmnId', [{mcc, Mcc}, {mnc, Mnc}], ResponseMap);
-        _ ->
-            ResponseMap
-    end,
-    {jsx:encode(Result), Req, State};
+    FieldMap = #{accept_new => 'acceptNewRequests',
+		 node_id    => 'nodeId'},
+    Response =
+	lists:foldl(
+	  fun({plmn_id, {MCC, MNC}}, M) ->
+		  M#{'plmnId' => [{mcc, MCC}, {mnc, MNC}]};
+	     ({Key, Value}, M)
+		when is_map_key(Key, FieldMap) ->
+		  M#{maps:get(Key, FieldMap) => Value};
+	     (_, M) ->
+		  M
+	  end, #{}, ergw:system_info()),
+    {jsx:encode(Response), Req, State};
 
 handle_request(<<"GET">>, <<"/api/v1/status/accept-new">>, json, Req, State) ->
     AcceptNew = ergw:system_info(accept_new),

test/bench_SUITE.erl

@@ -71,6 +71,7 @@
 
 	 {ergw, [{'$setup_vars',
 		  [{"ORIGIN", {value, "epc.mnc001.mcc001.3gppnetwork.org"}}]},
+		 {node_id, <<"PGW">>},
 		 {sockets,
 		  [{'cp-socket',
 			[{type, 'gtp-u'},
@@ -86,8 +87,6 @@
 			 ]},
 
 		   {sx, [{type, 'pfcp'},
-			 {node, 'ergw'},
-			 {name, 'ergw'},
 			 {socket, cp},
 			 {ip, ?MUST_BE_UPDATED},
 			 {reuseaddr, true}