<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22313">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pcu: Ignore dummy rlcmac packets in f_ms_rx_pkt_ass_pacch<br><br>Allow ignoring for received dumy packets while waiting for a Pkt Ass on<br>PACCH. This fixes some tests failing sometimes due to race condition<br>where rlcmac packet is requested too quicky, after the PCU has received<br>the BSSGP packet we sent to it.<br><br>The function is splitted into an internal altestep + a wrap function<br>which is compatible with tests already using it.<br><br>Change-Id: I0a10d3a7383d8534e9263864b4130a96392e6198<br>---<br>M pcu/GPRS_Components.ttcn<br>M pcu/PCU_Tests.ttcn<br>2 files changed, 53 insertions(+), 29 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/13/22313/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn</span><br><span>index 16036ad..54839d4 100644</span><br><span>--- a/pcu/GPRS_Components.ttcn</span><br><span>+++ b/pcu/GPRS_Components.ttcn</span><br><span>@@ -498,38 +498,62 @@</span><br><span> </span><br><span> function f_ms_rx_pkt_ass_pacch(inout GprsMS ms, out uint32_t poll_fn,</span><br><span> template RlcmacDlBlock t_pkt_ass := ?,</span><br><span style="color: hsl(0, 100%, 40%);">- template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum)</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum,</span><br><span style="color: hsl(120, 100%, 40%);">+ boolean ignore_dummy := true)</span><br><span> runs on MS_BTS_IFACE_CT return RlcmacDlBlock {</span><br><span> var RlcmacDlBlock dl_block;</span><br><span style="color: hsl(0, 100%, 40%);">- var uint32_t dl_fn;</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS.send(ts_PCUIF_RTS_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ sapi := PCU_IF_SAPI_PDTCH, fn := 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ arfcn := f_trxnr2arfcn(valueof(nr.trx_nr)), block_nr := nr.blk_nr));</span><br><span style="color: hsl(120, 100%, 40%);">+ as_ms_rx_pkt_ass_pacch(ms, poll_fn, t_pkt_ass, nr, ignore_dummy, dl_block);</span><br><span style="color: hsl(120, 100%, 40%);">+ return dl_block;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_rx_rlcmac_dl_block(dl_block, dl_fn, nr := nr);</span><br><span style="color: hsl(0, 100%, 40%);">- if (not match(dl_block, t_pkt_ass)) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Failed to match Packet Assignment:", t_pkt_ass);</span><br><span style="color: hsl(0, 100%, 40%);">- f_shutdown(__BFILE__, __LINE__);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+altstep as_ms_rx_pkt_ass_pacch(inout GprsMS ms, out uint32_t poll_fn,</span><br><span style="color: hsl(120, 100%, 40%);">+ template RlcmacDlBlock t_pkt_ass := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum,</span><br><span style="color: hsl(120, 100%, 40%);">+ boolean ignore_dummy := true,</span><br><span style="color: hsl(120, 100%, 40%);">+ out RlcmacDlBlock dl_block)</span><br><span style="color: hsl(120, 100%, 40%);">+runs on MS_BTS_IFACE_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var PCUIF_Message pcu_msg;</span><br><span style="color: hsl(120, 100%, 40%);">+ [] BTS.receive(tr_PCUIF_DATA_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ sapi := PCU_IF_SAPI_PDTCH)) -> value pcu_msg {</span><br><span style="color: hsl(120, 100%, 40%);">+ var uint32_t dl_fn;</span><br><span style="color: hsl(120, 100%, 40%);">+ dl_block := dec_RlcmacDlBlock(pcu_msg.u.data_req.data);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ignore_dummy and match(dl_block, tr_RLCMAC_DUMMY_CTRL())) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: sleep? */</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS.send(ts_PCUIF_RTS_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ sapi := PCU_IF_SAPI_PDTCH, fn := 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ arfcn := f_trxnr2arfcn(valueof(nr.trx_nr)), block_nr := nr.blk_nr));</span><br><span style="color: hsl(120, 100%, 40%);">+ repeat;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- poll_fn := f_rrbp_ack_fn(dl_fn, dl_block.ctrl.mac_hdr.rrbp);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (match(dl_block, tr_RLCMAC_UL_PACKET_ASS)) {</span><br><span style="color: hsl(0, 100%, 40%);">- ms.ul_tbf := f_ultbf_new_from_ass_pacch(dl_block);</span><br><span style="color: hsl(0, 100%, 40%);">- if (ms.ul_tbf.ass.pacch.identity.tlli.tlli != ms.tlli) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Wrong TLLI ", ms.ul_tbf.ass.pacch.identity.tlli, " received vs exp ", ms.tlli);</span><br><span style="color: hsl(0, 100%, 40%);">- f_shutdown(__BFILE__, __LINE__);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (match(dl_block, tr_RLCMAC_DL_PACKET_ASS)) {</span><br><span style="color: hsl(0, 100%, 40%);">- ms.dl_tbf := f_dltbf_new_from_ass_pacch(dl_block);</span><br><span style="color: hsl(0, 100%, 40%);">- if (ischosen(ms.dl_tbf.ass.pacch.tfi_or_tlli.tlli) and</span><br><span style="color: hsl(0, 100%, 40%);">- ms.dl_tbf.ass.pacch.tfi_or_tlli.tlli.tlli != ms.tlli) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Wrong TLLI ", ms.dl_tbf.ass.pacch.tfi_or_tlli.tlli.tlli, " received vs exp ", ms.tlli);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not match(dl_block, t_pkt_ass)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Failed to match Packet Assignment:", t_pkt_ass);</span><br><span> f_shutdown(__BFILE__, __LINE__);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Should not happen:", dl_block);</span><br><span style="color: hsl(0, 100%, 40%);">- f_shutdown(__BFILE__, __LINE__);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return dl_block;</span><br><span style="color: hsl(120, 100%, 40%);">+ dl_fn := pcu_msg.u.data_req.fn;</span><br><span style="color: hsl(120, 100%, 40%);">+ poll_fn := f_rrbp_ack_fn(dl_fn, dl_block.ctrl.mac_hdr.rrbp);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (match(dl_block, tr_RLCMAC_UL_PACKET_ASS)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ms.ul_tbf := f_ultbf_new_from_ass_pacch(dl_block);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ms.ul_tbf.ass.pacch.identity.tlli.tlli != ms.tlli) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Wrong TLLI ", ms.ul_tbf.ass.pacch.identity.tlli, " received vs exp ", ms.tlli);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_shutdown(__BFILE__, __LINE__);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (match(dl_block, tr_RLCMAC_DL_PACKET_ASS)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ms.dl_tbf := f_dltbf_new_from_ass_pacch(dl_block);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ischosen(ms.dl_tbf.ass.pacch.tfi_or_tlli.tlli) and</span><br><span style="color: hsl(120, 100%, 40%);">+ ms.dl_tbf.ass.pacch.tfi_or_tlli.tlli.tlli != ms.tlli) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Wrong TLLI ", ms.dl_tbf.ass.pacch.tfi_or_tlli.tlli.tlli, " received vs exp ", ms.tlli);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_shutdown(__BFILE__, __LINE__);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Should not happen:", dl_block);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_shutdown(__BFILE__, __LINE__);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> function f_ms_establish_ul_tbf(inout GprsMS ms, template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum)</span><br><span>diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn</span><br><span>index 13b33b2..7d569b1 100644</span><br><span>--- a/pcu/PCU_Tests.ttcn</span><br><span>+++ b/pcu/PCU_Tests.ttcn</span><br><span>@@ -3109,8 +3109,8 @@</span><br><span> f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, omit)));</span><br><span> </span><br><span> /* Expect an RLC/MAC block with Packet Uplink Assignment on PACCH (see 11.2.29) */</span><br><span style="color: hsl(0, 100%, 40%);">- var RlcmacDlBlock blk := f_ms_rx_pkt_ass_pacch(ms, poll_fn, tr_RLCMAC_UL_PACKET_ASS);</span><br><span style="color: hsl(0, 100%, 40%);">- var PacketUlAssignment ua := blk.ctrl.payload.u.ul_assignment;</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ms_rx_pkt_ass_pacch(ms, poll_fn, tr_RLCMAC_UL_PACKET_ASS);</span><br><span style="color: hsl(120, 100%, 40%);">+ var PacketUlAssignment ua := ms.ul_tbf.ass.pacch;</span><br><span> </span><br><span> /* 3GPP TS 44.060, section 12.8 "Frequency Parameters" */</span><br><span> var template (omit) FrequencyParameters fp;</span><br><span>@@ -3165,8 +3165,8 @@</span><br><span> BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data));</span><br><span> </span><br><span> /* Expect an RLC/MAC block with Packet Downlink Assignment on PACCH (see 11.2.29) */</span><br><span style="color: hsl(0, 100%, 40%);">- dl_block := f_ms_rx_pkt_ass_pacch(ms, poll_fn, tr_RLCMAC_DL_PACKET_ASS);</span><br><span style="color: hsl(0, 100%, 40%);">- var PacketDlAssignment da := dl_block.ctrl.payload.u.dl_assignment;</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ms_rx_pkt_ass_pacch(ms, poll_fn, tr_RLCMAC_DL_PACKET_ASS);</span><br><span style="color: hsl(120, 100%, 40%);">+ var PacketDlAssignment da := ms.dl_tbf.ass.pacch;</span><br><span> </span><br><span> /* This is an optional IE, so it's worth to check its presence */</span><br><span> if (not ispresent(da.freq_par)) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22313">change 22313</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22313"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I0a10d3a7383d8534e9263864b4130a96392e6198 </div>
<div style="display:none"> Gerrit-Change-Number: 22313 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>