<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20127">View Change</a></p><div style="white-space:pre-wrap">Approvals:
fixeria: Looks good to me, but someone else must approve
lynxis lazus: Looks good to me, but someone else must approve
daniel: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">NS_Emulation: Delay Tx of first NS-RESET until Provider tells us it's up<br><br>Change-Id: I300cfeb120540940990a834596b0a83a539df080<br>---<br>M library/NS_Emulation.ttcnpp<br>1 file changed, 15 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/NS_Emulation.ttcnpp b/library/NS_Emulation.ttcnpp</span><br><span>index dcc0e17..ee25d3e 100644</span><br><span>--- a/library/NS_Emulation.ttcnpp</span><br><span>+++ b/library/NS_Emulation.ttcnpp</span><br><span>@@ -108,10 +108,6 @@</span><br><span> }</span><br><span> </span><br><span> f_change_state(NSE_S_DEAD_BLOCKED);</span><br><span style="color: hsl(0, 100%, 40%);">- /* Send the first NS-ALIVE to test the connection */</span><br><span style="color: hsl(0, 100%, 40%);">- if (not config.role_sgsn) {</span><br><span style="color: hsl(0, 100%, 40%);">- f_sendReset();</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> }</span><br><span> </span><br><span> type component NS_Provider_CT {</span><br><span>@@ -151,6 +147,7 @@</span><br><span> timer Tns_alive := 3.0;</span><br><span> timer Tns_test := 10.0;</span><br><span> timer Tns_block := 10.0;</span><br><span style="color: hsl(120, 100%, 40%);">+ timer Tns_reset := 10.0;</span><br><span> }</span><br><span> </span><br><span> type record NSConfigurationIP {</span><br><span>@@ -185,6 +182,7 @@</span><br><span> </span><br><span> private function f_sendReset() runs on NS_CT {</span><br><span> NSCP.send(ts_NS_RESET(NS_CAUSE_OM_INTERVENTION, config.nsvci, config.nsei));</span><br><span style="color: hsl(120, 100%, 40%);">+ Tns_reset.start;</span><br><span> g_state := NSE_S_WAIT_RESET;</span><br><span> }</span><br><span> </span><br><span>@@ -219,12 +217,17 @@</span><br><span> f_sendAlive();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP.receive(NS_Provider_Evt:{link_status:=NS_PROV_LINK_STATUS_UP}) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [config.role_sgsn] NSCP.receive(NS_Provider_Evt:{link_status:=NS_PROV_LINK_STATUS_UP}) {</span><br><span> log("Provider Link came up: sending NS-ALIVE");</span><br><span> f_sendAlive();</span><br><span> Tns_test.start;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ [not config.role_sgsn] NSCP.receive(NS_Provider_Evt:{link_status:=NS_PROV_LINK_STATUS_UP}) {</span><br><span style="color: hsl(120, 100%, 40%);">+ log("Provider Link came up: sending NS-RESET");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_sendReset();</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Stop t_alive when receiving ALIVE-ACK */</span><br><span> [Tns_alive.running] NSCP.receive(t_NS_ALIVE_ACK) {</span><br><span> log("NS-ALIVE-ACK received: stopping Tns-alive; starting Tns-test");</span><br><span>@@ -363,7 +366,14 @@</span><br><span> </span><br><span> private altstep as_wait_reset() runs on NS_CT {</span><br><span> var PDU_NS rf;</span><br><span style="color: hsl(120, 100%, 40%);">+ [] Tns_reset.timeout {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If the sending entity of an NS-RESET PDU receives no NS-RESET-ACK PDU before timer</span><br><span style="color: hsl(120, 100%, 40%);">+ * Tns-reset expires the corresponding NS-VCs shall remain blocked and dead and the</span><br><span style="color: hsl(120, 100%, 40%);">+ * entire reset procedure shall be repeated */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_sendReset();</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> [] NSCP.receive(tr_NS_RESET_ACK(config.nsvci, config.nsei)) -> value rf {</span><br><span style="color: hsl(120, 100%, 40%);">+ Tns_reset.stop;</span><br><span> f_change_state(NSE_S_ALIVE_BLOCKED);</span><br><span> f_sendAlive();</span><br><span> f_sendUnblock();</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20127">change 20127</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/+/20127"/><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: I300cfeb120540940990a834596b0a83a539df080 </div>
<div style="display:none"> Gerrit-Change-Number: 20127 </div>
<div style="display:none"> Gerrit-PatchSet: 7 </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: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>