<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20505">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">PCU_Tests_NS: Fix our expectations regarding CellID presence/absence<br><br>This is required by the spec, and implemented libosmocore since<br>Change-Id Ie87820537d6d616da4fd4bbf73eab06e28fda5e1<br><br>So let's change our test expectations. Meanwhile, introduce<br>mp_tolerate_bvc_reset_cellid for working around the bug in 'latest'.<br><br>Change-Id: Icebee25b53fef623db6ae91ca0d943e70a3c86b7<br>---<br>M library/RAW_NS.ttcn<br>M pcu/PCU_Tests_NS.ttcn<br>2 files changed, 12 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/RAW_NS.ttcn b/library/RAW_NS.ttcn</span><br><span>index dca352f..2353046 100644</span><br><span>--- a/library/RAW_NS.ttcn</span><br><span>+++ b/library/RAW_NS.ttcn</span><br><span>@@ -162,11 +162,10 @@</span><br><span> }</span><br><span> </span><br><span> /* Receive a BSSGP RESET for given BVCI and ACK it */</span><br><span style="color: hsl(0, 100%, 40%);">-altstep as_rx_bvc_reset_tx_ack(BssgpBvci bvci, BssgpCellId cell_id, boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+altstep as_rx_bvc_reset_tx_ack(BssgpBvci bvci, template (omit) BssgpCellId cell_id, boolean oneshot := false, integer idx := 0) runs on RAW_NS_CT {</span><br><span> var NS_RecvFrom ns_rf;</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: nail down received cell_id in match */</span><br><span> [] NSCP[idx].receive(t_NS_RecvFrom(tr_NS_UNITDATA(t_SduCtrlB, 0,</span><br><span style="color: hsl(0, 100%, 40%);">- decmatch tr_BVC_RESET(?, bvci, ?))))</span><br><span style="color: hsl(120, 100%, 40%);">+ decmatch tr_BVC_RESET(?, bvci, cell_id))))</span><br><span> -> value ns_rf {</span><br><span> var PDU_BSSGP bssgp_rx := dec_PDU_BSSGP(ns_rf.msg.pDU_NS_Unitdata.nS_SDU);</span><br><span> var PDU_BSSGP bssgp_tx := valueof(ts_BVC_RESET_ACK(bvci, cell_id));</span><br><span>diff --git a/pcu/PCU_Tests_NS.ttcn b/pcu/PCU_Tests_NS.ttcn</span><br><span>index 26b81a2..6a62f29 100644</span><br><span>--- a/pcu/PCU_Tests_NS.ttcn</span><br><span>+++ b/pcu/PCU_Tests_NS.ttcn</span><br><span>@@ -28,6 +28,11 @@</span><br><span> import from PCUIF_CodecPort all;</span><br><span> import from RAW_NS all;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+modulepar {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* tolerate CellID absence/presence in BVC-RESET in violation to spec */</span><br><span style="color: hsl(120, 100%, 40%);">+ boolean mp_tolerate_bvc_reset_cellid := false;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> type component RAW_PCU_CT {</span><br><span> /* PCUIF (we emulate the BTS part) */</span><br><span> port PCUIF_CODEC_PT PCU;</span><br><span>@@ -188,7 +193,11 @@</span><br><span> f_outgoing_ns_alive();</span><br><span> </span><br><span> /* Expect BVC-RESET for signaling (0) and ptp BVCI */</span><br><span style="color: hsl(0, 100%, 40%);">- as_rx_bvc_reset_tx_ack(0, mp_gb_cfg.cell_id, oneshot := true);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mp_tolerate_bvc_reset_cellid) {</span><br><span style="color: hsl(120, 100%, 40%);">+ as_rx_bvc_reset_tx_ack(0, mp_gb_cfg.cell_id, oneshot := true);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ as_rx_bvc_reset_tx_ack(0, omit, oneshot := true);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> as_rx_bvc_reset_tx_ack(mp_gb_cfg.bvci, mp_gb_cfg.cell_id, oneshot := true);</span><br><span> as_rx_bvc_unblock_tx_ack(mp_gb_cfg.bvci, oneshot := true);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20505">change 20505</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/+/20505"/><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: Icebee25b53fef623db6ae91ca0d943e70a3c86b7 </div>
<div style="display:none"> Gerrit-Change-Number: 20505 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>