<p>Vadim Yanitskiy <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18360">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
neels: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BTS: move ASP_IPA_EVENT_UP handling to f_init_rsl()<br><br>Change-Id: I2479ce67426810d2789dda885bdbbe82b5d5282a<br>---<br>M bts/BTS_Tests.ttcn<br>1 file changed, 10 insertions(+), 17 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn</span><br><span>index d241496..012df47 100644</span><br><span>--- a/bts/BTS_Tests.ttcn</span><br><span>+++ b/bts/BTS_Tests.ttcn</span><br><span>@@ -178,6 +178,8 @@</span><br><span> }</span><br><span> </span><br><span> function f_init_rsl(charstring id) runs on test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ timer T := mp_ipa_up_timeout;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> vc_IPA := IPA_Emulation_CT.create(id & "-RSL-IPA");</span><br><span> vc_RSL := RSL_Emulation_CT.create(id & "-RSL");</span><br><span> </span><br><span>@@ -187,6 +189,14 @@</span><br><span> </span><br><span> vc_IPA.start(IPA_Emulation.main_server(mp_rsl_ip, mp_rsl_port));</span><br><span> vc_RSL.start(RSL_Emulation.main(false));</span><br><span style="color: hsl(120, 100%, 40%);">+</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%);">+ [] RSL_CCHAN.receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_UP));</span><br><span style="color: hsl(120, 100%, 40%);">+ [] T.timeout {</span><br><span style="color: hsl(120, 100%, 40%);">+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for ASP_IPA_EVENT_UP");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> type record ConnHdlrPars {</span><br><span>@@ -375,7 +385,6 @@</span><br><span> /* global init function */</span><br><span> function f_init() runs on test_CT {</span><br><span> var charstring id := testcasename();</span><br><span style="color: hsl(0, 100%, 40%);">- timer T := mp_ipa_up_timeout;</span><br><span> g_AllChannels := {</span><br><span> /* TS 1..4: TCH/F */</span><br><span> valueof(ts_RslChanNr_Bm(1)), valueof(ts_RslChanNr_Bm(2)),</span><br><span>@@ -415,13 +424,6 @@</span><br><span> };</span><br><span> }</span><br><span> f_init_rsl(id);</span><br><span style="color: hsl(0, 100%, 40%);">- T.start;</span><br><span style="color: hsl(0, 100%, 40%);">- alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] RSL_CCHAN.receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_UP));</span><br><span style="color: hsl(0, 100%, 40%);">- [] T.timeout {</span><br><span style="color: hsl(0, 100%, 40%);">- Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for ASP_IPA_EVENT_UP");</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> f_sleep(0.5); /* workaround for OS#3000 */</span><br><span> f_init_vty(id);</span><br><span> f_ipa_ctrl_start(mp_ctrl_ip, mp_ctrl_port);</span><br><span>@@ -4950,17 +4952,8 @@</span><br><span> /* Make sure that GPRS Indicator is absent when the PCU is not connected */</span><br><span> private function f_TC_pcu_socket_noconnect(RrMessageType si_type)</span><br><span> runs on test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- timer T := 5.0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* don't call f_init() as this would connect PCU socket */</span><br><span> f_init_rsl(testcasename());</span><br><span style="color: hsl(0, 100%, 40%);">- T.start;</span><br><span style="color: hsl(0, 100%, 40%);">- alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] RSL_CCHAN.receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_UP));</span><br><span style="color: hsl(0, 100%, 40%);">- [] T.timeout {</span><br><span style="color: hsl(0, 100%, 40%);">- Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for ASP_IPA_EVENT_UP");</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> </span><br><span> /* Send both System Information Type 3 and 4 (with GPRS Indicator) */</span><br><span> f_rsl_bcch_fill(RSL_SYSTEM_INFO_3, ts_SI3_default);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18360">change 18360</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/+/18360"/><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: I2479ce67426810d2789dda885bdbbe82b5d5282a </div>
<div style="display:none"> Gerrit-Change-Number: 18360 </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: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>