<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20122">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">NS_Emulation: Introduce status events from provider -> emulation<br><br>This allows NS_Emulation to react to changes of the underlying<br>transport layer (e.g. Frame Relay Link/DLCI up).<br><br>Change-Id: If00e9c50dc664ce62b6c0cbde99d741e8173169b<br>---<br>M library/NS_Emulation.ttcnpp<br>M library/NS_Provider_FR.ttcn<br>M library/NS_Provider_IPL4.ttcn<br>3 files changed, 40 insertions(+), 2 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 32746b4..5872b00 100644</span><br><span>--- a/library/NS_Emulation.ttcnpp</span><br><span>+++ b/library/NS_Emulation.ttcnpp</span><br><span>@@ -120,9 +120,17 @@</span><br><span> /* lower layer ports (UDP/IP, Frame Relay) are added in derived components */</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ type enumerated NS_Provider_LinkStatus {</span><br><span style="color: hsl(120, 100%, 40%);">+ NS_PROV_LINK_STATUS_UP,</span><br><span style="color: hsl(120, 100%, 40%);">+ NS_PROV_LINK_STATUS_DOWN</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ type union NS_Provider_Evt {</span><br><span style="color: hsl(120, 100%, 40%);">+ NS_Provider_LinkStatus link_status</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* port between NS_Provider and NS_CT */</span><br><span> type port NS_PROVIDER_PT message {</span><br><span style="color: hsl(0, 100%, 40%);">- inout PDU_NS;</span><br><span style="color: hsl(120, 100%, 40%);">+ inout PDU_NS, NS_Provider_Evt;</span><br><span> } with { extension "internal" };</span><br><span> </span><br><span> type component NS_CT {</span><br><span>@@ -211,6 +219,12 @@</span><br><span> f_sendAlive();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ [] 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-ALIVE");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_sendAlive();</span><br><span style="color: hsl(120, 100%, 40%);">+ Tns_test.start;</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>diff --git a/library/NS_Provider_FR.ttcn b/library/NS_Provider_FR.ttcn</span><br><span>index 851e6c4..afa27d9 100644</span><br><span>--- a/library/NS_Provider_FR.ttcn</span><br><span>+++ b/library/NS_Provider_FR.ttcn</span><br><span>@@ -22,6 +22,9 @@</span><br><span> type component NS_Provider_FR_CT extends NS_Provider_CT, FR_Client_CT {</span><br><span> /* component reference to Frame Relay emulation */</span><br><span> var FR_Emulation_CT vc_FREMU;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ var boolean link_available := false;</span><br><span style="color: hsl(120, 100%, 40%);">+ var boolean pvc_active := false;</span><br><span> };</span><br><span> </span><br><span> function main(NSConfiguration config) runs on NS_Provider_FR_CT system af_packet {</span><br><span>@@ -50,8 +53,28 @@</span><br><span> NSE.send(dec_PDU_NS(rx_fr.payload));</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ [] FR.receive(FRemu_Event:{link_status:=FR_LINK_STS_AVAILABLE}) -> value rx_frevt {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (link_available == false and pvc_active == true) {</span><br><span style="color: hsl(120, 100%, 40%);">+ NSE.send(NS_Provider_Evt:{link_status := NS_PROV_LINK_STATUS_UP});</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ link_available := true;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] FR.receive(FRemu_Event:{link_status:=FR_LINK_STS_UNAVAILABLE}) -> value rx_frevt {</span><br><span style="color: hsl(120, 100%, 40%);">+ link_available := false;</span><br><span style="color: hsl(120, 100%, 40%);">+ NSE.send(NS_Provider_Evt:{link_status := NS_PROV_LINK_STATUS_DOWN});</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] FR.receive(tr_FRemu_PvcStatusAct(config.provider.fr.dlci, true)) -> value rx_frevt {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pvc_active == false and link_available == true) {</span><br><span style="color: hsl(120, 100%, 40%);">+ NSE.send(NS_Provider_Evt:{link_status := NS_PROV_LINK_STATUS_UP});</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ pvc_active := true;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] FR.receive(tr_FRemu_PvcStatusAct(config.provider.fr.dlci, false)) -> value rx_frevt {</span><br><span style="color: hsl(120, 100%, 40%);">+ pvc_active := false;</span><br><span style="color: hsl(120, 100%, 40%);">+ NSE.send(NS_Provider_Evt:{link_status := NS_PROV_LINK_STATUS_DOWN});</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> [] FR.receive(FRemu_Event:?) -> value rx_frevt {</span><br><span style="color: hsl(0, 100%, 40%);">- /* TODO: dispatch to user */</span><br><span style="color: hsl(120, 100%, 40%);">+ log("Unhandled FRemu_event: ", rx_frevt);</span><br><span> }</span><br><span> [] NSE.receive(PDU_NS:?) -> value rx_pdu {</span><br><span> FR.send(ts_FR(config.provider.fr.dlci, enc_PDU_NS(rx_pdu), true));</span><br><span>diff --git a/library/NS_Provider_IPL4.ttcn b/library/NS_Provider_IPL4.ttcn</span><br><span>index 1414935..f1fda6c 100644</span><br><span>--- a/library/NS_Provider_IPL4.ttcn</span><br><span>+++ b/library/NS_Provider_IPL4.ttcn</span><br><span>@@ -36,6 +36,7 @@</span><br><span> mtc.stop;</span><br><span> }</span><br><span> g_conn_id := res.connId;</span><br><span style="color: hsl(120, 100%, 40%);">+ NSE.send(NS_Provider_Evt:{link_status := NS_PROV_LINK_STATUS_UP});</span><br><span> </span><br><span> /* transceive beteween user-facing port and UDP socket */</span><br><span> while (true) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20122">change 20122</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/+/20122"/><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: If00e9c50dc664ce62b6c0cbde99d741e8173169b </div>
<div style="display:none"> Gerrit-Change-Number: 20122 </div>
<div style="display:none"> Gerrit-PatchSet: 11 </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: 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-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>