<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21669">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sgsn+pcu: Port suspend/resume cases to new BSSGP_CT:GLOBAL port<br><br>For 12+ days, suspend/resume related SGSN + PCU TTCN3 tets have been failing.<br><br>It was the introduction of the BSSGP_CT:GLOBAL test port in<br>I40d973d80709f5d56f59247e8647b52754f09bc8 +<br>I805372f3024a0ec2491a24422e02c0bc6dc669d2 which caused the related PDUs<br>now to no longer show up where they used to.<br><br>Change-Id: I1977302fef4868dc1c330bc6f48f6a6608949393<br>Closes: OS#4902<br>---<br>M library/BSSGP_Emulation.ttcnpp<br>M pcu/PCU_Tests.ttcn<br>M pcu/SGSN_Components.ttcn<br>M sgsn/SGSN_Tests.ttcn<br>4 files changed, 12 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/BSSGP_Emulation.ttcnpp b/library/BSSGP_Emulation.ttcnpp</span><br><span>index 633eee2..5eef645 100644</span><br><span>--- a/library/BSSGP_Emulation.ttcnpp</span><br><span>+++ b/library/BSSGP_Emulation.ttcnpp</span><br><span>@@ -155,6 +155,7 @@</span><br><span> /* one port array for each client; allows talking to up to 3 BVC/Cell (handover, ...) */</span><br><span> port BSSGP_PT BSSGP[3]; /* PTP-BVC */</span><br><span> port BSSGP_PT BSSGP_SIG[3]; /* Signaling BVC */</span><br><span style="color: hsl(120, 100%, 40%);">+ port BSSGP_PT BSSGP_GLOBAL[3]; /* Signaling BVC */</span><br><span> port BSSGP_PROC_PT BSSGP_PROC[3]; /* registration / deregistration */</span><br><span> };</span><br><span> </span><br><span>diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn</span><br><span>index dad0873..0c56348 100644</span><br><span>--- a/pcu/PCU_Tests.ttcn</span><br><span>+++ b/pcu/PCU_Tests.ttcn</span><br><span>@@ -327,7 +327,7 @@</span><br><span> </span><br><span> T.start(2.0);</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] BSSGP_SIG[0].receive(tr_BSSGP_SUSPEND(tlli, mp_gb_cfg.bvc[0].cell_id.ra_id)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] BSSGP_GLOBAL[0].receive(tr_BSSGP_SUSPEND(tlli, mp_gb_cfg.bvc[0].cell_id.ra_id)) {</span><br><span> setverdict(pass);</span><br><span> }</span><br><span> [] T.timeout {</span><br><span>diff --git a/pcu/SGSN_Components.ttcn b/pcu/SGSN_Components.ttcn</span><br><span>index ca1dec6..18f3992 100644</span><br><span>--- a/pcu/SGSN_Components.ttcn</span><br><span>+++ b/pcu/SGSN_Components.ttcn</span><br><span>@@ -101,6 +101,7 @@</span><br><span> connect(self:BSSGP_PROC[i], vc_BVC:BSSGP_PROC);</span><br><span> f_bssgp_client_register(mmctx.imsi, mmctx.tlli);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ connect(self:BSSGP_GLOBAL[0], bssgp_component:GLOBAL);</span><br><span> }</span><br><span> </span><br><span> /* Establish BSSGP connection to PCU */</span><br><span>diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn</span><br><span>index 0b298bb..8e7d6e4 100644</span><br><span>--- a/sgsn/SGSN_Tests.ttcn</span><br><span>+++ b/sgsn/SGSN_Tests.ttcn</span><br><span>@@ -480,14 +480,17 @@</span><br><span> connect(vc_conn:BSSGP[0], gb[0].vc_BSSGP_BVC[0]:BSSGP_SP);</span><br><span> connect(vc_conn:BSSGP_SIG[0], gb[0].vc_BSSGP_BVC[0]:BSSGP_SP_SIG);</span><br><span> connect(vc_conn:BSSGP_PROC[0], gb[0].vc_BSSGP_BVC[0]:BSSGP_PROC);</span><br><span style="color: hsl(120, 100%, 40%);">+ connect(vc_conn:BSSGP_GLOBAL[0], gb[0].vc_BSSGP:GLOBAL);</span><br><span> </span><br><span> connect(vc_conn:BSSGP[1], gb[1].vc_BSSGP_BVC[0]:BSSGP_SP);</span><br><span> connect(vc_conn:BSSGP_SIG[1], gb[1].vc_BSSGP_BVC[0]:BSSGP_SP_SIG);</span><br><span> connect(vc_conn:BSSGP_PROC[1], gb[1].vc_BSSGP_BVC[0]:BSSGP_PROC);</span><br><span style="color: hsl(120, 100%, 40%);">+ connect(vc_conn:BSSGP_GLOBAL[1], gb[1].vc_BSSGP:GLOBAL);</span><br><span> </span><br><span> connect(vc_conn:BSSGP[2], gb[2].vc_BSSGP_BVC[0]:BSSGP_SP);</span><br><span> connect(vc_conn:BSSGP_SIG[2], gb[2].vc_BSSGP_BVC[0]:BSSGP_SP_SIG);</span><br><span> connect(vc_conn:BSSGP_PROC[2], gb[2].vc_BSSGP_BVC[0]:BSSGP_PROC);</span><br><span style="color: hsl(120, 100%, 40%);">+ connect(vc_conn:BSSGP_GLOBAL[2], gb[2].vc_BSSGP:GLOBAL);</span><br><span> </span><br><span> /* FIXME: support multiple RNCs */</span><br><span> if (g_ranap_enable) {</span><br><span>@@ -868,13 +871,13 @@</span><br><span> friend function f_bssgp_suspend(integer ran_idx := 0) runs on BSSGP_ConnHdlr return OCT1 {</span><br><span> timer T := 5.0;</span><br><span> var PDU_BSSGP rx_pdu;</span><br><span style="color: hsl(0, 100%, 40%);">- BSSGP_SIG[ran_idx].send(ts_BSSGP_SUSPEND(g_pars.tlli, g_pars.bssgp_cell_id[ran_idx].ra_id));</span><br><span style="color: hsl(120, 100%, 40%);">+ BSSGP_GLOBAL[ran_idx].send(ts_BSSGP_SUSPEND(g_pars.tlli, g_pars.bssgp_cell_id[ran_idx].ra_id));</span><br><span> T.start;</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] BSSGP_SIG[ran_idx].receive(tr_BSSGP_SUSPEND_ACK(g_pars.tlli, g_pars.bssgp_cell_id[ran_idx].ra_id, ?)) -> value rx_pdu {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] BSSGP_GLOBAL[ran_idx].receive(tr_BSSGP_SUSPEND_ACK(g_pars.tlli, g_pars.bssgp_cell_id[ran_idx].ra_id, ?)) -> value rx_pdu {</span><br><span> return rx_pdu.pDU_BSSGP_SUSPEND_ACK.suspend_Reference_Number.suspend_Reference_Number_value;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [] BSSGP_SIG[ran_idx].receive(tr_BSSGP_SUSPEND_NACK(g_pars.tlli, g_pars.bssgp_cell_id[ran_idx].ra_id, ?)) -> value rx_pdu {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] BSSGP_GLOBAL[ran_idx].receive(tr_BSSGP_SUSPEND_NACK(g_pars.tlli, g_pars.bssgp_cell_id[ran_idx].ra_id, ?)) -> value rx_pdu {</span><br><span> setverdict(fail, "SUSPEND-NACK in response to SUSPEND for TLLI ", g_pars.tlli);</span><br><span> mtc.stop;</span><br><span> }</span><br><span>@@ -888,11 +891,11 @@</span><br><span> </span><br><span> friend function f_bssgp_resume(OCT1 susp_ref, integer ran_idx := 0) runs on BSSGP_ConnHdlr {</span><br><span> timer T := 5.0;</span><br><span style="color: hsl(0, 100%, 40%);">- BSSGP_SIG[ran_idx].send(ts_BSSGP_RESUME(g_pars.tlli, g_pars.bssgp_cell_id[ran_idx].ra_id, susp_ref));</span><br><span style="color: hsl(120, 100%, 40%);">+ BSSGP_GLOBAL[ran_idx].send(ts_BSSGP_RESUME(g_pars.tlli, g_pars.bssgp_cell_id[ran_idx].ra_id, susp_ref));</span><br><span> T.start;</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] BSSGP_SIG[ran_idx].receive(tr_BSSGP_RESUME_ACK(g_pars.tlli, g_pars.bssgp_cell_id[ran_idx].ra_id));</span><br><span style="color: hsl(0, 100%, 40%);">- [] BSSGP_SIG[ran_idx].receive(tr_BSSGP_RESUME_NACK(g_pars.tlli, g_pars.bssgp_cell_id[ran_idx].ra_id,</span><br><span style="color: hsl(120, 100%, 40%);">+ [] BSSGP_GLOBAL[ran_idx].receive(tr_BSSGP_RESUME_ACK(g_pars.tlli, g_pars.bssgp_cell_id[ran_idx].ra_id));</span><br><span style="color: hsl(120, 100%, 40%);">+ [] BSSGP_GLOBAL[ran_idx].receive(tr_BSSGP_RESUME_NACK(g_pars.tlli, g_pars.bssgp_cell_id[ran_idx].ra_id,</span><br><span> ?)) {</span><br><span> setverdict(fail, "RESUME-NACK in response to RESUME for TLLI ", g_pars.tlli);</span><br><span> mtc.stop;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21669">change 21669</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/+/21669"/><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: I1977302fef4868dc1c330bc6f48f6a6608949393 </div>
<div style="display:none"> Gerrit-Change-Number: 21669 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>