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

[M] Change in ...osmo-s1gw[master]: [REST] OpenAPI specification skeleton

by fixeria

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41096?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: [REST] OpenAPI specification skeleton ...................................................................... [REST] OpenAPI specification skeleton Change-Id: I84e6ef5cc67cd26b11f7bed8510420e43e18c69b Related: SYS#7066 --- M Makefile M README.md A contrib/openapi.yaml A contrib/yaml2json.py M debian/copyright A priv/openapi.json 6 files changed, 55 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/96/41096/3 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41096?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: I84e6ef5cc67cd26b11f7bed8510420e43e18c69b Gerrit-Change-Number: 41096 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 week, 2 days

1
0
0 0

[M] Change in ...osmo-s1gw[master]: [REST] osmo-s1gw-cli.py skeleton

by fixeria

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41097?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: [REST] osmo-s1gw-cli.py skeleton ...................................................................... [REST] osmo-s1gw-cli.py skeleton This is an interactive shell based on Python's cmd2 library, providing an alternative to the traditional VTY interface used in many Osmocom projects. It communicates with the main process via the REST interface. Currently there's only one command fetching the OpenAPI specification. More commands will be introduced in follow-up commits. Change-Id: I05600f2fa6d213b9cee28871761231722ff5b876 Related: SYS#7066 --- M Makefile M README.md A contrib/osmo-s1gw-cli.py M debian/control M debian/copyright A debian/osmo-s1gw-cli.install A debian/osmo-s1gw.install 7 files changed, 213 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/97/41097/3 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41097?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: I05600f2fa6d213b9cee28871761231722ff5b876 Gerrit-Change-Number: 41097 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 week, 2 days

1
0
0 0

[M] Change in ...osmo-s1gw[master]: [REST] Integrate Erlang REST Framework

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41098?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: [REST] Integrate Erlang REST Framework ...................................................................... [REST] Integrate Erlang REST Framework Change-Id: I20ad3208b8cd4f5483992e3bf22af30ff62b0311 Related: SYS#7066 --- M README.md M config/sys.config M rebar.config M rebar.lock M src/osmo_s1gw.app.src M src/osmo_s1gw.erl M src/osmo_s1gw_sup.erl A src/rest_server.erl 8 files changed, 109 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/98/41098/3 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41098?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: I20ad3208b8cd4f5483992e3bf22af30ff62b0311 Gerrit-Change-Number: 41098 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 week, 2 days

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: S1GW: Add test case to test release of failed e-RABs during handover ...

by fixeria

Attention is currently required from: jolly. fixeria has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41095?usp=email ) Change subject: S1GW: Add test case to test release of failed e-RABs during handover resource allocation ...................................................................... Patch Set 2: (5 comments) File s1gw/S1GW_ConnHdlr.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41095/comment/2ce934ba_5a6e… : PS2, Line 1706: var ERabIdxList erabs_admitted; : for (var integer i := 0; i < lengthof(g_pars.erabs); i := i + 1) { : erabs_admitted[i] := i; : } See my comment about `f_ERabList_compose()` in previous patch. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41095/comment/aa4db8fc_d9b3… : PS2, Line 1720: f_ConnHdlr_tx_handover_ack(erabs_admitted, mme_ue_id, enb_ue_id, erabs_failed); : log("[eNB -> S1GW] -> MME: HANDOVER REQUEST ACKNOWLEDGE"); We usually log first: ```suggestion log("[eNB -> S1GW] -> MME: HANDOVER REQUEST ACKNOWLEDGE"); f_ConnHdlr_tx_handover_ack(erabs_admitted, mme_ue_id, enb_ue_id, erabs_failed); ``` https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41095/comment/95bc691b_7daf… : PS2, Line 1726: for (var integer i := 0; i < lengthof(erabs_admitted); i := i + 1) { : var ERabIdx idx := erabs_admitted[i]; : erabs[i] := g_pars.erabs[idx]; : } See my comment about `f_ERabList_compose()` in previous patch. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41095/comment/690d213b_e6d6… : PS2, Line 1736: for (var integer i := 0; i < lengthof(erabs_failed); i := i + 1) { : var ERabIdx idx := erabs_failed[i]; : erabs[i] := g_pars.erabs[idx]; : See my comment about `f_ERabList_compose()` in previous patch. File s1gw/S1GW_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41095/comment/5e6ae4a5_7a78… : PS2, Line 962: for (var integer i := 0; i < lengthof(erabs_admitted); i := i + 1) { : var ERabIdx idx := erabs_admitted[i]; : erabs_left[i] := g_pars.erabs[idx]; : See my comment about `f_ERabList_compose()` in previous patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41095?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: Ic14f560ae16b8386e58ac85f8af53b19d7c7a5c9 Gerrit-Change-Number: 41095 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Sat, 13 Sep 2025 08:29:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 week, 2 days

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: S1GW: Add test case to test release of e-RABs during handover prepera...

by fixeria

Attention is currently required from: jolly, pespin. fixeria has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41094?usp=email ) Change subject: S1GW: Add test case to test release of e-RABs during handover preperation ...................................................................... Patch Set 2: (5 comments) File s1gw/S1GW_ConnHdlr.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41094/comment/8539cb30_2d35… : PS2, Line 1210: in ERabIdxList erabs_release := {}) > I vote for stopping adding more "in" churn :D For `ERabIdxList`, yes, we don't really need `in/out`. However we should keep using them for `ERabList`, to let the caller know if the given list is going to be modified or not. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41094/comment/d9b9440a_5010… : PS2, Line 1720: in ERabIdxList erabs_forward, > No more "in" churn please. Why are you so obsessed with this? https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41094/comment/af12930b_322f… : PS2, Line 1718: function f_ConnHdlr_handover_cmd(MME_UE_S1AP_ID mme_ue_id, : ENB_UE_S1AP_ID enb_ue_id, : in ERabIdxList erabs_forward, : Nitpick: in the existing API, arguments `mme_ue_id` and `enb_ue_id` usually follow `ERabList`/`ERabIdxList` arguments. For the sake of consistency, I suggest: ```suggestion function f_ConnHdlr_handover_cmd(ERabIdxList erabs_forward, ERabIdxList erabs_release, MME_UE_S1AP_ID mme_ue_id, ENB_UE_S1AP_ID enb_ue_id) ``` File s1gw/S1GW_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41094/comment/702e923f_fce6… : PS2, Line 911: for (var integer i := 0; i < lengthof(erabs_forward); i := i + 1) { I see this logic repeated in several places, so I think it's worth having a function in `S1GW_ConnHdlr` (next to `f_ERabList_find_by_pdu()`): ``` function f_ERabList_compose(ERabIdxList idx_list) runs on ConnHdlr return ERabList { var ERabList erabs; for (var integer i := 0; i < lengthof(idx_list); i := i + 1) { var ERabIdx idx := idx_list[i]; erabs[i] := g_pars.erabs[idx]; } return erabs; } ``` This way here you could do: ``` if (lengthof(erabs_forward) > 0) { var ERabList erabs := f_ERabList_compose(erabs_forward); f_ConnHdlr_erab_release_cmd(erabs, g_pars.mme_ue_id, g_pars.idx); f_ConnHdlr_erab_release_rsp(erabs, g_pars.mme_ue_id, g_pars.idx); } ``` https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41094/comment/49ea8775_882e… : PS2, Line 912: tabs vs spaces -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41094?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: Ic70ba19c0a6e349f63aae124607d075b6d19e779 Gerrit-Change-Number: 41094 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 13 Sep 2025 08:21:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 week, 2 days

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: Add optonal e-RAB lists to HANDOVER messages

by fixeria

Attention is currently required from: jolly. fixeria has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41093?usp=email ) Change subject: Add optonal e-RAB lists to HANDOVER messages ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41093?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: I78d2fa8e72bb672674727a01d5c5a9aaf31cab7b Gerrit-Change-Number: 41093 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Sat, 13 Sep 2025 07:44:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 week, 2 days

1
0
0 0

[L] Change in ...osmo-s1gw[master]: enb_registry: new module

by fixeria

fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41034?usp=email ) Change subject: enb_registry: new module ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41034?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: I77a5a750ca6342da3a99926a44926b3973ab19c4 Gerrit-Change-Number: 41034 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 12 Sep 2025 20:57:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No

1 week, 2 days

1
0
0 0

[M] Change in ...osmo-s1gw[master]: [REST] Implement ErabDelete

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41105?usp=email ) Change subject: [REST] Implement ErabDelete ...................................................................... [REST] Implement ErabDelete 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, 57 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/05/41105/1 diff --git a/contrib/openapi.yaml b/contrib/openapi.yaml index adf3e58..75174d2 100644 --- a/contrib/openapi.yaml +++ b/contrib/openapi.yaml @@ -135,6 +135,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 8a65295..c008dad 100755 --- a/contrib/osmo-s1gw-cli.py +++ b/contrib/osmo-s1gw-cli.py @@ -126,6 +126,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' @@ -326,6 +331,12 @@ data = self.iface.erab_info(opts.pid) self.erab_list_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..3b77c8a 100644 --- a/priv/openapi.json +++ b/priv/openapi.json @@ -209,6 +209,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..6de53a0 100644 --- a/src/rest_server.erl +++ b/src/rest_server.erl @@ -41,7 +41,8 @@ enb_info/1, enb_erab_list/1, erab_list/1, - erab_info/1 + erab_info/1, + erab_delete/1 ]). -include_lib("kernel/include/logger.hrl"). @@ -140,6 +141,23 @@ 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), + try erab_fsm:shutdown(Pid) of + ok -> {200, [], undefined} + catch + exit:{noproc, _} -> {404, [], undefined} + end; + _ -> + ?LOG_ERROR("Unhandled E-RAB ID ~p", [ID]), + {400, [], undefined} + end. + + %% ------------------------------------------------------------------ %% private API %% ------------------------------------------------------------------ -- 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: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I3576814f44d87551fdac6236ddbec6215ba07455 Gerrit-Change-Number: 41105 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 week, 2 days

1
0
0 0

[M] Change in ...osmo-s1gw[master]: [REST] Implement ErabList and ErabInfo

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41104?usp=email ) Change subject: [REST] Implement ErabList and ErabInfo ...................................................................... [REST] Implement ErabList and ErabInfo Change-Id: Ia98498143fd0e38030429171e42a0c4c4887df64 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, 166 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/04/41104/1 diff --git a/contrib/openapi.yaml b/contrib/openapi.yaml index 0041274..adf3e58 100644 --- a/contrib/openapi.yaml +++ b/contrib/openapi.yaml @@ -108,6 +108,34 @@ '404': description: Unsuccessful outcome (eNB not found) + /erab-list: + get: + summary: Get E-RAB list for all eNBs + operationId: ErabList + responses: + '200': + description: A list of E-RABs + content: + application/json: + schema: + $ref: '#/components/schemas/ErabList' + + /erab/{ErabId}: + get: + summary: Get information about a specific E-RAB + operationId: ErabInfo + parameters: + - $ref: '#/components/parameters/ErabId' + responses: + '200': + description: Successful outcome (E-RAB info) + content: + application/json: + schema: + $ref: '#/components/schemas/ErabItem' + '404': + description: Unsuccessful outcome (E-RAB not found) + components: responses: OperationResult: @@ -146,6 +174,18 @@ description: eNB connection address/port example: enb-conn:192.168.1.1-34650 + ErabId: + name: ErabId + in: path + description: E-RAB identifier (selector) + required: true + schema: + oneOf: + - type: string + pattern: '^pid:[0-9]+\.[0-9]+\.[0-9]+$' + description: Process ID + example: pid:0.33.1 + schemas: OperationResult: type: object diff --git a/contrib/osmo-s1gw-cli.py b/contrib/osmo-s1gw-cli.py index cb77709..8a65295 100755 --- a/contrib/osmo-s1gw-cli.py +++ b/contrib/osmo-s1gw-cli.py @@ -116,6 +116,16 @@ with self.send_get_req(f'enb/{enb_id}/erab-list') as f: return json.load(f) + def erab_list(self) -> RESTResponse: + ''' ErabList :: Get E-RAB list for all eNBs ''' + with self.send_get_req('erab-list') as f: + return json.load(f) + + def erab_info(self, pid: str) -> RESTResponse: + ''' ErabInfo :: Get information about a specific E-RAB ''' + with self.send_get_req(f'erab/pid:{pid}') as f: + return json.load(f) + class OsmoS1GWCli(cmd2.Cmd): DESC = 'Interactive CLI for OsmoS1GW' @@ -123,6 +133,7 @@ CAT_METRICS = 'Metrics commands' CAT_PFCP = 'PFCP related commands' CAT_ENB = 'eNB related commands' + CAT_ERAB = 'E-RAB related commands' def __init__(self, argv): super().__init__(allow_cli_args=False, include_py=True) @@ -297,6 +308,24 @@ data = self.iface.enb_erab_list(enb_id) self.erab_list_print(data) + @cmd2.with_category(CAT_ERAB) + def do_erab_list(self, opts) -> None: + ''' Get E-RAB list for all eNBs ''' + data = self.iface.erab_list() + self.erab_list_print(data) + + erab_info_parser = cmd2.Cmd2ArgumentParser() + erab_info_parser.add_argument('-P', '--pid', + type=str, required=True, + help='E-RAB process ID (example: 0.33.1)') + + @cmd2.with_argparser(erab_info_parser) + @cmd2.with_category(CAT_ERAB) + def do_erab_info(self, opts) -> None: + ''' Get information about a specific E-RAB ''' + data = self.iface.erab_info(opts.pid) + self.erab_list_print([data]) + ap = argparse.ArgumentParser(prog='osmo-s1gw-cli', description=OsmoS1GWCli.DESC) diff --git a/priv/openapi.json b/priv/openapi.json index 07a11b8..bfe82a3 100644 --- a/priv/openapi.json +++ b/priv/openapi.json @@ -166,6 +166,50 @@ } } } + }, + "/erab-list": { + "get": { + "summary": "Get E-RAB list for all eNBs", + "operationId": "ErabList", + "responses": { + "200": { + "description": "A list of E-RABs", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErabList" + } + } + } + } + } + } + }, + "/erab/{ErabId}": { + "get": { + "summary": "Get information about a specific E-RAB", + "operationId": "ErabInfo", + "parameters": [ + { + "$ref": "#/components/parameters/ErabId" + } + ], + "responses": { + "200": { + "description": "Successful outcome (E-RAB info)", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErabItem" + } + } + } + }, + "404": { + "description": "Unsuccessful outcome (E-RAB not found)" + } + } + } } }, "components": { @@ -221,6 +265,22 @@ } ] } + }, + "ErabId": { + "name": "ErabId", + "in": "path", + "description": "E-RAB identifier (selector)", + "required": true, + "schema": { + "oneOf": [ + { + "type": "string", + "pattern": "^pid:[0-9]+\\.[0-9]+\\.[0-9]+$", + "description": "Process ID", + "example": "pid:0.33.1" + } + ] + } } }, "schemas": { diff --git a/src/rest_server.erl b/src/rest_server.erl index 2f805da..e1333c0 100644 --- a/src/rest_server.erl +++ b/src/rest_server.erl @@ -39,7 +39,9 @@ pfcp_heartbeat/1, enb_list/1, enb_info/1, - enb_erab_list/1 + enb_erab_list/1, + erab_list/1, + erab_info/1 ]). -include_lib("kernel/include/logger.hrl"). @@ -120,6 +122,24 @@ end. +%% ErabList :: Get E-RAB list for all eNBs +erab_list(#{}) -> + EnbList = enb_registry:fetch_enb_list(), + ErabList = lists:map(fun fetch_erab_list/1, EnbList), + {200, [], lists:flatten(ErabList)}. + + +%% ErabInfo :: Get information about a specific E-RAB +erab_info(#{path_parameters := PP}) -> + [{<< "ErabId" >>, << ID/bytes >>}] = PP, + case fetch_erab_info(ID) of + {ok, ErabInfo} -> + {200, [], ErabInfo}; + error -> + {404, [], undefined} + end. + + %% ------------------------------------------------------------------ %% private API %% ------------------------------------------------------------------ @@ -245,6 +265,22 @@ error. +-spec fetch_erab_info(binary()) -> {ok, erab_fsm:erab_info()} | error. +fetch_erab_info(<< "pid:", Val/bytes >>) -> + Pid = parse_pid(Val), + %% guard against non-existent process IDs + %% TODO: check if the given Pid is actually an erab_fsm + try erab_list_item({pid, Pid}) of + ErabInfo -> {ok, ErabInfo} + catch + exit:{noproc, _} -> error + end; + +fetch_erab_info(ID) -> + ?LOG_ERROR("Unhandled E-RAB ID ~p", [ID]), + error. + + -spec fetch_erab_list(enb_registry:enb_info()) -> [map()]. fetch_erab_list(#{mme_conn_info := ConnInfo}) -> Pid = maps:get(handler, ConnInfo), %% s1ap_proxy process pid -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41104?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: Ia98498143fd0e38030429171e42a0c4c4887df64 Gerrit-Change-Number: 41104 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 week, 2 days

1
0
0 0

[L] Change in ...osmo-s1gw[master]: [REST] Implement EnbErabList

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41103?usp=email ) Change subject: [REST] Implement EnbErabList ...................................................................... [REST] Implement EnbErabList Change-Id: I846974dd79e737acaac17918d18da55967a9abf2 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, 275 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/03/41103/1 diff --git a/contrib/openapi.yaml b/contrib/openapi.yaml index 24bc2c8..0041274 100644 --- a/contrib/openapi.yaml +++ b/contrib/openapi.yaml @@ -92,6 +92,22 @@ '404': description: Unsuccessful outcome (eNB not found) + /enb/{EnbId}/erab-list: + get: + summary: Get E-RAB list for a specific eNB + operationId: EnbErabList + parameters: + - $ref: '#/components/parameters/EnbId' + responses: + '200': + description: Successful outcome (E-RAB list) + content: + application/json: + schema: + $ref: '#/components/schemas/ErabList' + '404': + description: Unsuccessful outcome (eNB not found) + components: responses: OperationResult: @@ -248,3 +264,62 @@ mme_sctp_aid: type: integer description: SCTP association identifier of the S1GW-MME connection + + ErabList: + type: array + items: + $ref: '#/components/schemas/ErabItem' + + FTEID: + type: object + required: + - teid + - tla + properties: + teid: + type: integer + description: GTP-U TEID + tla: + type: string + description: GTP-U TLA (Transport Layer Address) + + ErabItem: + type: object + required: + - mme_ue_id + - erab_id + - state + - pid + properties: + mme_ue_id: + type: integer + description: MME-UE-S1AP-ID + erab_id: + type: integer + description: E-RAB-ID + state: + type: string + description: E-RAB FSM state + example: erab_wait_release_rsp + pid: + type: string + pattern: '^<[0-9]+\.[0-9]+\.[0-9]+>$' + description: E-RAB FSM process ID + pfcp_lseid: + type: integer + description: PFCP SEID (local) + pfcp_rseid: + type: integer + description: PFCP SEID (remote) + f_teid_u2c: + $ref: '#/components/schemas/FTEID' + description: GTP-U F-TEID for UPF -> Core + f_teid_c2u: + $ref: '#/components/schemas/FTEID' + description: GTP-U F-TEID for UPF <- Core + f_teid_a2u: + $ref: '#/components/schemas/FTEID' + description: GTP-U F-TEID for UPF <- Access + f_teid_u2a: + $ref: '#/components/schemas/FTEID' + description: GTP-U F-TEID for UPF -> Access diff --git a/contrib/osmo-s1gw-cli.py b/contrib/osmo-s1gw-cli.py index 84036d7..cb77709 100755 --- a/contrib/osmo-s1gw-cli.py +++ b/contrib/osmo-s1gw-cli.py @@ -111,6 +111,11 @@ with self.send_get_req(f'enb/{enb_id}') as f: return json.load(f) + 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: + return json.load(f) + class OsmoS1GWCli(cmd2.Cmd): DESC = 'Interactive CLI for OsmoS1GW' @@ -263,6 +268,35 @@ data = self.iface.enb_info(enb_id) self.enb_list_print([data]) + @staticmethod + def erab_list_item(item: dict) -> dict: + f_teid = lambda params: '0x{teid:08x}@{tla}'.format(**params) + seid = lambda val: f'0x{val:016x}' + return { + 'PID': item.get('pid'), + 'MME-UE-S1AP-ID': item.get('mme_ue_id'), + 'E-RAB-ID': item.get('erab_id'), + 'State': item.get('state'), + 'SEID (local)': seid(item.get('pfcp_lseid')) if 'pfcp_lseid' in item else None, + 'SEID (remote)': seid(item.get('pfcp_rseid')) if 'pfcp_rseid' in item else None, + 'U2C F-TEID': f_teid(item.get('f_teid_u2c')) if 'f_teid_u2c' in item else None, + 'C2U F-TEID': f_teid(item.get('f_teid_c2u')) if 'f_teid_c2u' in item else None, + 'A2U F-TEID': f_teid(item.get('f_teid_a2u')) if 'f_teid_a2u' in item else None, + 'U2A F-TEID': f_teid(item.get('f_teid_u2a')) if 'f_teid_u2a' in item else None, + } + + def erab_list_print(self, items: list[dict]) -> None: + self.poutput(tabulate.tabulate(map(self.erab_list_item, items), + headers='keys', tablefmt='github')) + + @cmd2.with_argparser(enb_id_parser) + @cmd2.with_category(CAT_ENB) + def do_enb_erab_list(self, opts) -> None: + ''' Get E-RAB list for a specific eNB ''' + enb_id = self.gen_enb_id(opts) + data = self.iface.enb_erab_list(enb_id) + self.erab_list_print(data) + ap = argparse.ArgumentParser(prog='osmo-s1gw-cli', description=OsmoS1GWCli.DESC) diff --git a/priv/openapi.json b/priv/openapi.json index 3e8f22e..07a11b8 100644 --- a/priv/openapi.json +++ b/priv/openapi.json @@ -140,6 +140,32 @@ } } } + }, + "/enb/{EnbId}/erab-list": { + "get": { + "summary": "Get E-RAB list for a specific eNB", + "operationId": "EnbErabList", + "parameters": [ + { + "$ref": "#/components/parameters/EnbId" + } + ], + "responses": { + "200": { + "description": "Successful outcome (E-RAB list)", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErabList" + } + } + } + }, + "404": { + "description": "Unsuccessful outcome (eNB not found)" + } + } + } } }, "components": { @@ -358,6 +384,82 @@ "description": "SCTP association identifier of the S1GW-MME connection" } } + }, + "ErabList": { + "type": "array", + "items": { + "$ref": "#/components/schemas/ErabItem" + } + }, + "FTEID": { + "type": "object", + "required": [ + "teid", + "tla" + ], + "properties": { + "teid": { + "type": "integer", + "description": "GTP-U TEID" + }, + "tla": { + "type": "string", + "description": "GTP-U TLA (Transport Layer Address)" + } + } + }, + "ErabItem": { + "type": "object", + "required": [ + "mme_ue_id", + "erab_id", + "state", + "pid" + ], + "properties": { + "mme_ue_id": { + "type": "integer", + "description": "MME-UE-S1AP-ID" + }, + "erab_id": { + "type": "integer", + "description": "E-RAB-ID" + }, + "state": { + "type": "string", + "description": "E-RAB FSM state", + "example": "erab_wait_release_rsp" + }, + "pid": { + "type": "string", + "pattern": "^<[0-9]+\\.[0-9]+\\.[0-9]+>$", + "description": "E-RAB FSM process ID" + }, + "pfcp_lseid": { + "type": "integer", + "description": "PFCP SEID (local)" + }, + "pfcp_rseid": { + "type": "integer", + "description": "PFCP SEID (remote)" + }, + "f_teid_u2c": { + "$ref": "#/components/schemas/FTEID", + "description": "GTP-U F-TEID for UPF -> Core" + }, + "f_teid_c2u": { + "$ref": "#/components/schemas/FTEID", + "description": "GTP-U F-TEID for UPF <- Core" + }, + "f_teid_a2u": { + "$ref": "#/components/schemas/FTEID", + "description": "GTP-U F-TEID for UPF <- Access" + }, + "f_teid_u2a": { + "$ref": "#/components/schemas/FTEID", + "description": "GTP-U F-TEID for UPF -> Access" + } + } } } } diff --git a/src/rest_server.erl b/src/rest_server.erl index f546ad9..2f805da 100644 --- a/src/rest_server.erl +++ b/src/rest_server.erl @@ -38,7 +38,8 @@ pfcp_assoc_state/1, pfcp_heartbeat/1, enb_list/1, - enb_info/1 + enb_info/1, + enb_erab_list/1 ]). -include_lib("kernel/include/logger.hrl"). @@ -105,6 +106,20 @@ end. +%% EnbErabList :: Get E-RAB list for a specific eNB +enb_erab_list(#{path_parameters := PP}) -> + [{<< "EnbId" >>, << ID/bytes >>}] = PP, + case fetch_enb_info(ID) of + [EnbInfo | _] -> + Rsp = fetch_erab_list(EnbInfo), + {200, [], Rsp}; + [] -> + {404, [], undefined}; + error -> + {500, [], undefined} + end. + + %% ------------------------------------------------------------------ %% private API %% ------------------------------------------------------------------ @@ -230,6 +245,54 @@ error. +-spec fetch_erab_list(enb_registry:enb_info()) -> [map()]. +fetch_erab_list(#{mme_conn_info := ConnInfo}) -> + Pid = maps:get(handler, ConnInfo), %% s1ap_proxy process pid + ERABs = s1ap_proxy:fetch_erab_list(Pid), + lists:map(fun erab_list_item/1, ERABs); + +fetch_erab_list(_) -> []. + + +-spec erab_list_item({term(), pid()}) -> map(). +erab_list_item({_, Pid}) -> + %% XXX: E-RAB FSM process might be dead here + Info = erab_fsm:fetch_info(Pid), + {MmeUeId, ErabId} = maps:get(uid, Info), + M0 = #{mme_ue_id => MmeUeId, + erab_id => ErabId, + state => maps:get(state, Info), + pid => pid_to_list(Pid)}, + M1 = erab_list_item_add_seid(Info, M0), + M2 = erab_list_item_add_f_teid(f_teid_u2c, Info, M1), + M3 = erab_list_item_add_f_teid(f_teid_c2u, Info, M2), + M4 = erab_list_item_add_f_teid(f_teid_a2u, Info, M3), + M5 = erab_list_item_add_f_teid(f_teid_u2a, Info, M4), + rsp_map(M5). + + +-spec erab_list_item_add_seid(erab_fsm:erab_info(), map()) -> map(). +erab_list_item_add_seid(Info, M0) -> + %% local SEID is always known/present + M1 = M0#{pfcp_lseid => maps:get(seid_loc, Info)}, + %% remote SEID may or may not be known/present + case maps:find(seid_rem, Info) of + {ok, SEID} -> M1#{pfcp_rseid => SEID}; + error -> M1 + end. + + +-spec erab_list_item_add_f_teid(atom(), erab_fsm:erab_info(), map()) -> map(). +erab_list_item_add_f_teid(Key, Info, M0) -> + case maps:find(Key, Info) of + {ok, {TEID, AddrBin}} -> + Addr = list_to_tuple(binary_to_list(AddrBin)), + M0#{Key => #{teid => TEID, + tla => inet:ntoa(Addr)}}; + error -> M0 + end. + + -spec parse_pid(binary() | list()) -> pid(). parse_pid(Data) when is_binary(Data) -> parse_pid(binary_to_list(Data)); -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41103?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: I846974dd79e737acaac17918d18da55967a9abf2 Gerrit-Change-Number: 41103 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 week, 2 days

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2025