September 2023 - gerrit-log - lists.osmocom.org

[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: f_rtpem_activate(): make RTP payload type configurable
by fixeria 04 Sep '23

04 Sep '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34277?usp=email ) Change subject: BTS_Tests: f_rtpem_activate(): make RTP payload type configurable ...................................................................... BTS_Tests: f_rtpem_activate(): make RTP payload type configurable Change-Id: I84f576f578ffc48c8b5e545bc1700000eb693efb Related: OS#1572 --- M bts/BTS_Tests.ttcn 1 file changed, 13 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 1b43797..cd13688 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -2609,7 +2609,8 @@ /* Initialize and start the RTP emulation component for a ConnHdlr */ friend function f_rtpem_activate(inout octetstring payload, RtpemConfig cfg := c_RtpemDefaultCfg, - RtpemMode mode := RTPEM_MODE_BIDIR) + RtpemMode mode := RTPEM_MODE_BIDIR, + uint7_t rtp_pt := 0) runs on ConnHdlr { /* Step 0: initialize, connect and start the emulation component */ vc_RTPEM := RTP_Emulation_CT.create(testcasename() & "-RTPEM"); @@ -2672,7 +2673,7 @@ ts_RSL_IPA_MDCX(g_chan_nr, conn_id, remote_ip := f_inet_addr(mp_rtpem_bind_ip), remote_port := rtpem_bind_port, - rtp_pt2 := 0), + rtp_pt2 := rtp_pt), tr_RSL_IPA_MDCX_ACK(g_chan_nr, conn_id, ?, ?, ?), "IPA MDCX ACK"); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34277?usp=email 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: I84f576f578ffc48c8b5e545bc1700000eb693efb Gerrit-Change-Number: 34277 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-MessageType: merged

1 0

[S] Change in osmo-ttcn3-hacks[master]: library: RTP_Emulation: implement new RTPEM_MODE_LOOPBACK
by fixeria 04 Sep '23

04 Sep '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34276?usp=email ) Change subject: library: RTP_Emulation: implement new RTPEM_MODE_LOOPBACK ...................................................................... library: RTP_Emulation: implement new RTPEM_MODE_LOOPBACK Change-Id: Iee8f736e1eebc357fc997353ee4b629d24dc09e7 Related: OS#1572 --- M library/RTP_Emulation.ttcn 1 file changed, 38 insertions(+), 3 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/RTP_Emulation.ttcn b/library/RTP_Emulation.ttcn index 539ea45..de2c877 100644 --- a/library/RTP_Emulation.ttcn +++ b/library/RTP_Emulation.ttcn @@ -97,6 +97,7 @@ var PortNumber g_local_port; /* state variables, change over time */ + var boolean g_loopback := false; var boolean g_rx_enabled := false; var boolean g_tx_connected := false; /* Set to true after connect() */ var LIN2_BO_LAST g_tx_next_seq := 0; @@ -116,7 +117,8 @@ RTPEM_MODE_NONE, RTPEM_MODE_TXONLY, RTPEM_MODE_RXONLY, - RTPEM_MODE_BIDIR + RTPEM_MODE_BIDIR, + RTPEM_MODE_LOOPBACK }; type record RtpemStats { @@ -512,12 +514,14 @@ [] CTRL.getcall(RTPEM_mode:{RTPEM_MODE_NONE}) { T_transmit.stop; g_rx_enabled := false; + g_loopback := false; CTRL.reply(RTPEM_mode:{RTPEM_MODE_NONE}); } [] CTRL.getcall(RTPEM_mode:{RTPEM_MODE_TXONLY}) { /* start transmit timer */ T_transmit.start; g_rx_enabled := false; + g_loopback := false; CTRL.reply(RTPEM_mode:{RTPEM_MODE_TXONLY}); } [] CTRL.getcall(RTPEM_mode:{RTPEM_MODE_RXONLY}) { @@ -529,6 +533,7 @@ RTCP.clear; g_rx_enabled := true; } + g_loopback := false; CTRL.reply(RTPEM_mode:{RTPEM_MODE_RXONLY}); } [] CTRL.getcall(RTPEM_mode:{RTPEM_MODE_BIDIR}) { @@ -539,8 +544,20 @@ RTCP.clear; g_rx_enabled := true; } + g_loopback := false; CTRL.reply(RTPEM_mode:{RTPEM_MODE_BIDIR}); } + [] CTRL.getcall(RTPEM_mode:{RTPEM_MODE_LOOPBACK}) { + T_transmit.stop; + if (g_rx_enabled == false) { + /* flush queues */ + RTP.clear; + RTCP.clear; + g_rx_enabled := true; + } + g_loopback := true; + CTRL.reply(RTPEM_mode:{RTPEM_MODE_LOOPBACK}); + } [] CTRL.getcall(RTPEM_configure:{?}) -> param (cfg) { g_cfg := cfg; g_iuup_ent.cfg := g_cfg.iuup_cfg; @@ -599,8 +616,16 @@ } } - /* Match the received payload against any of the predefined fixed rx payloads */ - f_check_fixed_rx_payloads(rx_rtp.msg.rtp.payload_type, rx_rtp.msg.rtp.data); + if (g_loopback) { + f_tx_rtp(rx_rtp.msg.rtp.data, rx_rtp.msg.rtp.payload_type); + /* update counters */ + g_stats_rtp.num_pkts_tx := g_stats_rtp.num_pkts_tx + 1; + g_stats_rtp.bytes_payload_tx := g_stats_rtp.bytes_payload_tx + + lengthof(rx_rtp.msg.rtp.data); + } else { + /* Match the received payload against any of the predefined fixed rx payloads */ + f_check_fixed_rx_payloads(rx_rtp.msg.rtp.payload_type, rx_rtp.msg.rtp.data); + } if (DATA.checkstate("Connected")) { DATA.send(rx_rtp.msg.rtp); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34276?usp=email 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: Iee8f736e1eebc357fc997353ee4b629d24dc09e7 Gerrit-Change-Number: 34276 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-MessageType: merged

1 0

[M] Change in osmo-ttcn3-hacks[master]: BTS_Tests: decouple payload generation from f_rtpem_activate()
by fixeria 04 Sep '23

04 Sep '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34278?usp=email ) Change subject: BTS_Tests: decouple payload generation from f_rtpem_activate() ...................................................................... BTS_Tests: decouple payload generation from f_rtpem_activate() This function is going to be used by the upcoming testcases for CSD specific channel modes. Generating the Rx/Tx payload(s) now becomes the duty of the calling function. So far the only user of this API is f_TC_speech_rtp(), so move the speech payload generation there. Change-Id: I9e823c33b1dbbadd57bc63df25b8ddf368d76232 Related: OS#1572 --- M bts/BTS_Tests.ttcn 1 file changed, 51 insertions(+), 41 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index cd13688..888abf5 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -2607,9 +2607,8 @@ } /* Initialize and start the RTP emulation component for a ConnHdlr */ -friend function f_rtpem_activate(inout octetstring payload, - RtpemConfig cfg := c_RtpemDefaultCfg, - RtpemMode mode := RTPEM_MODE_BIDIR, +friend function f_rtpem_activate(RtpemConfig cfg := c_RtpemDefaultCfg, + RtpemMode mode := RTPEM_MODE_LOOPBACK, uint7_t rtp_pt := 0) runs on ConnHdlr { /* Step 0: initialize, connect and start the emulation component */ @@ -2621,38 +2620,6 @@ vc_RTPEM.start(RTP_Emulation.f_main()); /* Step 1: configure the RTP parameters */ - var integer payload_len := 0; - var octetstring hdr := ''O; - var OCT1 pad := '00'O; - - select (g_pars.chan_mode) { - case (tr_RSL_ChanMode(RSL_CHRT_TCH_F, RSL_CMOD_SP_GSM1)) /* TCH/FS */ - { payload_len := 33; hdr := 'D0'O; pad := 'FF'O; } - case (tr_RSL_ChanMode(RSL_CHRT_TCH_H, RSL_CMOD_SP_GSM1)) /* TCH/HS */ - { payload_len := 15; hdr := '00'O; } - case (tr_RSL_ChanMode(RSL_CHRT_TCH_F, RSL_CMOD_SP_GSM2)) /* TCH/EFS */ - { payload_len := 31; hdr := 'C0'O; } - case (tr_RSL_ChanMode(RSL_CHRT_TCH_F, RSL_CMOD_SP_GSM3)) /* TCH/AFS */ - { - var integer amr_ft := get_start_amr_ft(); - payload_len := f_amrft_payload_len(amr_ft) + 2; - hdr := enc_RTP_AMR_Hdr(valueof(ts_RTP_AMR_Hdr(amr_ft, amr_ft, '1'B))); - } - case (tr_RSL_ChanMode(RSL_CHRT_TCH_H, RSL_CMOD_SP_GSM3)) /* TCH/AHS */ - { - var integer amr_ft := get_start_amr_ft(); - payload_len := f_amrft_payload_len(amr_ft) + 2; - hdr := enc_RTP_AMR_Hdr(valueof(ts_RTP_AMR_Hdr(amr_ft, amr_ft, '1'B))); - } - case else { - setverdict(fail, "Unhandled RSL channel mode := ", g_pars.chan_mode); - Misc_Helpers.f_shutdown(__BFILE__, __LINE__); - } - } - - /* Pad the payload to conform the expected length */ - payload := f_pad_oct(hdr & payload, payload_len, pad); - cfg.tx_payloads[0].fixed_payload := payload; f_rtpem_configure(RTPEM_CTRL, cfg); /* Step 2: bind the RTP emulation to the configured address */ @@ -8351,9 +8318,9 @@ /* Verify handling of Downlink and Uplink speech frames */ private function f_TC_speech_rtp(charstring id) runs on ConnHdlr { + var octetstring payload; var L1ctlMessage l1_dl; var PDU_RTP rtp_pdu; - var octetstring pl; timer Td, Tu; log("Testing channel mode ", g_pars.chan_mode); @@ -8361,9 +8328,37 @@ f_l1_tune(L1CTL); f_est_dchan(); + select (g_pars.chan_mode) { + case (tr_RSL_ChanMode(RSL_CHRT_TCH_F, RSL_CMOD_SP_GSM1)) /* TCH/FS */ + { payload := f_pad_oct('D0'O & f_rnd_octstring(6), 33, 'FF'O); } + case (tr_RSL_ChanMode(RSL_CHRT_TCH_H, RSL_CMOD_SP_GSM1)) /* TCH/HS */ + { payload := f_pad_oct('00'O & f_rnd_octstring(6), 15, '00'O); } + case (tr_RSL_ChanMode(RSL_CHRT_TCH_F, RSL_CMOD_SP_GSM2)) /* TCH/EFS */ + { payload := f_pad_oct('C0'O & f_rnd_octstring(6), 31, '00'O); } + case (tr_RSL_ChanMode(RSL_CHRT_TCH_F, RSL_CMOD_SP_GSM3)) /* TCH/AFS */ + { + var integer amr_ft := get_start_amr_ft(); + var integer payload_len := f_amrft_payload_len(amr_ft) + 2; + payload := enc_RTP_AMR_Hdr(valueof(ts_RTP_AMR_Hdr(amr_ft, amr_ft, '1'B))); + payload := f_pad_oct(payload & f_rnd_octstring(6), payload_len, '00'O); + } + case (tr_RSL_ChanMode(RSL_CHRT_TCH_H, RSL_CMOD_SP_GSM3)) /* TCH/AHS */ + { + var integer amr_ft := get_start_amr_ft(); + var integer payload_len := f_amrft_payload_len(amr_ft) + 2; + payload := enc_RTP_AMR_Hdr(valueof(ts_RTP_AMR_Hdr(amr_ft, amr_ft, '1'B))); + payload := f_pad_oct(payload & f_rnd_octstring(6), payload_len, '00'O); + } + case else { + setverdict(fail, "Unhandled RSL channel mode := ", g_pars.chan_mode); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); + } + } + /* Activate the RTP emulation */ - pl := f_rnd_octstring(6); - f_rtpem_activate(pl); + var RtpemConfig cfg := c_RtpemDefaultCfg; + cfg.tx_payloads[0].fixed_payload := payload; + f_rtpem_activate(cfg, RTPEM_MODE_BIDIR); /* Give the scheduler some time to fill up the buffers */ f_sleep(2.0); @@ -8373,7 +8368,7 @@ /* Make sure that Downlink frames are received at the UE */ Td.start(2.0); alt { - [] L1CTL.receive(tr_L1CTL_TRAFFIC_IND(g_chan_nr, frame := pl)) -> value l1_dl { + [] L1CTL.receive(tr_L1CTL_TRAFFIC_IND(g_chan_nr, frame := payload)) -> value l1_dl { var octetstring data := l1_dl.payload.traffic_ind.data; log("TCH received (len=", lengthof(data), "): ", data); L1CTL.send(ts_L1CTL_TRAFFIC_REQ(g_chan_nr, l1_dl.dl_info.link_id, @@ -8383,7 +8378,7 @@ [] L1CTL.receive(tr_L1CTL_TRAFFIC_IND(g_chan_nr, frame := ?)) -> value l1_dl { setverdict(fail, "Rx unexpected Downlink speech frame ", "(", l1_dl.payload.traffic_ind.data, ") ", - "expected (", pl, ")"); + "expected (", payload, ")"); Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } [] as_l1_sacch(); @@ -8401,7 +8396,7 @@ [] as_l1_tch_loop(); [] as_l1_sacch(); [] RTPEM_DATA.receive(PDU_RTP:?) -> value rtp_pdu { - if (rtp_pdu.data != pl) + if (rtp_pdu.data != payload) { repeat; } } [] RTPEM_DATA.receive { repeat; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34278?usp=email 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: I9e823c33b1dbbadd57bc63df25b8ddf368d76232 Gerrit-Change-Number: 34278 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-MessageType: merged

1 0

[M] Change in osmo-ttcn3-hacks[master]: BTS_Tests: add TC_data_rtp_tch* for CSD
by fixeria 04 Sep '23

04 Sep '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33072?usp=email ) Change subject: BTS_Tests: add TC_data_rtp_tch* for CSD ...................................................................... BTS_Tests: add TC_data_rtp_tch* for CSD Change-Id: I9a0dc0fcf722f862d8dcf04660d4448662210f44 Related: osmo-bts.git I08ffbf8e79ce76a586d61f5463890c6e72a6d9b9 Related: osmocom-bb.git I0d7389a9a5f7019b9316ab1c0115797ff54a0e41 Related: OS#1572, OS#4396 --- M bts/BTS_Tests.ttcn M bts/expected-results.xml 2 files changed, 229 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 888abf5..3fe6120 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -8572,6 +8572,210 @@ Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } +/* CSD channel tests */ +private function f_TC_data_rtp_loopback(charstring id) runs on ConnHdlr { + var octetstring udata := ''O; + var integer payload_len; + var L1ctlMessage l1_dl; + timer Td; + + log("Testing channel mode ", g_pars.chan_mode); + + select (g_pars.chan_mode) { + case (tr_RSL_ChanMode_DATA(RSL_CHRT_TCH_F, (RSL_CMOD_CSD_T_14k4, RSL_CMOD_CSD_NT_14k5))) + { payload_len := 290; } + case (tr_RSL_ChanMode_DATA(RSL_CHRT_TCH_F, (RSL_CMOD_CSD_T_9k6, RSL_CMOD_CSD_NT_12k0))) + { payload_len := 4 * 60; } + case (tr_RSL_ChanMode_DATA(RSL_CHRT_TCH_F, (RSL_CMOD_CSD_T_4k8, RSL_CMOD_CSD_NT_6k0))) + { payload_len := 2 * 60; } + case (tr_RSL_ChanMode_DATA(RSL_CHRT_TCH_H, (RSL_CMOD_CSD_T_4k8, RSL_CMOD_CSD_NT_6k0))) + { payload_len := 4 * 60; } + case (tr_RSL_ChanMode_DATA(RSL_CHRT_TCH_F, (RSL_CMOD_CSD_T_2k4, RSL_CMOD_CSD_T_1k2, + RSL_CMOD_CSD_T_600, RSL_CMOD_CSD_T_1200_75))) + { payload_len := 2 * 36; } + case (tr_RSL_ChanMode_DATA(RSL_CHRT_TCH_H, (RSL_CMOD_CSD_T_2k4, RSL_CMOD_CSD_T_1k2, + RSL_CMOD_CSD_T_600, RSL_CMOD_CSD_T_1200_75))) + { payload_len := 4 * 36; } + case else { + setverdict(fail, "Unhandled RSL channel mode := ", g_pars.chan_mode); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); + } + } + + /* Generate a pseudo-random payload */ + for (var integer i := 0; i < payload_len; i := i + 1) { + udata := udata & int2oct(i mod 2, 1); + } + + /* Activate the RTP emulation */ + f_rtpem_activate(mode := RTPEM_MODE_LOOPBACK, rtp_pt := 120); + + /* Tune to the dedicated channel */ + f_l1_tune(L1CTL); + f_est_dchan(); + + /* Send a pseudo-random data frame on the Uplink */ + log("Sending Uplink TCH (len=", lengthof(udata), "): ", udata); + L1CTL.send(ts_L1CTL_TRAFFIC_REQ(g_chan_nr, ts_RslLinkID_DCCH(0), udata)); + + /* Expect this frame to show up on the Downlink */ + Td.start(4.0); + alt { + [] L1CTL.receive(tr_L1CTL_TRAFFIC_IND(g_chan_nr, frame := udata)) { + log("TCH received (len=", lengthof(udata), "): ", udata); + setverdict(pass); + Td.stop; + } + [] L1CTL.receive(tr_L1CTL_TRAFFIC_IND(g_chan_nr)) -> value l1_dl { + var octetstring ddata := l1_dl.payload.traffic_ind.data; + log("TCH received (len=", lengthof(ddata), "): ", ddata); + repeat; + } + [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr)) -> value l1_dl { + var octetstring ddata := l1_dl.payload.data_ind.payload; + log("FACCH received: ", ddata); + repeat; + } + [] as_l1_sacch(); + [] L1CTL.receive { repeat; } + [] Td.timeout { + setverdict(fail, "Timeout waiting for matching Downlink data frame"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); + } + } + + /* TODO: send and expect FACCH */ + + f_rtpem_mode(RTPEM_CTRL, RTPEM_MODE_NONE); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + f_rsl_chan_deact(); + f_rslem_unregister(0, g_chan_nr); +} +testcase TC_data_rtp_tchf144() runs on test_CT { + var ConnHdlr vc_conn; + var ConnHdlrPars pars; + + f_init(); + + /* TS1, TCH/F14.4 (14k5 radio interface rate), transparent service */ + pars := valueof(t_Pars(ts_RslChanNr_Bm(1), + ts_RSL_ChanMode_DATA(RSL_CHRT_TCH_F, RSL_CMOD_CSD_T_14k4))); + vc_conn := f_start_handler(refers(f_TC_data_rtp_loopback), pars); + vc_conn.done; + + /* TS1, TCH/F14.4 (14k5 radio interface rate), non-transparent service */ + pars := valueof(t_Pars(ts_RslChanNr_Bm(1), + ts_RSL_ChanMode_DATA(RSL_CHRT_TCH_F, RSL_CMOD_CSD_NT_14k5))); + vc_conn := f_start_handler(refers(f_TC_data_rtp_loopback), pars); + vc_conn.done; + + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); +} + +testcase TC_data_rtp_tchf96() runs on test_CT { + var ConnHdlr vc_conn; + var ConnHdlrPars pars; + + f_init(); + + /* TS1, TCH/F9.6 (12k radio interface rate), transparent service */ + pars := valueof(t_Pars(ts_RslChanNr_Bm(1), + ts_RSL_ChanMode_DATA(RSL_CHRT_TCH_F, RSL_CMOD_CSD_T_9k6))); + vc_conn := f_start_handler(refers(f_TC_data_rtp_loopback), pars); + vc_conn.done; + + /* TS1, TCH/F9.6 (12k radio interface rate), non-transparent service */ + pars := valueof(t_Pars(ts_RslChanNr_Bm(1), + ts_RSL_ChanMode_DATA(RSL_CHRT_TCH_F, RSL_CMOD_CSD_NT_12k0))); + vc_conn := f_start_handler(refers(f_TC_data_rtp_loopback), pars); + vc_conn.done; + + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); +} + +testcase TC_data_rtp_tchf48() runs on test_CT { + var ConnHdlr vc_conn; + var ConnHdlrPars pars; + + f_init(); + + /* TS1, TCH/F4.8 (6k radio interface rate), transparent service */ + pars := valueof(t_Pars(ts_RslChanNr_Bm(1), + ts_RSL_ChanMode_DATA(RSL_CHRT_TCH_F, RSL_CMOD_CSD_T_4k8))); + vc_conn := f_start_handler(refers(f_TC_data_rtp_loopback), pars); + vc_conn.done; + + /* TS1, TCH/F4.8 (6k radio interface rate), non-transparent service */ + pars := valueof(t_Pars(ts_RslChanNr_Bm(1), + ts_RSL_ChanMode_DATA(RSL_CHRT_TCH_F, RSL_CMOD_CSD_NT_6k0))); + vc_conn := f_start_handler(refers(f_TC_data_rtp_loopback), pars); + vc_conn.done; + + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); +} + +testcase TC_data_rtp_tchh48() runs on test_CT { + var ConnHdlr vc_conn; + var ConnHdlrPars pars; + + f_init(); + + /* TS1, TCH/H4.8 (6k radio interface rate), transparent service */ + pars := valueof(t_Pars(ts_RslChanNr_Lm(5, 0), + ts_RSL_ChanMode_DATA(RSL_CHRT_TCH_H, RSL_CMOD_CSD_T_4k8))); + vc_conn := f_start_handler(refers(f_TC_data_rtp_loopback), pars); + vc_conn.done; + + /* TS1, TCH/H4.8 (6k radio interface rate), non-transparent service */ + pars := valueof(t_Pars(ts_RslChanNr_Lm(5, 0), + ts_RSL_ChanMode_DATA(RSL_CHRT_TCH_H, RSL_CMOD_CSD_NT_6k0))); + vc_conn := f_start_handler(refers(f_TC_data_rtp_loopback), pars); + vc_conn.done; + + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); +} + +testcase TC_data_rtp_tchf24() runs on test_CT { + var ConnHdlr vc_conn; + var ConnHdlrPars pars; + + f_init(); + + /* TS1, TCH/F2.4 (3k6 radio interface rate), transparent services only */ + pars := valueof(t_Pars(ts_RslChanNr_Bm(1), + ts_RSL_ChanMode_DATA(RSL_CHRT_TCH_F, RSL_CMOD_CSD_T_2k4))); + vc_conn := f_start_handler(refers(f_TC_data_rtp_loopback), pars); + vc_conn.done; + + pars := valueof(t_Pars(ts_RslChanNr_Bm(1), + ts_RSL_ChanMode_DATA(RSL_CHRT_TCH_F, RSL_CMOD_CSD_T_1k2))); + vc_conn := f_start_handler(refers(f_TC_data_rtp_loopback), pars); + vc_conn.done; + + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); +} + +testcase TC_data_rtp_tchh24() runs on test_CT { + var ConnHdlr vc_conn; + var ConnHdlrPars pars; + + f_init(); + + /* TS1, TCH/H2.4 (3k6 radio interface rate), transparent services only */ + pars := valueof(t_Pars(ts_RslChanNr_Lm(5, 0), + ts_RSL_ChanMode_DATA(RSL_CHRT_TCH_H, RSL_CMOD_CSD_T_2k4))); + vc_conn := f_start_handler(refers(f_TC_data_rtp_loopback), pars); + vc_conn.done; + + pars := valueof(t_Pars(ts_RslChanNr_Lm(5, 0), + ts_RSL_ChanMode_DATA(RSL_CHRT_TCH_H, RSL_CMOD_CSD_T_1k2))); + vc_conn := f_start_handler(refers(f_TC_data_rtp_loopback), pars); + vc_conn.done; + + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); +} + + private function f_TC_early_immediate_assignment(charstring id) runs on ConnHdlr { var GsmFrameNumber fn; var ChannelDescription ch_desc; @@ -9178,6 +9382,13 @@ execute( TC_speech_osmux_tchf() ); execute( TC_speech_osmux_tchh() ); + execute( TC_data_rtp_tchf144() ); + execute( TC_data_rtp_tchf96() ); + execute( TC_data_rtp_tchf48() ); + execute( TC_data_rtp_tchh48() ); + execute( TC_data_rtp_tchf24() ); + execute( TC_data_rtp_tchh24() ); + execute( TC_early_immediate_assignment() ); execute( TC_acch_overpower_rxqual_thresh() ); diff --git a/bts/expected-results.xml b/bts/expected-results.xml index a78755c..61c0b60 100644 --- a/bts/expected-results.xml +++ b/bts/expected-results.xml @@ -180,6 +180,12 @@ <testcase classname='BTS_Tests' name='TC_speech_rtp_tchh' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_speech_osmux_tchf' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_speech_osmux_tchh' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_data_rtp_tchf144' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_data_rtp_tchf96' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_data_rtp_tchf48' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_data_rtp_tchh48' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_data_rtp_tchf24' time='MASKED'/> + <testcase classname='BTS_Tests' name='TC_data_rtp_tchh24' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_early_immediate_assignment' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_acch_overpower_rxqual_thresh' time='MASKED'/> <testcase classname='BTS_Tests' name='TC_acch_overpower_rxqual_thresh_dtx' time='MASKED'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33072?usp=email 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: I9a0dc0fcf722f862d8dcf04660d4448662210f44 Gerrit-Change-Number: 33072 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-pcu[master]: pcuif_sock: improve log output (OsmoBTS/OsmoBSC)
by laforge 04 Sep '23

04 Sep '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34275?usp=email ) Change subject: pcuif_sock: improve log output (OsmoBTS/OsmoBSC) ...................................................................... pcuif_sock: improve log output (OsmoBTS/OsmoBSC) When printing the PCUIF protocol version, we only mention OsmoBTS, but since OsmoPCU can also be used in co-location with OsmoBSC, we should also mention OsmoBSC here. Let's write "OsmoBTS/OsmoBSC" Related: OS#5927 Change-Id: Ibe49064d04dff0617357e3e0b00fea961b657784 --- M src/pcuif_sock.c 1 file changed, 15 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/pcuif_sock.c b/src/pcuif_sock.c index c77605f..f8c0ecc 100644 --- a/src/pcuif_sock.c +++ b/src/pcuif_sock.c @@ -217,7 +217,7 @@ int pcu_l1if_open(void) { int rc; - LOGP(DL1IF, LOGL_INFO, "Opening OsmoPCU L1 interface v%u to OsmoBTS\n", PCU_IF_VERSION); + LOGP(DL1IF, LOGL_INFO, "Opening OsmoPCU L1 interface v%u to OsmoBTS/OsmoBSC\n", PCU_IF_VERSION); memset(&pcu_sock_state, 0x00, sizeof(pcu_sock_state)); INIT_LLIST_HEAD(&pcu_sock_state.upqueue); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34275?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ibe49064d04dff0617357e3e0b00fea961b657784 Gerrit-Change-Number: 34275 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-pcu[master]: osmobts_sock: cosmetic: rename osmobts_sock.c to pcuif_sock.c
by laforge 04 Sep '23

04 Sep '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34274?usp=email ) Change subject: osmobts_sock: cosmetic: rename osmobts_sock.c to pcuif_sock.c ...................................................................... osmobts_sock: cosmetic: rename osmobts_sock.c to pcuif_sock.c since OsmoPCU is no longer exclusively used in co-location to OsmoBTS the module osmobts_sock (PCUIF) should get a more generic name. Related: OS#5927 Change-Id: Ic7f6246265fa31be189e4aea36dfaa89bd0eeddd --- M src/Makefile.am R src/pcuif_sock.c 2 files changed, 14 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/Makefile.am b/src/Makefile.am index ded6632..8b8f31e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -82,7 +82,7 @@ rlc_window.cpp \ rlc_window_dl.cpp \ rlc_window_ul.cpp \ - osmobts_sock.c \ + pcuif_sock.c \ gprs_codel.c \ coding_scheme.c \ egprs_rlc_compression.cpp \ diff --git a/src/osmobts_sock.c b/src/pcuif_sock.c similarity index 100% rename from src/osmobts_sock.c rename to src/pcuif_sock.c -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34274?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic7f6246265fa31be189e4aea36dfaa89bd0eeddd Gerrit-Change-Number: 34274 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-bsc[master]: Includes: Remove enum/include from libosmocore instead
by laforge 04 Sep '23

04 Sep '23

Attention is currently required from: arehbein. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31304?usp=email ) Change subject: Includes: Remove enum/include from libosmocore instead ...................................................................... Patch Set 7: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31304?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2883aee12b501a717d5acecd5638882724336e72 Gerrit-Change-Number: 31304 Gerrit-PatchSet: 7 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Mon, 04 Sep 2023 20:24:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in libosmocore[master]: gm_12_21.h: Add cross-component parameter defaults (NSE timing)
by laforge 04 Sep '23

04 Sep '23

Attention is currently required from: arehbein. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31877?usp=email ) Change subject: gm_12_21.h: Add cross-component parameter defaults (NSE timing) ...................................................................... Patch Set 2: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31877?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I51d1fd8b596523ae2ac8fb6a186ce7a702334c27 Gerrit-Change-Number: 31877 Gerrit-PatchSet: 2 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Mon, 04 Sep 2023 20:24:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-ttcn3-hacks[master]: HLR_Tests: add testcase for multiple APNs in subscriber data
by laforge 04 Sep '23

04 Sep '23

Attention is currently required from: lynxis lazus. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32510?usp=email ) Change subject: HLR_Tests: add testcase for multiple APNs in subscriber data ...................................................................... Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32510?usp=email 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: I8d0c08272bc239370e800d6014ab9c68087b8989 Gerrit-Change-Number: 32510 Gerrit-PatchSet: 8 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Mon, 04 Sep 2023 20:22:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-ttcn3-hacks[master]: hlr: implement str2apn() to convert an apn as string into octetstring
by laforge 04 Sep '23

04 Sep '23

Attention is currently required from: daniel, laforge, lynxis lazus. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34288?usp=email ) Change subject: hlr: implement str2apn() to convert an apn as string into octetstring ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34288?usp=email 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: I607969cd58110d4d5ff1b828e64cf2b5031868ac Gerrit-Change-Number: 34288 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)gnumonks.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)gnumonks.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Mon, 04 Sep 2023 20:22:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0