<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15675">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pcu: Introduce func helper f_imm_ass_verify_ul_tbf_ass()<br><br>Change-Id: I5b8a7ca5a4d0f905bf68949978811b139568c237<br>---<br>M pcu/PCU_Tests_RAW.ttcn<br>1 file changed, 28 insertions(+), 16 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn</span><br><span>index d5e53e2..344c39f 100644</span><br><span>--- a/pcu/PCU_Tests_RAW.ttcn</span><br><span>+++ b/pcu/PCU_Tests_RAW.ttcn</span><br><span>@@ -549,6 +549,28 @@</span><br><span> return false;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+private function f_imm_ass_verify_ul_tbf_ass(GsmRrMessage rr_imm_ass, out PacketUlAssign ul_tbf_ass)</span><br><span style="color: hsl(120, 100%, 40%);">+runs on RAW_PCU_Test_CT return boolean {</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Make sure we received an UL TBF Assignment */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (match(rr_imm_ass, tr_IMM_TBF_ASS(dl := false, rest := tr_IaRestOctets_ULAss(?)))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ul_tbf_ass := rr_imm_ass.payload.imm_ass.rest_octets.hh.pa.uldl.ass.ul;</span><br><span style="color: hsl(120, 100%, 40%);">+ log("Rx Uplink TBF assignment: ", ul_tbf_ass);</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Failed to match UL TBF Assignment");</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</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%);">+ /* Make sure we have got a TBF with Dynamic Block Allocation */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ul_tbf_ass.dynamic == omit) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Single Block Allocation is not handled by ", testcasename());</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</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%);">+ return true;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Enqueue DATA.ind (both TDMA frame and block numbers to be patched) */</span><br><span> private function f_pcuif_tx_data_ind(octetstring data, int16_t lqual_cb := 0)</span><br><span> runs on RAW_PCU_Test_CT {</span><br><span>@@ -847,10 +869,10 @@</span><br><span> private template integer CS4_lqual_dB_range := (12 .. infinity);</span><br><span> </span><br><span> testcase TC_cs_lqual_ul_tbf() runs on RAW_PCU_Test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var GsmRrMessage rr_imm_ass;</span><br><span> var PacketUlAssign ul_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 GsmRrMessage rr_msg;</span><br><span> var octetstring data;</span><br><span> var boolean ok;</span><br><span> </span><br><span>@@ -858,25 +880,15 @@</span><br><span> f_init_raw(testcasename());</span><br><span> </span><br><span> /* Establish an Uplink TBF */</span><br><span style="color: hsl(0, 100%, 40%);">- ok := f_establish_tbf(rr_msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ ok := f_establish_tbf(rr_imm_ass);</span><br><span> if (not ok) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Failed to establish an Uplink TBF");</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Failed to establish TBF");</span><br><span> mtc.stop;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Make sure we received an UL TBF Assignment */</span><br><span style="color: hsl(0, 100%, 40%);">- if (match(rr_msg, tr_IMM_TBF_ASS(dl := false, rest := tr_IaRestOctets_ULAss(?)))) {</span><br><span style="color: hsl(0, 100%, 40%);">- ul_tbf_ass := rr_msg.payload.imm_ass.rest_octets.hh.pa.uldl.ass.ul;</span><br><span style="color: hsl(0, 100%, 40%);">- log("Rx Uplink TBF assignment: ", ul_tbf_ass);</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(pass);</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Failed to match UL TBF Assignment");</span><br><span style="color: hsl(0, 100%, 40%);">- mtc.stop;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Make sure we have got a TBF with Dynamic Block Allocation */</span><br><span style="color: hsl(0, 100%, 40%);">- if (ul_tbf_ass.dynamic == omit) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Single Block Allocation is not handled by ", testcasename());</span><br><span style="color: hsl(120, 100%, 40%);">+ ok := f_imm_ass_verify_ul_tbf_ass(rr_imm_ass, ul_tbf_ass);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not ok) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Immediate Assignment not an Uplink TBF");</span><br><span> mtc.stop;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15675">change 15675</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/+/15675"/><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: I5b8a7ca5a4d0f905bf68949978811b139568c237 </div>
<div style="display:none"> Gerrit-Change-Number: 15675 </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-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>