October 2025 - gerrit-log - lists.osmocom.org

[S] Change in osmo-ttcn3-hacks[master]: testenv: add a --fast argument
by jolly 08 Oct '25

08 Oct '25

Attention is currently required from: osmith. jolly has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41206?usp=email ) Change subject: testenv: add a --fast argument ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41206?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: Ief3488293e5c5c1a1c98244f80ffd56eadb040c5 Gerrit-Change-Number: 41206 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 08 Oct 2025 12:31:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in libosmo-abis[master]: trau2rtp CSD: add option to emit TW-TS-007 payloads
by osmith 08 Oct '25

08 Oct '25

Attention is currently required from: falconia. osmith has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/libosmo-abis/+/41164?usp=email ) Change subject: trau2rtp CSD: add option to emit TW-TS-007 payloads ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/41164?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I86d628c65104a119ef0fb9f27f5835c9a1769971 Gerrit-Change-Number: 41164 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Wed, 08 Oct 2025 12:19:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-msc[master]: vlr: Stop silent call before deduping subscribers
by fixeria 08 Oct '25

08 Oct '25

Attention is currently required from: jolly, lynxis lazus, matanp, neels. fixeria has posted comments on this change by matanp. ( https://gerrit.osmocom.org/c/osmo-msc/+/41131?usp=email ) Change subject: vlr: Stop silent call before deduping subscribers ...................................................................... Patch Set 1: (1 comment) File src/libvlr/vlr.c: https://gerrit.osmocom.org/c/osmo-msc/+/41131/comment/f6910f9f_14da8df6?usp… : PS1, Line 651: gsm_silent_call_stop( > Just a note: […] Good point. If there's no silent call going on, `gsm_silent_call_stop()` will log errors... -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/41131?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: If23f8b0e42d4a3a8bf1c8f5ca81b045834b6cccd Gerrit-Change-Number: 41131 Gerrit-PatchSet: 1 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: matanp <matan1008(a)gmail.com> Gerrit-Comment-Date: Wed, 08 Oct 2025 12:18:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: jolly <andreas(a)eversberg.eu>

1 0

[M] Change in libosmo-abis[master]: rtp2trau CSD: accept both CLEARMODE and TW-TS-007 payloads
by osmith 08 Oct '25

08 Oct '25

Attention is currently required from: falconia. osmith has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/libosmo-abis/+/41163?usp=email ) Change subject: rtp2trau CSD: accept both CLEARMODE and TW-TS-007 payloads ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/41163?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ide89de89ed43df5762a091f1577a8b8e84b55738 Gerrit-Change-Number: 41163 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Wed, 08 Oct 2025 12:17:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in libosmo-abis[master]: trau: add TW-TS-007 compression and decompression functions
by osmith 08 Oct '25

08 Oct '25

Attention is currently required from: falconia. osmith has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/libosmo-abis/+/41162?usp=email ) Change subject: trau: add TW-TS-007 compression and decompression functions ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/41162?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I10a86f5e4a7323cf06fb1d2624757c34bd23218f Gerrit-Change-Number: 41162 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Wed, 08 Oct 2025 12:15:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in docker-playground[master]: debian-trixie-build-arm: new container
by fixeria 08 Oct '25

08 Oct '25

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/docker-playground/+/41199?usp=email ) Change subject: debian-trixie-build-arm: new container ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/41199?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1c0efb85324b70b6370ea94f74f440e639442da5 Gerrit-Change-Number: 41199 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 08 Oct 2025 12:13:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in docker-playground[master]: debian-trixie-build: new container
by fixeria 08 Oct '25

08 Oct '25

Attention is currently required from: jolly, osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/docker-playground/+/41198?usp=email ) Change subject: debian-trixie-build: new container ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/41198?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I880b5d9c57642af98c116fcb4137a54c58f5f7b4 Gerrit-Change-Number: 41198 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Wed, 08 Oct 2025 12:12:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in libosmo-abis[master]: trau: add TW-TS-007 packing and unpacking functions
by osmith 08 Oct '25

08 Oct '25

Attention is currently required from: falconia. osmith has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/libosmo-abis/+/41161?usp=email ) Change subject: trau: add TW-TS-007 packing and unpacking functions ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/41161?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ie81280d2b90f69fbdde9fa968f747a35ea123f79 Gerrit-Change-Number: 41161 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Wed, 08 Oct 2025 12:11:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in ...osmo-s1gw[master]: [REST] MetricsList: return 404 on invalid path
by fixeria 08 Oct '25

08 Oct '25

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41170?usp=email ) Change subject: [REST] MetricsList: return 404 on invalid path ...................................................................... [REST] MetricsList: return 404 on invalid path Change-Id: If5ab039654007ccf3703a2364b767eaa19e43461 Related: SYS#7066 --- M contrib/openapi.yaml M priv/openapi.json M src/rest_server.erl 3 files changed, 14 insertions(+), 5 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/openapi.yaml b/contrib/openapi.yaml index e7934b2..a56f876 100644 --- a/contrib/openapi.yaml +++ b/contrib/openapi.yaml @@ -31,6 +31,8 @@ application/json: schema: $ref: '#/components/schemas/MetricsList' + '404': + description: No matching metrics found /pfcp/assoc: get: diff --git a/priv/openapi.json b/priv/openapi.json index 94c0287..5422c03 100644 --- a/priv/openapi.json +++ b/priv/openapi.json @@ -46,6 +46,9 @@ } } } + }, + "404": { + "description": "No matching metrics found" } } } diff --git a/src/rest_server.erl b/src/rest_server.erl index 2ea51f6..6e1f892 100644 --- a/src/rest_server.erl +++ b/src/rest_server.erl @@ -62,11 +62,15 @@ << "gauge" >> -> metric_list([gauge]); << "all" >> -> metric_list([]) end, - L1 = case proplists:get_value(<< "path" >>, QP) of - undefined -> L0; - Path -> lists:filter(fun(M) -> metric_filter_path(M, Path) end, L0) - end, - {200, [], L1}. + case proplists:get_value(<< "path" >>, QP) of + undefined -> + {200, [], L0}; + Path -> + case lists:filter(fun(M) -> metric_filter_path(M, Path) end, L0) of + [] -> {404, [], undefined}; + L1 -> {200, [], L1} + end + end. %% PfcpAssocState :: Get the PFCP association state -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41170?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: If5ab039654007ccf3703a2364b767eaa19e43461 Gerrit-Change-Number: 41170 Gerrit-PatchSet: 4 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>

1 0

[M] Change in ...osmo-s1gw[master]: [REST] Implement {Enb,Erab}Delete
by fixeria 08 Oct '25

08 Oct '25

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41105?usp=email ) Change subject: [REST] Implement {Enb,Erab}Delete ...................................................................... [REST] Implement {Enb,Erab}Delete Change-Id: I3576814f44d87551fdac6236ddbec6215ba07455 Related: SYS#7066 --- M contrib/openapi.yaml M contrib/osmo-s1gw-cli.py M priv/openapi.json M src/rest_server.erl 4 files changed, 121 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve diff --git a/contrib/openapi.yaml b/contrib/openapi.yaml index adf3e58..e7934b2 100644 --- a/contrib/openapi.yaml +++ b/contrib/openapi.yaml @@ -91,6 +91,16 @@ $ref: '#/components/schemas/EnbItem' '404': description: Unsuccessful outcome (eNB not found) + delete: + summary: Force disconnect an eNB + operationId: EnbDelete + parameters: + - $ref: '#/components/parameters/EnbId' + responses: + '200': + description: Successful outcome (eNB disconnected) + '404': + description: Unsuccessful outcome (eNB not found) /enb/{EnbId}/erab-list: get: @@ -135,6 +145,16 @@ $ref: '#/components/schemas/ErabItem' '404': description: Unsuccessful outcome (E-RAB not found) + delete: + summary: Terminate an E-RAB FSM process + operationId: ErabDelete + parameters: + - $ref: '#/components/parameters/ErabId' + responses: + '200': + description: Successful outcome (E-RAB FSM terminated) + '404': + description: Unsuccessful outcome (E-RAB not found) components: responses: diff --git a/contrib/osmo-s1gw-cli.py b/contrib/osmo-s1gw-cli.py index 99b62da..ac4b1c6 100755 --- a/contrib/osmo-s1gw-cli.py +++ b/contrib/osmo-s1gw-cli.py @@ -112,6 +112,11 @@ with self.send_get_req(f'enb/{enb_id}') as f: return json.load(f) + def enb_delete(self, enb_id: str) -> int: + ''' EnbDelete :: Force disconnect an eNB ''' + with self.send_delete_req(f'enb/{enb_id}') as f: + return f.status + def enb_erab_list(self, enb_id: str) -> RESTResponse: ''' EnbErabList :: Get E-RAB list for a specific eNB ''' with self.send_get_req(f'enb/{enb_id}/erab-list') as f: @@ -127,6 +132,11 @@ with self.send_get_req(f'erab/pid:{pid}') as f: return json.load(f) + def erab_delete(self, pid: str) -> int: + ''' ErabDelete :: Terminate an E-RAB FSM process ''' + with self.send_delete_req(f'erab/pid:{pid}') as f: + return f.status + class OsmoS1GWCli(cmd2.Cmd): DESC = 'Interactive CLI for OsmoS1GW' @@ -299,6 +309,13 @@ data = self.iface.enb_info(enb_id) self.enb_info_print(data) + @cmd2.with_argparser(enb_info_parser) + @cmd2.with_category(CAT_ENB) + def do_enb_delete(self, opts) -> None: + ''' Force disconnect an eNB ''' + enb_id = self.gen_enb_id(opts) + self.iface.enb_delete(enb_id) + @staticmethod def erab_list_item(item: dict) -> dict: ''' Generate a table row for the given E-RAB (brief) ''' @@ -374,6 +391,12 @@ data = self.iface.erab_info(opts.pid) self.erab_info_print(data) + @cmd2.with_argparser(erab_info_parser) + @cmd2.with_category(CAT_ERAB) + def do_erab_delete(self, opts) -> None: + ''' Terminate an E-RAB FSM process ''' + self.iface.erab_delete(opts.pid) + ap = argparse.ArgumentParser(prog='osmo-s1gw-cli', description=OsmoS1GWCli.DESC) diff --git a/priv/openapi.json b/priv/openapi.json index bfe82a3..94c0287 100644 --- a/priv/openapi.json +++ b/priv/openapi.json @@ -139,6 +139,23 @@ "description": "Unsuccessful outcome (eNB not found)" } } + }, + "delete": { + "summary": "Force disconnect an eNB", + "operationId": "EnbDelete", + "parameters": [ + { + "$ref": "#/components/parameters/EnbId" + } + ], + "responses": { + "200": { + "description": "Successful outcome (eNB disconnected)" + }, + "404": { + "description": "Unsuccessful outcome (eNB not found)" + } + } } }, "/enb/{EnbId}/erab-list": { @@ -209,6 +226,23 @@ "description": "Unsuccessful outcome (E-RAB not found)" } } + }, + "delete": { + "summary": "Terminate an E-RAB FSM process", + "operationId": "ErabDelete", + "parameters": [ + { + "$ref": "#/components/parameters/ErabId" + } + ], + "responses": { + "200": { + "description": "Successful outcome (E-RAB FSM terminated)" + }, + "404": { + "description": "Unsuccessful outcome (E-RAB not found)" + } + } } } }, diff --git a/src/rest_server.erl b/src/rest_server.erl index e1333c0..2ea51f6 100644 --- a/src/rest_server.erl +++ b/src/rest_server.erl @@ -39,9 +39,11 @@ pfcp_heartbeat/1, enb_list/1, enb_info/1, + enb_delete/1, enb_erab_list/1, erab_list/1, - erab_info/1 + erab_info/1, + erab_delete/1 ]). -include_lib("kernel/include/logger.hrl"). @@ -108,6 +110,20 @@ end. +%% EnbDelete :: Force disconnect an eNB +enb_delete(#{path_parameters := PP}) -> + [{<< "EnbId" >>, << ID/bytes >>}] = PP, + case fetch_enb_info(ID) of + [EnbInfo | _] -> + Pid = maps:get(pid, EnbInfo), + shutdown(sctp_proxy, Pid); + [] -> + {404, [], undefined}; + error -> + {500, [], undefined} + end. + + %% EnbErabList :: Get E-RAB list for a specific eNB enb_erab_list(#{path_parameters := PP}) -> [{<< "EnbId" >>, << ID/bytes >>}] = PP, @@ -140,6 +156,19 @@ end. +%% ErabDelete :: Terminate an E-RAB FSM process +erab_delete(#{path_parameters := PP}) -> + [{<< "ErabId" >>, << ID/bytes >>}] = PP, + case ID of + << "pid:", Val/bytes >> -> + Pid = parse_pid(Val), + shutdown(erab_fsm, Pid); + _ -> + ?LOG_ERROR("Unhandled E-RAB ID ~p", [ID]), + {400, [], undefined} + end. + + %% ------------------------------------------------------------------ %% private API %% ------------------------------------------------------------------ @@ -337,6 +366,20 @@ list_to_pid("<" ++ Data ++ ">"). +-spec shutdown(module(), pid()) -> erf:response(). +shutdown(Module, Pid) -> + ?LOG_NOTICE("Shutting down ~p process (pid ~p)", [Module, Pid]), + try Module:shutdown(Pid) of + ok -> {200, [], undefined} + catch + exit:noproc -> {404, [], undefined}; + exit:{noproc, _} -> {404, [], undefined}; + Exception:Type -> + ?LOG_ERROR("Caught an exception: ~p:~p", [Exception, Type]), + {500, [], undefined} + end. + + %% Convert the given response map to a format acceptable by the erf -spec rsp_map(map()) -> map(). rsp_map(M) -> -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41105?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I3576814f44d87551fdac6236ddbec6215ba07455 Gerrit-Change-Number: 41105 Gerrit-PatchSet: 11 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>

1 0