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

[S] Change in pysim[master]: ara_m: add command to lock write access to the ARA-M rules.

by dexter

Attention is currently required from: laforge. dexter has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/39780?usp=email ) Change subject: ara_m: add command to lock write access to the ARA-M rules. ...................................................................... Patch Set 3: (1 comment) File docs/shell.rst: https://gerrit.osmocom.org/c/pysim/+/39780/comment/e7141efd_406dc6a8?usp=em… : PS2, Line 1022: NOTE: Proprietary feature that is specific to Bertrand Martel's ARA-M > "ARA-M Locking is a proprietary feature that is specific to sysmocom's fork of Bertrand Martel's ARA […] As far as I can see there is no activity on the original repo. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/39780?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I71581a0c9f146f9a0921093d9b53b053b4a8946c Gerrit-Change-Number: 39780 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 01 Apr 2025 11:07:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

4 months, 1 week

1
0
0 0

[XS] Change in upf-benchmark[master]: doc: osmo_upf_setup: Add missing dependencies

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/upf-benchmark/+/39886?usp=email ) Change subject: doc: osmo_upf_setup: Add missing dependencies ...................................................................... doc: osmo_upf_setup: Add missing dependencies liburing-dev is needed by lisbosmocore to build io_uring backend. Other deps are requried to build nftables. Change-Id: Id65abb907c86cae0a89e28c08adc5ce8bc8a09e0 --- M doc/manuals/chapters/osmo_upf_setup.adoc 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/upf-benchmark refs/changes/86/39886/1 diff --git a/doc/manuals/chapters/osmo_upf_setup.adoc b/doc/manuals/chapters/osmo_upf_setup.adoc index 607cce9..d816de7 100644 --- a/doc/manuals/chapters/osmo_upf_setup.adoc +++ b/doc/manuals/chapters/osmo_upf_setup.adoc @@ -7,10 +7,12 @@ #Install osmo-* dependencies: ---- sudo apt install \ - build-essential gcc g++ make automake autoconf libtool pkg-config \ + bison build-essential flex gcc g++ \ + make automake autoconf libtool pkg-config \ + libjansson-dev \ libtalloc-dev libpcsclite-dev libortp-dev libsctp-dev libssl-dev libdbi-dev \ libdbd-sqlite3 libsqlite3-dev libpcap-dev libc-ares-dev libgnutls28-dev \ - libsctp-dev sqlite3 libusb-1.0-0-dev libmnl-dev libsofia-sip-ua-glib-dev + libsctp-dev sqlite3 libusb-1.0-0-dev libmnl-dev libsofia-sip-ua-glib-dev liburing-dev ---- Download osmo-dev: -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/39886?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: Id65abb907c86cae0a89e28c08adc5ce8bc8a09e0 Gerrit-Change-Number: 39886 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

4 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: s1gw: add UEMux TCs for E-RAB SETUP and RELEASE

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39882?usp=email ) Change subject: s1gw: add UEMux TCs for E-RAB SETUP and RELEASE ...................................................................... s1gw: add UEMux TCs for E-RAB SETUP and RELEASE Change-Id: Ia4583f82a768ca3d185aad596ce8ec9bbd37ad32 Related: SYS#7288 --- M s1gw/S1GW_Tests.ttcn M s1gw/S1GW_UEMux.ttcn M s1gw/expected-results.xml 3 files changed, 132 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index 6e08cd0..86807bf 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -717,6 +717,82 @@ f_UEMuxUEList_all_done(vc_ues); } +function f_TC_uemux_e_rab_setup_release(in ERabList erabs, + boolean release_cmd := false, + boolean release_ind := false) +runs on UEMuxUE { + f_UEMuxUE_subscribe_for_mme_ue_id(g_mme_ue_id); + f_UEMuxUE_subscribe_for_enb_ue_id(g_enb_ue_id); + + f_rnd_sleep(0.5); + f_UEMux_erab_setup(erabs); + + if (release_cmd) { + f_rnd_sleep(0.5); + f_UEMux_erab_release_cmd(erabs); + } + if (release_ind) { + f_rnd_sleep(0.5); + f_UEMux_erab_release_ind(erabs); + } + + f_UEMuxUE_unsubscribe(); +} +testcase TC_uemux_e_rab_setup() runs on test_CT { + var ConnHdlrPars pars := valueof(t_ConnHdlrPars(num_erabs := mp_multi_ue_num)); + var UEMuxUEList vc_ues; + var UEMux_CT vc_uemux; + + f_init(); + + vc_uemux := f_UEMux_spawn(refers(f_TC_UEMux_main), pars); + + for (var integer i := 0; i < mp_multi_ue_num; i := i + 1) { + var ERabList erabs := { pars.erabs[i] }; + + vc_ues[i] := f_UEMuxUE_create(vc_uemux, pars, i, i); + vc_ues[i].start(f_TC_uemux_e_rab_setup_release(erabs)); + } + + f_UEMuxUEList_all_done(vc_ues); +} +testcase TC_uemux_e_rab_release_cmd() runs on test_CT { + var ConnHdlrPars pars := valueof(t_ConnHdlrPars(num_erabs := mp_multi_ue_num)); + var UEMuxUEList vc_ues; + var UEMux_CT vc_uemux; + + f_init(); + + vc_uemux := f_UEMux_spawn(refers(f_TC_UEMux_main), pars); + + for (var integer i := 0; i < mp_multi_ue_num; i := i + 1) { + var ERabList erabs := { pars.erabs[i] }; + + vc_ues[i] := f_UEMuxUE_create(vc_uemux, pars, i, i); + vc_ues[i].start(f_TC_uemux_e_rab_setup_release(erabs, release_cmd := true)); + } + + f_UEMuxUEList_all_done(vc_ues); +} +testcase TC_uemux_e_rab_release_ind() runs on test_CT { + var ConnHdlrPars pars := valueof(t_ConnHdlrPars(num_erabs := mp_multi_ue_num)); + var UEMuxUEList vc_ues; + var UEMux_CT vc_uemux; + + f_init(); + + vc_uemux := f_UEMux_spawn(refers(f_TC_UEMux_main), pars); + + for (var integer i := 0; i < mp_multi_ue_num; i := i + 1) { + var ERabList erabs := { pars.erabs[i] }; + + vc_ues[i] := f_UEMuxUE_create(vc_uemux, pars, i, i); + vc_ues[i].start(f_TC_uemux_e_rab_setup_release(erabs, release_ind := false)); + } + + f_UEMuxUEList_all_done(vc_ues); +} + function f_TC_pfcp_heartbeat(charstring id) runs on ConnHdlr { var integer rts := f_PFCPEM_get_recovery_timestamp(); var PDU_PFCP pfcp_pdu; @@ -759,6 +835,9 @@ execute( TC_ue_ctx_release_cmd_compl() ); execute( TC_ue_ctx_release_cmd_compl3() ); execute( TC_uemux_uldl_nas_release() ); + execute( TC_uemux_e_rab_setup() ); + execute( TC_uemux_e_rab_release_cmd() ); + execute( TC_uemux_e_rab_release_ind() ); execute( TC_pfcp_heartbeat() ); } diff --git a/s1gw/S1GW_UEMux.ttcn b/s1gw/S1GW_UEMux.ttcn index 1d2e5c6..68be645 100644 --- a/s1gw/S1GW_UEMux.ttcn +++ b/s1gw/S1GW_UEMux.ttcn @@ -253,10 +253,18 @@ signature UEMux_subscribe_for_enb_ue_id(in ENB_UE_S1AP_ID enb_ue_id); signature UEMux_unsubscribe(); +signature UEMux_erab_setup(inout ERabList erabs); +signature UEMux_erab_release_cmd(inout ERabList erabs); +signature UEMux_erab_release_ind(inout ERabList erabs); + type port UEMUX_PROC_PT procedure { inout UEMux_subscribe_for_mme_ue_id; inout UEMux_subscribe_for_enb_ue_id; inout UEMux_unsubscribe; + + inout UEMux_erab_setup; + inout UEMux_erab_release_cmd; + inout UEMux_erab_release_ind; } with { extension "internal" }; /*********************************************************************************** @@ -284,6 +292,27 @@ } } +function f_UEMux_erab_setup(inout ERabList erabs) +runs on UEMuxUE { + UEMUX_PROC.call(UEMux_erab_setup:{erabs}) { + [] UEMUX_PROC.getreply(UEMux_erab_setup:{?}) -> param(erabs); + } +} + +function f_UEMux_erab_release_cmd(inout ERabList erabs) +runs on UEMuxUE { + UEMUX_PROC.call(UEMux_erab_release_cmd:{erabs}) { + [] UEMUX_PROC.getreply(UEMux_erab_release_cmd:{?}) -> param(erabs); + } +} + +function f_UEMux_erab_release_ind(inout ERabList erabs) +runs on UEMuxUE { + UEMUX_PROC.call(UEMux_erab_release_ind:{erabs}) { + [] UEMUX_PROC.getreply(UEMux_erab_release_ind:{?}) -> param(erabs); + } +} + function f_UEMuxUE_tx_s1ap_from_mme(template (value) S1AP_PDU pdu) runs on UEMuxUE { var S1AP_dPDU dpdu := { S1AP_PDU_DIR_FROM_MME, valueof(pdu) }; @@ -339,6 +368,7 @@ var MME_UE_S1AP_ID mme_ue_id; var ENB_UE_S1AP_ID enb_ue_id; var UEMuxUE vc_conn; + var ERabList erabs; var S1AP_PDU pdu; alt { @@ -373,6 +403,25 @@ f_UEMux_unsubscribe(vc_conn); UEMUX_PROC.reply(UEMux_unsubscribe:{}) to vc_conn; } + + /* E-RAB and context related procedures */ + [] UEMUX_PROC.getcall(UEMux_erab_setup:{?}) -> param(erabs) sender vc_conn { + var integer idx := f_UEMux_find_ue_by_vc_conn(vc_conn); + f_ConnHdlr_erab_setup_req(erabs, g_uemux_list[idx].mme_ue_id, g_uemux_list[idx].enb_ue_id); + f_ConnHdlr_erab_setup_rsp(erabs, g_uemux_list[idx].mme_ue_id, g_uemux_list[idx].enb_ue_id); + UEMUX_PROC.reply(UEMux_erab_setup:{erabs}) to vc_conn; + } + [] UEMUX_PROC.getcall(UEMux_erab_release_cmd:{?}) -> param(erabs) sender vc_conn { + var integer idx := f_UEMux_find_ue_by_vc_conn(vc_conn); + f_ConnHdlr_erab_release_cmd(erabs, g_uemux_list[idx].mme_ue_id, g_uemux_list[idx].enb_ue_id); + f_ConnHdlr_erab_release_rsp(erabs, g_uemux_list[idx].mme_ue_id, g_uemux_list[idx].enb_ue_id); + UEMUX_PROC.reply(UEMux_erab_release_cmd:{erabs}) to vc_conn; + } + [] UEMUX_PROC.getcall(UEMux_erab_release_ind:{?}) -> param(erabs) sender vc_conn { + var integer idx := f_UEMux_find_ue_by_vc_conn(vc_conn); + f_ConnHdlr_erab_release_ind(erabs, g_uemux_list[idx].mme_ue_id, g_uemux_list[idx].enb_ue_id); + UEMUX_PROC.reply(UEMux_erab_release_ind:{erabs}) to vc_conn; + } } } } diff --git a/s1gw/expected-results.xml b/s1gw/expected-results.xml index 343ba48..27698e9 100644 --- a/s1gw/expected-results.xml +++ b/s1gw/expected-results.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<testsuite name='S1GW_Tests' tests='25' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> +<testsuite name='S1GW_Tests' tests='28' 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'/> @@ -24,5 +24,8 @@ <testcase classname='S1GW_Tests' name='TC_ue_ctx_release_cmd_compl' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_ue_ctx_release_cmd_compl3' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_uemux_uldl_nas_release' time='MASKED'/> + <testcase classname='S1GW_Tests' name='TC_uemux_e_rab_setup' time='MASKED'/> + <testcase classname='S1GW_Tests' name='TC_uemux_e_rab_release_cmd' time='MASKED'/> + <testcase classname='S1GW_Tests' name='TC_uemux_e_rab_release_ind' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_pfcp_heartbeat' time='MASKED'/> </testsuite> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39882?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia4583f82a768ca3d185aad596ce8ec9bbd37ad32 Gerrit-Change-Number: 39882 Gerrit-PatchSet: 3 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>

4 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: s1gw: add UEMux TCs for INITIAL CTX SETUP and UE CTX RELEASE

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39885?usp=email ) Change subject: s1gw: add UEMux TCs for INITIAL CTX SETUP and UE CTX RELEASE ...................................................................... s1gw: add UEMux TCs for INITIAL CTX SETUP and UE CTX RELEASE Change-Id: I811904e50dd6f0a05b0bb6babebe5b4690e2d3ec Related: SYS#7288 --- M s1gw/S1GW_Tests.ttcn M s1gw/S1GW_UEMux.ttcn M s1gw/expected-results.xml 3 files changed, 127 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index 86807bf..fef8279 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -793,6 +793,82 @@ f_UEMuxUEList_all_done(vc_ues); } +function f_TC_uemux_initial_ctx_setup_release(in ERabList erabs, + boolean release_req := false, + boolean release_cmd := false) +runs on UEMuxUE { + f_UEMuxUE_subscribe_for_mme_ue_id(g_mme_ue_id); + f_UEMuxUE_subscribe_for_enb_ue_id(g_enb_ue_id); + + f_rnd_sleep(0.5); + f_UEMux_initial_ctx_setup(erabs); + + if (release_req) { + f_rnd_sleep(0.5); + f_UEMux_ue_ctx_release_req(erabs); + } + if (release_cmd) { + f_rnd_sleep(0.5); + f_UEMux_ue_ctx_release_cmd(erabs); + } + + f_UEMuxUE_unsubscribe(); +} +testcase TC_uemux_initial_ctx_setup() runs on test_CT { + var ConnHdlrPars pars := valueof(t_ConnHdlrPars(num_erabs := mp_multi_ue_num)); + var UEMuxUEList vc_ues; + var UEMux_CT vc_uemux; + + f_init(); + + vc_uemux := f_UEMux_spawn(refers(f_TC_UEMux_main), pars); + + for (var integer i := 0; i < mp_multi_ue_num; i := i + 1) { + var ERabList erabs := { pars.erabs[i] }; + + vc_ues[i] := f_UEMuxUE_create(vc_uemux, pars, i, i); + vc_ues[i].start(f_TC_uemux_initial_ctx_setup_release(erabs)); + } + + f_UEMuxUEList_all_done(vc_ues); +} +testcase TC_uemux_ue_ctx_release_req() runs on test_CT { + var ConnHdlrPars pars := valueof(t_ConnHdlrPars(num_erabs := mp_multi_ue_num)); + var UEMuxUEList vc_ues; + var UEMux_CT vc_uemux; + + f_init(); + + vc_uemux := f_UEMux_spawn(refers(f_TC_UEMux_main), pars); + + for (var integer i := 0; i < mp_multi_ue_num; i := i + 1) { + var ERabList erabs := { pars.erabs[i] }; + + vc_ues[i] := f_UEMuxUE_create(vc_uemux, pars, i, i); + vc_ues[i].start(f_TC_uemux_initial_ctx_setup_release(erabs, release_req := true)); + } + + f_UEMuxUEList_all_done(vc_ues); +} +testcase TC_uemux_ue_ctx_release_cmd() runs on test_CT { + var ConnHdlrPars pars := valueof(t_ConnHdlrPars(num_erabs := mp_multi_ue_num)); + var UEMuxUEList vc_ues; + var UEMux_CT vc_uemux; + + f_init(); + + vc_uemux := f_UEMux_spawn(refers(f_TC_UEMux_main), pars); + + for (var integer i := 0; i < mp_multi_ue_num; i := i + 1) { + var ERabList erabs := { pars.erabs[i] }; + + vc_ues[i] := f_UEMuxUE_create(vc_uemux, pars, i, i); + vc_ues[i].start(f_TC_uemux_initial_ctx_setup_release(erabs, release_cmd := true)); + } + + f_UEMuxUEList_all_done(vc_ues); +} + function f_TC_pfcp_heartbeat(charstring id) runs on ConnHdlr { var integer rts := f_PFCPEM_get_recovery_timestamp(); var PDU_PFCP pfcp_pdu; @@ -838,6 +914,9 @@ execute( TC_uemux_e_rab_setup() ); execute( TC_uemux_e_rab_release_cmd() ); execute( TC_uemux_e_rab_release_ind() ); + execute( TC_uemux_initial_ctx_setup() ); + execute( TC_uemux_ue_ctx_release_req() ); + execute( TC_uemux_ue_ctx_release_cmd() ); execute( TC_pfcp_heartbeat() ); } diff --git a/s1gw/S1GW_UEMux.ttcn b/s1gw/S1GW_UEMux.ttcn index 68be645..baecaff 100644 --- a/s1gw/S1GW_UEMux.ttcn +++ b/s1gw/S1GW_UEMux.ttcn @@ -256,6 +256,9 @@ signature UEMux_erab_setup(inout ERabList erabs); signature UEMux_erab_release_cmd(inout ERabList erabs); signature UEMux_erab_release_ind(inout ERabList erabs); +signature UEMux_initial_ctx_setup(inout ERabList erabs); +signature UEMux_ue_ctx_release_req(inout ERabList erabs); +signature UEMux_ue_ctx_release_cmd(inout ERabList erabs); type port UEMUX_PROC_PT procedure { inout UEMux_subscribe_for_mme_ue_id; @@ -265,6 +268,9 @@ inout UEMux_erab_setup; inout UEMux_erab_release_cmd; inout UEMux_erab_release_ind; + inout UEMux_initial_ctx_setup; + inout UEMux_ue_ctx_release_req; + inout UEMux_ue_ctx_release_cmd; } with { extension "internal" }; /*********************************************************************************** @@ -313,6 +319,27 @@ } } +function f_UEMux_initial_ctx_setup(inout ERabList erabs) +runs on UEMuxUE { + UEMUX_PROC.call(UEMux_initial_ctx_setup:{erabs}) { + [] UEMUX_PROC.getreply(UEMux_initial_ctx_setup:{?}) -> param(erabs); + } +} + +function f_UEMux_ue_ctx_release_req(inout ERabList erabs) +runs on UEMuxUE { + UEMUX_PROC.call(UEMux_ue_ctx_release_req:{erabs}) { + [] UEMUX_PROC.getreply(UEMux_ue_ctx_release_req:{?}) -> param(erabs); + } +} + +function f_UEMux_ue_ctx_release_cmd(inout ERabList erabs) +runs on UEMuxUE { + UEMUX_PROC.call(UEMux_ue_ctx_release_cmd:{erabs}) { + [] UEMUX_PROC.getreply(UEMux_ue_ctx_release_cmd:{?}) -> param(erabs); + } +} + function f_UEMuxUE_tx_s1ap_from_mme(template (value) S1AP_PDU pdu) runs on UEMuxUE { var S1AP_dPDU dpdu := { S1AP_PDU_DIR_FROM_MME, valueof(pdu) }; @@ -422,6 +449,23 @@ f_ConnHdlr_erab_release_ind(erabs, g_uemux_list[idx].mme_ue_id, g_uemux_list[idx].enb_ue_id); UEMUX_PROC.reply(UEMux_erab_release_ind:{erabs}) to vc_conn; } + [] UEMUX_PROC.getcall(UEMux_initial_ctx_setup:{?}) -> param(erabs) sender vc_conn { + var integer idx := f_UEMux_find_ue_by_vc_conn(vc_conn); + f_ConnHdlr_initial_ctx_setup_req(erabs, g_uemux_list[idx].mme_ue_id, g_uemux_list[idx].enb_ue_id); + f_ConnHdlr_initial_ctx_setup_rsp(erabs, g_uemux_list[idx].mme_ue_id, g_uemux_list[idx].enb_ue_id); + UEMUX_PROC.reply(UEMux_initial_ctx_setup:{erabs}) to vc_conn; + } + [] UEMUX_PROC.getcall(UEMux_ue_ctx_release_req:{?}) -> param(erabs) sender vc_conn { + var integer idx := f_UEMux_find_ue_by_vc_conn(vc_conn); + f_ConnHdlr_ue_ctx_release_req(erabs, g_uemux_list[idx].mme_ue_id, g_uemux_list[idx].enb_ue_id); + UEMUX_PROC.reply(UEMux_ue_ctx_release_req:{erabs}) to vc_conn; + } + [] UEMUX_PROC.getcall(UEMux_ue_ctx_release_cmd:{?}) -> param(erabs) sender vc_conn { + var integer idx := f_UEMux_find_ue_by_vc_conn(vc_conn); + f_ConnHdlr_ue_ctx_release_cmd(erabs, g_uemux_list[idx].mme_ue_id, g_uemux_list[idx].enb_ue_id); + f_ConnHdlr_ue_ctx_release_compl(g_uemux_list[idx].mme_ue_id, g_uemux_list[idx].enb_ue_id); + UEMUX_PROC.reply(UEMux_ue_ctx_release_cmd:{erabs}) to vc_conn; + } } } } diff --git a/s1gw/expected-results.xml b/s1gw/expected-results.xml index 27698e9..a44108e 100644 --- a/s1gw/expected-results.xml +++ b/s1gw/expected-results.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<testsuite name='S1GW_Tests' tests='28' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> +<testsuite name='S1GW_Tests' tests='31' 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'/> @@ -27,5 +27,8 @@ <testcase classname='S1GW_Tests' name='TC_uemux_e_rab_setup' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_uemux_e_rab_release_cmd' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_uemux_e_rab_release_ind' time='MASKED'/> + <testcase classname='S1GW_Tests' name='TC_uemux_initial_ctx_setup' time='MASKED'/> + <testcase classname='S1GW_Tests' name='TC_uemux_ue_ctx_release_req' time='MASKED'/> + <testcase classname='S1GW_Tests' name='TC_uemux_ue_ctx_release_cmd' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_pfcp_heartbeat' time='MASKED'/> </testsuite> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39885?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I811904e50dd6f0a05b0bb6babebe5b4690e2d3ec Gerrit-Change-Number: 39885 Gerrit-PatchSet: 2 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>

4 months, 1 week

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: s1gw: ConnHdlr: allow passing {MME,ENB}-UE-S1AP-ID

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39881?usp=email ) Change subject: s1gw: ConnHdlr: allow passing {MME,ENB}-UE-S1AP-ID ...................................................................... s1gw: ConnHdlr: allow passing {MME,ENB}-UE-S1AP-ID This is needed for follow-up UEMux testcases, in which we spawn multiple virtual UEs with unique {MME,ENB}-UE-S1AP-IDs. Change-Id: Ife37c77cff348cdfbde191dbad6da816e68ca941 Related: SYS#7288 --- M s1gw/S1GW_ConnHdlr.ttcn M s1gw/S1GW_Tests.ttcn 2 files changed, 177 insertions(+), 96 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve diff --git a/s1gw/S1GW_ConnHdlr.ttcn b/s1gw/S1GW_ConnHdlr.ttcn index d0dbc06..5c9e108 100644 --- a/s1gw/S1GW_ConnHdlr.ttcn +++ b/s1gw/S1GW_ConnHdlr.ttcn @@ -1,6 +1,6 @@ /* OsmoS1GW (S1AP Gateway) ConnHdlr * - * (C) 2024 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * (C) 2024-2025 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> * Author: Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> * * All rights reserved. @@ -334,11 +334,12 @@ return -1; /* make compiler happy */ } -function f_ConnHdlr_tx_erab_setup_req(in ERabList erabs) +function f_ConnHdlr_tx_erab_setup_req(in ERabList erabs, + MME_UE_S1AP_ID mme_ue_id, + ENB_UE_S1AP_ID enb_ue_id) runs on ConnHdlr { var template (value) E_RABToBeSetupListBearerSUReq items; var template (value) E_RABLevelQoSParameters qos_params; - var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; qos_params := valueof(ts_E_RABLevelQoSParameters); @@ -356,13 +357,14 @@ items[i] := ts_S1AP_RABToBeSetupListBearerSUReq(item)[0]; } - f_ConnHdlr_tx_s1ap_from_mme(ts_S1AP_RABSetupReq(g_pars.mme_ue_id, enb_ue_id, items)); + f_ConnHdlr_tx_s1ap_from_mme(ts_S1AP_RABSetupReq(mme_ue_id, enb_ue_id, items)); } -function f_ConnHdlr_rx_erab_setup_req(in ERabList erabs) +function f_ConnHdlr_rx_erab_setup_req(in ERabList erabs, + MME_UE_S1AP_ID mme_ue_id, + ENB_UE_S1AP_ID enb_ue_id) runs on ConnHdlr return S1AP_PDU { var template (present) E_RABToBeSetupListBearerSUReq items; - var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; var S1AP_PDU pdu; for (var integer i := 0; i < lengthof(erabs); i := i + 1) { @@ -379,14 +381,15 @@ items[i] := tr_S1AP_RABToBeSetupListBearerSUReq(item)[0]; } - f_ConnHdlr_rx_s1ap_from_mme(pdu, tr_S1AP_RABSetupReq(g_pars.mme_ue_id, enb_ue_id, items)); + f_ConnHdlr_rx_s1ap_from_mme(pdu, tr_S1AP_RABSetupReq(mme_ue_id, enb_ue_id, items)); return pdu; } -function f_ConnHdlr_tx_erab_setup_rsp(in ERabList erabs) +function f_ConnHdlr_tx_erab_setup_rsp(in ERabList erabs, + MME_UE_S1AP_ID mme_ue_id, + ENB_UE_S1AP_ID enb_ue_id) runs on ConnHdlr { var template (value) E_RABSetupListBearerSURes items; - var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; for (var integer i := 0; i < lengthof(erabs); i := i + 1) { var template (value) E_RABSetupItemBearerSURes item; @@ -400,13 +403,14 @@ items[i] := ts_S1AP_RABSetupListBearerSURes(item)[0]; } - f_ConnHdlr_tx_s1ap_from_enb(ts_S1AP_RABSetupRsp(g_pars.mme_ue_id, enb_ue_id, items)); + f_ConnHdlr_tx_s1ap_from_enb(ts_S1AP_RABSetupRsp(mme_ue_id, enb_ue_id, items)); } -function f_ConnHdlr_rx_erab_setup_rsp(in ERabList erabs) +function f_ConnHdlr_rx_erab_setup_rsp(in ERabList erabs, + MME_UE_S1AP_ID mme_ue_id, + ENB_UE_S1AP_ID enb_ue_id) runs on ConnHdlr return S1AP_PDU { var template (present) E_RABSetupListBearerSURes items; - var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; var S1AP_PDU pdu; for (var integer i := 0; i < lengthof(erabs); i := i + 1) { @@ -421,7 +425,7 @@ items[i] := tr_S1AP_RABSetupListBearerSURes(item)[0]; } - f_ConnHdlr_rx_s1ap_from_enb(pdu, tr_S1AP_RABSetupRsp(g_pars.mme_ue_id, enb_ue_id, items)); + f_ConnHdlr_rx_s1ap_from_enb(pdu, tr_S1AP_RABSetupRsp(mme_ue_id, enb_ue_id, items)); return pdu; } @@ -740,29 +744,32 @@ } function f_ConnHdlr_tx_erab_release_cmd(in ERabList erabs, + MME_UE_S1AP_ID mme_ue_id, + ENB_UE_S1AP_ID enb_ue_id, S1AP_IEs.Cause cause := c_REL_CMD_CAUSE) runs on ConnHdlr { var template (value) E_RABList items := f_ts_E_RABList(erabs, cause); - var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; - f_ConnHdlr_tx_s1ap_from_mme(ts_S1AP_RABReleaseCmd(g_pars.mme_ue_id, enb_ue_id, items)); + f_ConnHdlr_tx_s1ap_from_mme(ts_S1AP_RABReleaseCmd(mme_ue_id, enb_ue_id, items)); } function f_ConnHdlr_rx_erab_release_cmd(in ERabList erabs, + MME_UE_S1AP_ID mme_ue_id, + ENB_UE_S1AP_ID enb_ue_id, S1AP_IEs.Cause cause := c_REL_CMD_CAUSE) runs on ConnHdlr return S1AP_PDU { var template (present) E_RABList items := f_tr_E_RABList(erabs, cause); - var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; var S1AP_PDU pdu; - f_ConnHdlr_rx_s1ap_from_mme(pdu, tr_S1AP_RABReleaseCmd(g_pars.mme_ue_id, enb_ue_id, items)); + f_ConnHdlr_rx_s1ap_from_mme(pdu, tr_S1AP_RABReleaseCmd(mme_ue_id, enb_ue_id, items)); return pdu; } -function f_ConnHdlr_tx_erab_release_rsp(in ERabList erabs) +function f_ConnHdlr_tx_erab_release_rsp(in ERabList erabs, + MME_UE_S1AP_ID mme_ue_id, + ENB_UE_S1AP_ID enb_ue_id) runs on ConnHdlr { var template (value) E_RABReleaseListBearerRelComp items; - var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; for (var integer i := 0; i < lengthof(erabs); i := i + 1) { var template (value) E_RABReleaseItemBearerRelComp item; @@ -771,13 +778,14 @@ items[i] := ts_E_RABReleaseListBearerRelComp(item)[0]; } - f_ConnHdlr_tx_s1ap_from_enb(ts_S1AP_RABReleaseRsp(g_pars.mme_ue_id, enb_ue_id, items)); + f_ConnHdlr_tx_s1ap_from_enb(ts_S1AP_RABReleaseRsp(mme_ue_id, enb_ue_id, items)); } -function f_ConnHdlr_rx_erab_release_rsp(in ERabList erabs) +function f_ConnHdlr_rx_erab_release_rsp(in ERabList erabs, + MME_UE_S1AP_ID mme_ue_id, + ENB_UE_S1AP_ID enb_ue_id) runs on ConnHdlr return S1AP_PDU { var template (present) E_RABReleaseListBearerRelComp items; - var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; var S1AP_PDU pdu; for (var integer i := 0; i < lengthof(erabs); i := i + 1) { @@ -787,35 +795,38 @@ items[i] := tr_E_RABReleaseListBearerRelComp(item)[0]; } - f_ConnHdlr_rx_s1ap_from_enb(pdu, tr_S1AP_RABReleaseRsp(g_pars.mme_ue_id, enb_ue_id, items)); + f_ConnHdlr_rx_s1ap_from_enb(pdu, tr_S1AP_RABReleaseRsp(mme_ue_id, enb_ue_id, items)); return pdu; } function f_ConnHdlr_tx_erab_release_ind(in ERabList erabs, + MME_UE_S1AP_ID mme_ue_id, + ENB_UE_S1AP_ID enb_ue_id, S1AP_IEs.Cause cause := c_REL_CMD_CAUSE) runs on ConnHdlr { var template (value) E_RABList items := f_ts_E_RABList(erabs, cause); - var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; - f_ConnHdlr_tx_s1ap_from_enb(ts_S1AP_RABReleaseInd(g_pars.mme_ue_id, enb_ue_id, items)); + f_ConnHdlr_tx_s1ap_from_enb(ts_S1AP_RABReleaseInd(mme_ue_id, enb_ue_id, items)); } function f_ConnHdlr_rx_erab_release_ind(in ERabList erabs, + MME_UE_S1AP_ID mme_ue_id, + ENB_UE_S1AP_ID enb_ue_id, S1AP_IEs.Cause cause := c_REL_CMD_CAUSE) runs on ConnHdlr return S1AP_PDU { var template (present) E_RABList items := f_tr_E_RABList(erabs, cause); - var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; var S1AP_PDU pdu; - f_ConnHdlr_rx_s1ap_from_enb(pdu, tr_S1AP_RABReleaseInd(g_pars.mme_ue_id, enb_ue_id, items)); + f_ConnHdlr_rx_s1ap_from_enb(pdu, tr_S1AP_RABReleaseInd(mme_ue_id, enb_ue_id, items)); return pdu; } -function f_ConnHdlr_tx_initial_ctx_setup_req(in ERabList erabs) +function f_ConnHdlr_tx_initial_ctx_setup_req(in ERabList erabs, + MME_UE_S1AP_ID mme_ue_id, + ENB_UE_S1AP_ID enb_ue_id) runs on ConnHdlr { var template (value) E_RABToBeSetupListCtxtSUReq items; var template (value) E_RABLevelQoSParameters qos_params; - var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; qos_params := valueof(ts_E_RABLevelQoSParameters); @@ -833,7 +844,7 @@ items[i] := ts_E_RABToBeSetupListCtxtSUReq(item)[0]; } - f_ConnHdlr_tx_s1ap_from_mme(ts_S1AP_IntialCtxSetupReq(mme_id := g_pars.mme_ue_id, + f_ConnHdlr_tx_s1ap_from_mme(ts_S1AP_IntialCtxSetupReq(mme_id := mme_ue_id, enb_id := enb_ue_id, max_br := ts_UEAggregateMaximumBitrate, rab_setup_items := items, @@ -841,10 +852,11 @@ sec_key := f_rnd_bitstring(256))); } -function f_ConnHdlr_rx_initial_ctx_setup_req(in ERabList erabs) +function f_ConnHdlr_rx_initial_ctx_setup_req(in ERabList erabs, + MME_UE_S1AP_ID mme_ue_id, + ENB_UE_S1AP_ID enb_ue_id) runs on ConnHdlr return S1AP_PDU { var template (present) E_RABToBeSetupListCtxtSUReq items; - var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; var S1AP_PDU pdu; for (var integer i := 0; i < lengthof(erabs); i := i + 1) { @@ -861,7 +873,7 @@ items[i] := tr_E_RABToBeSetupListCtxtSUReq(item)[0]; } - f_ConnHdlr_rx_s1ap_from_mme(pdu, tr_S1AP_IntialCtxSetupReq(mme_id := g_pars.mme_ue_id, + f_ConnHdlr_rx_s1ap_from_mme(pdu, tr_S1AP_IntialCtxSetupReq(mme_id := mme_ue_id, enb_id := enb_ue_id, max_br := tr_UEAggregateMaximumBitrate, rab_setup_items := items, @@ -869,10 +881,11 @@ return pdu; } -function f_ConnHdlr_tx_initial_ctx_setup_rsp(in ERabList erabs) +function f_ConnHdlr_tx_initial_ctx_setup_rsp(in ERabList erabs, + MME_UE_S1AP_ID mme_ue_id, + ENB_UE_S1AP_ID enb_ue_id) runs on ConnHdlr { var template (value) E_RABSetupListCtxtSURes items; - var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; for (var integer i := 0; i < lengthof(erabs); i := i + 1) { var template (value) E_RABSetupItemCtxtSURes item; @@ -886,13 +899,14 @@ items[i] := ts_S1AP_RABSetupListCtxtSURes(item)[0]; } - f_ConnHdlr_tx_s1ap_from_enb(ts_S1AP_InitialCtxSetupResp(g_pars.mme_ue_id, enb_ue_id, items)); + f_ConnHdlr_tx_s1ap_from_enb(ts_S1AP_InitialCtxSetupResp(mme_ue_id, enb_ue_id, items)); } -function f_ConnHdlr_rx_initial_ctx_setup_rsp(in ERabList erabs) +function f_ConnHdlr_rx_initial_ctx_setup_rsp(in ERabList erabs, + MME_UE_S1AP_ID mme_ue_id, + ENB_UE_S1AP_ID enb_ue_id) runs on ConnHdlr return S1AP_PDU { var template (present) E_RABSetupListCtxtSURes items; - var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; var S1AP_PDU pdu; for (var integer i := 0; i < lengthof(erabs); i := i + 1) { @@ -907,7 +921,7 @@ items[i] := tr_S1AP_RABSetupListCtxtSURes(item)[0]; } - f_ConnHdlr_rx_s1ap_from_enb(pdu, tr_S1AP_InitialCtxSetupResp(g_pars.mme_ue_id, enb_ue_id, items)); + f_ConnHdlr_rx_s1ap_from_enb(pdu, tr_S1AP_InitialCtxSetupResp(mme_ue_id, enb_ue_id, items)); return pdu; } @@ -1088,7 +1102,14 @@ } } -function f_ConnHdlr_erab_setup_req(inout ERabList erabs) +function f_ConnHdlr_erab_setup_req_() +runs on ConnHdlr { + f_ConnHdlr_erab_setup_req(g_pars.erabs, g_pars.idx, g_pars.mme_ue_id); +} + +function f_ConnHdlr_erab_setup_req(inout ERabList erabs, + MME_UE_S1AP_ID mme_ue_id, + ENB_UE_S1AP_ID enb_ue_id) runs on ConnHdlr { const OCT8 c_SEID0 := '0000000000000000'O; @@ -1103,7 +1124,7 @@ f_PFCPEM_subscribe_seid(c_SEID0); log("eNB <- [S1GW <- MME]: E-RAB SETUP REQUEST"); - f_ConnHdlr_tx_erab_setup_req(erabs); + f_ConnHdlr_tx_erab_setup_req(erabs, mme_ue_id, enb_ue_id); f_ConnHdlr_session_establish(erabs); /* We're done establishing PFCP sessions, so at this point we no longer expect to @@ -1113,16 +1134,23 @@ f_Mutex_unlock(__BFILE__, __LINE__); log("[eNB <- S1GW] <- MME: E-RAB SETUP REQUEST"); - f_ConnHdlr_rx_erab_setup_req(erabs); + f_ConnHdlr_rx_erab_setup_req(erabs, mme_ue_id, enb_ue_id); } -function f_ConnHdlr_erab_setup_rsp(in ERabList erabs) +function f_ConnHdlr_erab_setup_rsp_() +runs on ConnHdlr { + f_ConnHdlr_erab_setup_rsp(g_pars.erabs, g_pars.idx, g_pars.mme_ue_id); +} + +function f_ConnHdlr_erab_setup_rsp(in ERabList erabs, + MME_UE_S1AP_ID mme_ue_id, + ENB_UE_S1AP_ID enb_ue_id) runs on ConnHdlr { log("[eNB -> S1GW] -> MME: E-RAB SETUP RESPONSE"); - f_ConnHdlr_tx_erab_setup_rsp(erabs); + f_ConnHdlr_tx_erab_setup_rsp(erabs, mme_ue_id, enb_ue_id); f_ConnHdlr_session_modify(erabs); log("eNB -> [S1GW -> MME]: E-RAB SETUP RESPONSE"); - f_ConnHdlr_rx_erab_setup_rsp(erabs); + f_ConnHdlr_rx_erab_setup_rsp(erabs, mme_ue_id, enb_ue_id); } function f_ConnHdlr_erab_modify_req(in ERabList erabs) @@ -1226,35 +1254,63 @@ f_ConnHdlr_rx_erab_modify_cnf(erabs_modified, erabs_not_modified, erabs_release); } +function f_ConnHdlr_erab_release_cmd_(S1AP_IEs.Cause cause := c_REL_CMD_CAUSE) +runs on ConnHdlr { + f_ConnHdlr_erab_release_cmd(g_pars.erabs, g_pars.idx, g_pars.mme_ue_id); +} + function f_ConnHdlr_erab_release_cmd(inout ERabList erabs, + MME_UE_S1AP_ID mme_ue_id, + ENB_UE_S1AP_ID enb_ue_id, S1AP_IEs.Cause cause := c_REL_CMD_CAUSE) runs on ConnHdlr { log("eNB <- [S1GW <- MME]: E-RAB RELEASE COMMAND"); - f_ConnHdlr_tx_erab_release_cmd(erabs, cause); + f_ConnHdlr_tx_erab_release_cmd(erabs, mme_ue_id, enb_ue_id, cause); f_ConnHdlr_session_delete(erabs); log("[eNB <- S1GW] <- MME: E-RAB RELEASE COMMAND"); - f_ConnHdlr_rx_erab_release_cmd(erabs, cause); + f_ConnHdlr_rx_erab_release_cmd(erabs, mme_ue_id, enb_ue_id, cause); } -function f_ConnHdlr_erab_release_rsp(inout ERabList erabs) +function f_ConnHdlr_erab_release_rsp_() +runs on ConnHdlr { + f_ConnHdlr_erab_release_rsp(g_pars.erabs, g_pars.idx, g_pars.mme_ue_id); +} + +function f_ConnHdlr_erab_release_rsp(inout ERabList erabs, + MME_UE_S1AP_ID mme_ue_id, + ENB_UE_S1AP_ID enb_ue_id) runs on ConnHdlr { log("[eNB -> S1GW] -> MME: E-RAB RELEASE RESPONSE"); - f_ConnHdlr_tx_erab_release_rsp(erabs); + f_ConnHdlr_tx_erab_release_rsp(erabs, mme_ue_id, enb_ue_id); log("eNB -> [S1GW -> MME]: E-RAB RELEASE RESPONSE"); - f_ConnHdlr_rx_erab_release_rsp(erabs); + f_ConnHdlr_rx_erab_release_rsp(erabs, mme_ue_id, enb_ue_id); +} + +function f_ConnHdlr_erab_release_ind_(S1AP_IEs.Cause cause := c_REL_CMD_CAUSE) +runs on ConnHdlr { + f_ConnHdlr_erab_release_ind(g_pars.erabs, g_pars.idx, g_pars.mme_ue_id, cause); } function f_ConnHdlr_erab_release_ind(inout ERabList erabs, + MME_UE_S1AP_ID mme_ue_id, + ENB_UE_S1AP_ID enb_ue_id, S1AP_IEs.Cause cause := c_REL_CMD_CAUSE) runs on ConnHdlr { log("[eNB -> S1GW] -> MME: E-RAB RELEASE INDICATION"); - f_ConnHdlr_tx_erab_release_ind(erabs, cause); + f_ConnHdlr_tx_erab_release_ind(erabs, mme_ue_id, enb_ue_id, cause); f_ConnHdlr_session_delete(erabs); log("eNB -> [S1GW -> MME]: E-RAB RELEASE INDICATION"); - f_ConnHdlr_rx_erab_release_ind(erabs, cause); + f_ConnHdlr_rx_erab_release_ind(erabs, mme_ue_id, enb_ue_id, cause); } -function f_ConnHdlr_initial_ctx_setup_req(inout ERabList erabs) +function f_ConnHdlr_initial_ctx_setup_req_() +runs on ConnHdlr { + f_ConnHdlr_initial_ctx_setup_req(g_pars.erabs, g_pars.idx, g_pars.mme_ue_id); +} + +function f_ConnHdlr_initial_ctx_setup_req(inout ERabList erabs, + MME_UE_S1AP_ID mme_ue_id, + ENB_UE_S1AP_ID enb_ue_id) runs on ConnHdlr { const OCT8 c_SEID0 := '0000000000000000'O; @@ -1269,7 +1325,7 @@ f_PFCPEM_subscribe_seid(c_SEID0); log("eNB <- [S1GW <- MME]: INITIAL CONTEXT SETUP REQUEST"); - f_ConnHdlr_tx_initial_ctx_setup_req(erabs); + f_ConnHdlr_tx_initial_ctx_setup_req(erabs, mme_ue_id, enb_ue_id); f_ConnHdlr_session_establish(erabs); /* We're done establishing PFCP sessions, so at this point we no longer expect to @@ -1279,37 +1335,58 @@ f_Mutex_unlock(__BFILE__, __LINE__); log("[eNB <- S1GW] <- MME: INITIAL CONTEXT SETUP REQUEST"); - f_ConnHdlr_rx_initial_ctx_setup_req(erabs); + f_ConnHdlr_rx_initial_ctx_setup_req(erabs, mme_ue_id, enb_ue_id); } -function f_ConnHdlr_initial_ctx_setup_rsp(inout ERabList erabs) +function f_ConnHdlr_initial_ctx_setup_rsp_() +runs on ConnHdlr { + f_ConnHdlr_initial_ctx_setup_rsp(g_pars.erabs, g_pars.idx, g_pars.mme_ue_id); +} + +function f_ConnHdlr_initial_ctx_setup_rsp(inout ERabList erabs, + MME_UE_S1AP_ID mme_ue_id, + ENB_UE_S1AP_ID enb_ue_id) runs on ConnHdlr { log("[eNB -> S1GW] -> MME: INITIAL CONTEXT SETUP RESPONSE"); - f_ConnHdlr_tx_initial_ctx_setup_rsp(erabs); + f_ConnHdlr_tx_initial_ctx_setup_rsp(erabs, mme_ue_id, enb_ue_id); f_ConnHdlr_session_modify(erabs); log("eNB -> [S1GW -> MME]: INITIAL CONTEXT SETUP RESPONSE"); - f_ConnHdlr_rx_initial_ctx_setup_rsp(erabs); + f_ConnHdlr_rx_initial_ctx_setup_rsp(erabs, mme_ue_id, enb_ue_id); } -function f_ConnHdlr_ue_ctx_release_req(S1AP_IEs.Cause cause := c_REL_CMD_CAUSE) +function f_ConnHdlr_ue_ctx_release_req_(S1AP_IEs.Cause cause := c_REL_CMD_CAUSE) runs on ConnHdlr { - var MME_UE_S1AP_ID mme_ue_id := g_pars.mme_ue_id; - var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; + f_ConnHdlr_ue_ctx_release_req(g_pars.erabs, g_pars.idx, g_pars.mme_ue_id, cause); +} + +function f_ConnHdlr_ue_ctx_release_req(inout ERabList erabs, + MME_UE_S1AP_ID mme_ue_id, + ENB_UE_S1AP_ID enb_ue_id, + S1AP_IEs.Cause cause := c_REL_CMD_CAUSE) +runs on ConnHdlr { var S1AP_PDU pdu; log("[eNB -> S1GW] -> MME: UE CONTEXT RELEASE REQUEST"); f_ConnHdlr_tx_s1ap_from_enb(ts_S1AP_UeContextReleaseReq(mme_ue_id, enb_ue_id, cause)); - f_ConnHdlr_session_delete(g_pars.erabs); + f_ConnHdlr_session_delete(erabs); log("eNB -> [S1GW -> MME]: UE CONTEXT RELEASE REQUEST"); f_ConnHdlr_rx_s1ap_from_enb(pdu, tr_S1AP_UeContextReleaseReq(mme_ue_id, enb_ue_id, cause)); } -function f_ConnHdlr_ue_ctx_release_cmd(S1AP_IEs.Cause cause := c_REL_CMD_CAUSE) +function f_ConnHdlr_ue_ctx_release_cmd_(S1AP_IEs.Cause cause := c_REL_CMD_CAUSE) +runs on ConnHdlr { + f_ConnHdlr_ue_ctx_release_cmd(g_pars.erabs, g_pars.idx, g_pars.mme_ue_id, cause); +} + +function f_ConnHdlr_ue_ctx_release_cmd(inout ERabList erabs, + MME_UE_S1AP_ID mme_ue_id, + ENB_UE_S1AP_ID enb_ue_id, + S1AP_IEs.Cause cause := c_REL_CMD_CAUSE) runs on ConnHdlr { var template (value) UE_S1AP_IDs ue_ids := { uE_S1AP_ID_pair := { - mME_UE_S1AP_ID := g_pars.mme_ue_id, - eNB_UE_S1AP_ID := g_pars.idx, + mME_UE_S1AP_ID := mme_ue_id, + eNB_UE_S1AP_ID := enb_ue_id, iE_Extensions := omit } }; @@ -1317,15 +1394,19 @@ log("eNB <- [S1GW <- MME]: UE CONTEXT RELEASE COMMAND"); f_ConnHdlr_tx_s1ap_from_mme(ts_S1AP_UeContextReleaseCmd(ue_ids, cause)); - f_ConnHdlr_session_delete(g_pars.erabs); + f_ConnHdlr_session_delete(erabs); log("[eNB <- S1GW] <- MME: UE CONTEXT RELEASE COMMAND"); f_ConnHdlr_rx_s1ap_from_mme(pdu, tr_S1AP_UeContextReleaseCmd(ue_ids, cause)); } -function f_ConnHdlr_ue_ctx_release_compl() +function f_ConnHdlr_ue_ctx_release_compl_() runs on ConnHdlr { - var MME_UE_S1AP_ID mme_ue_id := g_pars.mme_ue_id; - var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; + f_ConnHdlr_ue_ctx_release_compl(g_pars.idx, g_pars.mme_ue_id); +} + +function f_ConnHdlr_ue_ctx_release_compl(MME_UE_S1AP_ID mme_ue_id, + ENB_UE_S1AP_ID enb_ue_id) +runs on ConnHdlr { var S1AP_PDU pdu; log("[eNB -> S1GW] -> MME: UE CONTEXT RELEASE COMPLETE"); diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index f0b0826..6e08cd0 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -1,6 +1,6 @@ /* OsmoS1GW (S1AP Gateway) test suite in TTCN-3 * - * (C) 2024 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * (C) 2024-2025 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> * Author: Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> * * All rights reserved. @@ -385,10 +385,10 @@ 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); - f_ConnHdlr_erab_release_cmd(g_pars.erabs); - f_ConnHdlr_erab_release_rsp(g_pars.erabs); + f_ConnHdlr_erab_setup_req_(); + f_ConnHdlr_erab_setup_rsp_(); + f_ConnHdlr_erab_release_cmd_(); + f_ConnHdlr_erab_release_rsp_(); f_ConnHdlr_s1ap_disconnect(); f_ConnHdlr_s1ap_unregister(g_pars.genb_id); @@ -416,9 +416,9 @@ 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); - f_ConnHdlr_erab_release_ind(g_pars.erabs); + f_ConnHdlr_erab_setup_req_(); + f_ConnHdlr_erab_setup_rsp_(); + f_ConnHdlr_erab_release_ind_(); f_ConnHdlr_s1ap_disconnect(); f_ConnHdlr_s1ap_unregister(g_pars.genb_id); @@ -442,7 +442,7 @@ f_PFCPEM_subscribe_seid(erab.pfcp_loc_seid); log("eNB <- [S1GW <- MME]: E-RAB SETUP REQUEST"); - f_ConnHdlr_tx_erab_setup_req({erab}); + f_ConnHdlr_tx_erab_setup_req({erab}, g_pars.idx, g_pars.mme_ue_id); log("UPF <- S1GW: PFCP Session Establishment Request"); var PDU_PFCP req := f_ConnHdlr_rx_session_establish_req(erab); /* store peer's SEID, so that it can be used in outgoing PDUs later */ @@ -487,8 +487,8 @@ 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); + f_ConnHdlr_erab_setup_req_(); + f_ConnHdlr_erab_setup_rsp_(); /* MME orders eNB to modify all 4 E-RABs */ f_ConnHdlr_erab_modify_req(g_pars.erabs); @@ -496,8 +496,8 @@ f_ConnHdlr_erab_modify_rsp(erabs_modified := {1, 3}, erabs_failed := {0, 2}); - f_ConnHdlr_erab_release_cmd(g_pars.erabs); - f_ConnHdlr_erab_release_rsp(g_pars.erabs); + f_ConnHdlr_erab_release_cmd_(); + f_ConnHdlr_erab_release_rsp_(); f_ConnHdlr_s1ap_disconnect(); f_ConnHdlr_s1ap_unregister(g_pars.genb_id); @@ -517,8 +517,8 @@ 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); + f_ConnHdlr_erab_setup_req_(); + f_ConnHdlr_erab_setup_rsp_(); /* eNB wants to modify all E-RABs but E-RAB 4 */ f_ConnHdlr_erab_modify_ind(erabs_modified := {0, 1, 2, 3}, @@ -531,8 +531,8 @@ * 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_erab_release_cmd_(); + f_ConnHdlr_erab_release_rsp_(); f_ConnHdlr_s1ap_disconnect(); f_ConnHdlr_s1ap_unregister(g_pars.genb_id); @@ -552,8 +552,8 @@ f_ConnHdlr_s1ap_connect(mp_enb_bind_ip, mp_s1gw_enb_ip); f_ConnHdlr_s1ap_setup(g_pars.genb_id); - f_ConnHdlr_initial_ctx_setup_req(g_pars.erabs); - f_ConnHdlr_initial_ctx_setup_rsp(g_pars.erabs); + f_ConnHdlr_initial_ctx_setup_req_(); + f_ConnHdlr_initial_ctx_setup_rsp_(); f_ConnHdlr_s1ap_disconnect(); f_ConnHdlr_s1ap_unregister(g_pars.genb_id); @@ -586,7 +586,7 @@ f_ConnHdlr_s1ap_setup(g_pars.genb_id); /* Initiate E-RAB establishment by sending INITIAL CONTEXT SETUP */ - f_ConnHdlr_initial_ctx_setup_req(g_pars.erabs); + f_ConnHdlr_initial_ctx_setup_req_(); /* At this point, the associated PFCP session is created, but not modified yet. * The E-RAB FSM in the IUT is waiting for INITIAL CONTEXT SETUP RESPONSE. */ @@ -617,9 +617,9 @@ f_ConnHdlr_s1ap_connect(mp_enb_bind_ip, mp_s1gw_enb_ip); f_ConnHdlr_s1ap_setup(g_pars.genb_id); - f_ConnHdlr_initial_ctx_setup_req(g_pars.erabs); - f_ConnHdlr_initial_ctx_setup_rsp(g_pars.erabs); - f_ConnHdlr_ue_ctx_release_req(); + f_ConnHdlr_initial_ctx_setup_req_(); + f_ConnHdlr_initial_ctx_setup_rsp_(); + f_ConnHdlr_ue_ctx_release_req_(); f_ConnHdlr_s1ap_disconnect(); f_ConnHdlr_s1ap_unregister(g_pars.genb_id); @@ -637,11 +637,11 @@ f_ConnHdlr_s1ap_connect(mp_enb_bind_ip, mp_s1gw_enb_ip); f_ConnHdlr_s1ap_setup(g_pars.genb_id); - f_ConnHdlr_initial_ctx_setup_req(g_pars.erabs); - f_ConnHdlr_initial_ctx_setup_rsp(g_pars.erabs); + f_ConnHdlr_initial_ctx_setup_req_(); + f_ConnHdlr_initial_ctx_setup_rsp_(); - f_ConnHdlr_ue_ctx_release_cmd(); - f_ConnHdlr_ue_ctx_release_compl(); + f_ConnHdlr_ue_ctx_release_cmd_(); + f_ConnHdlr_ue_ctx_release_compl_(); f_ConnHdlr_s1ap_disconnect(); f_ConnHdlr_s1ap_unregister(g_pars.genb_id); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39881?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ife37c77cff348cdfbde191dbad6da816e68ca941 Gerrit-Change-Number: 39881 Gerrit-PatchSet: 3 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>

4 months, 1 week

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: s1gw: ConnHdlr: allow passing {MME,ENB}-UE-S1AP-ID

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39881?usp=email ) Change subject: s1gw: ConnHdlr: allow passing {MME,ENB}-UE-S1AP-ID ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39881?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: Ife37c77cff348cdfbde191dbad6da816e68ca941 Gerrit-Change-Number: 39881 Gerrit-PatchSet: 3 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: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 01 Apr 2025 09:24:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 1 week

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: s1gw: ConnHdlr: allow passing {MME,ENB}-UE-S1AP-ID

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39881?usp=email ) Change subject: s1gw: ConnHdlr: allow passing {MME,ENB}-UE-S1AP-ID ...................................................................... Patch Set 3: (1 comment) Patchset: PS3: > Ack, I'd at least probably add a new record containing both "MME_UE_S1AP_ID mme_ue_id" and "ENB_UE_S […] What you're suggesting is not possible because the `f_ConnHdlr_...` API cannot be used by the UE (`UEMuxUE`) components directly. It's a generic per-eNB connection API that is already used by other testcases. This API will also be invoked by the UEMux (`UEMux_CT` aka the UE orchestrator) component on behalf of the UE components. Both `MME_UE_S1AP_ID` and `ENB_UE_S1AP_ID` are already part of the UE (`UEMuxUE`) component state, and they do not have to pass these IDs explicitly because the UEMux component knows them and will transparently pass them to the `f_ConnHdlr_...` API (see follow-up patches). -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39881?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: Ife37c77cff348cdfbde191dbad6da816e68ca941 Gerrit-Change-Number: 39881 Gerrit-PatchSet: 3 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-Comment-Date: Tue, 01 Apr 2025 09:00:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

4 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: s1gw: add UEMux TCs for INITIAL CTX SETUP and UE CTX RELEASE

by fixeria

fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39885?usp=email ) Change subject: s1gw: add UEMux TCs for INITIAL CTX SETUP and UE CTX RELEASE ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39885?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: I811904e50dd6f0a05b0bb6babebe5b4690e2d3ec Gerrit-Change-Number: 39885 Gerrit-PatchSet: 2 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-Comment-Date: Tue, 01 Apr 2025 08:58:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: s1gw: add UEMux TCs for E-RAB SETUP and RELEASE

by fixeria

fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39882?usp=email ) Change subject: s1gw: add UEMux TCs for E-RAB SETUP and RELEASE ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39882?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: Ia4583f82a768ca3d185aad596ce8ec9bbd37ad32 Gerrit-Change-Number: 39882 Gerrit-PatchSet: 3 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-Comment-Date: Tue, 01 Apr 2025 08:58:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: s1gw: add UEMux TCs for INITIAL CTX SETUP and UE CTX RELEASE

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39885?usp=email ) Change subject: s1gw: add UEMux TCs for INITIAL CTX SETUP and UE CTX RELEASE ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39885?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: I811904e50dd6f0a05b0bb6babebe5b4690e2d3ec Gerrit-Change-Number: 39885 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 01 Apr 2025 08:46:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2025