<p>daniel <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21173">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
daniel: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gbproxy: Generalize pcu2sgsn / sgsn2pcu transmission<br><br>This reduces code duplication between ConnHdlr test functions<br><br>Change-Id: Ic13fa745178ffddf8e35fc5203ad8d824e8f338c<br>---<br>M gbproxy/GBProxy_Tests.ttcn<br>1 file changed, 48 insertions(+), 28 deletions(-)<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 7d39e7c..746ee33 100644</span><br><span>--- a/gbproxy/GBProxy_Tests.ttcn</span><br><span>+++ b/gbproxy/GBProxy_Tests.ttcn</span><br><span>@@ -496,6 +496,51 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Send 'tx' on PTP-BVCI from PCU; expect 'rx' on SGSN */</span><br><span style="color: hsl(120, 100%, 40%);">+friend function f_pcu2sgsn(template (value) PDU_BSSGP tx, template (present) PDU_BSSGP exp_rx,</span><br><span style="color: hsl(120, 100%, 40%);">+ integer pcu_idx := 0, integer sgsn_idx := 0) runs on BSSGP_ConnHdlr {</span><br><span style="color: hsl(120, 100%, 40%);">+ var PDU_BSSGP rx;</span><br><span style="color: hsl(120, 100%, 40%);">+ timer T := 1.0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ PCU[pcu_idx].send(tx);</span><br><span style="color: hsl(120, 100%, 40%);">+ T.start;</span><br><span style="color: hsl(120, 100%, 40%);">+ alt {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] SGSN[sgsn_idx].receive(exp_rx) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] SGSN[sgsn_idx].receive(PDU_BSSGP:?) -> value rx {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Unexpected BSSGP on SGSN side: ", rx);</span><br><span style="color: hsl(120, 100%, 40%);">+ mtc.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] T.timeout {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Timeout waiting for BSSGP on SGSN side: ", rx);</span><br><span style="color: hsl(120, 100%, 40%);">+ mtc.stop;</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%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Send 'tx' on PTP-BVCI from SGSN; expect 'rx' on PCU */</span><br><span style="color: hsl(120, 100%, 40%);">+friend function f_sgsn2pcu(template (value) PDU_BSSGP tx, template (present) PDU_BSSGP exp_rx,</span><br><span style="color: hsl(120, 100%, 40%);">+ integer sgsn_idx:= 0, integer pcu_idx := 0) runs on BSSGP_ConnHdlr {</span><br><span style="color: hsl(120, 100%, 40%);">+ var PDU_BSSGP rx;</span><br><span style="color: hsl(120, 100%, 40%);">+ timer T := 1.0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ SGSN[sgsn_idx].send(tx);</span><br><span style="color: hsl(120, 100%, 40%);">+ T.start;</span><br><span style="color: hsl(120, 100%, 40%);">+ alt {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] PCU[pcu_idx].receive(exp_rx) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] PCU[pcu_idx].receive(PDU_BSSGP:?) -> value rx {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Unexpected BSSGP on PCU side: ", rx);</span><br><span style="color: hsl(120, 100%, 40%);">+ mtc.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] T.timeout {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Timeout waiting for BSSGP on PCU side: ", rx);</span><br><span style="color: hsl(120, 100%, 40%);">+ mtc.stop;</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%);">+}</span><br><span> </span><br><span> /* TODO:</span><br><span> * Detach without Attach</span><br><span>@@ -576,16 +621,7 @@</span><br><span> /* we cannot use pdu_tx as there are some subtle differences in the length field :/ */</span><br><span> var template (present) PDU_BSSGP pdu_rx := tr_BSSGP_UL_UD(g_pars.tlli, g_pars.bssgp_cell_id[0], payload);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- PCU[0].send(pdu_tx);</span><br><span style="color: hsl(0, 100%, 40%);">- alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] SGSN[0].receive(pdu_rx);</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: Those should be handled before the ConnHdlr is started */</span><br><span style="color: hsl(0, 100%, 40%);">- [] SGSN[0].receive(BssgpStatusIndication:{*,?,BVC_S_UNBLOCKED}) { repeat; }</span><br><span style="color: hsl(0, 100%, 40%);">- [] SGSN[0].receive {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "SGSN Received unexpected");</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(120, 100%, 40%);">+ f_pcu2sgsn(pdu_tx, pdu_rx);</span><br><span> }</span><br><span> setverdict(pass);</span><br><span> }</span><br><span>@@ -614,16 +650,7 @@</span><br><span> var template (present) PDU_BSSGP pdu_rx :=</span><br><span> tr_BSSGP_DL_UD(g_pars.tlli, payload, tr_BSSGP_IMSI(g_pars.imsi));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- SGSN[0].send(pdu_tx);</span><br><span style="color: hsl(0, 100%, 40%);">- alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] PCU[0].receive(pdu_rx);</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: Those should be handled before the ConnHdlr is started */</span><br><span style="color: hsl(0, 100%, 40%);">- [] PCU[0].receive(BssgpStatusIndication:{*,?,BVC_S_UNBLOCKED}) { repeat; }</span><br><span style="color: hsl(0, 100%, 40%);">- [] PCU[0].receive {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "PCU Received unexpected");</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(120, 100%, 40%);">+ f_sgsn2pcu(pdu_tx, pdu_rx);</span><br><span> }</span><br><span> setverdict(pass);</span><br><span> }</span><br><span>@@ -648,14 +675,7 @@</span><br><span> /* we cannot use pdu_tx as there are some subtle differences in the length field :/ */</span><br><span> var template (present) PDU_BSSGP pdu_rx := tr_BSSGP_RA_CAP(g_pars.tlli, { tr_RaCapRec_BSSGP })</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- SGSN[0].send(pdu_tx);</span><br><span style="color: hsl(0, 100%, 40%);">- alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] PCU[0].receive(pdu_rx);</span><br><span style="color: hsl(0, 100%, 40%);">- [] PCU[0].receive {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "SGSN Received unexpected");</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(120, 100%, 40%);">+ f_sgsn2pcu(pdu_tx, pdu_rx);</span><br><span> }</span><br><span> setverdict(pass);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21173">change 21173</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/+/21173"/><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: Ic13fa745178ffddf8e35fc5203ad8d824e8f338c </div>
<div style="display:none"> Gerrit-Change-Number: 21173 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </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: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>