<p>daniel <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22049">View Change</a></p><div style="white-space:pre-wrap">Approvals:
lynxis lazus: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gbproxy: Fix TC_bvc_reset_sig_from_sgsn<br><br>The port receive operation only considers the first message in the<br>queue. We need to drain unrelated status/reset messages, such as those<br>from PTP BVCs, otherwise the test never completes and times out.<br><br>Change-Id: I1f2c76ae9bdc0267bfca60536e321fe88530803c<br>Related: SYS#5115 OS#4518<br>---<br>M gbproxy/GBProxy_Tests.ttcn<br>1 file changed, 15 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn</span><br><span>index 475b647..00f6e2e 100644</span><br><span>--- a/gbproxy/GBProxy_Tests.ttcn</span><br><span>+++ b/gbproxy/GBProxy_Tests.ttcn</span><br><span>@@ -2305,24 +2305,38 @@</span><br><span> f_cleanup();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+private altstep as_ignore_mgmt(BSSGP_BVC_MGMT_PT pt) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] pt.receive {repeat; }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> private altstep as_count_bvc0_block(integer pcu_idx, Nsei nsei, inout ro_integer roi)</span><br><span> runs on test_CT {</span><br><span> var BSSGP_CT pcu_ct := g_pcu[pcu_idx].vc_BSSGP;</span><br><span> [] PCU_MGMT.receive(BssgpResetIndication:{0}) from pcu_ct {</span><br><span> roi := roi & { nsei };</span><br><span style="color: hsl(120, 100%, 40%);">+ repeat;</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* reset the signaling BVC from the SGSN; expect all signaling BVC on all BSS to be reset */</span><br><span> testcase TC_bvc_reset_sig_from_sgsn() runs on test_CT {</span><br><span> </span><br><span> f_init();</span><br><span> f_sleep(3.0);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ SGSN_MGMT.clear;</span><br><span style="color: hsl(120, 100%, 40%);">+ PCU_MGMT.clear;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Start BVC-RESET procedure for BVCI=0 */</span><br><span> SGSN_MGMT.send(BssgpResetRequest:{cause:=BSSGP_CAUSE_OM_INTERVENTION}) to g_sgsn[0].vc_BSSGP;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Defaults match in reverse activation order, this one is a catch-all for Status indications</span><br><span style="color: hsl(120, 100%, 40%);">+ * and reset indications sent from other components (like the ptp_bvcs). If we don't drain</span><br><span style="color: hsl(120, 100%, 40%);">+ * the port and a different message sits at the front we wait forever and fail the test.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+ var ro_default defaults := { activate(as_ignore_mgmt(PCU_MGMT)) };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Activate altsteps: One for each PCU NSE */</span><br><span style="color: hsl(0, 100%, 40%);">- var ro_default defaults := {};</span><br><span> for (var integer i := 0; i < lengthof(g_pcu); i := i+1) {</span><br><span> var NSConfiguration nscfg := mp_nsconfig_pcu[i];</span><br><span> var default d := activate(as_count_bvc0_block(i, nscfg.nsei, g_roi));</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22049">change 22049</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/+/22049"/><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: I1f2c76ae9bdc0267bfca60536e321fe88530803c </div>
<div style="display:none"> Gerrit-Change-Number: 22049 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: daniel <dwillmann@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: 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>