March 2026 - gerrit-log - lists.osmocom.org

[XS] Change in ...osmo-s1gw[master]: pfcp_peer: define ?PFCP_ASSOC_SETUP_TIMEOUT
by fixeria 18 Mar '26

18 Mar '26

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42426?usp=email ) Change subject: pfcp_peer: define ?PFCP_ASSOC_SETUP_TIMEOUT ...................................................................... pfcp_peer: define ?PFCP_ASSOC_SETUP_TIMEOUT Change-Id: I0b7299d9f3eaa8c0a3c7e4a4d6331d1ec5a1c779 --- M src/pfcp_peer.erl 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/26/42426/1 diff --git a/src/pfcp_peer.erl b/src/pfcp_peer.erl index 9910f5f..6308f50 100644 --- a/src/pfcp_peer.erl +++ b/src/pfcp_peer.erl @@ -59,6 +59,7 @@ -define(PFCP_PORT, 8805). -define(PFCP_SEQ_NR_MAX, 16#ffffff). -define(PFCP_SEID_MAX, 16#ffffffffffffffff). +-define(PFCP_ASSOC_SETUP_TIMEOUT, 2000). -define(PFCP_HEARTBEAT_REQ_TIMEOUT, 2000). -type pfcp_session_rsp() :: ok | {error, term()}. @@ -196,7 +197,7 @@ s1gw_metrics:gauge_set(?S1GW_GAUGE_PFCP_ASSOCIATED, 0), %% Tx PFCP Association Setup {ok, S1} = send_assoc_setup(S0), - {keep_state, S1, [{state_timeout, 2_000, assoc_setup_timeout}]}; + {keep_state, S1, [{state_timeout, ?PFCP_ASSOC_SETUP_TIMEOUT, assoc_setup_timeout}]}; %% Handle Association Setup timeout connecting(state_timeout, assoc_setup_timeout, S) -> -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42426?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I0b7299d9f3eaa8c0a3c7e4a4d6331d1ec5a1c779 Gerrit-Change-Number: 42426 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in ...osmo-s1gw[master]: enb_proxy: signal mme_info() to the enb_registry
by fixeria 18 Mar '26

18 Mar '26

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42427?usp=email ) Change subject: enb_proxy: signal mme_info() to the enb_registry ...................................................................... enb_proxy: signal mme_info() to the enb_registry When an MME is selected from the pool, pass the mme_registry:mme_info() to the enb_registry via notify_mme_connecting/2 (replacing /1). This makes all MME configuration details (name, address, port, TAC list) available to consumers such as the REST server, without having to look them up separately from the mme_registry. Change-Id: I22e705b8196c9dcf436ed3c4d91c5c5a912e7282 Related: SYS#7052 --- M src/enb_proxy.erl M src/enb_registry.erl M src/rest_server.erl 3 files changed, 29 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/27/42427/1 diff --git a/src/enb_proxy.erl b/src/enb_proxy.erl index 1d479d6..f2c0cbf 100644 --- a/src/enb_proxy.erl +++ b/src/enb_proxy.erl @@ -58,12 +58,10 @@ -include("S1AP-Constants.hrl"). -%% XXX: replace/merge with mme_registry:mme_info()? -type conn_info() :: #{handler := pid(), - mme_addr := inet:ip_address(), - mme_port := inet:port_number(), enb_aid := gen_sctp:assoc_id(), mme_aid => gen_sctp:assoc_id() + %% TODO: add mme_saddr / mme_sport }. -record(state, {enb_aid :: gen_sctp:assoc_id(), @@ -206,7 +204,7 @@ rport => maps:get(rport, MmeInfo), sockopts => MmeSockOpts}, {ok, Sock} = sctp_client:connect(MmeConnCfg), - enb_registry:notify_mme_connecting(S#state.enb_handle), + enb_registry:notify_mme_connecting(S#state.enb_handle, MmeInfo), {next_state, ?FUNCTION_NAME, %% loop transition to enable state_timeout S#state{sock = Sock, mme_aid = undefined, @@ -469,10 +467,8 @@ -spec conn_info(state()) -> conn_info(). -conn_info(#state{mme_conn_cfg = MmeConnCfg} = S) -> +conn_info(S) -> Info = #{handler => S#state.handler, - mme_addr => maps:get(raddr, MmeConnCfg), - mme_port => maps:get(rport, MmeConnCfg), enb_aid => S#state.enb_aid, mme_aid => S#state.mme_aid}, maps:filter(fun(_K, V) -> V =/= undefined end, Info). diff --git a/src/enb_registry.erl b/src/enb_registry.erl index 61f0c59..0ad20ba 100644 --- a/src/enb_registry.erl +++ b/src/enb_registry.erl @@ -45,7 +45,7 @@ enb_unregister/1, notify_enb_connected/2, notify_genb_id/2, - notify_mme_connecting/1, + notify_mme_connecting/2, notify_mme_wait_rsp/1, notify_mme_connected/2, fetch_enb_info/1, @@ -66,6 +66,7 @@ -type enb_prop() :: {state, atom()} | {enb_conn_info, sctp_server:conn_info()} | {mme_conn_info, undefined | enb_proxy:conn_info()} + | {mme_info, mme_registry:mme_info()} | {genb_id, s1ap_utils:genb_id()}. -type enb_proplist() :: [enb_prop()]. @@ -84,7 +85,8 @@ genb_id => s1ap_utils:genb_id(), %% Global-eNB-ID genb_id_str => string(), %% Global-eNB-ID string enb_conn_info => sctp_server:conn_info(), %% eNB -> S1GW connection info - mme_conn_info => enb_proxy:conn_info() %% S1GW -> MME connection info + mme_conn_info => enb_proxy:conn_info(), %% S1GW -> MME connection info + mme_info => mme_registry:mme_info() %% selected MME configuration }. -record(state, {enbs :: #{enb_handle() => enb_info()}, @@ -127,10 +129,10 @@ enb_update(Handle, [{genb_id, GENBId}]). -%% MME connection attempt in progress; clears any stale mme_conn_info --spec notify_mme_connecting(enb_handle()) -> ok. -notify_mme_connecting(Handle) -> - enb_update(Handle, [{state, connecting}, {mme_conn_info, undefined}]). +%% MME connection attempt in progress; stores selected MME info, clears any stale mme_conn_info +-spec notify_mme_connecting(enb_handle(), mme_registry:mme_info()) -> ok. +notify_mme_connecting(Handle, MmeInfo) -> + enb_update(Handle, [{state, connecting}, {mme_info, MmeInfo}, {mme_conn_info, undefined}]). %% MME SCTP link established; S1 SETUP REQUEST forwarded, awaiting response @@ -342,6 +344,9 @@ enb_update_prop({mme_conn_info, ConnInfo}, EnbInfo) -> EnbInfo#{mme_conn_info => ConnInfo}; +enb_update_prop({mme_info, MmeInfo}, EnbInfo) -> + EnbInfo#{mme_info => MmeInfo}; + enb_update_prop({genb_id, GENBId}, EnbInfo) -> GlobalENBId = s1ap_utils:genb_id_str(GENBId), enb_metrics_register(GlobalENBId), @@ -374,8 +379,8 @@ enb_filter_by_sub_field({enb_conn_info, port, Port}, Item) end; enb_filter({mme_addr_port, {Addr, Port}}) -> - fun(_, Item) -> enb_filter_by_sub_field({mme_conn_info, mme_addr, Addr}, Item) andalso - enb_filter_by_sub_field({mme_conn_info, mme_port, Port}, Item) end; + fun(_, Item) -> enb_filter_by_sub_field({mme_info, raddr, Addr}, Item) andalso + enb_filter_by_sub_field({mme_info, rport, Port}, Item) end; enb_filter(Filter) -> ?LOG_ERROR("Unknown eNB filter: ~p", [Filter]), diff --git a/src/rest_server.erl b/src/rest_server.erl index 79090e8..e515445 100644 --- a/src/rest_server.erl +++ b/src/rest_server.erl @@ -328,7 +328,8 @@ M1 = enb_item_add_enb_info(M0, EnbInfo), M2 = enb_item_add_enb_conn_info(M1, EnbInfo), M3 = enb_item_add_mme_conn_info(M2, EnbInfo), - rsp_map(M3). + M4 = enb_item_add_mme_info(M3, EnbInfo), + rsp_map(M4). -spec enb_item_add_enb_info(map(), enb_registry:enb_info()) -> map(). @@ -353,16 +354,23 @@ enb_item_add_mme_conn_info(M0, #{mme_conn_info := ConnInfo}) -> Pid = maps:get(handler, ConnInfo), ERABs = s1ap_proxy:fetch_erab_list(Pid), - M0#{mme_daddr => maps:get(mme_addr, ConnInfo), %% XXX inet:ntoa - mme_dport => maps:get(mme_port, ConnInfo), - %% TODO: mme_sport - mme_sctp_aid => maps:get(mme_aid, ConnInfo), + %% TODO: mme_sport (source port) is not yet available in conn_info() + M0#{mme_sctp_aid => maps:get(mme_aid, ConnInfo), erab_count => length(ERABs) }; enb_item_add_mme_conn_info(M0, _) -> M0. +-spec enb_item_add_mme_info(map(), enb_registry:enb_info()) -> map(). +enb_item_add_mme_info(M0, #{mme_info := MmeInfo}) -> + M0#{mme_daddr => inet:ntoa(maps:get(raddr, MmeInfo)), + mme_dport => maps:get(rport, MmeInfo) + }; + +enb_item_add_mme_info(M0, _) -> M0. + + -spec fetch_enb_info(binary()) -> [enb_registry:enb_info()] | error. fetch_enb_info(<< "handle:", Val/bytes >>) -> Handle = binary_to_integer(Val), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42427?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I22e705b8196c9dcf436ed3c4d91c5c5a912e7282 Gerrit-Change-Number: 42427 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[L] Change in ...osmo-s1gw[master]: [REST] Add GET /config endpoint (ConfigRead)
by fixeria 18 Mar '26

18 Mar '26

Attention is currently required from: fixeria, osmith, pespin. Hello Jenkins Builder, osmith, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42416?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by osmith, Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: [REST] Add GET /config endpoint (ConfigRead) ...................................................................... [REST] Add GET /config endpoint (ConfigRead) This endpoint returns the effective runtime configuration that OsmoS1GW is currently using, with all defaults applied. This reflects the values read via `osmo_s1gw:get_env/2` at startup. Change-Id: Ic6c9562a541e4a0728257538887537aac6b99b97 Related: SYS#7066 --- M contrib/openapi.yaml M contrib/osmo-s1gw-cli.py M doc/manuals/chapters/cli.adoc M doc/manuals/chapters/rest.adoc A include/osmo_s1gw.hrl M priv/openapi.json M src/osmo_s1gw_sup.erl M src/rest_server.erl 8 files changed, 472 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/16/42416/3 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42416?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ic6c9562a541e4a0728257538887537aac6b99b97 Gerrit-Change-Number: 42416 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in ...osmo-s1gw[master]: enb_proxy: obtain sctp_client sockopts from the env directly
by fixeria 18 Mar '26

18 Mar '26

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42428?usp=email ) Change subject: enb_proxy: obtain sctp_client sockopts from the env directly ...................................................................... enb_proxy: obtain sctp_client sockopts from the env directly Instead of passing the MmeConnCfg (sctp_client:cfg()) all the way from osmo_s1gw_sup through sctp_server (as priv) into enb_proxy (as state), read the sctp_client configuration in-place via osmo_s1gw:get_env/2 when it is actually needed (connecting/enter). This works because osmo_s1gw_sup already normalizes and writes back the complete sctp_client config to the application env (set_env/2) before starting the supervision tree. As a result, mme_conn_cfg is removed from enb_proxy's state record, start_link/2 no longer uses its Priv argument, and server_cfg/1 is simplified to server_cfg/0. Change-Id: Ic77d3eb3351c8981c87fa4b6febcdeb814b9187b --- M src/enb_proxy.erl M src/osmo_s1gw_sup.erl 2 files changed, 9 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/28/42428/1 diff --git a/src/enb_proxy.erl b/src/enb_proxy.erl index f2c0cbf..c76ac42 100644 --- a/src/enb_proxy.erl +++ b/src/enb_proxy.erl @@ -67,7 +67,6 @@ -record(state, {enb_aid :: gen_sctp:assoc_id(), mme_aid :: undefined | gen_sctp:assoc_id(), enb_conn_info :: sctp_server:conn_info(), - mme_conn_cfg :: sctp_client:cfg(), s1setup_req :: undefined | binary(), tried_mmes :: [mme_registry:mme_name()], enb_tacs :: undefined | [s1ap_utils:tac()], @@ -88,10 +87,10 @@ -spec start_link(ConnInfo, Priv) -> Result when ConnInfo :: sctp_server:conn_info(), - Priv :: sctp_client:cfg(), + Priv :: term(), Result :: gen_statem:start_ret(). -start_link(ConnInfo, Priv) -> - gen_statem:start_link(?MODULE, [ConnInfo, Priv], []). +start_link(ConnInfo, _Priv) -> + gen_statem:start_link(?MODULE, [ConnInfo], []). -spec send_data(pid(), binary()) -> ok. @@ -113,13 +112,12 @@ %% gen_statem API %% ------------------------------------------------------------------ -init([EnbConnInfo, MmeConnCfg]) -> +init([EnbConnInfo]) -> {ok, EnbHandle} = enb_registry:enb_register(), {ok, Pid} = s1ap_proxy:start_link(self()), {ok, wait_s1setup_req, #state{enb_aid = maps:get(aid, EnbConnInfo), enb_conn_info = EnbConnInfo, - mme_conn_cfg = MmeConnCfg, enb_handle = EnbHandle, tried_mmes = [], handler = Pid}}. @@ -198,7 +196,7 @@ %% Close the old connection, if any close_sock(S), %% Initiate connection establishment with the MME - MmeSockOpts = maps:get(sockopts, S#state.mme_conn_cfg), + MmeSockOpts = maps:get(sockopts, osmo_s1gw:get_env(sctp_client, #{})), MmeConnCfg = #{laddr => maps:get(laddr, MmeInfo), raddr => maps:get(raddr, MmeInfo), rport => maps:get(rport, MmeInfo), @@ -208,7 +206,6 @@ {next_state, ?FUNCTION_NAME, %% loop transition to enable state_timeout S#state{sock = Sock, mme_aid = undefined, - mme_conn_cfg = MmeConnCfg, tried_mmes = [MmeName | TriedMMEs]}, [{state_timeout, 2_000, conn_est_timeout}]}; error -> diff --git a/src/osmo_s1gw_sup.erl b/src/osmo_s1gw_sup.erl index 875e19b..447dfc4 100644 --- a/src/osmo_s1gw_sup.erl +++ b/src/osmo_s1gw_sup.erl @@ -67,7 +67,7 @@ PfcpRemAddr = osmo_s1gw:get_env(pfcp_rem_addr, ?ENV_DEFAULT_PFCP_REM_ADDR), ClientCfg = client_cfg(), - ServerCfg = server_cfg(ClientCfg), + ServerCfg = server_cfg(), %% Set a complete 'sctp_client' section with all fields populated. %% This may be used by mme_registry:mme_list_from_sctp_client/0 @@ -144,8 +144,8 @@ sockopts => sctp_common:gen_sockopts(SockOpts)}. --spec server_cfg(term()) -> sctp_server:cfg(). -server_cfg(Priv) -> +-spec server_cfg() -> sctp_server:cfg(). +server_cfg() -> %% parse old/legacy environment options, if any DefCfg = parse_env_map(#{laddr => s1gw_bind_addr, lport => s1gw_bind_port}), @@ -159,7 +159,7 @@ lport => maps:get(lport, Cfg, ?ENV_DEFAULT_S1GW_BIND_PORT), sockopts => sctp_common:gen_sockopts(SockOpts), handler => enb_proxy, - priv => Priv}. + priv => undefined}. -spec gtpu_kpi_cfg() -> gtpu_kpi:cfg(). -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42428?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ic77d3eb3351c8981c87fa4b6febcdeb814b9187b Gerrit-Change-Number: 42428 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[M] Change in ...osmo-s1gw[master]: [REST] Implement PfcpAssoc{Setup,Release}
by fixeria 18 Mar '26

18 Mar '26

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42430?usp=email ) Change subject: [REST] Implement PfcpAssoc{Setup,Release} ...................................................................... [REST] Implement PfcpAssoc{Setup,Release} Change-Id: I2e24544563e4c4d23bb3d8a4a7b5434191b482d8 Related: SYS#7066 --- M contrib/osmo-s1gw-cli.py M doc/manuals/chapters/cli.adoc M src/pfcp_peer.erl M src/rest_server.erl 4 files changed, 65 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/30/42430/1 diff --git a/contrib/osmo-s1gw-cli.py b/contrib/osmo-s1gw-cli.py index 50b545d..5d60e16 100755 --- a/contrib/osmo-s1gw-cli.py +++ b/contrib/osmo-s1gw-cli.py @@ -250,12 +250,16 @@ @cmd2.with_category(CAT_PFCP) def do_pfcp_assoc_setup(self, opts) -> None: ''' Initiate the PFCP Association Setup procedure ''' - raise NotImplementedError + data = self.iface.pfcp_assoc_setup() + if not data['success']: + self.perror('PFCP Association Setup request failed: {message}'.format(**data)) @cmd2.with_category(CAT_PFCP) def do_pfcp_assoc_release(self, opts) -> None: ''' Initiate the PFCP Association Release procedure ''' - raise NotImplementedError + data = self.iface.pfcp_assoc_release() + if not data['success']: + self.perror('PFCP Association Release request failed: {message}'.format(**data)) @cmd2.with_category(CAT_PFCP) def do_pfcp_heartbeat(self, opts) -> None: diff --git a/doc/manuals/chapters/cli.adoc b/doc/manuals/chapters/cli.adoc index 1b677f5..52fe54b 100644 --- a/doc/manuals/chapters/cli.adoc +++ b/doc/manuals/chapters/cli.adoc @@ -150,6 +150,14 @@ | Remote Recovery TimeStamp | 3965211123 | ---- +==== `pfcp_assoc_setup` + +Initiate the PFCP Association Setup procedure. + +==== `pfcp_assoc_release` + +Initiate the PFCP Association Release procedure. + ==== `pfcp_heartbeat` Send a PFCP Heartbeat Request to the UPF and display the result. diff --git a/src/pfcp_peer.erl b/src/pfcp_peer.erl index 6308f50..aee679a 100644 --- a/src/pfcp_peer.erl +++ b/src/pfcp_peer.erl @@ -42,6 +42,8 @@ code_change/4, terminate/3]). -export([start_link/2, + assoc_setup/0, + assoc_release/0, seid_alloc/0, heartbeat_req/0, heartbeat_req/1, @@ -115,6 +117,18 @@ []). +%% Initiate the PFCP Association Setup procedure +-spec assoc_setup() -> ok | {error, term()}. +assoc_setup() -> + gen_statem:call(?MODULE, ?FUNCTION_NAME). + + +%% Initiate the PFCP Association Release procedure +-spec assoc_release() -> ok | {error, term()}. +assoc_release() -> + gen_statem:call(?MODULE, ?FUNCTION_NAME). + + %% Request to allocate a unique SEID -spec seid_alloc() -> {ok, pfcp_seid()} | {error, term()}. @@ -240,6 +254,13 @@ {keep_state, S0} end; +connecting({call, From}, assoc_setup, S) -> + %% Force retransmission of the PFCP Association Setup Request + {repeat_state, S, [{reply, From, ok}]}; + +connecting({call, From}, assoc_release, _S) -> + {keep_state_and_data, [{reply, From, {error, not_connected}}]}; + connecting(Event, EventData, S) -> handle_event(?FUNCTION_NAME, Event, EventData, S). @@ -288,6 +309,14 @@ {keep_state, S0} end; +connected({call, From}, assoc_setup, _S) -> + {keep_state_and_data, [{reply, From, {error, already_connected}}]}; + +connected({call, From}, assoc_release, S) -> + send_assoc_release(S), + {next_state, connecting, S#peer_state{rem_rts = undefined}, + [{reply, From, ok}]}; + %% Catch-all handler for this state connected(Event, EventData, S) -> handle_event(?FUNCTION_NAME, Event, EventData, S). diff --git a/src/rest_server.erl b/src/rest_server.erl index f6eee94..b326852 100644 --- a/src/rest_server.erl +++ b/src/rest_server.erl @@ -37,6 +37,8 @@ -export([config_read/1, metrics_list/1, pfcp_assoc_state/1, + pfcp_assoc_setup/1, + pfcp_assoc_release/1, pfcp_heartbeat/1, mme_list/1, mme_add/1, @@ -97,8 +99,26 @@ Info2 = maps:update_with(raddr, fun inet:ntoa/1, Info1), {200, [], rsp_map(Info2)}. -%% TODO: PfcpAssocSetup :: Initiate the PFCP Association Setup procedure -%% TODO: PfcpAssocRelease :: Initiate the PFCP Association Release procedure +%% PfcpAssocSetup :: Initiate the PFCP Association Setup procedure +pfcp_assoc_setup(#{}) -> + case pfcp_peer:assoc_setup() of + ok -> + {200, [], rsp_map(#{success => true})}; + {error, Error} -> + {200, [], rsp_map(#{success => false, + message => Error})} + end. + + +%% PfcpAssocRelease :: Initiate the PFCP Association Release procedure +pfcp_assoc_release(#{}) -> + case pfcp_peer:assoc_release() of + ok -> + {200, [], rsp_map(#{success => true})}; + {error, Error} -> + {200, [], rsp_map(#{success => false, + message => Error})} + end. %% PfcpHeartbeat :: Send a PFCP Heartbeat Request to the peer -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42430?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I2e24544563e4c4d23bb3d8a4a7b5434191b482d8 Gerrit-Change-Number: 42430 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[M] Change in ...osmo-s1gw[master]: [REST] Implement eNB/MME selection by addr-port
by fixeria 18 Mar '26

18 Mar '26

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42429?usp=email ) Change subject: [REST] Implement eNB/MME selection by addr-port ...................................................................... [REST] Implement eNB/MME selection by addr-port Change-Id: If02c8de1e1b7214bba868eee35233a79d0704dc5 Related: SYS#7066 --- M contrib/osmo-s1gw-cli.py M doc/manuals/chapters/cli.adoc M src/rest_server.erl 3 files changed, 94 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/29/42429/1 diff --git a/contrib/osmo-s1gw-cli.py b/contrib/osmo-s1gw-cli.py index 5c37bdc..50b545d 100755 --- a/contrib/osmo-s1gw-cli.py +++ b/contrib/osmo-s1gw-cli.py @@ -117,14 +117,14 @@ with self.send_post_req('mme-list', mme_info) as f: return f.status - def mme_info(self, name: str) -> RESTResponse: + def mme_info(self, mme_id: str) -> RESTResponse: ''' MmeInfo :: Get information about a specific MME ''' - with self.send_get_req(f'mme/name:{name}') as f: + with self.send_get_req(f'mme/{mme_id}') as f: return json.load(f) - def mme_delete(self, name: str) -> int: - ''' MmeInfo :: Get information about a specific MME ''' - with self.send_delete_req(f'mme/name:{name}') as f: + def mme_delete(self, mme_id: str) -> int: + ''' MmeDelete :: Delete an MME from the pool ''' + with self.send_delete_req(f'mme/{mme_id}') as f: return f.status def enb_list(self) -> RESTResponse: @@ -349,6 +349,17 @@ self.iface.mme_add(mme_info) @staticmethod + def gen_mme_id(opts) -> str: + ''' Generate the MmeId parameter value (for URL) ''' + if opts.name is not None: + return f'name:{opts.name}' + elif opts.addr is not None: + return f'addr:{opts.addr}-36412' + elif opts.addr_port is not None: + return f'addr:{opts.addr_port}' + raise ValueError # shall not happen + + @staticmethod def add_mme_id_group(parser): ''' Add argparse group for the MmeId parameter ''' mme_id_group = parser.add_argument_group('MME ID') @@ -356,7 +367,12 @@ mme_id_group.add_argument('-N', '--name', type=str, help='MME name (example: mme0)') - # TODO: address/port + mme_id_group.add_argument('-a', '--addr', + type=str, metavar='ADDR', + help='MME address (example: 192.168.1.1)') + mme_id_group.add_argument('-ap', '--addr-port', + type=str, metavar='ADDR-PORT', + help='MME address/port (example: 192.168.1.1-36412)') return mme_id_group mme_info_parser = cmd2.Cmd2ArgumentParser() @@ -366,14 +382,14 @@ @cmd2.with_category(CAT_MME) def do_mme_info(self, opts) -> None: ''' Get information about a specific MME ''' - data = self.iface.mme_info(opts.name) + data = self.iface.mme_info(self.gen_mme_id(opts)) self.mme_info_print(data) @cmd2.with_argparser(mme_info_parser) @cmd2.with_category(CAT_MME) def do_mme_delete(self, opts) -> None: ''' Delete an MME from the pool ''' - self.iface.mme_delete(opts.name) + self.iface.mme_delete(self.gen_mme_id(opts)) @staticmethod def enb_list_item(item: dict) -> dict: @@ -429,6 +445,8 @@ return f'enb-sctp-aid:{opts.enb_sctp_aid}' elif opts.mme_sctp_aid is not None: return f'mme-sctp-aid:{opts.mme_sctp_aid}' + elif opts.enb_conn is not None: + return f'enb-conn:{opts.enb_conn}' raise ValueError # shall not happen @staticmethod @@ -451,6 +469,9 @@ enb_id_group.add_argument('--mme-sctp-aid', type=int, metavar='AID', help='MME association identifier (example: 42)') + enb_id_group.add_argument('--enb-conn', + type=str, metavar='ADDR-PORT', + help='eNB connection address/port (example: 192.168.1.1-34650)') return enb_id_group enb_info_parser = cmd2.Cmd2ArgumentParser() diff --git a/doc/manuals/chapters/cli.adoc b/doc/manuals/chapters/cli.adoc index 93c7fe4..1b677f5 100644 --- a/doc/manuals/chapters/cli.adoc +++ b/doc/manuals/chapters/cli.adoc @@ -213,13 +213,16 @@ ==== `mme_info` -Show configuration details for a specific MME, selected by name. +Show configuration details for a specific MME. ---- -Usage: mme_info [-h] -N NAME +Usage: mme_info [-h] (-N NAME | -a ADDR | -ap ADDR-PORT) MME ID: - -N, --name NAME MME name (example: mme0) + -N, --name NAME MME name (example: mme0) + -a, --addr ADDR MME remote address (default port: 36412) + -ap, --addr-port ADDR-PORT + MME remote address/port (example: 192.168.1.1-36412) ---- Example: @@ -236,13 +239,16 @@ ==== `mme_delete` -Remove an MME from the pool, selected by name. +Remove an MME from the pool. ---- -Usage: mme_delete [-h] -N NAME +Usage: mme_delete [-h] (-N NAME | -a ADDR | -ap ADDR-PORT) MME ID: - -N, --name NAME MME name (example: mme0) + -N, --name NAME MME name (example: mme0) + -a, --addr ADDR MME remote address (default port: 36412) + -ap, --addr-port ADDR-PORT + MME remote address/port (example: 192.168.1.1-36412) ---- Example: @@ -282,14 +288,16 @@ ---- Usage: enb_info [-h] (-H HANDLE | -P PID | -G GENBID | - --enb-sctp-aid AID | --mme-sctp-aid AID) + --enb-sctp-aid AID | --mme-sctp-aid AID | + --enb-conn ADDR-PORT) eNB ID: - -H, --handle HANDLE eNB handle (example: 0) - -P, --pid PID eNB process ID (example: 0.33.1) - -G, --genbid GENBID Global-eNB-ID (example: 262-42-1337) - --enb-sctp-aid AID eNB SCTP association identifier - --mme-sctp-aid AID MME SCTP association identifier + -H, --handle HANDLE eNB handle (example: 0) + -P, --pid PID eNB process ID (example: 0.33.1) + -G, --genbid GENBID Global-eNB-ID (example: 262-42-1337) + --enb-sctp-aid AID eNB SCTP association identifier + --mme-sctp-aid AID MME SCTP association identifier + --enb-conn ADDR-PORT eNB connection address/port (example: 192.168.1.1-34650) ---- Example: selecting by handle. @@ -310,8 +318,8 @@ ==== `enb_delete` -Force-disconnect an eNB, terminating its SCTP connection. The same -selectors as `enb_info` are accepted. +Force-disconnect an eNB, terminating its SCTP connection. Accepts the +same selectors as `enb_info`. ==== `enb_erab_list` @@ -321,7 +329,8 @@ Usage: enb_erab_list [-h] [-f] [-S {pid,state,mme_ue_id,erab_id}] [--reverse] (-H HANDLE | -P PID | -G GENBID | - --enb-sctp-aid AID | --mme-sctp-aid AID) + --enb-sctp-aid AID | --mme-sctp-aid AID | + --enb-conn ADDR-PORT) optional arguments: -f, --full Print full table including PFCP and GTP-U F-TEID columns diff --git a/src/rest_server.erl b/src/rest_server.erl index 550da3e..f6eee94 100644 --- a/src/rest_server.erl +++ b/src/rest_server.erl @@ -272,6 +272,25 @@ <<"swagger_ui">> => osmo_s1gw:get_env(rest_srv_swagger_ui, ?ENV_DEFAULT_REST_SRV_SWAGGER_UI)}. +%% parse address/port from a string like "192.168.1.1-36412" +-spec parse_addr_port(Data) -> {ok, {Addr, Port}} | error + when Data :: binary() | string(), + Addr :: inet:ip_address(), + Port :: inet:port_number(). +parse_addr_port(Data) when is_binary(Data) -> + parse_addr_port(binary_to_list(Data)); + +parse_addr_port(Data) when is_list(Data) -> + case string:split(Data, "-") of + [AddrStr, PortStr] -> + case {inet:parse_address(AddrStr), string:to_integer(PortStr)} of + {{ok, Addr}, {Port, []}} -> {ok, {Addr, Port}}; + _ -> error + end; + _ -> error + end. + + -spec sockopts_to_map([gen_sctp:option()]) -> map(). sockopts_to_map(SockOpts) -> maps:from_list([{atom_to_binary(K), V} || {K, V} <- SockOpts]). @@ -368,7 +387,19 @@ MmeName = binary_to_list(Val), mme_registry:fetch_mme_info(MmeName); -%% TODO: '^addr:[0-9a-f:.]+-[0-9]+$' +fetch_mme_info(<< "addr:", Val/bytes >>) -> + case parse_addr_port(Val) of + {ok, {Addr, Port}} -> + Fun = fun(#{raddr := R, rport := P}) -> R =:= Addr andalso P =:= Port end, + case lists:filter(Fun, mme_registry:fetch_mme_list()) of + [MmeInfo | _] -> {ok, MmeInfo}; + [] -> error + end; + error -> + ?LOG_ERROR("Failed to parse MME addr:port from ~p", [Val]), + error + end; + fetch_mme_info(ID) -> ?LOG_ERROR("Unhandled MME ID ~p", [ID]), error. @@ -454,7 +485,15 @@ Aid = binary_to_integer(Val), enb_registry:fetch_enb_list({mme_sctp_aid, Aid}); -%% TODO: '^enb-conn:[0-9:.]+-[0-9]+$' +fetch_enb_info(<< "enb-conn:", Val/bytes >>) -> + case parse_addr_port(Val) of + {ok, AddrPort} -> + enb_registry:fetch_enb_list({enb_addr_port, AddrPort}); + error -> + ?LOG_ERROR("Failed to parse eNB addr:port from ~p", [Val]), + error + end; + fetch_enb_info(ID) -> ?LOG_ERROR("Unhandled eNB ID ~p", [ID]), error. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42429?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: If02c8de1e1b7214bba868eee35233a79d0704dc5 Gerrit-Change-Number: 42429 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in ...osmo-s1gw[master]: [REST] EnbItem: expose name of the selected MME
by fixeria 18 Mar '26

18 Mar '26

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42431?usp=email ) Change subject: [REST] EnbItem: expose name of the selected MME ...................................................................... [REST] EnbItem: expose name of the selected MME For each eNB connection, include the name of the MME that was selected from the pool. Update the OpenAPI spec, CLI (enb_list/enb_info tables), and user manual accordingly. Change-Id: I4839275efa5d3545e84d684ad1b8b989214ef76a Related: SYS#7066, SYS#7052 --- M contrib/openapi.yaml M contrib/osmo-s1gw-cli.py M doc/manuals/chapters/cli.adoc M doc/manuals/chapters/rest.adoc M priv/openapi.json M src/rest_server.erl 6 files changed, 18 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/31/42431/1 diff --git a/contrib/openapi.yaml b/contrib/openapi.yaml index c50ccce..bb6b79a 100644 --- a/contrib/openapi.yaml +++ b/contrib/openapi.yaml @@ -438,6 +438,9 @@ mme_sctp_aid: type: integer description: SCTP association identifier of the S1GW-MME connection + mme_name: + type: string + description: Human-readable identifier of the selected MME Config: type: object diff --git a/contrib/osmo-s1gw-cli.py b/contrib/osmo-s1gw-cli.py index 5d60e16..487b18c 100755 --- a/contrib/osmo-s1gw-cli.py +++ b/contrib/osmo-s1gw-cli.py @@ -407,6 +407,7 @@ 'State': item.get('state'), 'eNB addr:port (aid)': enb_addr(item) if 'enb_saddr' in item else None, 'MME addr:port (aid)': mme_addr(item) if 'mme_daddr' in item else None, + 'MME name': item.get('mme_name'), 'Uptime (s)': item.get('uptime'), '# E-RABs': item.get('erab_count'), } diff --git a/doc/manuals/chapters/cli.adoc b/doc/manuals/chapters/cli.adoc index 52fe54b..24287a1 100644 --- a/doc/manuals/chapters/cli.adoc +++ b/doc/manuals/chapters/cli.adoc @@ -282,11 +282,11 @@ ---- OsmoS1GW# enb_list -| handle | PID | Global-eNB-ID | State | eNB addr:port (aid) | MME addr:port (aid) | Uptime | E-RABs | -|----------|-----------|---------------|-----------|-------------------------|-------------------------|----------|----------| -| 0 | <0.699.0> | 001-01-0 | connected | 127.0.1.10:56767 (5706) | 127.0.2.10:36412 (5707) | 418 | 0 | -| 1 | <0.701.0> | 001-01-1 | connected | 127.0.1.10:54140 (5710) | 127.0.2.10:36412 (5711) | 33 | 3 | -| 2 | <0.703.0> | 001-01-2 | connected | 127.0.1.10:34076 (5714) | 127.0.2.10:36412 (5715) | 3600 | 20 | +| handle | PID | Global-eNB-ID | State | eNB addr:port (aid) | MME addr:port (aid) | MME name | Uptime | E-RABs | +|----------|-----------|---------------|-----------|-------------------------|-------------------------|----------|----------|----------| +| 0 | <0.699.0> | 001-01-0 | connected | 127.0.1.10:56767 (5706) | 127.0.2.10:36412 (5707) | mme0 | 418 | 0 | +| 1 | <0.701.0> | 001-01-1 | connected | 127.0.1.10:54140 (5710) | 127.0.2.10:36412 (5711) | mme0 | 33 | 3 | +| 2 | <0.703.0> | 001-01-2 | connected | 127.0.1.10:34076 (5714) | 127.0.2.10:36412 (5715) | mme0 | 3600 | 20 | ---- ==== `enb_info` @@ -320,6 +320,7 @@ | State | connected | | eNB addr:port (aid) | 127.0.1.10:57362 (5734) | | MME addr:port (aid) | 127.0.2.10:36412 (5745) | +| MME name | mme0 | | Uptime (s) | 521 | | # E-RABs | 99 | ---- diff --git a/doc/manuals/chapters/rest.adoc b/doc/manuals/chapters/rest.adoc index c907ece..7c1383b 100644 --- a/doc/manuals/chapters/rest.adoc +++ b/doc/manuals/chapters/rest.adoc @@ -258,6 +258,7 @@ "enb_saddr": "192.168.1.10", "enb_sport": 56767, "enb_sctp_aid": 5706, + "mme_name": "mme0", "mme_daddr": "192.168.2.10", "mme_dport": 36412, "mme_sport": 34500, @@ -276,6 +277,7 @@ `wait_s1setup_rsp`, or `connected`. `enb_saddr` / `enb_sport`:: Source address and port of the eNB's SCTP connection. `enb_sctp_aid`:: SCTP association ID of the eNB-S1GW connection. +`mme_name`:: Name of the selected MME (from the MME pool). `mme_daddr` / `mme_dport`:: Destination address and port of the MME. `mme_sport`:: Local source port of the S1GW-MME SCTP connection. `mme_sctp_aid`:: SCTP association ID of the S1GW-MME connection. diff --git a/priv/openapi.json b/priv/openapi.json index 8289c02..48158ca 100644 --- a/priv/openapi.json +++ b/priv/openapi.json @@ -645,6 +645,10 @@ "mme_sctp_aid": { "type": "integer", "description": "SCTP association identifier of the S1GW-MME connection" + }, + "mme_name": { + "type": "string", + "description": "Human-readable identifier of the selected MME" } } }, diff --git a/src/rest_server.erl b/src/rest_server.erl index b326852..0b384a4 100644 --- a/src/rest_server.erl +++ b/src/rest_server.erl @@ -471,7 +471,8 @@ -spec enb_item_add_mme_info(map(), enb_registry:enb_info()) -> map(). enb_item_add_mme_info(M0, #{mme_info := MmeInfo}) -> - M0#{mme_daddr => inet:ntoa(maps:get(raddr, MmeInfo)), + M0#{mme_name => maps:get(name, MmeInfo), + mme_daddr => inet:ntoa(maps:get(raddr, MmeInfo)), mme_dport => maps:get(rport, MmeInfo) }; -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42431?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I4839275efa5d3545e84d684ad1b8b989214ef76a Gerrit-Change-Number: 42431 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[L] Change in osmo-ttcn3-hacks[master]: s1gw: initial testcases for MME pooling
by fixeria 18 Mar '26

18 Mar '26

Attention is currently required from: laforge. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42358?usp=email ) Change subject: s1gw: initial testcases for MME pooling ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42358?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib8fd62e4352e3055971a669b8b363078bcd95d8d Gerrit-Change-Number: 42358 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 17 Mar 2026 21:05:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-ttcn3-hacks[master]: s1gw: add tests for MME registry REST procedures
by fixeria 18 Mar '26

18 Mar '26

fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42360?usp=email ) Change subject: s1gw: add tests for MME registry REST procedures ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42360?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I260bc987ab8ae0ecb547d0b69b261fd97c5c9c23 Gerrit-Change-Number: 42360 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 17 Mar 2026 21:05:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in ...osmo-s1gw[master]: rebar.lock: bump exometer_report_statsd version
by fixeria 18 Mar '26

18 Mar '26

Attention is currently required from: pespin. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42413?usp=email ) Change subject: rebar.lock: bump exometer_report_statsd version ...................................................................... Patch Set 2: (1 comment) File rebar.lock: https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42413/comment/5e19a2b1_6303… : PS1, Line 21: {ref,"bfd6c095bfc404e5fab5c07f5ebe0fe305e58830"}}, > yeah, or leave the "counter" one but create a new "osmocom/master" one. […] Done -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/42413?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I931321a831215012aa8186d851d9a8d38908a4bf Gerrit-Change-Number: 42413 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 17 Mar 2026 19:52:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log March 2026