<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16409">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pcu: TC_mo_ping_pong: Check DL block is sent and ACK it<br><br>Function f_rx_rlcmac_dl_block_exp_data() still misses proper<br>verification of data. Apparently the received message has 2 blocks,<br>first with expected 10 bytes, but next one contains 18 bytes with 4<br>actual bytes and other bits are padding.<br><br>Last DL ACK/NACK sent is not yet working correctly. osmo-pcu seems to be<br>unable to match it against sent DL block (I think due to non-matching<br>FN), and instead drops it and schedules after timeout an IMM ASS to try<br>to send DL block again.<br><br>Change-Id: Icf66dd5c07690368722c586632c38fb7e770053c<br>---<br>M library/RLCMAC_CSN1_Types.ttcn<br>M library/RLCMAC_Types.ttcn<br>M pcu/PCU_Tests_RAW.ttcn<br>3 files changed, 55 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/RLCMAC_CSN1_Types.ttcn b/library/RLCMAC_CSN1_Types.ttcn</span><br><span>index 29ec07b..a2f9a92 100644</span><br><span>--- a/library/RLCMAC_CSN1_Types.ttcn</span><br><span>+++ b/library/RLCMAC_CSN1_Types.ttcn</span><br><span>@@ -643,11 +643,11 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- private const ILevel iNone := {</span><br><span style="color: hsl(120, 100%, 40%);">+ const ILevel iNone := {</span><br><span> presence := '0'B,</span><br><span> i_level := omit</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- private const ChannelQualityReport c_ChQualRep_default := {</span><br><span style="color: hsl(120, 100%, 40%);">+ const ChannelQualityReport c_ChQualRep_default := {</span><br><span> c_value := 0,</span><br><span> rxqual := 0,</span><br><span> sign_var := 0,</span><br><span>diff --git a/library/RLCMAC_Types.ttcn b/library/RLCMAC_Types.ttcn</span><br><span>index b0dac35..8e6942e 100644</span><br><span>--- a/library/RLCMAC_Types.ttcn</span><br><span>+++ b/library/RLCMAC_Types.ttcn</span><br><span>@@ -256,7 +256,30 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Template fro uplink Data block */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Send Template for Downlink ACK/NACK */</span><br><span style="color: hsl(120, 100%, 40%);">+ template RlcmacUlBlock ts_RLCMAC_DL_ACK_NACK(template uint5_t tfi, AckNackDescription andesc, boolean retry := false) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ctrl := {</span><br><span style="color: hsl(120, 100%, 40%);">+ mac_hdr := {</span><br><span style="color: hsl(120, 100%, 40%);">+ payload_type := MAC_PT_RLCMAC_NO_OPT,</span><br><span style="color: hsl(120, 100%, 40%);">+ spare := '00000'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ retry := retry</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ payload := {</span><br><span style="color: hsl(120, 100%, 40%);">+ msg_type := PACKET_DL_ACK_NACK,</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%);">+ dl_tfi := tfi,</span><br><span style="color: hsl(120, 100%, 40%);">+ ack_nack_desc := andesc,</span><br><span style="color: hsl(120, 100%, 40%);">+ chreq_desc_presence := '0'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ chreq_desc := omit,</span><br><span style="color: hsl(120, 100%, 40%);">+ ch_qual_rep := c_ChQualRep_default</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 style="color: hsl(120, 100%, 40%);">+ /* 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> data := {</span><br><span>diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn</span><br><span>index 4a6f54a..410dc31 100644</span><br><span>--- a/pcu/PCU_Tests_RAW.ttcn</span><br><span>+++ b/pcu/PCU_Tests_RAW.ttcn</span><br><span>@@ -46,6 +46,8 @@</span><br><span> </span><br><span> modulepar {</span><br><span> charstring mp_pcu_sock_path := PCU_SOCK_DEFAULT;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ float X2002 := 0.2; /* Timer -2002, IMM ASSIGN confirm delay */</span><br><span> }</span><br><span> </span><br><span> type component RAW_NS_CT {</span><br><span>@@ -753,6 +755,19 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+private function f_rx_rlcmac_dl_block_exp_data(out RlcmacDlBlock dl_block, octetstring data)</span><br><span style="color: hsl(120, 100%, 40%);">+runs on RAW_PCU_Test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var template RlcmacDlBlock dl_template := tr_RLCMAC_DATA_RRBP;</span><br><span style="color: hsl(120, 100%, 40%);">+ dl_template.data.blocks := ?;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: match data correctly: { valueof(t_RLCMAC_LLCBLOCK(data)) }; */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_rx_rlcmac_dl_block(dl_block);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not match(dl_block, dl_template)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Failed to match Packet data: ", dl_block, " vs ", dl_template);</span><br><span style="color: hsl(120, 100%, 40%);">+ mtc.stop;</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> testcase TC_pcuif_suspend() runs on RAW_PCU_Test_CT {</span><br><span> var octetstring ra_id := enc_RoutingAreaIdentification(mp_gb_cfg.cell_id.ra_id);</span><br><span> var GprsTlli tlli := 'FFFFFFFF'O;</span><br><span>@@ -1320,9 +1335,15 @@</span><br><span> var PacketDlAssign dl_tbf_ass;</span><br><span> var RlcmacDlBlock dl_block;</span><br><span> var PCUIF_Message pcu_msg;</span><br><span style="color: hsl(0, 100%, 40%);">- var octetstring data;</span><br><span style="color: hsl(120, 100%, 40%);">+ var octetstring data := f_rnd_octstring(10);</span><br><span> var boolean ok;</span><br><span> var OCT4 tlli := '00000001'O;</span><br><span style="color: hsl(120, 100%, 40%);">+ var AckNackDescription ack_nack_desc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ack_nack_desc.final_ack := '0'B;</span><br><span style="color: hsl(120, 100%, 40%);">+ ack_nack_desc.starting_seq_nr := 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ ack_nack_desc.receive_block_bitmap := '0000000000000000000000000000000000000000000000000000000000000000'B;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> /* Initialize NS/BSSGP side */</span><br><span> f_init_bssgp();</span><br><span>@@ -1354,7 +1375,7 @@</span><br><span> BSSGP[0].receive(tr_BSSGP_UL_UD(tlli, mp_gb_cfg.cell_id));</span><br><span> </span><br><span> /* Now SGSN sends some DL data, PCU will page on CCCH (PCH) */</span><br><span style="color: hsl(0, 100%, 40%);">- BSSGP[0].send(ts_BSSGP_DL_UD(tlli, f_rnd_octstring(10)));</span><br><span style="color: hsl(120, 100%, 40%);">+ BSSGP[0].send(ts_BSSGP_DL_UD(tlli, data));</span><br><span> f_pcuif_rx_pch_imm_tbf_ass(rr_imm_ass);</span><br><span> </span><br><span> ok := f_imm_ass_verify_dl_tbf_ass(rr_imm_ass, dl_tbf_ass);</span><br><span>@@ -1363,7 +1384,12 @@</span><br><span> mtc.stop;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* TODO: ACK the assignment and the DL block somehow? */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_sleep(X2002);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_rx_rlcmac_dl_block_exp_data(dl_block, data);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* ACK the DL block */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_tx_rlcmac_ul_block(ts_RLCMAC_DL_ACK_NACK(dl_block.data.mac_hdr.hdr_ext.tfi, ack_nack_desc));</span><br><span> }</span><br><span> </span><br><span> control {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16409">change 16409</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/+/16409"/><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: Icf66dd5c07690368722c586632c38fb7e770053c </div>
<div style="display:none"> Gerrit-Change-Number: 16409 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>