December 2024 - gerrit-log - lists.osmocom.org

[XS] Change in mncc-python[master]: cosmetic: mncc_mt_loadgen.py: Fix trailing whitespace

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/mncc-python/+/39142?usp=email ) Change subject: cosmetic: mncc_mt_loadgen.py: Fix trailing whitespace ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/mncc-python/+/39142?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: mncc-python Gerrit-Branch: master Gerrit-Change-Id: I8581e7837df29daa2a0fd1676cc730345872b0d5 Gerrit-Change-Number: 39142 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 13 Dec 2024 19:21:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 1 week

1
0
0 0

[XS] Change in osmo-bsc[master]: cbsp_link: set name on stream

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-bsc/+/39146?usp=email ) Change subject: cbsp_link: set name on stream ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/39146?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia0873ea26a4ef5678fc571e40391d04a2757a7bc Gerrit-Change-Number: 39146 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 13 Dec 2024 19:20:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 1 week

1
0
0 0

[XS] Change in libosmo-abis[master]: ipaccess: Set name on oml and rsl stream listen socket

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/39148?usp=email ) Change subject: ipaccess: Set name on oml and rsl stream listen socket ...................................................................... ipaccess: Set name on oml and rsl stream listen socket Change-Id: I0b96605aa5012ee3eafa405172ac06cb1c7e7c33 --- M src/input/ipaccess.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/48/39148/1 diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 5cb1123..63a293f 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -948,6 +948,7 @@ { int ret = -ENOENT; struct ipaccess_line *il; + char conn_name[128]; if (!line->driver_data) line->driver_data = talloc_zero(line, struct ipaccess_line); @@ -971,6 +972,8 @@ oml_link = osmo_stream_srv_link_create(tall_ipa_ctx); OSMO_ASSERT(oml_link); + snprintf(conn_name, sizeof(conn_name), "ts-%u-oml", line->num); + osmo_stream_srv_set_name(oml_link, conn_name); osmo_stream_srv_link_set_proto(oml_link, IPPROTO_TCP); osmo_stream_srv_link_set_addr(oml_link, ipa); osmo_stream_srv_link_set_port(oml_link, IPA_TCP_PORT_OML); @@ -989,6 +992,8 @@ rsl_link = osmo_stream_srv_link_create(tall_ipa_ctx); OSMO_ASSERT(rsl_link); + snprintf(conn_name, sizeof(conn_name), "ts-%u-rsl", line->num); + osmo_stream_srv_set_name(rsl_link, conn_name); osmo_stream_srv_link_set_proto(rsl_link, IPPROTO_TCP); osmo_stream_srv_link_set_addr(rsl_link, ipa); osmo_stream_srv_link_set_port(rsl_link, IPA_TCP_PORT_RSL); -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/39148?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I0b96605aa5012ee3eafa405172ac06cb1c7e7c33 Gerrit-Change-Number: 39148 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

6 months, 1 week

1
0
0 0

[M] Change in ...osmo-s1gw[master]: s1ap_proxy: handle E-RAB MODIFY REQ/RSP

by fixeria

Attention is currently required from: fixeria, laforge, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39117?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Code-Review+1 by laforge, Code-Review+1 by pespin, Code-Review+2 by fixeria, Verified+1 by Jenkins Builder The change is no longer submittable: Code-Review and Verified are unsatisfied now. Change subject: s1ap_proxy: handle E-RAB MODIFY REQ/RSP ...................................................................... s1ap_proxy: handle E-RAB MODIFY REQ/RSP TODO: add unit tests! Change-Id: I057a1c58d0c6ad04c00ad3ea4c68230d8632a07e --- M include/s1gw_metrics.hrl M src/s1ap_proxy.erl M src/s1gw_metrics.erl 3 files changed, 118 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/17/39117/4 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39117?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: I057a1c58d0c6ad04c00ad3ea4c68230d8632a07e Gerrit-Change-Number: 39117 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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

6 months, 1 week

1
0
0 0

[M] Change in ...osmo-s1gw[master]: erab_fsm: implement E-RAB MODIFY Ind/Cnf procedure

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39147?usp=email ) Change subject: erab_fsm: implement E-RAB MODIFY Ind/Cnf procedure ...................................................................... erab_fsm: implement E-RAB MODIFY Ind/Cnf procedure The eNB-initiated E-RAB modification procedure is defined in 3GPP TS 36.413 section 8.2.4. This is pretty much the same as the MME-initiated E-RAB modification. Change-Id: I750ada0a5a21edc8bc06d567c8000b6304966474 --- M src/erab_fsm.erl M test/erab_fsm_test.erl M test/pfcp_mock.hrl 3 files changed, 119 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/47/39147/1 diff --git a/src/erab_fsm.erl b/src/erab_fsm.erl index c684510..9d11be6 100644 --- a/src/erab_fsm.erl +++ b/src/erab_fsm.erl @@ -51,6 +51,8 @@ erab_setup_rsp/2, erab_modify_req/2, erab_modify_rsp/2, + erab_modify_ind/2, + erab_modify_cnf/2, erab_release/2, erab_release_cmd/1, erab_release_rsp/1, @@ -77,7 +79,9 @@ -type mod_kind() :: setup_rsp | modify_req | - modify_rsp_nack. + modify_rsp_nack | + modify_ind | + modify_cnf_nack. -type rel_kind() :: cmd | ind. -record(erab_state, {uid :: term(), %% unique E-RAB identifier @@ -87,6 +91,7 @@ a2u :: undefined | teid_addr(), %% GTP-U params for UPF <- Access u2a :: undefined | teid_addr(), %% GTP-U params for UPF -> Access u2cm :: undefined | teid_addr(), %% GTP-U params for UPF -> Core (modified) + u2am :: undefined | teid_addr(), %% GTP-U params for UPF -> Access (modified) seid_loc :: undefined | pfcp_peer:pfcp_seid(), %% local SEID, chosen by us seid_rem :: undefined | pfcp_peer:pfcp_seid(), %% remote SEID, chosen by the UPF mod_kind :: undefined | mod_kind(), %% E-RAB MODIFY kind @@ -156,6 +161,28 @@ gen_statem:call(Pid, {?FUNCTION_NAME, Res}). +%% @doc Indicate reception of E-RAB modify indication (from access). +%% @param Pid PID of an erab_fsm. +%% @param F_TEID TEID and bind address indicated by the eNB. +%% @returns TEID and Addr to be sent to the MME; an error otherwise. +%% @end +-spec erab_modify_ind(pid(), teid_addr()) -> {ok, teid_addr()} | + {error, term()}. +erab_modify_ind(Pid, F_TEID) -> + gen_statem:call(Pid, {?FUNCTION_NAME, F_TEID}). + + +%% @doc Indicate reception of E-RAB modify confirmation (from core). +%% @param Pid PID of an erab_fsm. +%% @param Res ack if MME indicates successful modification; +%% nack if MME indicates unsuccessful modification. +%% @returns ok or an error. +%% @end +-spec erab_modify_cnf(pid(), ack | nack) -> ok | {error, term()}. +erab_modify_cnf(Pid, Res) -> + gen_statem:call(Pid, {?FUNCTION_NAME, Res}). + + -spec erab_release(pid(), rel_kind()) -> ok. erab_release(Pid, cmd) -> erab_release_cmd(Pid); @@ -320,6 +347,10 @@ modify_req -> {ok, S#erab_state.a2u}; modify_rsp_nack -> + ok; + modify_ind -> + {ok, S#erab_state.c2u}; + modify_cnf_nack -> ok end, {next_state, erab_setup, @@ -379,6 +410,41 @@ end; erab_setup({call, From}, + {erab_modify_ind, U2AM}, + #erab_state{} = S) -> + ?LOG_DEBUG("Rx E-RAB MODIFY Ind (U2AM ~p)", [U2AM]), + {next_state, session_modify, + S#erab_state{mod_kind = modify_ind, + from = From, + u2am = U2AM}}; + +erab_setup({call, From}, + {erab_modify_cnf, Res}, + #erab_state{u2am = undefined}) -> + %% Ignore erab_modify_cnf events without prior erab_modify_ind. This happens + %% when the S1AP E-RAB MODIFY Ind contains no F-TEID (nothing to modify). + ?LOG_DEBUG("Rx E-RAB MODIFY Cnf (~p), F-TEID remains unchanged", [Res]), + {keep_state_and_data, {reply, From, ok}}; + +erab_setup({call, From}, + {erab_modify_cnf, Res}, + #erab_state{u2am = U2AM} = S0) -> + ?LOG_DEBUG("Rx E-RAB MODIFY Cnf (~p)", [Res]), + case Res of + ack -> + {keep_state, + S0#erab_state{u2a = U2AM, + u2am = undefined}, + {reply, From, ok}}; + nack -> + %% revert PFCP session params + {next_state, session_modify, + S0#erab_state{mod_kind = modify_cnf_nack, + u2am = undefined, + from = From}} + end; + +erab_setup({call, From}, erab_release_cmd, #erab_state{} = S) -> ?LOG_DEBUG("Rx E-RAB RELEASE Cmd"), @@ -559,7 +625,21 @@ u2c = U2C}) -> %% E-RAB MODIFY Rsp (NACK) - eNB NACK's E-RAB modification %% so we modify the respective FAR (id=2) - session_modify_req(SEID, 2, U2C). + session_modify_req(SEID, 2, U2C); + +session_modify_req(#erab_state{mod_kind = modify_ind, + seid_rem = SEID, + u2am = U2AM}) -> + %% E-RAB MODIFY Ind - eNB orders modification of U2A F-TEID, + %% so we modify the respective FAR (id=1) + session_modify_req(SEID, 1, U2AM); + +session_modify_req(#erab_state{mod_kind = modify_cnf_nack, + seid_rem = SEID, + u2a = U2A}) -> + %% E-RAB MODIFY Cnf (NACK) - MME NACK's E-RAB modification + %% so we modify the respective FAR (id=1) + session_modify_req(SEID, 1, U2A). -spec session_modify_req(SEID, FAR_ID, F_TEID) -> Result diff --git a/test/erab_fsm_test.erl b/test/erab_fsm_test.erl index 5563d02..c000701 100644 --- a/test/erab_fsm_test.erl +++ b/test/erab_fsm_test.erl @@ -9,6 +9,7 @@ -define(U2A, {?TEID_U2A, ?ADDR_U2A}). -define(U2CM, {?TEID_U2CM, ?ADDR_U2CM}). +-define(U2AM, {?TEID_U2AM, ?ADDR_U2AM}). %% ------------------------------------------------------------------ %% setup/misc functions @@ -54,7 +55,11 @@ [{"E-RAB MODIFY REQ :: ACK", ?TC(fun test_erab_modify_req_ack/1)}, {"E-RAB MODIFY REQ :: NACK", - ?TC(fun test_erab_modify_req_nack/1)}]. + ?TC(fun test_erab_modify_req_nack/1)}, + {"E-RAB MODIFY IND :: ACK", + ?TC(fun test_erab_modify_ind_ack/1)}, + {"E-RAB MODIFY IND :: NACK", + ?TC(fun test_erab_modify_ind_nack/1)}]. erab_release_test_() -> @@ -143,6 +148,35 @@ test_erab_modify_req(Pid, nack). +test_erab_modify_ind(Pid, Res) -> + U2A = case Res of + ack -> ?U2AM; + nack -> ?U2A + end, + [?_assertEqual({ok, ?A2U}, erab_fsm:erab_setup_req(Pid, ?U2C)), + ?_assertEqual({ok, ?C2U}, erab_fsm:erab_setup_rsp(Pid, ?U2A)), + %% E-RAB MODIFY Ind indicates the new (modified) F-TEID to be used + %% in the UPF -> Access direction. The FSM logic indicates the old + %% (unmodified) F-TEID to be used in the UPF <- Core direction. + ?_assertEqual({ok, ?C2U}, erab_fsm:erab_modify_ind(Pid, ?U2AM)), + %% Before getting the Rsp, the U2C F-TEID remains unchanged + ?_assertEqual(?U2A, erab_fsm_info(Pid, f_teid_u2a)), + %% After getting the Cnf (ACK), the new (modified) U2A F-TEID is used + %% After getting the Cnf (NACK), the U2A F-TEID remains unchanged + ?_assertEqual(ok, erab_fsm:erab_modify_cnf(Pid, Res)), + ?_assertEqual(U2A, erab_fsm_info(Pid, f_teid_u2a)), + ?_assertEqual(ok, erab_fsm:shutdown(Pid)), + ?_assertNot(erlang:is_process_alive(Pid))]. + + +test_erab_modify_ind_ack(Pid) -> + test_erab_modify_ind(Pid, ack). + + +test_erab_modify_ind_nack(Pid) -> + test_erab_modify_ind(Pid, nack). + + test_erab_release_cmd_success(Pid) -> [?_assertEqual({ok, ?A2U}, erab_fsm:erab_setup_req(Pid, ?U2C)), ?_assertEqual({ok, ?C2U}, erab_fsm:erab_setup_rsp(Pid, ?U2A)), diff --git a/test/pfcp_mock.hrl b/test/pfcp_mock.hrl index 9a0232a..609d5f2 100644 --- a/test/pfcp_mock.hrl +++ b/test/pfcp_mock.hrl @@ -7,6 +7,7 @@ -define(TEID_U2A, 16#0002). %% UPF -> Access -define(TEID_U2CM, 16#0f0001). %% UPF -> Core (modified) +-define(TEID_U2AM, 16#0f0002). %% UPF -> Access (modified) -define(ADDR_U2C, << 16#7f, 16#00, 16#00, 16#01 >>). %% UPF -> Core -define(ADDR_C2U, << 16#7f, 16#00, 16#01, 16#01 >>). %% UPF <- Core @@ -14,5 +15,6 @@ -define(ADDR_U2A, << 16#7f, 16#00, 16#00, 16#02 >>). %% UPF -> Access -define(ADDR_U2CM, << 16#7f, 16#0f, 16#00, 16#01 >>). %% UPF -> Core (modified) +-define(ADDR_U2AM, << 16#7f, 16#0f, 16#00, 16#02 >>). %% UPF -> Access (modified) %% vim:set ts=4 sw=4 et: -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39147?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: I750ada0a5a21edc8bc06d567c8000b6304966474 Gerrit-Change-Number: 39147 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

6 months, 1 week

1
0
0 0

[XS] Change in osmo-bsc[master]: cbsp_link: set name on stream

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/39146?usp=email ) Change subject: cbsp_link: set name on stream ...................................................................... cbsp_link: set name on stream Otherwise it's difficult to identify it in logs eg. during reconnect. Change-Id: Ia0873ea26a4ef5678fc571e40391d04a2757a7bc --- M src/osmo-bsc/cbsp_link.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/46/39146/1 diff --git a/src/osmo-bsc/cbsp_link.c b/src/osmo-bsc/cbsp_link.c index 9e17ef3..3a86ea3 100644 --- a/src/osmo-bsc/cbsp_link.c +++ b/src/osmo-bsc/cbsp_link.c @@ -121,6 +121,7 @@ osmo_sock_get_name2(fd)); return -1; } + osmo_stream_srv_set_name(srv, "cbsp"); osmo_stream_srv_set_read_cb(srv, cbsp_srv_read_cb); osmo_stream_srv_set_closed_cb(srv, cbsp_srv_closed_cb); osmo_stream_srv_set_segmentation_cb(srv, osmo_cbsp_segmentation_cb); @@ -240,6 +241,8 @@ OSMO_SOCKADDR_STR_FMT_ARGS(&cbc->client.remote_addr)); if (!cbc->client.cli) { cbc->client.cli = osmo_stream_cli_create(cbc); + OSMO_ASSERT(cbc->client.cli); + osmo_stream_cli_set_name(cbc->client.cli, "cbsp"); osmo_stream_cli_set_data(cbc->client.cli, cbc); osmo_stream_cli_set_connect_cb(cbc->client.cli, cbsp_client_connect_cb); osmo_stream_cli_set_disconnect_cb(cbc->client.cli, cbsp_client_disconnect_cb); @@ -273,6 +276,8 @@ if (!cbc->server.link) { LOGP(DCBS, LOGL_NOTICE, "Creating CBSP Server\n"); cbc->server.link = osmo_stream_srv_link_create(cbc); + OSMO_ASSERT(cbc->server.link); + osmo_stream_srv_link_set_name(cbc->server.link, "cbsp"); osmo_stream_srv_link_set_data(cbc->server.link, cbc); osmo_stream_srv_link_set_accept_cb(cbc->server.link, cbsp_srv_link_accept_cb); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/39146?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia0873ea26a4ef5678fc571e40391d04a2757a7bc Gerrit-Change-Number: 39146 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

6 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: s1gw: add TC_e_rab_modify_req_rsp[_multi]

by fixeria

Attention is currently required from: laforge, osmith, pespin. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39077?usp=email ) Change subject: s1gw: add TC_e_rab_modify_req_rsp[_multi] ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39077?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: I58b9964bae24b5aac526ee0c0c8ac8798f351e05 Gerrit-Change-Number: 39077 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 13 Dec 2024 18:59:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No

6 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: s1gw: make f_ConnHdlr_rx_session_modify_req() more flexible

by fixeria

Attention is currently required from: pespin. Hello Jenkins Builder, osmith, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39076?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: s1gw: make f_ConnHdlr_rx_session_modify_req() more flexible ...................................................................... s1gw: make f_ConnHdlr_rx_session_modify_req() more flexible Allow the caller to pass FAR ID, SEID, and E-RAB parameters (F-TEID), so that it can also be used for testing the E-RAB MODIFY procedure. Change-Id: I52317e79ac02cb4e321b49c2cd824de28e25a1c6 --- M s1gw/S1GW_ConnHdlr.ttcn 1 file changed, 17 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/76/39076/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39076?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I52317e79ac02cb4e321b49c2cd824de28e25a1c6 Gerrit-Change-Number: 39076 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-Attention: pespin <pespin(a)sysmocom.de>

6 months, 1 week

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: library/s1ap: add E-RAB MODIFY IND/CNF templates

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39144?usp=email ) Change subject: library/s1ap: add E-RAB MODIFY IND/CNF templates ...................................................................... library/s1ap: add E-RAB MODIFY IND/CNF templates Change-Id: I2dd3d420ebfaf37fefa1d33a40176ec57fee5619 --- M library/s1ap/S1AP_Templates.ttcn 1 file changed, 358 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/44/39144/1 diff --git a/library/s1ap/S1AP_Templates.ttcn b/library/s1ap/S1AP_Templates.ttcn index b40f948..cb74cb4 100644 --- a/library/s1ap/S1AP_Templates.ttcn +++ b/library/s1ap/S1AP_Templates.ttcn @@ -1923,4 +1923,362 @@ iE_Extensions := * } +/* 9.1.3.8 E-RAB MODIFICATION INDICATION */ +template (value) S1AP_PDU +ts_S1AP_RABModifyInd(template (value) MME_UE_S1AP_ID mme_id, + template (value) ENB_UE_S1AP_ID enb_id, + template (value) E_RABToBeModifiedListBearerModInd rab_do_modify_items, + template (omit) E_RABNotToBeModifiedListBearerModInd rab_no_modify_items := omit) := { + initiatingMessage := { + procedureCode := S1AP_Constants.id_E_RABModificationIndication, + criticality := reject, + value_ := { + e_RABModificationIndication := f_ts_S1AP_RABModifyInd(mme_id, enb_id, + rab_do_modify_items, + rab_no_modify_items) + } + } +} +template (present) S1AP_PDU +tr_S1AP_RABModifyInd(template (present) MME_UE_S1AP_ID mme_id := ?, + template (present) ENB_UE_S1AP_ID enb_id := ?, + template (present) E_RABToBeModifiedListBearerModInd rab_do_modify_items := ?, + template E_RABNotToBeModifiedListBearerModInd rab_no_modify_items := *) := { + initiatingMessage := { + procedureCode := S1AP_Constants.id_E_RABModificationIndication, + criticality := reject, + value_ := { + e_RABModificationIndication := f_tr_S1AP_RABModifyInd(mme_id, enb_id, + rab_do_modify_items, + rab_no_modify_items) + } + } +} + +private function +f_ts_S1AP_RABModifyInd(template (value) MME_UE_S1AP_ID mme_id, + template (value) ENB_UE_S1AP_ID enb_id, + template (value) E_RABToBeModifiedListBearerModInd rab_do_modify_items, + template (omit) E_RABNotToBeModifiedListBearerModInd rab_no_modify_items) +return template (value) E_RABModificationIndication +{ + var template (value) E_RABModificationIndication ind := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := reject, + value_ := { MME_UE_S1AP_ID := mme_id } + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := reject, + value_ := { ENB_UE_S1AP_ID := enb_id } + }, { + id := S1AP_Constants.id_E_RABToBeModifiedListBearerModInd, + criticality := reject, + value_ := { e_RABToBeModifiedListBearerModInd := rab_do_modify_items } + } + } + }; + + var integer idx := lengthof(ind.protocolIEs); + if (isvalue(rab_no_modify_items)) { + ind.protocolIEs[idx] := { + id := S1AP_Constants.id_E_RABNotToBeModifiedListBearerModInd, + criticality := reject, + value_ := { e_RABNotToBeModifiedListBearerModInd := rab_no_modify_items } + }; + idx := idx + 1; + } + + return ind; +} +private function +f_tr_S1AP_RABModifyInd(template (present) MME_UE_S1AP_ID mme_id, + template (present) ENB_UE_S1AP_ID enb_id, + template (present) E_RABToBeModifiedListBearerModInd rab_do_modify_items, + template E_RABNotToBeModifiedListBearerModInd rab_no_modify_items) +return template E_RABModificationIndication +{ + var template E_RABModificationIndication ind := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := reject, + value_ := { MME_UE_S1AP_ID := mme_id } + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := reject, + value_ := { ENB_UE_S1AP_ID := enb_id } + }, { + id := S1AP_Constants.id_E_RABToBeModifiedListBearerModInd, + criticality := reject, + value_ := { e_RABToBeModifiedListBearerModInd := rab_do_modify_items } + } + } + }; + + var integer idx := lengthof(ind.protocolIEs); + if (ispresent(rab_no_modify_items)) { + ind.protocolIEs[idx] := { + id := S1AP_Constants.id_E_RABNotToBeModifiedListBearerModInd, + criticality := reject, + value_ := { e_RABNotToBeModifiedListBearerModInd := rab_no_modify_items } + }; + idx := idx + 1; + } + + /* ignore the remaining IEs */ + ind.protocolIEs[idx] := *; + + return ind; +} + +template (value) E_RABToBeModifiedListBearerModInd +ts_E_RABToBeModifiedListBearerModInd(template (value) E_RABToBeModifiedItemBearerModInd it) := { + { + id := S1AP_Constants.id_E_RABToBeModifiedItemBearerModInd, + criticality := reject, + value_ := { e_RABToBeModifiedItemBearerModInd := it } + } +} +template (present) E_RABToBeModifiedListBearerModInd +tr_E_RABToBeModifiedListBearerModInd(template (present) E_RABToBeModifiedItemBearerModInd it := ?) := { + { + id := S1AP_Constants.id_E_RABToBeModifiedItemBearerModInd, + criticality := reject, + value_ := { e_RABToBeModifiedItemBearerModInd := it } + } +} + +template (value) E_RABToBeModifiedItemBearerModInd +ts_E_RABToBeModifiedItemBearerModInd(template (value) E_RAB_ID rab_id, + template (value) TransportLayerAddress tla, + template (value) GTP_TEID gtp_teid) := { + e_RAB_ID := rab_id, + transportLayerAddress := tla, + dL_GTP_TEID := gtp_teid, + iE_Extensions := omit +} +template (present) E_RABToBeModifiedItemBearerModInd +tr_E_RABToBeModifiedItemBearerModInd(template (present) E_RAB_ID rab_id, + template (present) TransportLayerAddress tla, + template (present) GTP_TEID gtp_teid) := { + e_RAB_ID := rab_id, + transportLayerAddress := tla, + dL_GTP_TEID := gtp_teid, + iE_Extensions := * +} + +template (value) E_RABNotToBeModifiedListBearerModInd +ts_E_RABNotToBeModifiedListBearerModInd(template (value) E_RABNotToBeModifiedItemBearerModInd it) := { + { + id := S1AP_Constants.id_E_RABNotToBeModifiedItemBearerModInd, + criticality := reject, + value_ := { e_RABNotToBeModifiedItemBearerModInd := it } + } +} +template (present) E_RABNotToBeModifiedListBearerModInd +tr_E_RABNotToBeModifiedListBearerModInd(template (present) E_RABNotToBeModifiedItemBearerModInd it := ?) := { + { + id := S1AP_Constants.id_E_RABNotToBeModifiedItemBearerModInd, + criticality := reject, + value_ := { e_RABNotToBeModifiedItemBearerModInd := it } + } +} + +template (value) E_RABNotToBeModifiedItemBearerModInd +ts_E_RABNotToBeModifiedItemBearerModInd(template (value) E_RAB_ID rab_id, + template (value) TransportLayerAddress tla, + template (value) GTP_TEID gtp_teid) := { + e_RAB_ID := rab_id, + transportLayerAddress := tla, + dL_GTP_TEID := gtp_teid, + iE_Extensions := omit +} +template (present) E_RABNotToBeModifiedItemBearerModInd +tr_E_RABNotToBeModifiedItemBearerModInd(template (present) E_RAB_ID rab_id, + template (present) TransportLayerAddress tla, + template (present) GTP_TEID gtp_teid) := { + e_RAB_ID := rab_id, + transportLayerAddress := tla, + dL_GTP_TEID := gtp_teid, + iE_Extensions := * +} + +/* 9.1.3.9 E-RAB MODIFICATION CONFIRMATION */ +template (value) S1AP_PDU +ts_S1AP_RABModifyCnf(template (value) MME_UE_S1AP_ID mme_id, + template (value) ENB_UE_S1AP_ID enb_id, + template (omit) E_RABModifyListBearerModConf rab_modified_items := omit, + template (omit) E_RABList rab_failed_items := omit, + template (omit) E_RABList rab_release_items := omit) := { + successfulOutcome := { + procedureCode := S1AP_Constants.id_E_RABModificationIndication, + criticality := reject, + value_ := { + e_RABModificationConfirm := f_ts_S1AP_RABModifyCnf(mme_id, enb_id, + rab_modified_items, + rab_failed_items, + rab_release_items) + } + } +} +template (present) S1AP_PDU +tr_S1AP_RABModifyCnf(template (present) MME_UE_S1AP_ID mme_id := ?, + template (present) ENB_UE_S1AP_ID enb_id := ?, + template E_RABModifyListBearerModConf rab_modified_items := *, + template E_RABList rab_failed_items := *, + template E_RABList rab_release_items := *) := { + successfulOutcome := { + procedureCode := S1AP_Constants.id_E_RABModificationIndication, + criticality := reject, + value_ := { + e_RABModificationConfirm := f_tr_S1AP_RABModifyCnf(mme_id, enb_id, + rab_modified_items, + rab_failed_items, + rab_release_items) + } + } +} + +private function +f_ts_S1AP_RABModifyCnf(template (value) MME_UE_S1AP_ID mme_id, + template (value) ENB_UE_S1AP_ID enb_id, + template (omit) E_RABModifyListBearerModConf rab_modified_items, + template (omit) E_RABList rab_failed_items, + template (omit) E_RABList rab_release_items) +return template (value) E_RABModificationConfirm +{ + var template (value) E_RABModificationConfirm cnf := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := ignore, + value_ := { MME_UE_S1AP_ID := mme_id } + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := ignore, + value_ := { ENB_UE_S1AP_ID := enb_id } + } + } + }; + + var integer idx := lengthof(cnf.protocolIEs); + if (isvalue(rab_modified_items)) { + cnf.protocolIEs[idx] := { + id := S1AP_Constants.id_E_RABModifyListBearerModConf, + criticality := ignore, + value_ := { e_RABModifyListBearerModConf := rab_modified_items } + }; + idx := idx + 1; + } + if (isvalue(rab_failed_items)) { + cnf.protocolIEs[idx] := { + id := S1AP_Constants.id_E_RABFailedToModifyListBearerModConf, + criticality := ignore, + value_ := { e_RABList := rab_failed_items } + }; + idx := idx + 1; + } + if (isvalue(rab_release_items)) { + cnf.protocolIEs[idx] := { + id := S1AP_Constants.id_E_RABToBeReleasedListBearerModConf, + criticality := ignore, + value_ := { e_RABList := rab_release_items } + }; + idx := idx + 1; + } + + return cnf; +} +private function +f_tr_S1AP_RABModifyCnf(template (present) MME_UE_S1AP_ID mme_id, + template (present) ENB_UE_S1AP_ID enb_id, + template E_RABModifyListBearerModConf rab_modified_items, + template E_RABList rab_failed_items, + template E_RABList rab_release_items) +return template E_RABModificationConfirm +{ + var template E_RABModificationConfirm cnf := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := ignore, + value_ := { MME_UE_S1AP_ID := mme_id } + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := ignore, + value_ := { ENB_UE_S1AP_ID := enb_id } + } + } + }; + + var integer idx := lengthof(cnf.protocolIEs); + if (ispresent(rab_modified_items)) { + cnf.protocolIEs[idx] := { + id := S1AP_Constants.id_E_RABModifyListBearerModConf, + criticality := ignore, + value_ := { e_RABModifyListBearerModConf := rab_modified_items } + }; + idx := idx + 1; + } else if (istemplatekind(rab_modified_items, "*")) { + cnf.protocolIEs[idx] := *; + idx := idx + 1; + } + + if (ispresent(rab_failed_items)) { + cnf.protocolIEs[idx] := { + id := S1AP_Constants.id_E_RABFailedToModifyListBearerModConf, + criticality := ignore, + value_ := { e_RABList := rab_failed_items } + }; + idx := idx + 1; + } else if (istemplatekind(rab_failed_items, "*")) { + cnf.protocolIEs[idx] := *; + idx := idx + 1; + } + + if (ispresent(rab_release_items)) { + cnf.protocolIEs[idx] := { + id := S1AP_Constants.id_E_RABToBeReleasedListBearerModConf, + criticality := ignore, + value_ := { e_RABList := rab_release_items } + }; + idx := idx + 1; + } + + /* ignore the remaining IEs */ + cnf.protocolIEs[idx] := *; + + return cnf; +} + +template (value) E_RABModifyListBearerModConf +ts_E_RABModifyListBearerModConf(template (value) E_RABModifyItemBearerModConf it) := { + { + id := S1AP_Constants.id_E_RABModifyItemBearerModConf, + criticality := ignore, + value_ := { e_RABModifyItemBearerModConf := it } + } +} +template (present) E_RABModifyListBearerModConf +tr_E_RABModifyListBearerModConf(template (present) E_RABModifyItemBearerModConf it := ?) := { + { + id := S1AP_Constants.id_E_RABModifyItemBearerModConf, + criticality := ignore, + value_ := { e_RABModifyItemBearerModConf := it } + } +} + +template (value) E_RABModifyItemBearerModConf +ts_E_RABModifyItemBearerModConf(template (value) E_RAB_ID rab_id) := { + e_RAB_ID := rab_id, + iE_Extensions := omit +} +template (present) E_RABModifyItemBearerModConf +tr_E_RABModifyItemBearerModConf(template (present) E_RAB_ID rab_id) := { + e_RAB_ID := rab_id, + iE_Extensions := * +} + } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39144?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2dd3d420ebfaf37fefa1d33a40176ec57fee5619 Gerrit-Change-Number: 39144 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

6 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: s1gw: add constants for PFCP FAR IDs

by fixeria

Attention is currently required from: fixeria, laforge, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39079?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by pespin, Code-Review+2 by laforge, Verified+1 by Jenkins Builder The change is no longer submittable: Code-Review and Verified are unsatisfied now. Change subject: s1gw: add constants for PFCP FAR IDs ...................................................................... s1gw: add constants for PFCP FAR IDs Change-Id: Ib25e5cc9ca21047f9884e1c13d0861bf4f7251a1 --- M s1gw/S1GW_ConnHdlr.ttcn 1 file changed, 8 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/79/39079/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39079?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib25e5cc9ca21047f9884e1c13d0861bf4f7251a1 Gerrit-Change-Number: 39079 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

6 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2024