<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18234">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pcu: Properly pass tlli in f_tx_rlcmac_ul_n_blocks()<br><br>Change-Id: Idb8febbbff732f02d05b0043c75e2a0729e01d4f<br>---<br>M pcu/PCU_Tests.ttcn<br>1 file changed, 14 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn</span><br><span>index a232a7f..efb7d94 100644</span><br><span>--- a/pcu/PCU_Tests.ttcn</span><br><span>+++ b/pcu/PCU_Tests.ttcn</span><br><span>@@ -503,7 +503,7 @@</span><br><span> f_pcuif_tx_data_ind(data, lqual_cb, fn);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-private function f_tx_rlcmac_ul_n_blocks(PacketUlAssign ul_tbf_ass, integer num_blocks := 1)</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_tx_rlcmac_ul_n_blocks(PacketUlAssign ul_tbf_ass, integer num_blocks := 1, template (omit) GprsTlli tlli := omit)</span><br><span> runs on RAW_PCU_Test_CT {</span><br><span> var template (value) RlcmacUlBlock ul_data := t_RLCMAC_UL_DATA(</span><br><span> tfi := ul_tbf_ass.dynamic.tfi_assignment,</span><br><span>@@ -511,8 +511,10 @@</span><br><span> bsn := 0, /* TODO: what should be here? */</span><br><span> blocks := { /* To be generated in loop */ });</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* HACK: patch missing TLLI; otherwise OsmoPCU rejects DATA.req */</span><br><span style="color: hsl(0, 100%, 40%);">- ul_data.data.tlli := '00000001'O;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not istemplatekind(tlli, "omit")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ul_data.data.mac_hdr.tlli_ind := true;</span><br><span style="color: hsl(120, 100%, 40%);">+ ul_data.data.tlli := tlli;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> for (var integer i := 0; i < num_blocks; i := i + 1) {</span><br><span> /* Prepare a new UL block (CV, random payload) */</span><br><span>@@ -1295,8 +1297,9 @@</span><br><span> /* Make sure we've got an Uplink TBF assignment */</span><br><span> f_imm_ass_verify_ul_tbf_ass(rr_imm_ass, ul_tbf_ass);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Send one UL block and make sure it is ACKED fine */</span><br><span style="color: hsl(0, 100%, 40%);">- f_tx_rlcmac_ul_n_blocks(ul_tbf_ass, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Send one UL block (with TLLI since we are in One-Phase Access</span><br><span style="color: hsl(120, 100%, 40%);">+ contention resoultion) and make sure it is ACKED fine */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_tx_rlcmac_ul_n_blocks(ul_tbf_ass, 1, tlli);</span><br><span> f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, unused_fn);</span><br><span> /* UL block should be received in SGSN */</span><br><span> BSSGP[0].receive(tr_BSSGP_UL_UD(tlli, mp_gb_cfg.cell_id));</span><br><span>@@ -1417,8 +1420,9 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Send one UL block and make sure it is ACKED fine */</span><br><span style="color: hsl(0, 100%, 40%);">- f_tx_rlcmac_ul_n_blocks(ul_tbf_ass, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Send one UL block (with TLLI since we are in One-Phase Access</span><br><span style="color: hsl(120, 100%, 40%);">+ contention resoultion) and make sure it is ACKED fine */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_tx_rlcmac_ul_n_blocks(ul_tbf_ass, 1, tlli);</span><br><span> f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, sched_fn);</span><br><span> /* DL ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */</span><br><span> f_tx_rlcmac_ul_block(ts_RLCMAC_CTRL_ACK(tlli), 0, sched_fn);</span><br><span>@@ -1517,8 +1521,9 @@</span><br><span> /* Make sure we've got an Uplink TBF assignment */</span><br><span> f_imm_ass_verify_ul_tbf_ass(rr_imm_ass, ul_tbf_ass);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Send one UL block and make sure it is ACKED fine */</span><br><span style="color: hsl(0, 100%, 40%);">- f_tx_rlcmac_ul_n_blocks(ul_tbf_ass, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Send one UL block (with TLLI since we are in One-Phase Access</span><br><span style="color: hsl(120, 100%, 40%);">+ contention resoultion) and make sure it is ACKED fine */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_tx_rlcmac_ul_n_blocks(ul_tbf_ass, 1, tlli);</span><br><span> f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, sched_fn);</span><br><span> /* DL ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */</span><br><span> f_tx_rlcmac_ul_block(ts_RLCMAC_CTRL_ACK(tlli), 0, sched_fn);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18234">change 18234</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/+/18234"/><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: Idb8febbbff732f02d05b0043c75e2a0729e01d4f </div>
<div style="display:none"> Gerrit-Change-Number: 18234 </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-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>