<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17951">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;">DIAMETER_Emulation: Notify user of CapabilityExchange<br><br>During start of the test case, we must wait until the IUT has<br>established a DIAMETER/SCTP connection to the testsuite. Implement<br>this by means of a message on the DIAMETER_UNIT port and an associated<br>helper function.<br><br>Change-Id: I95434307efc67025ee6d373561f6d22398f959c5<br>---<br>M library/DIAMETER_Emulation.ttcn<br>M mme/MME_Tests.ttcn<br>2 files changed, 30 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/DIAMETER_Emulation.ttcn b/library/DIAMETER_Emulation.ttcn</span><br><span>index cff4d63..f7a0f88 100644</span><br><span>--- a/library/DIAMETER_Emulation.ttcn</span><br><span>+++ b/library/DIAMETER_Emulation.ttcn</span><br><span>@@ -37,6 +37,12 @@</span><br><span> </span><br><span> type hexstring IMSI;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* notify the recipient that a Capability Exchange happened */</span><br><span style="color: hsl(120, 100%, 40%);">+type record DiameterCapabilityExchgInd {</span><br><span style="color: hsl(120, 100%, 40%);">+ PDU_DIAMETER rx,</span><br><span style="color: hsl(120, 100%, 40%);">+ PDU_DIAMETER tx</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> type component DIAMETER_ConnHdlr {</span><br><span> port DIAMETER_Conn_PT DIAMETER;</span><br><span> /* procedure based port to register for incoming connections */</span><br><span>@@ -50,7 +56,7 @@</span><br><span> </span><br><span> /* global test port e.g. for non-imsi/conn specific messages */</span><br><span> type port DIAMETER_PT message {</span><br><span style="color: hsl(0, 100%, 40%);">- inout PDU_DIAMETER;</span><br><span style="color: hsl(120, 100%, 40%);">+ inout PDU_DIAMETER, DiameterCapabilityExchgInd;</span><br><span> } with { extension "internal" };</span><br><span> </span><br><span> </span><br><span>@@ -319,6 +325,8 @@</span><br><span> resp := ts_DIA_CEA(mrf.msg.hop_by_hop_id, mrf.msg.end_to_end_id, p.origin_host,</span><br><span> p.origin_realm, f_inet_addr(p.local_ip), p.vendor_app_id);</span><br><span> DIAMETER.send(t_DIAMETER_Send(g_diameter_conn_id, resp));</span><br><span style="color: hsl(120, 100%, 40%);">+ /* notify our user that the CER->CEA exchange has happened */</span><br><span style="color: hsl(120, 100%, 40%);">+ DIAMETER_UNIT.send(DiameterCapabilityExchgInd:{rx:=mrf.msg, tx:=valueof(resp)});</span><br><span> }</span><br><span> </span><br><span> /* DIAMETER from remote peer */</span><br><span>@@ -434,4 +442,23 @@</span><br><span> }</span><br><span> </span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+function f_diameter_wait_capability(DIAMETER_PT pt)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Wait for the Capability Exchange with the DUT */</span><br><span style="color: hsl(120, 100%, 40%);">+ timer T := 10.0;</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%);">+ [] pt.receive(DiameterCapabilityExchgInd:?) {}</span><br><span style="color: hsl(120, 100%, 40%);">+ [] pt.receive {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Unexpected receive waiting for DiameterCapabilityExchgInd");</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 DiameterCapabilityExchgInd");</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%);">+</span><br><span> }</span><br><span>diff --git a/mme/MME_Tests.ttcn b/mme/MME_Tests.ttcn</span><br><span>index 0516809..f9bcf6d 100644</span><br><span>--- a/mme/MME_Tests.ttcn</span><br><span>+++ b/mme/MME_Tests.ttcn</span><br><span>@@ -229,6 +229,8 @@</span><br><span> connect(vc_DIAMETER:DIAMETER_UNIT, self:DIAMETER_UNIT);</span><br><span> connect(vc_DIAMETER:DIAMETER_PROC, self:DIAMETER_PROC);</span><br><span> vc_DIAMETER.start(DIAMETER_Emulation.main(ops, pars, id));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_diameter_wait_capability(DIAMETER_UNIT);</span><br><span> }</span><br><span> </span><br><span> friend template (value) TAI ts_enb_S1AP_TAI(EnbParams enb) := {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17951">change 17951</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/+/17951"/><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: I95434307efc67025ee6d373561f6d22398f959c5 </div>
<div style="display:none"> Gerrit-Change-Number: 17951 </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>