May 2022 - gerrit-log - lists.osmocom.org

Change in osmo-ttcn3-hacks[master]: mgw: Introduce test TC_two_crcx_mdcx_and_iuup{_rtp}_rfci_unordered

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28191 ) Change subject: mgw: Introduce test TC_two_crcx_mdcx_and_iuup{_rtp}_rfci_unordered ...................................................................... mgw: Introduce test TC_two_crcx_mdcx_and_iuup{_rtp}_rfci_unordered Related: SYS#5969 Change-Id: I2523f18a0fdba87f4e13a2ce3c5da482c4af2e3c --- M mgw/MGCP_Test.ttcn 1 file changed, 39 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index de00e9d..60f955f 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -19,6 +19,7 @@ import from RTP_CodecPort all; import from RTP_CodecPort_CtrlFunct all; import from RTP_Emulation all; + import from IuUP_Emulation all; import from OSMUX_Types all; import from OSMUX_CodecPort all; import from OSMUX_CodecPort_CtrlFunct all; @@ -2465,6 +2466,7 @@ /* create two local RTP+IuUP emulations and pass data in both directions */ function f_tc_two_crcx_mdcx_and_iuup(charstring local_ip_a, charstring remote_ip_a, + IuUP_RabFlowCombinationList rfcl_a, charstring local_ip_b, charstring remote_ip_b) runs on dummy_CT { var RtpFlowData flow[2]; var RtpemStats stats[2]; @@ -2483,6 +2485,7 @@ flow[0].rtp_cfg.tx_payload_type := flow[0].pt; flow[0].rtp_cfg.iuup_mode := true; flow[0].rtp_cfg.iuup_cfg.active_init := true; + flow[0].rtp_cfg.iuup_cfg.rab_flow_combs := rfcl_a; f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow[0], true); f_rtpem_mode(RTPEM[0], RTPEM_MODE_RXONLY); @@ -2576,12 +2579,28 @@ setverdict(pass); } testcase TC_two_crcx_mdcx_and_iuup() runs on dummy_CT { - f_tc_two_crcx_mdcx_and_iuup(mp_local_ipv4, mp_remote_ipv4, + var template (value) IuUP_RabFlowCombinationList rfcl := { + t_IuUP_RFC_AMR_12_2(0), + t_IuUP_RFC_AMR_SID(1), + t_IuUP_RFC_AMR_NO_DATA(2) + }; + f_tc_two_crcx_mdcx_and_iuup(mp_local_ipv4, mp_remote_ipv4, valueof(rfcl), + mp_local_ipv4, mp_remote_ipv4); + } + /* Same as TC_two_crcx_mdcx_and_iuup, but passing unordered RFCI list (ID != position) */ + testcase TC_two_crcx_mdcx_and_iuup_rfci_unordered() runs on dummy_CT { + var template (value) IuUP_RabFlowCombinationList rfcl := { + t_IuUP_RFC_AMR_12_2(1), + t_IuUP_RFC_AMR_SID(2), + t_IuUP_RFC_AMR_NO_DATA(0) + }; + f_tc_two_crcx_mdcx_and_iuup(mp_local_ipv4, mp_remote_ipv4, valueof(rfcl), mp_local_ipv4, mp_remote_ipv4); } /* create two local emulations (1 RTP, 1 RTP+IuUP) and pass data in both directions */ function f_tc_two_crcx_mdcx_and_iuup_rtp(charstring local_ip_a, charstring remote_ip_a, + IuUP_RabFlowCombinationList rfcl_a, charstring local_ip_b, charstring remote_ip_b) runs on dummy_CT { var RtpFlowData flow[2]; var RtpemStats stats[2]; @@ -2602,6 +2621,7 @@ flow[0].rtp_cfg.rx_fixed_payload := '08556d944c71a1a081e7ead204244480000ecd82b81118000097c4794e7740'O; /* flow[1].rtp_cfg.tx_fixed_payload converted AMR-BE-RTP->AMR-IUUP*/ flow[0].rtp_cfg.iuup_mode := true; flow[0].rtp_cfg.iuup_cfg.active_init := true; + flow[0].rtp_cfg.iuup_cfg.rab_flow_combs := rfcl_a; f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow[0], true); f_rtpem_mode(RTPEM[0], RTPEM_MODE_RXONLY); @@ -2696,7 +2716,22 @@ setverdict(pass); } testcase TC_two_crcx_mdcx_and_iuup_rtp() runs on dummy_CT { - f_tc_two_crcx_mdcx_and_iuup_rtp(mp_local_ipv4, mp_remote_ipv4, + var template (value) IuUP_RabFlowCombinationList rfcl := { + t_IuUP_RFC_AMR_12_2(0), + t_IuUP_RFC_AMR_SID(1), + t_IuUP_RFC_AMR_NO_DATA(2) + }; + f_tc_two_crcx_mdcx_and_iuup_rtp(mp_local_ipv4, mp_remote_ipv4, valueof(rfcl), + mp_local_ipv4, mp_remote_ipv4); + } + /* Same as TC_two_crcx_mdcTC_two_crcx_mdcx_and_iuup_rtpx_and_iuup, but passing unordered RFCI list (ID != position) */ + testcase TC_two_crcx_mdcx_and_iuup_rtp_rfci_unordered() runs on dummy_CT { + var template (value) IuUP_RabFlowCombinationList rfcl := { + t_IuUP_RFC_AMR_12_2(1), + t_IuUP_RFC_AMR_SID(2), + t_IuUP_RFC_AMR_NO_DATA(0) + }; + f_tc_two_crcx_mdcx_and_iuup_rtp(mp_local_ipv4, mp_remote_ipv4, valueof(rfcl), mp_local_ipv4, mp_remote_ipv4); } @@ -2775,7 +2810,9 @@ execute(TC_two_crcx_mdcx_and_rtp_osmux_ipv6_ipv4()); execute(TC_two_crcx_mdcx_and_iuup()); + execute(TC_two_crcx_mdcx_and_iuup_rfci_unordered()); execute(TC_two_crcx_mdcx_and_iuup_rtp()); + execute(TC_two_crcx_mdcx_and_iuup_rtp_rfci_unordered()); /* Note: This testcase will trigger an OSMO_ASSERT() bug in * older versions of osmo-mgw. This eventually leads into -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28191 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2523f18a0fdba87f4e13a2ce3c5da482c4af2e3c Gerrit-Change-Number: 28191 Gerrit-PatchSet: 5 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> Gerrit-MessageType: merged

3 years

1
0
0 0

Change in pysim[master]: pySim-shell: catch exceptions from walk() while exporting

by fixeria

Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28162 ) Change subject: pySim-shell: catch exceptions from walk() while exporting ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File pySim-shell.py: https://gerrit.osmocom.org/c/pysim/+/28162/comment/750ca161_b9e8a458 PS2, Line 679: except Exception as e: Does pySim-shell support multi-line comments in a script file? If so, I would do: try: ... except e: ... import traceback print("'''") print(traceback.format_exc()) print("'''") -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28162 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I3edc250ef2a84550c5b821a72e207e4d685790a5 Gerrit-Change-Number: 28162 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 May 2022 20:18:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years

1
0
0 0

Change in pysim[master]: pySim-shell: match SW in apdu command

by fixeria

Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28169 ) Change subject: pySim-shell: match SW in apdu command ...................................................................... Patch Set 1: Code-Review-1 (1 comment) File pySim-shell.py: https://gerrit.osmocom.org/c/pysim/+/28169/comment/6e3f8559_23824a41 PS1, Line 249: expect_sw I would avoid mixing '-' and '_' in command options, '--expect-sw' looks more natural to me. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28169 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic5a52d7cf533c51d111850eb6d8147011a48ae6c Gerrit-Change-Number: 28169 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 May 2022 20:06:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years

1
0
0 0

Change in pysim[master]: filesystem: also return the encoded FCP from probe_file

by fixeria

Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28170 ) Change subject: filesystem: also return the encoded FCP from probe_file ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28170 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia5659e106fb0d6fb8b77506a10eba309e764723e Gerrit-Change-Number: 28170 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 May 2022 19:42:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years

1
0
0 0

Change in pysim[master]: ts_102_221: fix SFI generation

by fixeria

Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28184 ) Change subject: ts_102_221: fix SFI generation ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28184 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iaa38d2be4719f12c1d7b30a8befe278f1ed78ac1 Gerrit-Change-Number: 28184 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 May 2022 19:41:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years

1
0
0 0

Change in pysim[master]: ts_102_221: The BTLV IEs FILE SIZE and TOTAL FILE SIZE have a min length

by fixeria

Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28185 ) Change subject: ts_102_221: The BTLV IEs FILE SIZE and TOTAL FILE SIZE have a min length ...................................................................... Patch Set 1: Code-Review-1 (1 comment) File pySim/construct.py: https://gerrit.osmocom.org/c/pysim/+/28185/comment/9bf39c23_9cd317b8 PS1, Line 244: length = length + (self.minlen - length) This looks weird to me, because 'length' would always be equal to 'self.minlen': test(len=0, min=10) == 0 + (10 - 0) == 10 test(len=1, min=10) == 1 + (10 - 1) == 10 test(len=5, min=10) == 5 + (10 - 5) == 10 test(len=7, min=10) == 7 + (10 - 7) == 10 test(len=9, min=10) == 9 + (10 - 9) == 10 If you want to ensure a minimum value, just do: length = min(self.__bytes_required(obj), self.minlen) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ief113ce8fe3bcae2c9fb2ff4138df9ccf98d26ff Gerrit-Change-Number: 28185 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 May 2022 19:39:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: test lchan rel during LCS Loc Req

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28092 ) Change subject: bsc: test lchan rel during LCS Loc Req ...................................................................... bsc: test lchan rel during LCS Loc Req Test this scenario: Emergency call is started; Location Request is started to locate the emergency; lchan releases early for any reason; (Do not send Clear Request immediately); Location Request is completed, locating the emergency. Related: SYS#5912 Related: Ib44dd05b0adee84234f671313b156ff6625357cc (osmo-bsc) Change-Id: Idea690a4aa4aecbe4642a16e96d086cc0538564a --- M bsc/BSC_Tests.ttcn 1 file changed, 116 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index b35d316..feb8bfb 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -10301,6 +10301,120 @@ f_shutdown_helper(); } +private altstep no_bssmap_clear_req() runs on MSC_ConnHdlr { + [] BSSAP.receive(tr_BSSMAP_ClearRequest) { + setverdict(fail, "unexpected BSSMAP Clear Request"); + mtc.stop; + } +} + +private type enumerated RslRel { + RSLREL_REL_IND, + RSLREL_CONN_FAIL +}; + +private function f_emerg_call_and_lcs_loc_req_early_lchan_release(RslRel rsl_rel) runs on MSC_ConnHdlr +{ + g_pars.ra := f_rnd_ra_emerg(); + f_assignment_emerg_setup(); + + var PDU_BSSAP emerg_setup_data_ind_bssap; + timer T := 3.0; + T.start; + alt { + [] BSSAP.receive(tr_BSSAP_DTAP) -> value emerg_setup_data_ind_bssap { + var PDU_ML3_MS_NW verify_emerg_setup; + verify_emerg_setup := dec_PDU_ML3_MS_NW(emerg_setup_data_ind_bssap.pdu.dtap); + if (not ischosen(verify_emerg_setup.msgs.cc.emergencySetup)) { + setverdict(fail, "no emergency setup"); + } + } + [] BSSAP.receive { + setverdict(fail, "unexpected BSSAP message!"); + } + [] T.timeout { + setverdict(fail, "timeout waiting for EMERGENCY SETUP!"); + } + } + + /* Start a Location Request to locate the emergency */ + f_bssap_le_register_imsi(g_pars.imsi, omit); + BSSAP.send(valueof(ts_BSSMAP_Perform_Location_Request(ts_BSSMAP_Imsi(g_pars.imsi), + ts_CellId_CGI('262'H, '42'H, 23, 42)))); + BSSAP_LE.receive(tr_BSSMAP_LE_PerfLocReq(BSSMAP_LE_LOC_INFO_CURRENT_GEOGRAPHIC_LOC, ?, ?)); + + /* As long as this LCS is going on, the BSC should not send any Clear Request. Later on, it is up to the MSC to + * do a Clear Command when the Location Response arrives. */ + activate(no_bssmap_clear_req()); + + /* the lchan gets interrupted while the Location Request has no response */ + select (rsl_rel) { + case (RSLREL_REL_IND) { + RSL.send(ts_RSL_REL_IND(g_chan_nr, valueof(ts_RslLinkID_DCCH(0)))); + f_expect_lchan_rel(RSL, RSL_PROC); + } + case (RSLREL_CONN_FAIL) { + RSL.send(ts_RSL_CONN_FAIL_IND(g_chan_nr, RSL_ERR_RADIO_LINK_FAIL)); + } + case else { + setverdict(fail, "Unknown RslRel type"); + mtc.stop; + } + } + + /* Still expect the Location Response to find its way to the MSC. */ + BSSAP_LE.send(ts_BSSMAP_LE_PerfLocResp(gad_ell_point_unc_circle, omit)); + BSSAP_LE.receive(BSSAP_LE_Conn_Prim:CONN_PRIM_DISC_IND); + BSSAP.receive(tr_BSSMAP_Perform_Location_Response(tr_BSSMAP_IE_LocationEstimate(gad_ell_point_unc_circle))); + + setverdict(pass); + + select (rsl_rel) { + case (RSLREL_REL_IND) { + f_perform_clear_no_lchan(); + } + case (RSLREL_CONN_FAIL) { + f_perform_clear(); + } + } +} + +private function f_tc_emerg_call_and_lcs_loc_req_early_lchan_rel_ind(charstring id) runs on MSC_ConnHdlr +{ + f_emerg_call_and_lcs_loc_req_early_lchan_release(RSLREL_REL_IND); +} + +testcase TC_emerg_call_and_lcs_loc_req_early_lchan_rel_ind() runs on test_CT { + var MSC_ConnHdlr vc_conn; + var TestHdlrParams pars := f_gen_test_hdlr_pars(); + + f_init(1, true); + f_sleep(1.0); + f_vty_allow_emerg_msc(true); + f_vty_allow_emerg_bts(true, 0); + vc_conn := f_start_handler(refers(f_tc_emerg_call_and_lcs_loc_req_early_lchan_rel_ind), pars); + vc_conn.done; + f_shutdown_helper(); +} + +private function f_tc_emerg_call_and_lcs_loc_req_early_lchan_conn_fail(charstring id) runs on MSC_ConnHdlr +{ + f_emerg_call_and_lcs_loc_req_early_lchan_release(RSLREL_CONN_FAIL); +} + +testcase TC_emerg_call_and_lcs_loc_req_early_lchan_conn_fail() runs on test_CT { + var MSC_ConnHdlr vc_conn; + var TestHdlrParams pars := f_gen_test_hdlr_pars(); + + f_init(1, true); + f_sleep(1.0); + f_vty_allow_emerg_msc(true); + f_vty_allow_emerg_bts(true, 0); + vc_conn := f_start_handler(refers(f_tc_emerg_call_and_lcs_loc_req_early_lchan_conn_fail), pars); + vc_conn.done; + f_shutdown_helper(); +} + /* Attempt Complete Layer 3 without any MSC available (OS#4832) */ private function f_tc_no_msc(charstring id) runs on MSC_ConnHdlr { f_MscConnHdlr_init(g_pars.media_nr, "127.0.0.2", "127.0.0.3", FR_AMR); @@ -11677,6 +11791,8 @@ execute( TC_cm_service_during_lcs_loc_req() ); execute( TC_ho_during_lcs_loc_req() ); execute( TC_emerg_call_and_lcs_loc_req() ); + execute( TC_emerg_call_and_lcs_loc_req_early_lchan_rel_ind() ); + execute( TC_emerg_call_and_lcs_loc_req_early_lchan_conn_fail() ); } execute( TC_no_msc() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28092 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Idea690a4aa4aecbe4642a16e96d086cc0538564a Gerrit-Change-Number: 28092 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years

1
0
0 0

Change in osmo-ttcn3-hacks[master]: mgw: Introduce test TC_two_crcx_mdcx_and_iuup{_rtp}_rfci_unordered

by fixeria

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28191 ) Change subject: mgw: Introduce test TC_two_crcx_mdcx_and_iuup{_rtp}_rfci_unordered ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28191 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2523f18a0fdba87f4e13a2ce3c5da482c4af2e3c Gerrit-Change-Number: 28191 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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 May 2022 19:29:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years

1
0
0 0

Change in osmo-ttcn3-hacks[master]: IuUP: Encode Initialization according to cfg

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28189 ) Change subject: IuUP: Encode Initialization according to cfg ...................................................................... IuUP: Encode Initialization according to cfg Change-Id: I1dec3a8dcc829ad2c308636b697b089e873fd824 --- M library/IuUP_Emulation.ttcn 1 file changed, 45 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/IuUP_Emulation.ttcn b/library/IuUP_Emulation.ttcn index 899ba50..1bb2bb2 100644 --- a/library/IuUP_Emulation.ttcn +++ b/library/IuUP_Emulation.ttcn @@ -35,6 +35,7 @@ template (value) IuUP_RabFlowCombination t_IuUP_RFC_AMR_12_2(IuUP_RFCI rfci) := t_IuUP_RFC(rfci, {81, 103, 60}, 1); template (value) IuUP_RabFlowCombination t_IuUP_RFC_AMR_SID(IuUP_RFCI rfci) := t_IuUP_RFC(rfci, {34, 0, 0}, 7); +template (value) IuUP_RabFlowCombination t_IuUP_RFC_AMR_NO_DATA(IuUP_RFCI rfci) := t_IuUP_RFC(rfci, {0, 0, 0}, 1); type record IuUP_Config { /* actively send INIT (true) or only passively respond (false) */ @@ -63,7 +64,7 @@ cfg := { active_init := act_init, data_pdu_type_0 := true, - rab_flow_combs := { t_IuUP_RFC_AMR_12_2(0), t_IuUP_RFC_AMR_SID(1) } + rab_flow_combs := { t_IuUP_RFC_AMR_12_2(0), t_IuUP_RFC_AMR_SID(1), t_IuUP_RFC_AMR_NO_DATA(2) } }, state := ST_INIT, tx_next_frame_nr := 0, @@ -120,6 +121,48 @@ self.stop; } +private function f_ts_IuUP_INIT(inout IuUP_Entity st) return IuUP_PDU +{ + var IuUP_PDU pdu; + var uint4_t data_pdu_type; + var template (omit) IuUP_InitRfci rfci := omit; + var IuUP_IPTI_List IPTIs := {}; + var uint4_t num_rfci := lengthof(st.cfg.rab_flow_combs); + + if (st.cfg.data_pdu_type_0 == true) { + data_pdu_type := 0; + } else { + data_pdu_type := 1; + } + + /* Build RFCI list: */ + for (var integer remain := num_rfci; remain > 0; remain := remain - 1) { + var IuUP_RabFlowCombination comb := st.cfg.rab_flow_combs[remain - 1]; + var boolean lri := false; + if (remain == num_rfci) { + lri := true; + } + rfci := ts_IuUP_InitRfci(lri, false, comb.rfci, comb.sub_flow_bits, omit, rfci) + } + + /* Build IPTI list: */ + for (var integer i := 0; i < num_rfci; i := i + 1) { + IPTIs := IPTIs & { st.cfg.rab_flow_combs[i].ipti }; + } + + template (value) IuUP_PDU14_ProcSending_INIT tpl := ts_IuUP_PDU14_ProcSending_INIT( + ti := true, + subflows_per_rfci := num_rfci, + chain_ind := false, + rfci := rfci, + IPTIs := IPTIs, + versions_supported := '0000000000000001'B, + data_pdu_type := data_pdu_type + ); + pdu := valueof(ts_IuUP_INIT(tpl)); + return pdu; +} + function f_IuUP_Em_tx_encap(inout IuUP_Entity st, in octetstring payload) return octetstring { var IuUP_PDU pdu; select (st.state) { @@ -127,7 +170,7 @@ if (st.cfg.active_init) { if (not isvalue(st.pending_tx_pdu)) { /* send INIT */ - pdu := valueof(ts_IuUP_INIT(ts_IuUP_PDU14_ProcSending_INIT)); + pdu := f_ts_IuUP_INIT(st); st.pending_tx_pdu := pdu; } /* else: wait for INIT-ACK return ''O at the end */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28189 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1dec3a8dcc829ad2c308636b697b089e873fd824 Gerrit-Change-Number: 28189 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> Gerrit-MessageType: merged

3 years

1
0
0 0

Change in osmo-ttcn3-hacks[master]: Allow Setting IuUP_Cfg from test using RTP_Emulation

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28190 ) Change subject: Allow Setting IuUP_Cfg from test using RTP_Emulation ...................................................................... Allow Setting IuUP_Cfg from test using RTP_Emulation Change-Id: I4e8296dae40277be51974338bc0d21c939eec149 --- M hnodeb/HNBGW_ConnectionHandler.ttcn M library/IuUP_Emulation.ttcn M library/RTP_Emulation.ttcn M mgw/MGCP_Test.ttcn 4 files changed, 43 insertions(+), 17 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/hnodeb/HNBGW_ConnectionHandler.ttcn b/hnodeb/HNBGW_ConnectionHandler.ttcn index 076cb82..6b06437 100644 --- a/hnodeb/HNBGW_ConnectionHandler.ttcn +++ b/hnodeb/HNBGW_ConnectionHandler.ttcn @@ -251,7 +251,7 @@ /* Initialize, connect and start the emulation component */ var RtpemConfig cfg := c_RtpemDefaultCfg; cfg.iuup_mode := true; - cfg.iuup_tx_init := false; + cfg.iuup_cfg.active_init := false; cfg.tx_payload_type := 96; vc_RTPEM := RTP_Emulation_CT.create(testcasename() & "-RTPEM") alive; diff --git a/library/IuUP_Emulation.ttcn b/library/IuUP_Emulation.ttcn index 1bb2bb2..b649e44 100644 --- a/library/IuUP_Emulation.ttcn +++ b/library/IuUP_Emulation.ttcn @@ -26,6 +26,7 @@ /* IPTI value in number of ITIs for the corresponding RFCI */ uint8_t ipti }; +type record of IuUP_RabFlowCombination IuUP_RabFlowCombinationList; template (value) IuUP_RabFlowCombination t_IuUP_RFC(IuUP_RFCI rfci, RecOfU8 subflow_bits, uint8_t ipti) := { rfci := rfci, @@ -37,21 +38,50 @@ template (value) IuUP_RabFlowCombination t_IuUP_RFC_AMR_SID(IuUP_RFCI rfci) := t_IuUP_RFC(rfci, {34, 0, 0}, 7); template (value) IuUP_RabFlowCombination t_IuUP_RFC_AMR_NO_DATA(IuUP_RFCI rfci) := t_IuUP_RFC(rfci, {0, 0, 0}, 1); + +const IuUP_RabFlowCombinationList c_IuUP_Config_RabFlowCombination_def := { + { + rfci := 0, + sub_flow_bits := {81, 103, 60}, + ipti := 1 + }, { + rfci := 1, + sub_flow_bits := {34, 0, 0}, + ipti := 7 + }, { + rfci := 2, + sub_flow_bits := {0, 0, 0}, + ipti := 1 + } +}; type record IuUP_Config { /* actively send INIT (true) or only passively respond (false) */ boolean active_init, boolean data_pdu_type_0, /* RAB Flow Combinations */ - record of IuUP_RabFlowCombination rab_flow_combs + IuUP_RabFlowCombinationList rab_flow_combs }; +template (value) IuUP_Config t_IuUP_Config(boolean active_init := true, + boolean data_pdu_type_0 := true, + template (value) IuUP_RabFlowCombinationList rab_flow_combs := + c_IuUP_Config_RabFlowCombination_def) := { + active_init := active_init, + data_pdu_type_0 := true, + rab_flow_combs := rab_flow_combs +} + +const IuUP_Config c_IuUP_Config_def := { + active_init := true, + data_pdu_type_0 := true, + rab_flow_combs := c_IuUP_Config_RabFlowCombination_def +} + type enumerated IuUP_Em_State { ST_INIT, ST_DATA_TRANSFER_READY }; - - type record IuUP_Entity { IuUP_Config cfg, IuUP_Em_State state, @@ -60,12 +90,8 @@ IuUP_PDU pending_tx_pdu optional }; -template (value) IuUP_Entity t_IuUP_Entity(boolean act_init) := { - cfg := { - active_init := act_init, - data_pdu_type_0 := true, - rab_flow_combs := { t_IuUP_RFC_AMR_12_2(0), t_IuUP_RFC_AMR_SID(1), t_IuUP_RFC_AMR_NO_DATA(2) } - }, +template (value) IuUP_Entity t_IuUP_Entity(template (value) IuUP_Config cfg) := { + cfg := cfg, state := ST_INIT, tx_next_frame_nr := 0, rx_last_frame_nr := omit, diff --git a/library/RTP_Emulation.ttcn b/library/RTP_Emulation.ttcn index f4d926e..eaff017 100644 --- a/library/RTP_Emulation.ttcn +++ b/library/RTP_Emulation.ttcn @@ -161,7 +161,7 @@ octetstring tx_fixed_payload optional, octetstring rx_fixed_payload optional, boolean iuup_mode, - boolean iuup_tx_init + IuUP_Config iuup_cfg }; const RtpemConfig c_RtpemDefaultCfg := { @@ -172,7 +172,7 @@ tx_fixed_payload := '01020304'O, rx_fixed_payload := '01020304'O, iuup_mode := false, - iuup_tx_init := true + iuup_cfg := c_IuUP_Config_def } signature RTPEM_bind(in HostName local_host, inout PortNumber local_port); @@ -384,7 +384,7 @@ os_error_code := 111, os_error_text := ? /* "Connection refused" */}}; - g_iuup_ent := valueof(t_IuUP_Entity(g_cfg.iuup_tx_init)); + g_iuup_ent := valueof(t_IuUP_Entity(g_cfg.iuup_cfg)); while (true) { alt { @@ -488,7 +488,7 @@ } [] CTRL.getcall(RTPEM_configure:{?}) -> param (cfg) { g_cfg := cfg; - g_iuup_ent.cfg.active_init := g_cfg.iuup_tx_init; + g_iuup_ent.cfg := g_cfg.iuup_cfg; CTRL.reply(RTPEM_configure:{cfg}); } [] CTRL.getcall(RTPEM_stats_get:{?, ?}) -> param (is_rtcp) { diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index 9defea7..de00e9d 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -2482,7 +2482,7 @@ flow[0].rtp_cfg := c_RtpemDefaultCfg; flow[0].rtp_cfg.tx_payload_type := flow[0].pt; flow[0].rtp_cfg.iuup_mode := true; - flow[0].rtp_cfg.iuup_tx_init := true; + flow[0].rtp_cfg.iuup_cfg.active_init := true; f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow[0], true); f_rtpem_mode(RTPEM[0], RTPEM_MODE_RXONLY); @@ -2493,7 +2493,7 @@ flow[1].rtp_cfg := c_RtpemDefaultCfg; flow[1].rtp_cfg.tx_payload_type := flow[1].pt; flow[1].rtp_cfg.iuup_mode := true; - flow[1].rtp_cfg.iuup_tx_init := false; + flow[1].rtp_cfg.iuup_cfg.active_init := false; f_flow_create(RTPEM[1], ep, call_id, "recvonly", flow[1], true); f_rtpem_mode(RTPEM[1], RTPEM_MODE_RXONLY); @@ -2601,7 +2601,7 @@ flow[0].rtp_cfg.tx_fixed_payload := '4f28959ffeb80181f5c4e83d176c897b4a4e333298333419a493ca63ded6e0'O; flow[0].rtp_cfg.rx_fixed_payload := '08556d944c71a1a081e7ead204244480000ecd82b81118000097c4794e7740'O; /* flow[1].rtp_cfg.tx_fixed_payload converted AMR-BE-RTP->AMR-IUUP*/ flow[0].rtp_cfg.iuup_mode := true; - flow[0].rtp_cfg.iuup_tx_init := true; + flow[0].rtp_cfg.iuup_cfg.active_init := true; f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow[0], true); f_rtpem_mode(RTPEM[0], RTPEM_MODE_RXONLY); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28190 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4e8296dae40277be51974338bc0d21c939eec149 Gerrit-Change-Number: 28190 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2022