- gerrit-log - lists.osmocom.org

[M] Change in ...osmo-s1gw[master]: s1ap_proxy: handle E-RAB MODIFY REQ/RSP
by fixeria 13 Dec '24

13 Dec '24

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>

1 0

[M] Change in ...osmo-s1gw[master]: erab_fsm: implement E-RAB MODIFY Ind/Cnf procedure
by fixeria 13 Dec '24

13 Dec '24

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>

1 0

[XS] Change in osmo-bsc[master]: cbsp_link: set name on stream
by pespin 13 Dec '24

13 Dec '24

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>

1 0

[M] Change in osmo-ttcn3-hacks[master]: s1gw: add TC_e_rab_modify_req_rsp[_multi]
by fixeria 13 Dec '24

13 Dec '24

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

1 0

[S] Change in osmo-ttcn3-hacks[master]: s1gw: make f_ConnHdlr_rx_session_modify_req() more flexible
by fixeria 13 Dec '24

13 Dec '24

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>

1 0

[L] Change in osmo-ttcn3-hacks[master]: library/s1ap: add E-RAB MODIFY IND/CNF templates
by fixeria 13 Dec '24

13 Dec '24

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>

1 0

[S] Change in osmo-ttcn3-hacks[master]: s1gw: add constants for PFCP FAR IDs
by fixeria 13 Dec '24

13 Dec '24

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>

1 0

[L] Change in osmo-ttcn3-hacks[master]: s1gw: add TC_e_rab_modify_ind_cnf[_multi]
by fixeria 13 Dec '24

13 Dec '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39145?usp=email ) Change subject: s1gw: add TC_e_rab_modify_ind_cnf[_multi] ...................................................................... s1gw: add TC_e_rab_modify_ind_cnf[_multi] Test the E-RAB Modify procedure (eNB initiated), which is defined in 3GPP TS 36.413 section 8.2.4. Change-Id: Iec95ca0ecf37290bddfbefce1861f8ae66bf4db1 --- M s1gw/S1GW_ConnHdlr.ttcn M s1gw/S1GW_Tests.ttcn M s1gw/expected-results.xml 3 files changed, 271 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/45/39145/1 diff --git a/s1gw/S1GW_ConnHdlr.ttcn b/s1gw/S1GW_ConnHdlr.ttcn index 6e5ba99..5c57af4 100644 --- a/s1gw/S1GW_ConnHdlr.ttcn +++ b/s1gw/S1GW_ConnHdlr.ttcn @@ -290,6 +290,7 @@ ERabParams a2u, /* Access -> UPF params */ ERabParams u2a, /* UPF -> Access params */ ERabParams u2cm, /* UPF -> Core params (modified) */ + ERabParams u2am, /* UPF -> Access params (modified) */ OCT8 pfcp_loc_seid, OCT8 pfcp_rem_seid optional }; @@ -518,6 +519,164 @@ return pdu; } +function f_ConnHdlr_tx_erab_modify_ind(in ERabIdList erabs_modified, + in ERabIdList erabs_not_modified := {}) +runs on ConnHdlr { + var template (value) E_RABToBeModifiedListBearerModInd items_modified; + var template (omit) E_RABNotToBeModifiedListBearerModInd items_not_modified := omit; + var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; + + for (var integer i := 0; i < lengthof(erabs_modified); i := i + 1) { + var template (value) E_RABToBeModifiedItemBearerModInd item; + var integer erab_idx := erabs_modified[i]; + var ERabParams epars := g_pars.erabs[erab_idx].u2am; + + item := ts_E_RABToBeModifiedItemBearerModInd(rab_id := g_pars.erabs[erab_idx].erab_id, + tla := oct2bit(f_inet_addr(epars.tla)), + gtp_teid := epars.teid); + + items_modified[i] := ts_E_RABToBeModifiedListBearerModInd(item)[0]; + } + + for (var integer i := 0; i < lengthof(erabs_not_modified); i := i + 1) { + var template (value) E_RABNotToBeModifiedItemBearerModInd item; + var integer erab_idx := erabs_not_modified[i]; + var ERabParams epars := g_pars.erabs[erab_idx].u2a; + + item := ts_E_RABNotToBeModifiedItemBearerModInd(rab_id := g_pars.erabs[erab_idx].erab_id, + tla := oct2bit(f_inet_addr(epars.tla)), + gtp_teid := epars.teid); + + items_not_modified[i] := ts_E_RABNotToBeModifiedListBearerModInd(item)[0]; + } + + f_ConnHdlr_tx_s1ap_from_enb(ts_S1AP_RABModifyInd(g_pars.mme_ue_id, enb_ue_id, + rab_do_modify_items := items_modified, + rab_no_modify_items := items_not_modified)); +} + +function f_ConnHdlr_rx_erab_modify_ind(in ERabIdList erabs_modified, + in ERabIdList erabs_not_modified := {}) +runs on ConnHdlr return S1AP_PDU { + var template (present) E_RABToBeModifiedListBearerModInd items_modified; + var template E_RABNotToBeModifiedListBearerModInd items_not_modified := omit; + var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; + var S1AP_PDU pdu; + + for (var integer i := 0; i < lengthof(erabs_modified); i := i + 1) { + var template (present) E_RABToBeModifiedItemBearerModInd item; + var integer erab_idx := erabs_modified[i]; + var ERabParams epars := g_pars.erabs[erab_idx].c2u; + + item := tr_E_RABToBeModifiedItemBearerModInd(rab_id := g_pars.erabs[erab_idx].erab_id, + tla := oct2bit(f_inet_addr(epars.tla)), + gtp_teid := epars.teid); + + items_modified[i] := tr_E_RABToBeModifiedListBearerModInd(item)[0]; + } + + for (var integer i := 0; i < lengthof(erabs_not_modified); i := i + 1) { + var template (present) E_RABNotToBeModifiedItemBearerModInd item; + var integer erab_idx := erabs_not_modified[i]; + var ERabParams epars := g_pars.erabs[erab_idx].c2u; + + item := tr_E_RABNotToBeModifiedItemBearerModInd(rab_id := g_pars.erabs[erab_idx].erab_id, + tla := oct2bit(f_inet_addr(epars.tla)), + gtp_teid := epars.teid); + + items_not_modified[i] := tr_E_RABNotToBeModifiedListBearerModInd(item)[0]; + } + + f_ConnHdlr_rx_s1ap_from_enb(pdu, tr_S1AP_RABModifyInd(g_pars.mme_ue_id, enb_ue_id, + rab_do_modify_items := items_modified, + rab_no_modify_items := items_not_modified)); + return pdu; +} + +function f_ConnHdlr_tx_erab_modify_cnf(in ERabIdList erabs_modified := {}, + in ERabIdList erabs_not_modified := {}, + in ERabIdList erabs_release := {}) +runs on ConnHdlr { + var template (omit) E_RABModifyListBearerModConf items_modified := omit; + var template (omit) E_RABList items_not_modified := omit; + var template (omit) E_RABList items_release := omit; + var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; + + for (var integer i := 0; i < lengthof(erabs_modified); i := i + 1) { + var template (value) E_RABModifyItemBearerModConf item; + var integer erab_idx := erabs_modified[i]; + + item := ts_E_RABModifyItemBearerModConf(rab_id := g_pars.erabs[erab_idx].erab_id); + items_modified[i] := ts_E_RABModifyListBearerModConf(item)[0]; + } + + for (var integer i := 0; i < lengthof(erabs_not_modified); i := i + 1) { + var template (value) E_RABItem item; + var integer erab_idx := erabs_not_modified[i]; + + item := ts_E_RABItem(rab_id := g_pars.erabs[erab_idx].erab_id, + cause := { transport := transport_resource_unavailable }); + items_not_modified[i] := ts_E_RABList(item)[0]; + } + + for (var integer i := 0; i < lengthof(erabs_release); i := i + 1) { + var template (value) E_RABItem item; + var integer erab_idx := erabs_release[i]; + + item := ts_E_RABItem(rab_id := g_pars.erabs[erab_idx].erab_id, + cause := { transport := transport_resource_unavailable }); + items_release[i] := ts_E_RABList(item)[0]; + } + + f_ConnHdlr_tx_s1ap_from_mme(ts_S1AP_RABModifyCnf(g_pars.mme_ue_id, enb_ue_id, + rab_modified_items := items_modified, + rab_failed_items := items_not_modified, + rab_release_items := items_release)); +} + +function f_ConnHdlr_rx_erab_modify_cnf(in ERabIdList erabs_modified := {}, + in ERabIdList erabs_not_modified := {}, + in ERabIdList erabs_release := {}) +runs on ConnHdlr return S1AP_PDU { + var template E_RABModifyListBearerModConf items_modified := omit; + var template E_RABList items_not_modified := omit; + var template E_RABList items_release := omit; + var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; + var S1AP_PDU pdu; + + for (var integer i := 0; i < lengthof(erabs_modified); i := i + 1) { + var template (present) E_RABModifyItemBearerModConf item; + var integer erab_idx := erabs_modified[i]; + + item := tr_E_RABModifyItemBearerModConf(rab_id := g_pars.erabs[erab_idx].erab_id); + items_modified[i] := tr_E_RABModifyListBearerModConf(item)[0]; + } + + for (var integer i := 0; i < lengthof(erabs_not_modified); i := i + 1) { + var template (present) E_RABItem item; + var integer erab_idx := erabs_not_modified[i]; + + item := tr_E_RABItem(rab_id := g_pars.erabs[erab_idx].erab_id, + cause := { transport := transport_resource_unavailable }); + items_not_modified[i] := tr_E_RABList(item)[0]; + } + + for (var integer i := 0; i < lengthof(erabs_release); i := i + 1) { + var template (present) E_RABItem item; + var integer erab_idx := erabs_release[i]; + + item := tr_E_RABItem(rab_id := g_pars.erabs[erab_idx].erab_id, + cause := { transport := transport_resource_unavailable }); + items_release[i] := tr_E_RABList(item)[0]; + } + + f_ConnHdlr_rx_s1ap_from_mme(pdu, tr_S1AP_RABModifyCnf(g_pars.mme_ue_id, enb_ue_id, + rab_modified_items := items_modified, + rab_failed_items := items_not_modified, + rab_release_items := items_release)); + return pdu; +} + private function f_ts_E_RABList(in ERabList erabs, S1AP_IEs.Cause cause) return template (value) E_RABList { @@ -962,6 +1121,64 @@ f_ConnHdlr_rx_erab_modify_rsp(erabs_modified, erabs_failed); } +function f_ConnHdlr_erab_modify_ind(in ERabIdList erabs_modified, + in ERabIdList erabs_not_modified := {}) +runs on ConnHdlr { + log("[eNB -> S1GW] -> MME: E-RAB MODIFICATION INDICATION"); + f_ConnHdlr_tx_erab_modify_ind(erabs_modified, erabs_not_modified); + /* Expect the S1GW to modify FARs (id=1) of the respective PFCP sessions */ + for (var integer i := 0; i < lengthof(erabs_modified); i := i + 1) { + var E_RAB_ID erab_idx := erabs_modified[i]; + var ERab erab := g_pars.erabs[erab_idx]; + + log("UPF <- S1GW: PFCP Session Modification Request for E-RAB ID ", erab.erab_id); + var PDU_PFCP pdu := f_ConnHdlr_rx_session_modify_req(epars := erab.u2am, + seid := erab.pfcp_loc_seid, + far_id := c_PFCP_FAR_ID_C2A); + log("UPF -> S1GW: PFCP Session Modification Response for E-RAB ID ", erab.erab_id); + f_ConnHdlr_tx_session_modify_resp(erab, pdu); + } + log("eNB -> [S1GW -> MME]: E-RAB MODIFICATION INDICATION"); + f_ConnHdlr_rx_erab_modify_ind(erabs_modified, erabs_not_modified); +} + +function f_ConnHdlr_erab_modify_cnf(in ERabIdList erabs_modified := {}, + in ERabIdList erabs_not_modified := {}, + in ERabIdList erabs_release := {}) +runs on ConnHdlr { + log("eNB <- [S1GW <- MME]: E-RAB MODIFICATION CONFIRMATION"); + f_ConnHdlr_tx_erab_modify_cnf(erabs_modified, erabs_not_modified, erabs_release); + /* For successfully modified E-RABs, U2AM becomes U2A */ + for (var integer i := 0; i < lengthof(erabs_modified); i := i + 1) { + var E_RAB_ID erab_id := erabs_modified[i]; + g_pars.erabs[erab_id].u2a := g_pars.erabs[erab_id].u2am; + } + /* Expect the S1GW to modify (revert) FARs (id=1) for failed E-RABs (if any) */ + for (var integer i := 0; i < lengthof(erabs_not_modified); i := i + 1) { + var E_RAB_ID erab_idx := erabs_not_modified[i]; + var ERab erab := g_pars.erabs[erab_idx]; + + log("UPF <- S1GW: PFCP Session Modification Request for E-RAB ID ", erab.erab_id); + var PDU_PFCP pdu := f_ConnHdlr_rx_session_modify_req(epars := erab.u2a, + seid := erab.pfcp_loc_seid, + far_id := c_PFCP_FAR_ID_C2A); + log("UPF -> S1GW: PFCP Session Modification Response for E-RAB ID ", erab.erab_id); + f_ConnHdlr_tx_session_modify_resp(erab, pdu); + } + /* Expect the S1GW to delete sessions for released E-RABs (if any) */ + if (lengthof(erabs_release) > 0) { + var ERabList erabs; + + for (var integer i := 0; i < lengthof(erabs_release); i := i + 1) { + var E_RAB_ID erab_idx := erabs_release[i]; + erabs[i] := g_pars.erabs[erab_idx]; + } + f_ConnHdlr_session_delete(erabs); + } + log("[eNB <- S1GW] <- MME: E-RAB MODIFICATION CONFIRMATION"); + f_ConnHdlr_rx_erab_modify_cnf(erabs_modified, erabs_not_modified, erabs_release); +} + function f_ConnHdlr_erab_release_cmd(inout ERabList erabs, S1AP_IEs.Cause cause := c_REL_CMD_CAUSE) runs on ConnHdlr { diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index 8b821bc..6d7cba8 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -159,6 +159,7 @@ a2u := {'0202'O & uid, "127.0.2.2"}, u2a := {'0002'O & uid, "127.0.0.2"}, u2cm := {'0011'O & uid, "127.127.0.1"}, + u2am := {'0022'O & uid, "127.127.0.2"}, pfcp_loc_seid := seid_prefix & uid, pfcp_rem_seid := omit /* assigned by S1GW */ }; @@ -471,6 +472,54 @@ f_TC_e_rab_modify_req_rsp_exec(num_enbs := mp_multi_enb_num); } +/* Test E-RAB MODIFICATION Ind/Cnf procedure */ +function f_TC_e_rab_modify_ind_cnf(charstring id) runs on ConnHdlr { + f_ConnHdlr_s1ap_register(g_pars.genb_id); + f_ConnHdlr_s1ap_connect(mp_enb_bind_ip, mp_s1gw_enb_ip); + f_ConnHdlr_s1ap_setup(g_pars.genb_id); + + f_ConnHdlr_erab_setup_req(g_pars.erabs); + f_ConnHdlr_erab_setup_rsp(g_pars.erabs); + + /* eNB wants to modify all E-RABs but E-RAB 4 */ + f_ConnHdlr_erab_modify_ind(erabs_modified := {0, 1, 2, 3}, + erabs_not_modified := {4}); + /* MME modifies E-RABs 1 and 3, but not E-RAB 0 and 2 */ + f_ConnHdlr_erab_modify_cnf(erabs_modified := {1, 3}, + erabs_not_modified := {0, 2}); + + /* For the sake of fun, test forwarding of an empty confirmation, + * which is expected to be forwarded unmodified */ + f_ConnHdlr_erab_modify_cnf(); + + f_ConnHdlr_erab_release_cmd(g_pars.erabs); + f_ConnHdlr_erab_release_rsp(g_pars.erabs); + + f_ConnHdlr_s1ap_disconnect(); + f_ConnHdlr_s1ap_unregister(g_pars.genb_id); +} +private function f_TC_e_rab_modify_ind_cnf_exec(integer num_enbs) +runs on test_CT { + var ConnHdlrList vc_conns; + + f_init(); + + for (var integer i := 0; i < num_enbs; i := i + 1) { + var ConnHdlrPars pars := valueof(t_ConnHdlrPars(i, num_erabs := 5)); + vc_conns[i] := f_ConnHdlr_spawn(refers(f_TC_e_rab_modify_ind_cnf), pars); + } + + f_ConnHdlrList_all_done(vc_conns); +} +/* 5 E-RABs at a time, single eNB */ +testcase TC_e_rab_modify_ind_cnf() runs on test_CT { + f_TC_e_rab_modify_ind_cnf_exec(num_enbs := 1); +} +/* 5 E-RABs at a time, multiple eNB connections */ +testcase TC_e_rab_modify_ind_cnf_multi() runs on test_CT { + f_TC_e_rab_modify_ind_cnf_exec(num_enbs := mp_multi_enb_num); +} + /* Test INITIAL CONTEXT SETUP procedure (successful case) */ function f_TC_initial_ctx_setup(charstring id) runs on ConnHdlr { f_ConnHdlr_s1ap_register(g_pars.genb_id); @@ -591,6 +640,8 @@ execute( TC_e_rab_setup_failure() ); execute( TC_e_rab_modify_req_rsp() ); execute( TC_e_rab_modify_req_rsp_multi() ); + execute( TC_e_rab_modify_ind_cnf() ); + execute( TC_e_rab_modify_ind_cnf_multi() ); execute( TC_initial_ctx_setup() ); execute( TC_initial_ctx_setup3() ); execute( TC_initial_ctx_setup_multi() ); diff --git a/s1gw/expected-results.xml b/s1gw/expected-results.xml index 911dda8..8d07117 100644 --- a/s1gw/expected-results.xml +++ b/s1gw/expected-results.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<testsuite name='S1GW_Tests' tests='18' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> +<testsuite name='S1GW_Tests' tests='20' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> <testcase classname='S1GW_Tests' name='TC_setup' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_setup_multi' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_conn_term_by_mme' time='MASKED'/> @@ -12,6 +12,8 @@ <testcase classname='S1GW_Tests' name='TC_e_rab_setup_failure' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_e_rab_modify_req_rsp' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_e_rab_modify_req_rsp_multi' time='MASKED'/> + <testcase classname='S1GW_Tests' name='TC_e_rab_modify_ind_cnf' time='MASKED'/> + <testcase classname='S1GW_Tests' name='TC_e_rab_modify_ind_cnf_multi' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_initial_ctx_setup' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_initial_ctx_setup3' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_initial_ctx_setup_multi' time='MASKED'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39145?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: Iec95ca0ecf37290bddfbefce1861f8ae66bf4db1 Gerrit-Change-Number: 39145 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in mncc-python[master]: mncc_mt_loadgen.py: Allow configuring first_msisdn_called in calls()
by pespin 13 Dec '24

13 Dec '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/mncc-python/+/39143?usp=email ) Change subject: mncc_mt_loadgen.py: Allow configuring first_msisdn_called in calls() ...................................................................... mncc_mt_loadgen.py: Allow configuring first_msisdn_called in calls() The msisdns to use actually depen on external configuration. Hence allow passing an initial MSIDN to incrementally setup calls. Take the chance to match the default msisdn first value with abis-load-test. Change-Id: I2dd6b96ea2da117d67a368bc076969f25fa61a52 --- M mncc_mt_loadgen.py 1 file changed, 11 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/mncc-python refs/changes/43/39143/1 diff --git a/mncc_mt_loadgen.py b/mncc_mt_loadgen.py index 8e7a65b..1a4a998 100755 --- a/mncc_mt_loadgen.py +++ b/mncc_mt_loadgen.py @@ -178,10 +178,16 @@ call_conn.start_call(msisdn_called, msisdn_calling, codec) return call_conn -def calls(nr, ramp=1.0, codec='GSM_FR'): +def calls(nr, ramp=1.0, codec='GSM_FR', first_msisdn_called='402965200501'): + first_msisdn_called_int = int(first_msisdn_called) + needed_len = len(str(first_msisdn_called_int + (nr-1))) + # If user passed a longer zero-preffixed input, take it into account: + if len(first_msisdn_called) > needed_len: + needed_len = len(first_msisdn_called) for i in range(nr): - a = 90001 + i - a = str(a) + a = str(first_msisdn_called_int + i) + # prepend with zeros as needed: + a = a.zfill(needed_len) print("%d: mt_call(%r)" % (i, a)) mt_call(a, codec=codec) time.sleep(ramp) @@ -189,9 +195,9 @@ log.info("") log.info("") log.info("Start a single call by typing:") -log.info(" mt_call('90001')") +log.info(" mt_call('402965200501')") log.info("With a specific codec (default is 'GSM_FR'):") -log.info(" mt_call('90001', codec='GSM_EFR')") +log.info(" mt_call('402965200501', codec='GSM_EFR')") log.info("Start multiple calls with (e.g. 4 calls with EFR):") log.info(" calls(4, codec='GSM_EFR')") log.info("") -- To view, visit https://gerrit.osmocom.org/c/mncc-python/+/39143?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: mncc-python Gerrit-Branch: master Gerrit-Change-Id: I2dd6b96ea2da117d67a368bc076969f25fa61a52 Gerrit-Change-Number: 39143 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in mncc-python[master]: cosmetic: mncc_mt_loadgen.py: Fix trailing whitespace
by pespin 13 Dec '24

13 Dec '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/mncc-python/+/39142?usp=email ) Change subject: cosmetic: mncc_mt_loadgen.py: Fix trailing whitespace ...................................................................... cosmetic: mncc_mt_loadgen.py: Fix trailing whitespace Change-Id: I8581e7837df29daa2a0fd1676cc730345872b0d5 --- M mncc_mt_loadgen.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/mncc-python refs/changes/42/39142/1 diff --git a/mncc_mt_loadgen.py b/mncc_mt_loadgen.py index 9a88066..8e7a65b 100755 --- a/mncc_mt_loadgen.py +++ b/mncc_mt_loadgen.py @@ -148,7 +148,7 @@ self.mncc_act.tell({'type': 'send', 'msg': mncc_rtp_conn}) elif message['type'] == 'call_state_change': if message['new_state'] == 'NULL': - # Call FSM has reached the NULL state again (call terminated) + # Call FSM has reached the NULL state again (call terminated) # on_stop() will clean up the RTP connection at rtpsource self.stop() -- 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: newchange 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-CC: osmith <osmith(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log