<p>Vadim Yanitskiy <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18355">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;">library/IPA: split t_ASP_IPA_EVT_UD into send / receive templates<br><br>Change-Id: Ib5494bff3f9aa0ac396b729c326e7b4a64c5a5dd<br>---<br>M bts/BTS_Tests_OML.ttcn<br>M hlr/HLR_Tests.ttcn<br>M library/IPA_Emulation.ttcnpp<br>M msc/MSC_Tests.ttcn<br>M remsim/RemsimClient_Tests.ttcn<br>M remsim/RemsimServer_Tests.ttcn<br>M selftest/Selftest.ttcn<br>M sgsn/SGSN_Tests.ttcn<br>8 files changed, 25 insertions(+), 21 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bts/BTS_Tests_OML.ttcn b/bts/BTS_Tests_OML.ttcn</span><br><span>index 84d46a4..4835e66 100644</span><br><span>--- a/bts/BTS_Tests_OML.ttcn</span><br><span>+++ b/bts/BTS_Tests_OML.ttcn</span><br><span>@@ -102,8 +102,8 @@</span><br><span> T_oml_guard.start;</span><br><span> activate(as_Tguard());</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- OML.receive(t_ASP_IPA_EVT_UD(ASP_IPA_EVENT_UP));</span><br><span style="color: hsl(0, 100%, 40%);">- //OML.receive(t_ASP_IPA_EVT_UD(ASP_IPA_EVENT_ID_ACK));</span><br><span style="color: hsl(120, 100%, 40%);">+ OML.receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_UP));</span><br><span style="color: hsl(120, 100%, 40%);">+ //OML.receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_ID_ACK));</span><br><span> </span><br><span> activate(as_SwAct());</span><br><span> activate(as_IPA_evt());</span><br><span>diff --git a/hlr/HLR_Tests.ttcn b/hlr/HLR_Tests.ttcn</span><br><span>index 06354b9..27a44de 100644</span><br><span>--- a/hlr/HLR_Tests.ttcn</span><br><span>+++ b/hlr/HLR_Tests.ttcn</span><br><span>@@ -200,7 +200,7 @@</span><br><span> timer T := 10.0;</span><br><span> T.start;</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [not legacy] GSUP_IPA_EVENT.receive(t_ASP_IPA_EVT_UD(ASP_IPA_EVENT_UP)) { }</span><br><span style="color: hsl(120, 100%, 40%);">+ [not legacy] GSUP_IPA_EVENT.receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_UP)) { }</span><br><span> [legacy] GSUP.receive(ASP_IPA_Event:{up_down := ASP_IPA_EVENT_UP}) { }</span><br><span> [] T.timeout {</span><br><span> setverdict(fail, "No connection to GSUP Port");</span><br><span>diff --git a/library/IPA_Emulation.ttcnpp b/library/IPA_Emulation.ttcnpp</span><br><span>index 6658ca8..0edc0a7 100644</span><br><span>--- a/library/IPA_Emulation.ttcnpp</span><br><span>+++ b/library/IPA_Emulation.ttcnpp</span><br><span>@@ -88,7 +88,11 @@</span><br><span> ASP_IPA_EventType up_down</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-template ASP_IPA_Event t_ASP_IPA_EVT_UD(ASP_IPA_EventType ud) := {</span><br><span style="color: hsl(120, 100%, 40%);">+template (value) ASP_IPA_Event ts_ASP_IPA_EV(ASP_IPA_EventType ud) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ up_down := ud</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%);">+template ASP_IPA_Event tr_ASP_IPA_EV(template ASP_IPA_EventType ud) := {</span><br><span> up_down := ud</span><br><span> }</span><br><span> </span><br><span>@@ -291,7 +295,7 @@</span><br><span> data := char2oct(payload) & '00'O</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-private function f_send_IPA_EVT(template ASP_IPA_Event evt) runs on IPA_Emulation_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_send_IPA_EVT(template (value) ASP_IPA_Event evt) runs on IPA_Emulation_CT {</span><br><span> if (IPA_SP_PORT.checkstate("Connected")) {</span><br><span> IPA_SP_PORT.send(evt);</span><br><span> }</span><br><span>@@ -410,7 +414,7 @@</span><br><span> f_ccm_tx(valueof(ts_IPA_PONG));</span><br><span> }</span><br><span> case (IPAC_MSGT_ID_ACK) {</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_IPA_EVT(t_ASP_IPA_EVT_UD(ASP_IPA_EVENT_ID_ACK));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_IPA_EVT(ts_ASP_IPA_EV(ASP_IPA_EVENT_ID_ACK));</span><br><span> }</span><br><span> case (IPAC_MSGT_ID_GET) {</span><br><span> f_ccm_tx(f_ccm_make_id_resp(ccm));</span><br><span>@@ -432,7 +436,7 @@</span><br><span> * the TCP connection is established. Other implementations may differ.</span><br><span> * We currently ignore it completely - but actually we should make sure that</span><br><span> * one ID_ACK is received by the server at some point */</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_IPA_EVT(t_ASP_IPA_EVT_UD(ASP_IPA_EVENT_ID_ACK));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_IPA_EVT(ts_ASP_IPA_EV(ASP_IPA_EVENT_ID_ACK));</span><br><span> }</span><br><span> case (IPAC_MSGT_ID_RESP) {</span><br><span> log("IPA ID RESP: ", ccm.u.resp);</span><br><span>@@ -488,7 +492,7 @@</span><br><span> /* we're a client: Send ID_ACK immediately after connect */</span><br><span> f_ccm_tx(valueof(ts_IPA_ACK));</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_IPA_EVT(t_ASP_IPA_EVT_UD(ASP_IPA_EVENT_UP));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_IPA_EVT(ts_ASP_IPA_EV(ASP_IPA_EVENT_UP));</span><br><span> ScanEvents();</span><br><span> }</span><br><span> </span><br><span>@@ -666,7 +670,7 @@</span><br><span> [] IPA_PORT.receive(ASP_Event:{connOpened:=?}) -> value asp_evt {</span><br><span> log("IPA: Connected");</span><br><span> g_ipa_conn_id := asp_evt.connOpened.connId;</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_IPA_EVT(t_ASP_IPA_EVT_UD(ASP_IPA_EVENT_UP));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_IPA_EVT(ts_ASP_IPA_EV(ASP_IPA_EVENT_UP));</span><br><span> if (g_mode == IPA_MODE_SERVER and g_ccm_enabled) {</span><br><span> select (g_init_behavior) {</span><br><span> case (IPA_INIT_SEND_IPA_ID_GET) {</span><br><span>@@ -682,14 +686,14 @@</span><br><span> [] IPA_PORT.receive(ASP_Event:{connClosed:=?}) -> value asp_evt {</span><br><span> log("IPA: Closed");</span><br><span> g_ipa_conn_id := -1;</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_IPA_EVT(t_ASP_IPA_EVT_UD(ASP_IPA_EVENT_DOWN));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_IPA_EVT(ts_ASP_IPA_EV(ASP_IPA_EVENT_DOWN));</span><br><span> self.stop;</span><br><span> }</span><br><span> </span><br><span> [] IPA_PORT.receive(Socket_API_Definitions.PortEvent:{result:={errorCode:=ERROR_SOCKET, connId:=?, os_error_code:=?, os_error_text:=?}}) -> value port_evt {</span><br><span> log("PortEvent: ERROR_SOCKET: ", port_evt);</span><br><span> g_ipa_conn_id := -1;</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_IPA_EVT(t_ASP_IPA_EVT_UD(ASP_IPA_EVENT_DOWN));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_IPA_EVT(ts_ASP_IPA_EV(ASP_IPA_EVENT_DOWN));</span><br><span> self.stop;</span><br><span> }</span><br><span> </span><br><span>@@ -774,7 +778,7 @@</span><br><span> port IPA_SP_PT IPA_SP_PORT;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-function waiter_main(template ASP_IPA_Event wait_for := t_ASP_IPA_EVT_UD(ASP_IPA_EVENT_ID_ACK))</span><br><span style="color: hsl(120, 100%, 40%);">+function waiter_main(template ASP_IPA_Event wait_for := tr_ASP_IPA_EV(ASP_IPA_EVENT_ID_ACK))</span><br><span> runs on IPA_EventWaiter_CT {</span><br><span> </span><br><span> alt {</span><br><span>diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn</span><br><span>index 084ae85..35ca84a 100644</span><br><span>--- a/msc/MSC_Tests.ttcn</span><br><span>+++ b/msc/MSC_Tests.ttcn</span><br><span>@@ -290,7 +290,7 @@</span><br><span> timer T := 10.0;</span><br><span> T.start;</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] GSUP_IPA_EVENT.receive(t_ASP_IPA_EVT_UD(ASP_IPA_EVENT_UP)) { }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] GSUP_IPA_EVENT.receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_UP)) { }</span><br><span> [] T.timeout {</span><br><span> setverdict(fail, "No connection to GSUP Port");</span><br><span> mtc.stop</span><br><span>diff --git a/remsim/RemsimClient_Tests.ttcn b/remsim/RemsimClient_Tests.ttcn</span><br><span>index 457e449..499fd3e 100644</span><br><span>--- a/remsim/RemsimClient_Tests.ttcn</span><br><span>+++ b/remsim/RemsimClient_Tests.ttcn</span><br><span>@@ -59,7 +59,7 @@</span><br><span> /* expect inbound connectClientReq */</span><br><span> as_connectClientReq(res := illegalClientId);</span><br><span> /* expect disconnect by client */</span><br><span style="color: hsl(0, 100%, 40%);">- RSPRO_SRV[0].receive(t_ASP_IPA_EVT_UD(ASP_IPA_EVENT_DOWN));</span><br><span style="color: hsl(120, 100%, 40%);">+ RSPRO_SRV[0].receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_DOWN));</span><br><span> setverdict(pass);</span><br><span> f_sleep(1.0);</span><br><span> }</span><br><span>@@ -139,7 +139,7 @@</span><br><span> f_rspro_config_client_bank(bslot, ts_IpPort(ts_IPv4("0.0.0.0"), 0));</span><br><span> </span><br><span> /* expect disconnect of client on simulated bankd side */</span><br><span style="color: hsl(0, 100%, 40%);">- RSPRO_SRV[1].receive(t_ASP_IPA_EVT_UD(ASP_IPA_EVENT_DOWN));</span><br><span style="color: hsl(120, 100%, 40%);">+ RSPRO_SRV[1].receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_DOWN));</span><br><span> setverdict(pass);</span><br><span> }</span><br><span> </span><br><span>@@ -162,7 +162,7 @@</span><br><span> f_rspro_config_client_bank(bslot, ts_IpPort(ts_IPv4("0.0.0.0"), 0));</span><br><span> </span><br><span> /* expect disconnect of client on simulated bankd side */</span><br><span style="color: hsl(0, 100%, 40%);">- RSPRO_SRV[1].receive(t_ASP_IPA_EVT_UD(ASP_IPA_EVENT_DOWN));</span><br><span style="color: hsl(120, 100%, 40%);">+ RSPRO_SRV[1].receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_DOWN));</span><br><span> </span><br><span> /* re-start the IPA emulation (which terminated itself on the TCP disconnect */</span><br><span> f_rspro_srv_init(1, mp_bankd_ip, mp_bankd_port, g_bankd_comp_id, exp_connect := false);</span><br><span>diff --git a/remsim/RemsimServer_Tests.ttcn b/remsim/RemsimServer_Tests.ttcn</span><br><span>index bada70a..1ca5ce9 100644</span><br><span>--- a/remsim/RemsimServer_Tests.ttcn</span><br><span>+++ b/remsim/RemsimServer_Tests.ttcn</span><br><span>@@ -164,8 +164,8 @@</span><br><span> T.start;</span><br><span> /* expect that we're disconnected if we never send a ConnectClientReq */</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] RSPRO[0].receive(t_ASP_IPA_EVT_UD(ASP_IPA_EVENT_ID_ACK)) { repeat; }</span><br><span style="color: hsl(0, 100%, 40%);">- [] RSPRO[0].receive(t_ASP_IPA_EVT_UD(ASP_IPA_EVENT_DOWN)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RSPRO[0].receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_ID_ACK)) { repeat; }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RSPRO[0].receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_DOWN)) {</span><br><span> setverdict(pass);</span><br><span> }</span><br><span> [] T.timeout {</span><br><span>diff --git a/selftest/Selftest.ttcn b/selftest/Selftest.ttcn</span><br><span>index 8411b3d..263c317 100644</span><br><span>--- a/selftest/Selftest.ttcn</span><br><span>+++ b/selftest/Selftest.ttcn</span><br><span>@@ -46,8 +46,8 @@</span><br><span> </span><br><span> function f_ipa_wait_up() runs on IPA_selftest_CT {</span><br><span> interleave {</span><br><span style="color: hsl(0, 100%, 40%);">- [] IPA_RSL.receive(t_ASP_IPA_EVT_UD(ASP_IPA_EVENT_UP));</span><br><span style="color: hsl(0, 100%, 40%);">- [] IPA_CTRL.receive(t_ASP_IPA_EVT_UD(ASP_IPA_EVENT_UP));</span><br><span style="color: hsl(120, 100%, 40%);">+ [] IPA_RSL.receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_UP));</span><br><span style="color: hsl(120, 100%, 40%);">+ [] IPA_CTRL.receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_UP));</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn</span><br><span>index 6c963fa..9d191cc 100644</span><br><span>--- a/sgsn/SGSN_Tests.ttcn</span><br><span>+++ b/sgsn/SGSN_Tests.ttcn</span><br><span>@@ -232,7 +232,7 @@</span><br><span> timer T := 10.0;</span><br><span> T.start;</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] GSUP_IPA_EVENT.receive(t_ASP_IPA_EVT_UD(ASP_IPA_EVENT_UP)) { }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] GSUP_IPA_EVENT.receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_UP)) { }</span><br><span> [] T.timeout {</span><br><span> setverdict(fail, "No connection to GSUP Port");</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/+/18355">change 18355</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/+/18355"/><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: Ib5494bff3f9aa0ac396b729c326e7b4a64c5a5dd </div>
<div style="display:none"> Gerrit-Change-Number: 18355 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>