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

[M] Change in osmo-ttcn3-hacks[master]: osmo-*.cfg: enable gsmtap log

by fixeria

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38665?usp=email ) Change subject: osmo-*.cfg: enable gsmtap log ...................................................................... Patch Set 1: (1 comment) File bsc/osmo-stp.cfg: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38665/comment/ae21c683_4541… : PS1, Line 5: 172.18.31.203 `127.0.0.1`? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38665?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: I8a1c734c0d34b81e70707b0ac6732a366b867bbe Gerrit-Change-Number: 38665 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 07 Nov 2024 17:05:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

7 months, 2 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: hnbgw: Small fixes in f_tc_rab_assignment()

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38685?usp=email ) Change subject: hnbgw: Small fixes in f_tc_rab_assignment() ...................................................................... hnbgw: Small fixes in f_tc_rab_assignment() Change-Id: I2f21d3ed59f6b8d26cfee3bd8e75c63cc9d710a3 --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index f9da374..3db72bf 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -1064,11 +1064,10 @@ f_shutdown_helper(); } -friend function f_tc_rab_assignment(charstring id) runs on ConnHdlr { +private function f_tc_rab_assignment(charstring id) runs on ConnHdlr { const charstring hnb0_ctr_prefix := mp_statsd_prefix & "hnb.001-01-L2342-R0-S55-C1."; var MgcpCommand mgcp_cmd; var RANAP_PDU tx; - timer T := 5.0; f_statsd_reset(); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38685?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: I2f21d3ed59f6b8d26cfee3bd8e75c63cc9d710a3 Gerrit-Change-Number: 38685 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: hnbgw: Small fixes in f_tc_rab_assignment()

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38685?usp=email ) Change subject: hnbgw: Small fixes in f_tc_rab_assignment() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38685?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: I2f21d3ed59f6b8d26cfee3bd8e75c63cc9d710a3 Gerrit-Change-Number: 38685 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 07 Nov 2024 15:38:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 2 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: RUA_Emulation: Add missing msg component destination

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38680?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: RUA_Emulation: Add missing msg component destination ...................................................................... RUA_Emulation: Add missing msg component destination Seen while running lots of components concurrently: "RUA_Emulation.ttcn:315 Dynamic test case error: Port CLIENT has more than one active connections. Message can be sent on it only with explicit addressing." Change-Id: Ief257969a451f2d11ad7619fb97af16d7dd7e199 --- M library/rua/RUA_Emulation.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/library/rua/RUA_Emulation.ttcn b/library/rua/RUA_Emulation.ttcn index 26c2da7..8b28a98 100644 --- a/library/rua/RUA_Emulation.ttcn +++ b/library/rua/RUA_Emulation.ttcn @@ -312,7 +312,7 @@ } /* notify user of disconnect */ if (CLIENT.checkstate("Connected")) { - CLIENT.send(RUA_Disc_Ind:{cause}); + CLIENT.send(RUA_Disc_Ind:{cause}) to vc_conn; } f_conn_table_del(context_id); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38680?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: Ief257969a451f2d11ad7619fb97af16d7dd7e199 Gerrit-Change-Number: 38680 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Add test TC_ps_rab_assignment_concurrent

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38676?usp=email ) Change subject: hnbgw: Add test TC_ps_rab_assignment_concurrent ...................................................................... hnbgw: Add test TC_ps_rab_assignment_concurrent Related: SYS#6602 Change-Id: I053950373cec93ed8dbdfd6b8a71ffe31de3806f --- M hnbgw/HNBGW_Tests.ttcn M hnbgw/expected-results.xml 2 files changed, 32 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 91bbb11..9bd4f40 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -662,6 +662,14 @@ return vc_conn; } +/* wait for all ConnHdlr in the given list to be .done() */ +private function f_ConnHdlrList_all_done(in ConnHdlrList vc_conns) +runs on test_CT { + for (var integer i := 0; i < lengthof(vc_conns); i := i + 1) { + vc_conns[i].done; + } +} + /*********************************************************************** * HNBAP Testing ***********************************************************************/ @@ -1506,6 +1514,27 @@ f_shutdown_helper(); } +/* Same as TC_ps_rab_assignment, but 16 subscribers in parallel. + * Currently 16 is the maximum we can create due to array sizes of RAN_Emulation.ttcn. + */ +testcase TC_ps_rab_assignment_concurrent() runs on test_CT { + var ConnHdlrList vc_conn_list := {}; + g_num_hnbs := 1; + f_init(); + f_sleep(1.0); + const integer num_conns := 16; + + for (var integer i := 0; i < num_conns; i := i + 1) { + var ConnHdlr vc_conn; + var TestHdlrParams pars := f_TestHdlrParams(i, ps_domain := true); + vc_conn := f_start_handler_with_pars(refers(f_tc_ps_rab_assignment), pars); + vc_conn_list := vc_conn_list & { vc_conn }; + } + + f_ConnHdlrList_all_done(vc_conn_list); + f_shutdown_helper(); +} + /* Default list of counters for a 'cn' entity to test the cnpool feature. */ const CounterNameVals counternames_cnpool := { { "cnpool:subscr:new", 0 }, @@ -2395,6 +2424,7 @@ execute(TC_cs_iu_release_req_rua_disconnect()); execute(TC_ps_iu_release_req_rua_disconnect()); execute(TC_ps_rab_assignment()); + execute(TC_ps_rab_assignment_concurrent()); execute( TC_mscpool_L3Compl_on_1_cnlink() ); execute( TC_mscpool_L3Complete_by_imsi_round_robin() ); diff --git a/hnbgw/expected-results.xml b/hnbgw/expected-results.xml index 70e29e6..338bf4e 100644 --- a/hnbgw/expected-results.xml +++ b/hnbgw/expected-results.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<testsuite name='Titan' tests='54' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> +<testsuite name='Titan' tests='55' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> <testcase classname='HNBGW_Tests' name='TC_hnb_register' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_hnb_register_duplicate' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_hnb_register_duplicate_reuse_sctp_assoc' time='MASKED'/> @@ -27,6 +27,7 @@ <testcase classname='HNBGW_Tests' name='TC_cs_iu_release_req_rua_disconnect' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_ps_iu_release_req_rua_disconnect' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_ps_rab_assignment' time='MASKED'/> + <testcase classname='HNBGW_Tests' name='TC_ps_rab_assignment_concurrent' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_mscpool_L3Compl_on_1_cnlink' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_mscpool_L3Complete_by_imsi_round_robin' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_mscpool_LU_by_tmsi_null_nri_0_round_robin' time='MASKED'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38676?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: I053950373cec93ed8dbdfd6b8a71ffe31de3806f Gerrit-Change-Number: 38676 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: with-pfcp: Support running ConnHdlr concurrently

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38674?usp=email ) Change subject: hnbgw: with-pfcp: Support running ConnHdlr concurrently ...................................................................... hnbgw: with-pfcp: Support running ConnHdlr concurrently Use Mutex to serialize PFCP session establishment to workaround the "Req with SEID=0" dispatching problem. This same system is used in S1GW_Tests. Change-Id: Ie19ee0bd1b811e9381e3c245a4b1208de8afcbce --- M hnbgw/ConnHdlr.ttcn M hnbgw/HNBGW_Tests.ttcn M hnbgw/gen_links.sh 3 files changed, 29 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/hnbgw/ConnHdlr.ttcn b/hnbgw/ConnHdlr.ttcn index 9205599..560d732 100644 --- a/hnbgw/ConnHdlr.ttcn +++ b/hnbgw/ConnHdlr.ttcn @@ -74,6 +74,8 @@ import from SCCPasp_Types all; import from SCCP_Templates all; +import from Mutex all; + /*********************************************************************** * code running inside per-UE ConnHdlr ***********************************************************************/ @@ -84,13 +86,15 @@ * MGCP_ConnHdlr (for the MGCP side, emulating the MGW) * StatsD_ConnHdlr (for the statsd interface, verifying counters) */ -type component ConnHdlr extends RAN_ConnHdlr, MGCP_ConnHdlr, RUA_ConnHdlr, PFCP_ConnHdlr, StatsD_ConnHdlr { +type component ConnHdlr +extends RAN_ConnHdlr, MGCP_ConnHdlr, RUA_ConnHdlr, PFCP_ConnHdlr, StatsD_ConnHdlr, MutexCT { var integer g_sccp_conn_id; var TestHdlrParams g_pars; timer g_Tguard; port TELNETasp_PT HNBGWVTY; } +type record of ConnHdlr ConnHdlrList; type record MgwResponse { integer resp, @@ -774,6 +778,15 @@ var RANAP_PDU rx; var PDU_PFCP m; + /* This code block cannot be executed by more than one component at a time because + * the RANAP RAB Ass Request triggers the IUT to send PFCP Session Establishment + * Request PDU(s), which needs to be routed to the respective ConnHdlr component (us). + * As per 3GPP TS 29.244, section 7.2.2.4.2, these PFCP PDUs shall all have SEID=0, + * so that the PFCPEM component cannot route them unambiguously. This is why we + * need to ensure that only one ConnHdlr is triggering PFCP session establishment + * at the given moment of time. */ + f_Mutex_lock(__BFILE__, __LINE__); + /* Subscribe for PFCP Session Establishment Request PDU(s), which are * expected to have SEID set to 0, as per 3GPP TS 29.244, section 7.2.2.4.2. */ f_PFCPEM_subscribe_seid(c_SEID0); @@ -788,8 +801,11 @@ m := f_pfcp_expect(tr_PFCP_Session_Est_Req()); /* Ask PFCPEM to route PDUs with to be indicated F-SEID to us. */ f_PFCPEM_subscribe_seid(g_pars.pfcp_pars.upf_f_seid.seid); - /* We no longer expect to receive PFCP Session Establishment Request PDU(s). */ + /* We're done establishing PFCP sessions, so at this point we no longer expect to + * receive Session Establishment Request PDUs with SEID=0. Unregister and unlock + * the mutex, enabling other components to establish PFCP sessions after us. */ f_PFCPEM_unsubscribe_seid(c_SEID0); + f_Mutex_unlock(__BFILE__, __LINE__); var PFCP_Session_Establishment_Request serq := m.message_body.pfcp_session_establishment_request; /* Store HNBGW F-SEID for later: */ diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 97ae334..91bbb11 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -75,6 +75,7 @@ import from SCCPasp_Types all; import from ConnHdlr all; +import from Mutex all; const integer NUM_MSC := 4; const integer NUM_SGSN := 4; @@ -275,6 +276,8 @@ var CounterNameValsList g_ctr_hnb; var RanOps g_ran_ops := MSC_RanOps; + + var MutexDispCT vc_mutex_disp; } /* global altstep for global guard timer; */ @@ -488,6 +491,8 @@ T_guard.start(guard_timeout); activate(as_Tguard()); + vc_mutex_disp := f_MutexDisp_start(); + f_init_statsd("VirtHNBGW", vc_STATSD, mp_local_statsd_ip, mp_local_statsd_port); f_init_vty("VirtHNBGW"); f_ipa_ctrl_start_client(mp_hnbgw_ip, mp_hnbgw_ctrl_port); @@ -586,7 +591,8 @@ pfcp_pars := t_PfcpParams(pfcp_enabled := mp_enable_pfcp_tests, pfcp_local_addr := mp_pfcp_ip_local, - pfcp_upf_node_id := mp_pfcp_upf_node_id); + pfcp_upf_node_id := mp_pfcp_upf_node_id, + upf_f_seid := 1000 + imsi_suffix); pars := t_pars(imsi_suffix, ps_domain := ps_domain, expect_separate_sccp_cr := expect_separate_sccp_cr, @@ -637,13 +643,15 @@ connect(vc_conn:PFCP, vc_PFCP:CLIENT); connect(vc_conn:PFCP_PROC, vc_PFCP:CLIENT_PROC); + f_MutexDisp_connect(vc_mutex_disp, vc_conn); + return vc_conn; } private function f_start_handler_run(ConnHdlr vc_conn, void_fn fn, TestHdlrParams pars) runs on test_CT { var charstring id := testcasename(); // & int2str(pars.ran_idx); pars.hnb := g_hnb_cfg[pars.hnb_idx]; - vc_conn.start(f_handler_init(fn, id, pars)) + vc_conn.start(f_handler_init(fn, id, pars)); } function f_start_handler_with_pars(void_fn fn, template (value) TestHdlrParams pars) diff --git a/hnbgw/gen_links.sh b/hnbgw/gen_links.sh index 51ce602..de173f1 100755 --- a/hnbgw/gen_links.sh +++ b/hnbgw/gen_links.sh @@ -105,6 +105,7 @@ FILES+="StatsD_Types.ttcn StatsD_CodecPort.ttcn StatsD_CodecPort_CtrlFunct.ttcn StatsD_CodecPort_CtrlFunctdef.cc StatsD_Checker.ttcnpp " FILES+="L3_Templates.ttcn L3_Common.ttcn " FILES+="SCTP_Templates.ttcn " +FILES+="Mutex.ttcn " gen_links $DIR $FILES ignore_pp_results -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38674?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: Ie19ee0bd1b811e9381e3c245a4b1208de8afcbce Gerrit-Change-Number: 38674 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: RAN_Emulation: Increase ExpecTable size to 16

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38675?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: RAN_Emulation: Increase ExpecTable size to 16 ...................................................................... RAN_Emulation: Increase ExpecTable size to 16 Use same size as other tables. This allow running HNBGW_Tests with 16 ConnHdlrs instead of 8. Change-Id: I0748da523d886a8097b9f35991b9044e6ca33f95 --- M library/RAN_Emulation.ttcnpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp index 9f942f3..5eb14de 100644 --- a/library/RAN_Emulation.ttcnpp +++ b/library/RAN_Emulation.ttcnpp @@ -273,7 +273,7 @@ var ConnectionData ConnectionTable[16]; /* pending expected incoming connections */ - var ExpectData ExpectTable[8]; + var ExpectData ExpectTable[16]; /* tables for mapping inbound unitdata (like paging) */ var ImsiMapping ImsiTable[16]; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38675?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: I0748da523d886a8097b9f35991b9044e6ca33f95 Gerrit-Change-Number: 38675 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(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>

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Parametrize MgcpParameters MGCP endpoint

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38677?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: hnbgw: Parametrize MgcpParameters MGCP endpoint ...................................................................... hnbgw: Parametrize MgcpParameters MGCP endpoint This will be needed if we want to run several CS RAB ConnHdlrs in parallel. Change-Id: I4bb28dea22a6ea5b415d6ca16bde61b835d435bc --- M hnbgw/ConnHdlr.ttcn M hnbgw/HNBGW_Tests.ttcn 2 files changed, 13 insertions(+), 4 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/hnbgw/ConnHdlr.ttcn b/hnbgw/ConnHdlr.ttcn index 560d732..7ba5b94 100644 --- a/hnbgw/ConnHdlr.ttcn +++ b/hnbgw/ConnHdlr.ttcn @@ -122,11 +122,17 @@ integer got_osmux_count } -template (value) MgcpParameters t_MgcpParams := { +private function f_mgcp_endp_str(integer endp_idx := 1) return charstring +{ + return "rtpbridge/" & int2str(endp_idx) & "@mgw"; +} + +template (value) MgcpParameters +t_MgcpParams(integer endp_idx := 1) := { got_crcx_count := 0, got_dlcx_count := 0, mgcp_call_id := omit, - mgcp_ep := "rtpbridge/1@mgw", + mgcp_ep := f_mgcp_endp_str(endp_idx), mgw_conn_ran := { resp := 1, mgw_rtp_ip := "127.1.2.1", @@ -258,6 +264,7 @@ integer tx_sccp_cr_data_len := 0, boolean expect_compl_l3_success := true, integer cn_idx := 0, + template (value) MgcpParameters mgcp_pars := t_MgcpParams(), template (value) PfcpParameters pfcp_pars := t_PfcpParams(), template (value) RANAP_IEs.Cause rab_rel_cause := ts_RanapCause_nas_normal, integer hnbgw_timer_x31 := 5, @@ -266,7 +273,7 @@ cn_idx := cn_idx, imsi := f_gen_imsi(imsi_suffix), ps_domain := ps_domain, - mgcp_pars := t_MgcpParams, + mgcp_pars := mgcp_pars, gtp_pars := t_GtpParams, hnb := omit, /* filled in later */ expect_separate_sccp_cr := expect_separate_sccp_cr, diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 9bd4f40..6441cef 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -587,8 +587,9 @@ template (value) RANAP_IEs.Cause rab_rel_cause := ts_RanapCause_nas_normal) runs on test_CT return TestHdlrParams { var template (value) TestHdlrParams pars; + var template (value) MgcpParameters mgcp_pars; var template (value) PfcpParameters pfcp_pars; - + mgcp_pars := t_MgcpParams(endp_idx := imsi_suffix); pfcp_pars := t_PfcpParams(pfcp_enabled := mp_enable_pfcp_tests, pfcp_local_addr := mp_pfcp_ip_local, pfcp_upf_node_id := mp_pfcp_upf_node_id, @@ -599,6 +600,7 @@ tx_sccp_cr_data_len := tx_sccp_cr_data_len, expect_compl_l3_success := expect_compl_l3_success, cn_idx := f_cn_idx(ps_domain, cn_nr), + mgcp_pars := mgcp_pars, pfcp_pars := pfcp_pars, rab_rel_cause := rab_rel_cause, hnbgw_timer_x31 := mp_hnbgw_timer_x31); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38677?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: I4bb28dea22a6ea5b415d6ca16bde61b835d435bc Gerrit-Change-Number: 38677 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(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>

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: mgcp: Support running CS RAB ConnHdlr concurrently

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38678?usp=email ) Change subject: hnbgw: mgcp: Support running CS RAB ConnHdlr concurrently ...................................................................... hnbgw: mgcp: Support running CS RAB ConnHdlr concurrently Use Mutex to serialize CRCX wildcard endpoint, in order to be able to properly steer the message to the good ConnHdlr. Change-Id: Ibd97a37d98abfa746b58db0ea8bb591e7c8dc638 --- M hnbgw/ConnHdlr.ttcn M hnbgw/HNBGW_Tests.ttcn 2 files changed, 14 insertions(+), 11 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/hnbgw/ConnHdlr.ttcn b/hnbgw/ConnHdlr.ttcn index 7ba5b94..44e4cce 100644 --- a/hnbgw/ConnHdlr.ttcn +++ b/hnbgw/ConnHdlr.ttcn @@ -687,6 +687,15 @@ var template RAB_SetupOrModifyList rab_sml; timer T := 5.0; + /* This code block cannot be executed by more than one component at a time because the + * RANAP RAB Ass Request triggers the IUT to send MGCP CRCX PDU(s), which needs to be + * routed to the respective ConnHdlr component (us). This is why we need to ensure that + * one ConnHdlr is triggering MGCP CRCX wildcard at the given moment of time. + */ + f_Mutex_lock(__BFILE__, __LINE__); + + f_create_mgcp_expect(ExpectCriteria:{omit,omit,omit}); + /* Send RAB Assignment Request */ rab_sml := ts_RAB_SML(t_RAB_id(23), f_ts_RAB_TLA(g_pars.mgcp_pars.cn_rtp_ip), t_RAB_binding_port(g_pars.mgcp_pars.cn_rtp_port)); tx := valueof(ts_RANAP_RabAssReq(rab_sml)); @@ -697,11 +706,15 @@ alt { [] MGCP.receive(tr_CRCX) -> value mgcp_cmd { log("CRCX1", mgcp_cmd); + /* Unregister and unlock the mutex, enabling other components to + * establish MGCP sessions after us. */ + f_Mutex_unlock(__BFILE__, __LINE__); var template MgcpResponse mgcp_rsp := f_handle_crcx(g_pars.mgcp_pars, mgcp_cmd); MGCP.send(valueof(mgcp_rsp)); } [] T.timeout { - setverdict(fail, "Timeout waiting for MGCP"); + /* No need to f_Mutex_unlock since we are exiting anyway... */ + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for MGCP"); } } T.stop; diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 6441cef..e367666 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -1070,8 +1070,6 @@ var RANAP_PDU tx; timer T := 5.0; - f_create_mgcp_expect(ExpectCriteria:{omit,omit,omit}); - f_statsd_reset(); tx := f_build_initial_ue(g_pars); @@ -1114,8 +1112,6 @@ var RANAP_PDU tx; timer T := 5.0; - f_create_mgcp_expect(ExpectCriteria:{omit,omit,omit}); - f_statsd_reset(); tx := f_build_initial_ue(g_pars); @@ -1170,8 +1166,6 @@ var RANAP_PDU tx; timer T := 15.0; - f_create_mgcp_expect(ExpectCriteria:{omit,omit,omit}); - f_statsd_reset(); tx := f_build_initial_ue(g_pars); @@ -1407,8 +1401,6 @@ var RANAP_PDU tx; timer T := 5.0; - f_create_mgcp_expect(ExpectCriteria:{omit,omit,omit}); - tx := f_build_initial_ue(g_pars); f_iuh2iu_connect(tx); @@ -2329,8 +2321,6 @@ var RANAP_PDU tx; timer T := 5.0; - f_create_mgcp_expect(ExpectCriteria:{omit,omit,omit}); - tx := f_build_initial_ue(g_pars); f_iuh2iu_connect(tx); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38678?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: Ibd97a37d98abfa746b58db0ea8bb591e7c8dc638 Gerrit-Change-Number: 38678 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Introduce test TC_rab_assignment_concurrent

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38679?usp=email ) Change subject: hnbgw: Introduce test TC_rab_assignment_concurrent ...................................................................... hnbgw: Introduce test TC_rab_assignment_concurrent Related: SYS#6602 Change-Id: I1f717edbe4a758288d017861c4b77836c5811040 --- M hnbgw/HNBGW_Tests.ttcn M hnbgw/expected-results.xml 2 files changed, 41 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index e367666..f9da374 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -1094,7 +1094,6 @@ f_cn_iu_release_procedure(mgcp_teardown := true); } - testcase TC_rab_assignment() runs on test_CT { var ConnHdlr vc_conn; g_num_hnbs := 1; @@ -1106,6 +1105,44 @@ f_shutdown_helper(); } +/* Same as TC_rab_assignment, but 16 subscribers in parallel. + * Currently 16 is the maximum we can create due to array sizes of RAN_Emulation.ttcn. + * Stats are removed since it's difficult to count with several conns concurrently doing stuff. + */ +private function f_tc_rab_assignment_concurrent(charstring id) runs on ConnHdlr { + const charstring hnb0_ctr_prefix := mp_statsd_prefix & "hnb.001-01-L2342-R0-S55-C1."; + var MgcpCommand mgcp_cmd; + var RANAP_PDU tx; + + f_statsd_reset(); + + tx := f_build_initial_ue(g_pars); + f_iuh2iu_connect(tx); + + f_create_rab_cs(); + + /* Wait some time with connection up */ + f_sleep(2.0); + + f_cn_iu_release_procedure(mgcp_teardown := true); +} +testcase TC_rab_assignment_concurrent() runs on test_CT { + var ConnHdlrList vc_conn_list := {}; + g_num_hnbs := 1; + f_init(); + f_sleep(1.0); + const integer num_conns := 16; + + for (var integer i := 0; i < num_conns; i := i + 1) { + var ConnHdlr vc_conn; + vc_conn := f_start_handler_with_pars(refers(f_tc_rab_assignment_concurrent), f_TestHdlrParams(i)); + vc_conn_list := vc_conn_list & { vc_conn }; + } + + f_ConnHdlrList_all_done(vc_conn_list); + f_shutdown_helper(); +} + friend function f_tc_rab_assign_fail(charstring id) runs on ConnHdlr { const charstring hnb0_ctr_prefix := mp_statsd_prefix & "hnb.001-01-L2342-R0-S55-C1."; var MgcpCommand mgcp_cmd; @@ -2404,6 +2441,7 @@ execute(TC_ranap_cs_bidir()); execute(TC_ranap_ps_bidir()); execute(TC_rab_assignment()); + execute(TC_rab_assignment_concurrent()); execute(TC_rab_release()); execute(TC_rab_release_abnormal()); execute(TC_rab_assign_fail()); diff --git a/hnbgw/expected-results.xml b/hnbgw/expected-results.xml index 338bf4e..ad5a0f5 100644 --- a/hnbgw/expected-results.xml +++ b/hnbgw/expected-results.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<testsuite name='Titan' tests='55' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> +<testsuite name='Titan' tests='56' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> <testcase classname='HNBGW_Tests' name='TC_hnb_register' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_hnb_register_duplicate' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_hnb_register_duplicate_reuse_sctp_assoc' time='MASKED'/> @@ -15,6 +15,7 @@ <testcase classname='HNBGW_Tests' name='TC_ranap_cs_bidir' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_ranap_ps_bidir' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_rab_assignment' time='MASKED'/> + <testcase classname='HNBGW_Tests' name='TC_rab_assignment_concurrent' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_rab_release' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_rab_release_abnormal' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_rab_assign_fail' time='MASKED'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38679?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: I1f717edbe4a758288d017861c4b77836c5811040 Gerrit-Change-Number: 38679 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2024