<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18083">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: 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: refactor f_imm_ass_verify_{ul,dl}_tbf_ass(): call f_shutdown()<br><br>This allows us to reduce code duplication.<br><br>Change-Id: Ib74285177a5d8e3c4a27df1321e7eab3462318bc<br>Signed-off-by: Vadim Yanitskiy <axilirator@gmail.com><br>---<br>M pcu/PCU_Tests.ttcn<br>1 file changed, 38 insertions(+), 75 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 ac2aaf3..0c61595 100644</span><br><span>--- a/pcu/PCU_Tests.ttcn</span><br><span>+++ b/pcu/PCU_Tests.ttcn</span><br><span>@@ -382,7 +382,7 @@</span><br><span> }</span><br><span> </span><br><span> private function f_imm_ass_verify_ul_tbf_ass(in GsmRrMessage rr_imm_ass, out PacketUlAssign ul_tbf_ass)</span><br><span style="color: hsl(0, 100%, 40%);">-runs on RAW_PCU_Test_CT return boolean {</span><br><span style="color: hsl(120, 100%, 40%);">+runs on RAW_PCU_Test_CT {</span><br><span> </span><br><span> /* Make sure we received an UL TBF Assignment */</span><br><span> if (match(rr_imm_ass, tr_IMM_TBF_ASS(dl := false, rest := tr_IaRestOctets_ULAss(?)))) {</span><br><span>@@ -391,20 +391,18 @@</span><br><span> setverdict(pass);</span><br><span> } else {</span><br><span> setverdict(fail, "Failed to match UL TBF Assignment");</span><br><span style="color: hsl(0, 100%, 40%);">- return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ f_shutdown(__BFILE__, __LINE__);</span><br><span> }</span><br><span> </span><br><span> /* Make sure we have got a TBF with Dynamic Block Allocation */</span><br><span> if (ul_tbf_ass.dynamic == omit) {</span><br><span> setverdict(fail, "Single Block Allocation is not handled by ", testcasename());</span><br><span style="color: hsl(0, 100%, 40%);">- return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ f_shutdown(__BFILE__, __LINE__);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return true;</span><br><span> }</span><br><span> </span><br><span> private function f_imm_ass_verify_dl_tbf_ass(in GsmRrMessage rr_imm_ass, out PacketDlAssign dl_tbf_ass)</span><br><span style="color: hsl(0, 100%, 40%);">-runs on RAW_PCU_Test_CT return boolean {</span><br><span style="color: hsl(120, 100%, 40%);">+runs on RAW_PCU_Test_CT {</span><br><span> </span><br><span> /* Make sure we received a DL TBF Assignment */</span><br><span> if (match(rr_imm_ass, tr_IMM_TBF_ASS(dl := true, rest := tr_IaRestOctets_DLAss(?)))) {</span><br><span>@@ -413,10 +411,8 @@</span><br><span> setverdict(pass);</span><br><span> } else {</span><br><span> setverdict(fail, "Failed to match DL TBF Assignment");</span><br><span style="color: hsl(0, 100%, 40%);">- return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ f_shutdown(__BFILE__, __LINE__);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return true;</span><br><span> }</span><br><span> </span><br><span> /* Enqueue DATA.ind (both TDMA frame and block numbers to be patched) */</span><br><span>@@ -1051,11 +1047,8 @@</span><br><span> f_shutdown(__BFILE__, __LINE__);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ok := f_imm_ass_verify_ul_tbf_ass(rr_imm_ass, ul_tbf_ass);</span><br><span style="color: hsl(0, 100%, 40%);">- if (not ok) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Immediate Assignment not an Uplink TBF");</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(120, 100%, 40%);">+ /* Make sure we've got an Uplink TBF assignment */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_imm_ass_verify_ul_tbf_ass(rr_imm_ass, ul_tbf_ass);</span><br><span> </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>@@ -1140,11 +1133,8 @@</span><br><span> f_shutdown(__BFILE__, __LINE__);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ok := f_imm_ass_verify_ul_tbf_ass(rr_imm_ass, ul_tbf_ass);</span><br><span style="color: hsl(0, 100%, 40%);">- if (not ok) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Immediate Assignment not an Uplink TBF");</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(120, 100%, 40%);">+ /* Make sure we've got an Uplink TBF assignment */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_imm_ass_verify_ul_tbf_ass(rr_imm_ass, ul_tbf_ass);</span><br><span> </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>@@ -1222,11 +1212,8 @@</span><br><span> f_shutdown(__BFILE__, __LINE__);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ok := f_imm_ass_verify_ul_tbf_ass(rr_imm_ass, ul_tbf_ass);</span><br><span style="color: hsl(0, 100%, 40%);">- if (not ok) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Immediate Assignment not an Uplink TBF");</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(120, 100%, 40%);">+ /* Make sure we've got an Uplink TBF assignment */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_imm_ass_verify_ul_tbf_ass(rr_imm_ass, ul_tbf_ass);</span><br><span> </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>@@ -1292,11 +1279,8 @@</span><br><span> f_shutdown(__BFILE__, __LINE__);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ok := f_imm_ass_verify_ul_tbf_ass(rr_imm_ass, ul_tbf_ass);</span><br><span style="color: hsl(0, 100%, 40%);">- if (not ok) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Immediate Assignment not an Uplink TBF");</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(120, 100%, 40%);">+ /* Make sure we've got an Uplink TBF assignment */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_imm_ass_verify_ul_tbf_ass(rr_imm_ass, ul_tbf_ass);</span><br><span> </span><br><span> /* Send one UL block and make sure it is ACKED fine */</span><br><span> f_tx_rlcmac_ul_n_blocks(ul_tbf_ass, 1);</span><br><span>@@ -1340,11 +1324,10 @@</span><br><span> /* SGSN sends some DL data, PCU will page on CCCH (PCH) */</span><br><span> 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 style="color: hsl(0, 100%, 40%);">- ok := f_imm_ass_verify_dl_tbf_ass(rr_imm_ass, dl_tbf_ass);</span><br><span style="color: hsl(0, 100%, 40%);">- if (not ok) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Immediate Assignment not a Downlink TBF");</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(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Make sure we've got a Downlink TBF assignment */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_imm_ass_verify_dl_tbf_ass(rr_imm_ass, dl_tbf_ass);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */</span><br><span> f_sleep(X2002);</span><br><span> f_rx_rlcmac_dl_block_exp_data(dl_block, sched_fn, data, 0);</span><br><span>@@ -1401,11 +1384,9 @@</span><br><span> setverdict(fail, "Failed to establish TBF");</span><br><span> f_shutdown(__BFILE__, __LINE__);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- ok := f_imm_ass_verify_ul_tbf_ass(rr_imm_ass, ul_tbf_ass);</span><br><span style="color: hsl(0, 100%, 40%);">- if (not ok) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Immediate Assignment not an Uplink TBF");</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(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Make sure we've got an Uplink TBF assignment */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_imm_ass_verify_ul_tbf_ass(rr_imm_ass, ul_tbf_ass);</span><br><span> </span><br><span> if (not istemplatekind(ms_racap, "omit")) {</span><br><span> /* Send PACKET RESOURCE REQUEST to upgrade to EGPRS</span><br><span>@@ -1432,11 +1413,8 @@</span><br><span> 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 style="color: hsl(0, 100%, 40%);">- ok := f_imm_ass_verify_dl_tbf_ass(rr_imm_ass, dl_tbf_ass);</span><br><span style="color: hsl(0, 100%, 40%);">- if (not ok) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Immediate Assignment not a Downlink TBF");</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(120, 100%, 40%);">+ /* Make sure we've got a Downlink TBF assignment */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_imm_ass_verify_dl_tbf_ass(rr_imm_ass, dl_tbf_ass);</span><br><span> </span><br><span> /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */</span><br><span> f_sleep(X2002);</span><br><span>@@ -1498,11 +1476,8 @@</span><br><span> BSSGP[0].send(ts_BSSGP_DL_UD(tlli, data, ms_racap));</span><br><span> f_pcuif_rx_pch_imm_tbf_ass(rr_imm_ass);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ok := f_imm_ass_verify_dl_tbf_ass(rr_imm_ass, dl_tbf_ass);</span><br><span style="color: hsl(0, 100%, 40%);">- if (not ok) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Immediate Assignment not a Downlink TBF");</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(120, 100%, 40%);">+ /* Make sure we've got a Downlink TBF assignment */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_imm_ass_verify_dl_tbf_ass(rr_imm_ass, dl_tbf_ass);</span><br><span> </span><br><span> /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */</span><br><span> f_sleep(X2002);</span><br><span>@@ -1518,11 +1493,9 @@</span><br><span> setverdict(fail, "Failed to establish TBF");</span><br><span> f_shutdown(__BFILE__, __LINE__);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- ok := f_imm_ass_verify_ul_tbf_ass(rr_imm_ass, ul_tbf_ass);</span><br><span style="color: hsl(0, 100%, 40%);">- if (not ok) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Immediate Assignment not an Uplink TBF");</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(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Make sure we've got an Uplink TBF assignment */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_imm_ass_verify_ul_tbf_ass(rr_imm_ass, ul_tbf_ass);</span><br><span> </span><br><span> /* Send one UL block and make sure it is ACKED fine */</span><br><span> f_tx_rlcmac_ul_n_blocks(ul_tbf_ass, 1);</span><br><span>@@ -1579,11 +1552,9 @@</span><br><span> /* SGSN sends some DL data, PCU will page on CCCH (PCH) */</span><br><span> 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 style="color: hsl(0, 100%, 40%);">- ok := f_imm_ass_verify_dl_tbf_ass(rr_imm_ass, dl_tbf_ass);</span><br><span style="color: hsl(0, 100%, 40%);">- if (not ok) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Immediate Assignment not a Downlink TBF");</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(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Make sure we've got a Downlink TBF assignment */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_imm_ass_verify_dl_tbf_ass(rr_imm_ass, dl_tbf_ass);</span><br><span> </span><br><span> /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */</span><br><span> f_sleep(X2002);</span><br><span>@@ -1593,11 +1564,10 @@</span><br><span> * or GPRS DL, or DL ACK was lost for some reason). As a result, PCU</span><br><span> * should retrigger IMM ASS + GPRS DL procedure after poll timeout. */</span><br><span> f_pcuif_rx_pch_imm_tbf_ass(rr_imm_ass);</span><br><span style="color: hsl(0, 100%, 40%);">- ok := f_imm_ass_verify_dl_tbf_ass(rr_imm_ass, dl_tbf_ass);</span><br><span style="color: hsl(0, 100%, 40%);">- if (not ok) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Immediate Assignment not a Downlink TBF");</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(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Make sure we've got a Downlink TBF assignment */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_imm_ass_verify_dl_tbf_ass(rr_imm_ass, dl_tbf_ass);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */</span><br><span> f_sleep(X2002);</span><br><span> f_rx_rlcmac_dl_block_exp_data(dl_block, sched_fn, data, 0);</span><br><span>@@ -1677,12 +1647,8 @@</span><br><span> f_shutdown(__BFILE__, __LINE__);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ok := f_imm_ass_verify_ul_tbf_ass(rr_imm_ass, ul_tbf_ass);</span><br><span style="color: hsl(0, 100%, 40%);">- if (not ok) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Immediate Assignment not an Uplink TBF");</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 style="color: hsl(120, 100%, 40%);">+ /* Make sure we've got an Uplink TBF assignment */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_imm_ass_verify_ul_tbf_ass(rr_imm_ass, ul_tbf_ass);</span><br><span> </span><br><span> /* build mobile Identity */</span><br><span> mi := valueof(ts_MI_IMSI_LV(imsi));</span><br><span>@@ -1729,11 +1695,8 @@</span><br><span> f_shutdown(__BFILE__, __LINE__);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ok := f_imm_ass_verify_ul_tbf_ass(rr_imm_ass, ul_tbf_ass);</span><br><span style="color: hsl(0, 100%, 40%);">- if (not ok) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Immediate Assignment not an Uplink TBF");</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(120, 100%, 40%);">+ /* Make sure we've got an Uplink TBF assignment */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_imm_ass_verify_ul_tbf_ass(rr_imm_ass, ul_tbf_ass);</span><br><span> </span><br><span> /* Send paging request with or without TMSI */</span><br><span> if (use_ptmsi) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18083">change 18083</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/+/18083"/><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: Ib74285177a5d8e3c4a27df1321e7eab3462318bc </div>
<div style="display:none"> Gerrit-Change-Number: 18083 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </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>