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

[S] Change in osmo-bts[master]: systemd: remove RestartPreventExitStatus=1

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/34540?usp=email ) Change subject: systemd: remove RestartPreventExitStatus=1 ...................................................................... systemd: remove RestartPreventExitStatus=1 Fix OsmoBTS not restarting if e.g. an external gsmtap IP is configured that is currently not available. Also make the service files more consistent with other Osmocom projects. Partial revert of ae2473c2 ("systemd: Do not restart with a broken config file or such"). Related: SYS#6581 Change-Id: Ieeed858c159839ebaa27b2be35a597fb86874c4b --- M contrib/systemd/osmo-bts-lc15.service M contrib/systemd/osmo-bts-oc2g.service M contrib/systemd/osmo-bts-sysmo.service 3 files changed, 17 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/40/34540/1 diff --git a/contrib/systemd/osmo-bts-lc15.service b/contrib/systemd/osmo-bts-lc15.service index fd0760a..03341bd 100644 --- a/contrib/systemd/osmo-bts-lc15.service +++ b/contrib/systemd/osmo-bts-lc15.service @@ -11,7 +11,6 @@ RuntimeDirectory=osmo-bts Restart=always RestartSec=2 -RestartPreventExitStatus=1 # CPU scheduling policy: CPUSchedulingPolicy=rr diff --git a/contrib/systemd/osmo-bts-oc2g.service b/contrib/systemd/osmo-bts-oc2g.service index dabb002..bc64a54 100644 --- a/contrib/systemd/osmo-bts-oc2g.service +++ b/contrib/systemd/osmo-bts-oc2g.service @@ -11,7 +11,6 @@ RuntimeDirectory=osmo-bts Restart=always RestartSec=2 -RestartPreventExitStatus=1 # CPU scheduling policy: CPUSchedulingPolicy=rr diff --git a/contrib/systemd/osmo-bts-sysmo.service b/contrib/systemd/osmo-bts-sysmo.service index 09880a8..09e91de 100644 --- a/contrib/systemd/osmo-bts-sysmo.service +++ b/contrib/systemd/osmo-bts-sysmo.service @@ -13,7 +13,6 @@ WorkingDirectory=%S/osmocom Restart=always RestartSec=2 -RestartPreventExitStatus=1 # CPU scheduling policy: CPUSchedulingPolicy=rr -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34540?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ieeed858c159839ebaa27b2be35a597fb86874c4b Gerrit-Change-Number: 34540 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: osmo-mgw.cfg syntax fix

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34538?usp=email ) Change subject: osmo-mgw.cfg syntax fix ...................................................................... osmo-mgw.cfg syntax fix was added with mismatching indent in "mgw: Update to contain similar config from docker-playground.git" commit cec73acdd4fa4ddc39ab44853ece0888b3e1bf34 I2aa4d86e548d6644f1dd9358f6b8b48a19c96c3c Change-Id: I5d4d1af40410bfdcc1280f45b85a8ae0c7b94a80 --- M mgw/osmo-mgw.cfg 1 file changed, 24 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/38/34538/1 diff --git a/mgw/osmo-mgw.cfg b/mgw/osmo-mgw.cfg index 3844e79..2af7dff 100644 --- a/mgw/osmo-mgw.cfg +++ b/mgw/osmo-mgw.cfg @@ -60,12 +60,12 @@ osmux off osmux bind-ip 127.0.0.1 osmux bind-ip-v6 ::1 - trunk 1 - sdp audio-payload send-ptime - sdp audio-payload send-name - no rtp keep-alive - loop 0 - no rtcp-omit - no rtp-patch - allow-transcoding - line 0 + trunk 1 + sdp audio-payload send-ptime + sdp audio-payload send-name + no rtp keep-alive + loop 0 + no rtcp-omit + no rtp-patch + allow-transcoding + line 0 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34538?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: I5d4d1af40410bfdcc1280f45b85a8ae0c7b94a80 Gerrit-Change-Number: 34538 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: mgw: add f_TC_amr_switch_to_iuup

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34539?usp=email ) Change subject: mgw: add f_TC_amr_switch_to_iuup ...................................................................... mgw: add f_TC_amr_switch_to_iuup Change-Id: I08eca9ea123029c37892d5de7c94a8ed6cc0a913 --- M mgw/MGCP_Test.ttcn 1 file changed, 160 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/39/34539/1 diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index 73591b2..ca6e520 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -3078,6 +3078,155 @@ mp_local_ipv4, mp_remote_ipv4); } + function f_tc_amr_switch_to_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]; + var MgcpResponse resp; + var MgcpEndpoint ep := c_mgw_ep_rtpbridge & "2@" & c_mgw_domain; + var MgcpCallId call_id := '1227'H; + var integer num_pkts_tx[2]; + var integer temp; + + f_init(ep); + + /* Create the first connection in receive only mode (RNC side, IuUP-Init active) */ + flow[0] := valueof(t_RtpFlow(local_ip_a, remote_ip_a, 96, "VND.3GPP.IUFP/16000")); + flow[0].em.portnr := 10000; + flow[0].rtp_cfg := c_RtpemDefaultCfg; + flow[0].rtp_cfg.tx_payloads[0].payload_type := flow[0].codec_descr[0].pt; + flow[0].rtp_cfg.rx_payloads[0].payload_type := flow[0].codec_descr[0].pt; + flow[0].rtp_cfg.tx_payloads[0].fixed_payload := '4f28959ffeb80181f5c4e83d176c897b4a4e333298333419a493ca63ded6e0'O; + /* flow[1].rtp_cfg.rx_payloads[0].fixed_payload converted AMR-BE-RTP->AMR-IUUP*/ + flow[0].rtp_cfg.rx_payloads[0].fixed_payload := '08556d944c71a1a081e7ead204244480000ecd82b81118000097c4794e7740'O; + 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); + + /* Create the second connection. This connection will be also + * in receive only mode (CN side, regular RTP) */ + flow[1] := valueof(t_RtpFlow(local_ip_b, remote_ip_b, 112, "AMR/8000")); + flow[1].em.portnr := 20000; + flow[1].rtp_cfg := c_RtpemDefaultCfg; + flow[1].rtp_cfg.tx_payloads[0].payload_type := flow[1].codec_descr[0].pt; + flow[1].rtp_cfg.rx_payloads[0].payload_type := flow[1].codec_descr[0].pt; + flow[1].rtp_cfg.tx_payloads[0].fixed_payload := '0382155b65131c68682079fab4810911200003b360ae0446000025f11e539dd0'O; + /* flow[0].rtp_cfg.rx_payloads[0].fixed_payload converted AMR-IuUP->AMR-BE-RTP*/ + flow[1].rtp_cfg.rx_payloads[0].fixed_payload := 'f3d3ca2567ffae00607d713a0f45db225ed2938ccca60ccd066924f298f7b5b8'O; + flow[1].rtp_cfg.iuup_mode := false; + f_flow_create(RTPEM[1], ep, call_id, "recvonly", flow[1], true); + f_rtpem_mode(RTPEM[1], RTPEM_MODE_RXONLY); + + /* The first leg starts transmitting */ + f_rtpem_mode(RTPEM[0], RTPEM_MODE_TXONLY); + f_sleep(0.5); + stats[0] := f_rtpem_stats_get(RTPEM[0]); + if (stats[0].num_pkts_rx_err_disabled != 0) { + setverdict(fail, "received packets from MGW on recvonly connection 0"); + mtc.stop; + } + stats[1] := f_rtpem_stats_get(RTPEM[1]); + if (stats[1].num_pkts_rx_err_disabled != 0) { + setverdict(fail, "received packets from MGW on recvonly connection 1"); + mtc.stop; + } + + /* The second leg starts transmitting a little later */ + f_rtpem_mode(RTPEM[1], RTPEM_MODE_TXONLY); + f_sleep(1.0); + stats[0] := f_rtpem_stats_get(RTPEM[0]); + if (stats[0].num_pkts_rx_err_disabled != 0) { + setverdict(fail, "received packets from MGW on recvonly connection 0"); + mtc.stop; + } + stats[1] := f_rtpem_stats_get(RTPEM[1]); + if (stats[1].num_pkts_rx_err_disabled != 0) { + setverdict(fail, "received packets from MGW on recvonly connection 1"); + mtc.stop; + } + + /* The first leg will now be switched into bidirectional + * mode, but we do not expect any data coming back yet. */ + f_rtpem_mode(RTPEM[0], RTPEM_MODE_BIDIR); + stats[1] := f_rtpem_stats_get(RTPEM[1]); + num_pkts_tx[1] := stats[1].num_pkts_tx; + f_flow_modify(RTPEM[0], ep, call_id, "sendrecv", flow[0]); + f_sleep(0.5); + stats[0] := f_rtpem_stats_get(RTPEM[0]); + if (stats[0].num_pkts_rx_err_disabled != 0) { + setverdict(fail, "received packets from MGW on recvonly connection 0"); + mtc.stop; + } + stats[1] := f_rtpem_stats_get(RTPEM[1]); + if (stats[1].num_pkts_rx_err_disabled != 0) { + setverdict(fail, "received packets from MGW on recvonly connection 1"); + mtc.stop; + } + + /* When the second leg is switched into bidirectional mode + * as well, then the MGW will connect the two together and + * we should see RTP streams passing through from both ends. */ + f_rtpem_mode(RTPEM[1], RTPEM_MODE_BIDIR); + stats[0] := f_rtpem_stats_get(RTPEM[0]); + num_pkts_tx[0] := stats[0].num_pkts_tx; + f_flow_modify(RTPEM[1], ep, call_id, "sendrecv", flow[1]); + f_sleep(2.0); + + stats[0] := f_rtpem_stats_get(RTPEM[0]); + stats[1] := f_rtpem_stats_get(RTPEM[1]); + + temp := stats[0].num_pkts_tx - num_pkts_tx[0] - stats[1].num_pkts_rx; + if (temp > 3 or temp < -3) { + setverdict(fail, "number of packets not within normal parameters:", temp); + mtc.stop; + } + + temp := stats[1].num_pkts_tx - num_pkts_tx[1] - stats[0].num_pkts_rx; + if (temp > 3 or temp < -3) { + setverdict(fail, "number of packets not within normal parameters:", temp); + mtc.stop; + } + + f_rtpem_stats_err_check(stats[0]); + f_rtpem_stats_err_check(stats[1]); + + /* Modify the AMR side to also do IuUP */ + flow[1].codec_descr := {{ + pt := 96, + codec := "VND.3GPP.IUFP/16000", + fmtp := omit + }}; + flow[1].rtp_cfg.iuup_mode := true; /* <-- does it work to switch this on with f_flow_modify()? */ + flow[1].rtp_cfg.iuup_cfg.active_init := false; + flow[1].rtp_cfg.iuup_cfg.rab_flow_combs := rfcl_a; + flow[1].rtp_cfg.tx_payloads[0].payload_type := flow[1].codec_descr[0].pt; + flow[1].rtp_cfg.rx_payloads[0].payload_type := flow[1].codec_descr[0].pt; + f_flow_modify(RTPEM[1], ep, call_id, "sendrecv", flow[1]); + + // ... now what + // want to verify that the RTP packets switched from AMR to IuUP, + // and that an IuUP Initialization happened by initiative of osmo-mgw. + // In the pcap, I see a switch to IuUP without Initialization, and then invalid IuUP PDUs being + // forwarded out of flow[1] (wireshark: "Unknown PDU Type(15)"). + f_sleep(3.0); + + /* Tear down */ + f_flow_delete(RTPEM[0]); + f_flow_delete(RTPEM[1], ep, call_id); + setverdict(pass); + } + testcase TC_amr_switch_to_iuup() runs on dummy_CT { + 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_amr_switch_to_iuup(mp_local_ipv4, mp_remote_ipv4, valueof(rfcl), + mp_local_ipv4, mp_remote_ipv4); + } control { execute(TC_selftest()); execute(TC_auep_null()); @@ -3167,6 +3316,8 @@ execute(TC_two_crcx_mdcx_and_iuup_rtp()); execute(TC_two_crcx_mdcx_and_iuup_rtp_rfci_unordered()); + execute(TC_amr_switch_to_iuup()); + execute(TC_two_crcx_mdcx_and_rtp_clearmode()); /* Note: This testcase will trigger an OSMO_ASSERT() bug in -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34539?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: I08eca9ea123029c37892d5de7c94a8ed6cc0a913 Gerrit-Change-Number: 34539 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: IuUP_Emulation: fix AMR SID SDU size

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34537?usp=email ) Change subject: IuUP_Emulation: fix AMR SID SDU size ...................................................................... IuUP_Emulation: fix AMR SID SDU size See 3GPP TS 26.102 Table 6-2, an AMR SID should have 39 bits. Change-Id: I9afb28ca6e23f7976edcc130ea012be34e04eb4b --- M library/IuUP_Emulation.ttcn 1 file changed, 13 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/37/34537/1 diff --git a/library/IuUP_Emulation.ttcn b/library/IuUP_Emulation.ttcn index b649e44..3bda958 100644 --- a/library/IuUP_Emulation.ttcn +++ b/library/IuUP_Emulation.ttcn @@ -35,7 +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_SID(IuUP_RFCI rfci) := t_IuUP_RFC(rfci, {39, 0, 0}, 7); template (value) IuUP_RabFlowCombination t_IuUP_RFC_AMR_NO_DATA(IuUP_RFCI rfci) := t_IuUP_RFC(rfci, {0, 0, 0}, 1); @@ -46,7 +46,7 @@ ipti := 1 }, { rfci := 1, - sub_flow_bits := {34, 0, 0}, + sub_flow_bits := {39, 0, 0}, ipti := 7 }, { rfci := 2, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34537?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: I9afb28ca6e23f7976edcc130ea012be34e04eb4b Gerrit-Change-Number: 34537 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Clean up code

by daniel

Attention is currently required from: arehbein. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34524?usp=email ) Change subject: osmo_io: Clean up code ...................................................................... Patch Set 1: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34524?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: I77f7ae2b211507f420d87c484ec75ee054fceb63 Gerrit-Change-Number: 34524 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Tue, 26 Sep 2023 20:54:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Clean up code

by daniel

Attention is currently required from: arehbein. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34524?usp=email ) Change subject: osmo_io: Clean up code ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: osmo_iofd_init() is only called from the main thread, it needs to be public similar to osmo_select_init() to initialize TLS in a multithreaded program. See osmo-remsim/src/client/user_ifdhandler.c where osmo_select_init() is called explicitly. I'd suggest to only fix the declaration in the header to match the function name. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34524?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: I77f7ae2b211507f420d87c484ec75ee054fceb63 Gerrit-Change-Number: 34524 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Tue, 26 Sep 2023 20:54:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in osmo-trx[master]: ms: reduce rx burst queue size

by fixeria

Attention is currently required from: Hoernchen. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/34272?usp=email ) Change subject: ms: reduce rx burst queue size ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34272?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ifb8bf2894c87e4234e3d3f65d66c1e98c8f63c53 Gerrit-Change-Number: 34272 Gerrit-PatchSet: 5 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Tue, 26 Sep 2023 20:36:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: WIP

by pespin

pespin has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34535?usp=email ) Change subject: WIP ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34535?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: Idd821049315ae4d0cf83f551d5fc1f2961545291 Gerrit-Change-Number: 34535 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: abandon

1 year, 9 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: WIP

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34535?usp=email ) Change subject: WIP ...................................................................... WIP Change-Id: Idd821049315ae4d0cf83f551d5fc1f2961545291 --- M pcu/PCU_Tests.ttcn 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/35/34535/1 diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 012a0be..6917404 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -1953,7 +1953,7 @@ var GprsMS ms; const integer N3105_MAX := 2; var integer N3105 := 0; - timer T_3195 := 1.0; + timer T_3195 := 1.0 + 0.1; /* 0.1: some extra time to avoid race conditions between test and IUT */ var integer num_poll_recv := 0; var template RlcmacDlBlock dl_block_exp; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34535?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: Idd821049315ae4d0cf83f551d5fc1f2961545291 Gerrit-Change-Number: 34535 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: pcu: Fail immediately in TC_n3105_max_t3195

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34536?usp=email ) Change subject: pcu: Fail immediately in TC_n3105_max_t3195 ...................................................................... pcu: Fail immediately in TC_n3105_max_t3195 Change-Id: I55b97037c014478451790e1943c617a634fe2457 --- M pcu/PCU_Tests.ttcn 1 file changed, 19 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/36/34536/1 diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 6917404..45b1883 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -1955,7 +1955,6 @@ var integer N3105 := 0; timer T_3195 := 1.0 + 0.1; /* 0.1: some extra time to avoid race conditions between test and IUT */ var integer num_poll_recv := 0; - var template RlcmacDlBlock dl_block_exp; /* Initialize NS/BSSGP side */ f_init_bssgp(); @@ -2041,10 +2040,17 @@ log("T_3195 timeout"); /* Done in alt, wait for pending RTS initiated previously in * above case before continuing (expect empty block): */ - dl_block_exp := omit; - BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, + alt { + [] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), - dl_block_exp)); + omit)); /* DONE, continue after altstep. */ + [] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, + tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), + tr_RLCMAC_DL_DUMMY_CTRL)) { + setverdict(fail, "Rx unexpected DUMMY message, expected empty data block"); + f_shutdown(__BFILE__, __LINE__); + } + } } [] BTS.receive { setverdict(fail, "Unexpected BTS message"); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34536?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: I55b97037c014478451790e1943c617a634fe2457 Gerrit-Change-Number: 34536 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2023