<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20261">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;">stp: wait until IPA handshake is done in f_connect_ipa<br><br>Otherwise when trying to send stuff to an IPA ASP in some test, it may<br>fail because the ASP is till not active in the STP (because IPA<br>handshake was yet not finished, race condition).<br><br>Change-Id: I8ea11fe331baf2b65ce0b7b3c1a2b480332faa2a<br>---<br>M stp/STP_Tests_IPA.ttcn<br>1 file changed, 16 insertions(+), 24 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/stp/STP_Tests_IPA.ttcn b/stp/STP_Tests_IPA.ttcn</span><br><span>index 26abc80..10367ad 100644</span><br><span>--- a/stp/STP_Tests_IPA.ttcn</span><br><span>+++ b/stp/STP_Tests_IPA.ttcn</span><br><span>@@ -56,6 +56,7 @@</span><br><span> /* for IPA we use the IPA_Emulation and not directly IPA_CodecPort to avoid</span><br><span> * having to re-invent IPA CCM handling here */</span><br><span> port MTP3asp_PT IPA[NR_IPA];</span><br><span style="color: hsl(120, 100%, 40%);">+ port IPA_SP_PT IPA_CTRL[NR_IPA];</span><br><span> var IPA_Emulation_CT vc_IPA[NR_IPA];</span><br><span> var IPA_CCM_Parameters g_ccm_pars[NR_IPA];</span><br><span> }</span><br><span>@@ -103,12 +104,13 @@</span><br><span> vc_IPA[i] := IPA_Emulation_CT.create("IPA" & int2str(i));</span><br><span> map(vc_IPA[i]:IPA_PORT, system:IPA_CODEC_PT);</span><br><span> connect(self:IPA[i], vc_IPA[i]:MTP3_SP_PORT);</span><br><span style="color: hsl(120, 100%, 40%);">+ connect(self:IPA_CTRL[i], vc_IPA[i]:IPA_SP_PORT);</span><br><span> g_ccm_pars[i] := c_IPA_default_ccm_pars;</span><br><span> g_ccm_pars[i].name := mp_ipa_as_names[i];</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-friend function f_connect_ipa(integer idx, boolean use_unknown_asp_port := false) runs on IPA_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+friend function f_connect_ipa(integer idx, boolean use_unknown_asp_port := false, boolean exp_act := true) runs on IPA_CT {</span><br><span> var integer port_offset := 0;</span><br><span> if (use_unknown_asp_port) {</span><br><span> /* Add 100 to the port since we know that port is not configured in any</span><br><span>@@ -117,6 +119,12 @@</span><br><span> }</span><br><span> vc_IPA[idx].start(IPA_Emulation.main_client(mp_stp_ipa_ip, mp_stp_ipa_port, mp_local_ipa_ip,</span><br><span> mp_local_ipa_port + idx + port_offset, g_ccm_pars[idx]));</span><br><span style="color: hsl(120, 100%, 40%);">+ IPA_CTRL[idx].receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_UP));</span><br><span style="color: hsl(120, 100%, 40%);">+ alt {</span><br><span style="color: hsl(120, 100%, 40%);">+ [exp_act] IPA_CTRL[idx].receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_ID_ACK));</span><br><span style="color: hsl(120, 100%, 40%);">+ [not exp_act] IPA_CTRL[idx].receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_DOWN));</span><br><span style="color: hsl(120, 100%, 40%);">+ [] IPA_CTRL[idx].receive(tr_ASP_IPA_EV(?)) { repeat; }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> </span><br><span>@@ -126,16 +134,12 @@</span><br><span> f_vty_config2(VTY, {"cs7 instance 0", "listen ipa 5000"},</span><br><span> "accept-asp-connections pre-configured");</span><br><span> f_init_ipa();</span><br><span style="color: hsl(0, 100%, 40%);">- f_connect_ipa(0, true);</span><br><span style="color: hsl(0, 100%, 40%);">- f_sleep(1.0);</span><br><span style="color: hsl(0, 100%, 40%);">- if (IPA[0].checkstate("Connected")) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Expected IPA port to be disconnected");</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(pass);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ f_connect_ipa(0, true, false);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* switch back to default */</span><br><span> f_vty_config2(VTY, {"cs7 instance 0", "listen ipa 5000"},</span><br><span> "accept-asp-connections dynamic-permitted");</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(pass);</span><br><span> }</span><br><span> </span><br><span> /* "accept-asp-connections pre-configured" and client from known source */</span><br><span>@@ -145,15 +149,11 @@</span><br><span> "accept-asp-connections pre-configured");</span><br><span> f_init_ipa();</span><br><span> f_connect_ipa(0, false);</span><br><span style="color: hsl(0, 100%, 40%);">- f_sleep(1.0);</span><br><span style="color: hsl(0, 100%, 40%);">- if (not IPA[0].checkstate("Connected")) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Expected IPA port to be connected");</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(pass);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* switch back to default */</span><br><span> f_vty_config2(VTY, {"cs7 instance 0", "listen ipa 5000"},</span><br><span> "accept-asp-connections dynamic-permitted");</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(pass);</span><br><span> }</span><br><span> </span><br><span> </span><br><span>@@ -162,12 +162,7 @@</span><br><span> f_init_common();</span><br><span> f_init_ipa();</span><br><span> f_connect_ipa(0, true);</span><br><span style="color: hsl(0, 100%, 40%);">- f_sleep(1.0);</span><br><span style="color: hsl(0, 100%, 40%);">- if (not IPA[0].checkstate("Connected")) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Expected IPA port to be connected");</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(pass);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(pass);</span><br><span> }</span><br><span> </span><br><span> private function f_tc_tmt_override(boolean unknwon_dynamic_asp)</span><br><span>@@ -178,17 +173,16 @@</span><br><span> f_connect_ipa(4, unknwon_dynamic_asp);</span><br><span> /* activate the first 'receiver' side ASP */</span><br><span> f_connect_ipa(5, unknwon_dynamic_asp);</span><br><span style="color: hsl(0, 100%, 40%);">- f_sleep(1.0);</span><br><span> </span><br><span> /* verify traffic is routed from sender to [sole] receiver */</span><br><span> f_test_traffic(4, 5);</span><br><span> </span><br><span> /* activate the second 'receiver' side ASP */</span><br><span> f_connect_ipa(6, unknwon_dynamic_asp);</span><br><span style="color: hsl(0, 100%, 40%);">- f_sleep(1.0);</span><br><span> </span><br><span> /* verify traffic is routed from sender to new receiver */</span><br><span> f_test_traffic(4, 6);</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(pass);</span><br><span> }</span><br><span> </span><br><span> /* test "traffic-mode override" behavior */</span><br><span>@@ -218,7 +212,6 @@</span><br><span> f_connect_ipa(0, unknwon_dynamic_asp);</span><br><span> /* activate the first 'receiver' side ASP */</span><br><span> f_connect_ipa(1, unknwon_dynamic_asp);</span><br><span style="color: hsl(0, 100%, 40%);">- f_sleep(1.0);</span><br><span> </span><br><span> /* verify traffic is routed from sender to [sole] receiver */</span><br><span> for (i := 0; i < 10; i := i+1) {</span><br><span>@@ -227,7 +220,6 @@</span><br><span> </span><br><span> /* activate the second 'receiver' side ASP */</span><br><span> f_connect_ipa(2, unknwon_dynamic_asp);</span><br><span style="color: hsl(0, 100%, 40%);">- f_sleep(1.0);</span><br><span> </span><br><span> /* verify traffic is routed from sender to new receiver */</span><br><span> const integer iter_per_asp := 5;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20261">change 20261</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/+/20261"/><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: I8ea11fe331baf2b65ce0b7b3c1a2b480332faa2a </div>
<div style="display:none"> Gerrit-Change-Number: 20261 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </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-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>