<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18381">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pcu: TC_mt_ping_pong: Request UL TBF on last DL ACK<br><br>Let's test the code path where UL TBF is requested through DL ACK/NACK<br>here, since we already test the usual UL TBF through CCCH approach in<br>most tests.<br><br>rlc_mode is changed to ACKED since that's the mode we are using so far<br>in tests.<br><br>Change-Id: I5a9a2e8107c87fdbf74cc2f09ae5eeafbb13ad55<br>---<br>M library/RLCMAC_CSN1_Templates.ttcn<br>M library/RLCMAC_Templates.ttcn<br>M pcu/PCU_Tests.ttcn<br>3 files changed, 23 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/RLCMAC_CSN1_Templates.ttcn b/library/RLCMAC_CSN1_Templates.ttcn</span><br><span>index eebda7f..9f53c3f 100644</span><br><span>--- a/library/RLCMAC_CSN1_Templates.ttcn</span><br><span>+++ b/library/RLCMAC_CSN1_Templates.ttcn</span><br><span>@@ -123,10 +123,10 @@</span><br><span> return ms_rac2;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- private const ChannelReqDescription c_ChReqDesc_default := {</span><br><span style="color: hsl(120, 100%, 40%);">+ const ChannelReqDescription c_ChReqDesc_default := {</span><br><span> peak_tput_class := 0,</span><br><span> priority := 0,</span><br><span style="color: hsl(0, 100%, 40%);">- rlc_mode := RLC_MODE_UNACKNOWLEDGED,</span><br><span style="color: hsl(120, 100%, 40%);">+ rlc_mode := RLC_MODE_ACKNOWLEDGED,</span><br><span> llc_pdu_type := LLC_PDU_IS_NOT_SACK_OR_ACK,</span><br><span> RlcOctetCount := 0</span><br><span> }</span><br><span>diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn</span><br><span>index e2abd84..939a814 100644</span><br><span>--- a/library/RLCMAC_Templates.ttcn</span><br><span>+++ b/library/RLCMAC_Templates.ttcn</span><br><span>@@ -329,6 +329,23 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ template RlcmacUlBlock ts_RLCMAC_DL_ACK_NACK_CHREQ(template uint5_t tfi,</span><br><span style="color: hsl(120, 100%, 40%);">+ AckNackDescription andesc,</span><br><span style="color: hsl(120, 100%, 40%);">+ boolean retry := false,</span><br><span style="color: hsl(120, 100%, 40%);">+ template ChannelReqDescription chreq_desc := c_ChReqDesc_default)</span><br><span style="color: hsl(120, 100%, 40%);">+ modifies ts_RLCMAC_DL_ACK_NACK := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ctrl := {</span><br><span style="color: hsl(120, 100%, 40%);">+ payload := {</span><br><span style="color: hsl(120, 100%, 40%);">+ u := {</span><br><span style="color: hsl(120, 100%, 40%);">+ dl_ack_nack := {</span><br><span style="color: hsl(120, 100%, 40%);">+ chreq_desc_presence := '1'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ chreq_desc := chreq_desc</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Template for uplink Data block */</span><br><span> template RlcmacUlBlock t_RLCMAC_UL_DATA(template uint5_t tfi, template uint4_t cv, template uint7_t bsn,</span><br><span> template LlcBlocks blocks := {}, template boolean stall := false) := {</span><br><span>diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn</span><br><span>index 8b9a471..4a26814 100644</span><br><span>--- a/pcu/PCU_Tests.ttcn</span><br><span>+++ b/pcu/PCU_Tests.ttcn</span><br><span>@@ -1096,13 +1096,13 @@</span><br><span> f_sleep(X2002);</span><br><span> f_rx_rlcmac_dl_block_exp_data(dl_block, dl_fn, data, 0, exp_cs_mcs);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* ACK the DL block */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* ACK the DL block, and request UL TBF at the same time */</span><br><span> f_acknackdesc_ack_block(ms.dl_tbf.acknack_desc, dl_block, '1'B);</span><br><span style="color: hsl(0, 100%, 40%);">- f_ms_tx_ul_block(ms, ts_RLCMAC_DL_ACK_NACK(ms.dl_tbf.tfi, ms.dl_tbf.acknack_desc),</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ms_tx_ul_block(ms, ts_RLCMAC_DL_ACK_NACK_CHREQ(ms.dl_tbf.tfi, ms.dl_tbf.acknack_desc),</span><br><span> f_dl_block_ack_fn(dl_block, dl_fn));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Now MS wants to answer the DL data, Establish an Uplink TBF */</span><br><span style="color: hsl(0, 100%, 40%);">- f_ms_establish_ul_tbf(ms);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Expect UL ass */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ms_rx_imm_ass_pacch(ms, sched_fn, tr_RLCMAC_UL_PACKET_ASS);</span><br><span> </span><br><span> /* Send one UL block (with TLLI since we are in One-Phase Access</span><br><span> contention resoultion) and make sure it is ACKED fine */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18381">change 18381</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/+/18381"/><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: I5a9a2e8107c87fdbf74cc2f09ae5eeafbb13ad55 </div>
<div style="display:none"> Gerrit-Change-Number: 18381 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>