<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21419">View Change</a></p><div style="white-space:pre-wrap">Approvals:
daniel: 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: Verify LLC UI dummy frames are not appended at end of rlcmac DL block<br><br>LLC UI dummy frames are only to be sent alone in order to delay TBF<br>termination. Until recently (osmo-pcu.git<br>Ifae1a7b2b3dfad8df19585063088ba0df2749c8f), osmo-pcu was sending LLC UI<br>dummy frames instead of padding at RLCMAC layer, which made no sense.<br><br>Related: OS#4849<br>Change-Id: I7e0d9ed2475dbf989fbf932c8b83117ff5fb28fc<br>---<br>M pcu/GPRS_Components.ttcn<br>M pcu/PCU_Tests.ttcn<br>2 files changed, 77 insertions(+), 14 deletions(-)<br><br></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 0850a3d..16036ad 100644</span><br><span>--- a/pcu/GPRS_Components.ttcn</span><br><span>+++ b/pcu/GPRS_Components.ttcn</span><br><span>@@ -1001,13 +1001,6 @@</span><br><span> f_shutdown(__BFILE__, __LINE__);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Check next data blocks contain dummy frames */</span><br><span style="color: hsl(0, 100%, 40%);">- if (lengthof(data_block.blocks) > 1 and substr(data_block.blocks[1].payload, 0, 3) != '43C001'O) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Second data payload is not a dummy frame: ",</span><br><span style="color: hsl(0, 100%, 40%);">- data_block.blocks[1].payload);</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%);">-</span><br><span> if (not match(data_block.cs, exp_cs)) {</span><br><span> setverdict(fail, "Failed to match ", data_block.cs, " vs exp ", exp_cs);</span><br><span> f_shutdown(__BFILE__, __LINE__);</span><br><span>@@ -1036,13 +1029,6 @@</span><br><span> f_shutdown(__BFILE__, __LINE__);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Check next data blocks contain dummy frames */</span><br><span style="color: hsl(0, 100%, 40%);">- if (lengthof(data_block.blocks) > 1 and substr(data_block.blocks[1].payload, 0, 3) != '43C001'O) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Second data payload is not a dummy frame: ",</span><br><span style="color: hsl(0, 100%, 40%);">- data_block.blocks[1].payload);</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%);">-</span><br><span> if (not match(data_block.mcs, exp_cs)) {</span><br><span> setverdict(fail, "Failed to match ", data_block.mcs, " vs exp ", exp_cs);</span><br><span> f_shutdown(__BFILE__, __LINE__);</span><br><span>diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn</span><br><span>index 67a811d..dad0873 100644</span><br><span>--- a/pcu/PCU_Tests.ttcn</span><br><span>+++ b/pcu/PCU_Tests.ttcn</span><br><span>@@ -2546,6 +2546,81 @@</span><br><span> f_shutdown(__BFILE__, __LINE__, final := true);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+private function f_tc_dl_data_no_llc_ui_dummy(template (omit) MSRadioAccessCapabilityV_BSSGP ms_racap := omit) runs on RAW_PCU_Test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var AckNackDescription ack_nack_desc := valueof(t_AckNackDescription_init);</span><br><span style="color: hsl(120, 100%, 40%);">+ var octetstring data := f_rnd_octstring(6);</span><br><span style="color: hsl(120, 100%, 40%);">+ var RlcmacDlBlock dl_block;</span><br><span style="color: hsl(120, 100%, 40%);">+ var GprsMS ms;</span><br><span style="color: hsl(120, 100%, 40%);">+ var uint32_t fn;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Initialize NS/BSSGP side */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_bssgp();</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Initialize GPRS MS side */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_gprs_ms();</span><br><span style="color: hsl(120, 100%, 40%);">+ ms := g_ms[0]; /* We only use first MS in this test */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Initialize the PCU interface abstraction */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_raw(testcasename());</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Establish BSSGP connection to the PCU */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_bssgp_establish();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* SGSN sends some DL data, PCU will page on CCCH (PCH) */</span><br><span style="color: hsl(120, 100%, 40%);">+ BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data, ms_racap));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH);</span><br><span style="color: hsl(120, 100%, 40%);">+</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Expect the first (GPRS DL) block with bsn=0 and rrbp_valid=1 */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_rx_rlcmac_dl_block_exp_data(dl_block, fn, data, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ischosen(dl_block.data_egprs)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lengthof(dl_block.data_egprs.blocks) != 2) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "DL EGPRS block has unexpected number of LLC frames: ", dl_block.data_egprs);</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%);">+ if (dl_block.data_egprs.blocks[1].hdr.length_ind != 127) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "DL EGPRS block 2nd llc frame is not padding!: ", dl_block.data_egprs);</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%);">+ if (not match(dl_block.data_egprs.blocks[1].payload,</span><br><span style="color: hsl(120, 100%, 40%);">+ f_pad_oct(''O, lengthof(dl_block.data_egprs.blocks[1].payload), '2B'O))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "DL EGPRS block 2nd llc frame is not padding!: ", dl_block.data_egprs);</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 (lengthof(dl_block.data.blocks) > 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "DL GPRS block has extra unexpected LLC frames: ", dl_block.data);</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 style="color: hsl(120, 100%, 40%);">+ f_shutdown(__BFILE__, __LINE__, final := true);</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%);">+/* Verify osmo-pcu Doesn't append LLC UI dummy frames to rlcmac blocks</span><br><span style="color: hsl(120, 100%, 40%);">+ * containing llc data. See OS#4849 */</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_dl_gprs_data_no_llc_ui_dummy() runs on RAW_PCU_Test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_tc_dl_data_no_llc_ui_dummy(omit);</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%);">+/* Verify osmo-pcu Doesn't append LLC UI dummy frames to rlcmac blocks</span><br><span style="color: hsl(120, 100%, 40%);">+ * containing llc data. See OS#4849 */</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_dl_egprs_data_no_llc_ui_dummy() runs on RAW_PCU_Test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ var MultislotCap_GPRS_BSSGP mscap_gprs := {</span><br><span style="color: hsl(120, 100%, 40%);">+ gprsmultislotclass := '00011'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ gprsextendeddynalloccap := '0'B</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ var MultislotCap_EGPRS_BSSGP mscap_egprs := {</span><br><span style="color: hsl(120, 100%, 40%);">+ egprsmultislotclass := '00011'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ egprsextendeddynalloccap := '0'B</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ var MSRadioAccessCapabilityV_BSSGP ms_racap := { valueof(ts_RaCapRec_BSSGP('0001'B /* E-GSM */, mscap_gprs, mscap_egprs)) };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_tc_dl_data_no_llc_ui_dummy(ms_racap);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> private function f_TC_egprs_pkt_chan_req(in EGPRSPktChRequest req,</span><br><span> template GsmRrMessage t_imm_ass := ?,</span><br><span> PCUIF_BurstType bt := BURST_TYPE_1)</span><br><span>@@ -3459,6 +3534,8 @@</span><br><span> execute( TC_paging_cs_multi_ms_tmsi() );</span><br><span> execute( TC_bssgp_dl_unitdata_with_valid_imsi() );</span><br><span> execute( TC_bssgp_dl_unitdata_with_invalid_imsi() );</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_dl_gprs_data_no_llc_ui_dummy() );</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_dl_egprs_data_no_llc_ui_dummy() );</span><br><span> </span><br><span> /* EGPRS specific test cases */</span><br><span> execute( TC_egprs_pkt_chan_req_signalling() );</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21419">change 21419</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/+/21419"/><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: I7e0d9ed2475dbf989fbf932c8b83117ff5fb28fc </div>
<div style="display:none"> Gerrit-Change-Number: 21419 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>