<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20128">View Change</a></p><div style="white-space:pre-wrap">Approvals:
fixeria: Looks good to me, approved
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
lynxis lazus: 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: pass around string idenifier for components created<br><br>We want to see useful identification for components in the log, and<br>hence must be giving every component a name at create() time.<br><br>Change-Id: I0fe650243953e4d85161684865acd0354b2e465f<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, 11 insertions(+), 10 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 ee25d3e..5fb2aa6 100644</span><br><span>--- a/library/NS_Emulation.ttcnpp</span><br><span>+++ b/library/NS_Emulation.ttcnpp</span><br><span>@@ -85,25 +85,25 @@</span><br><span> out NsUnitdataRequest;</span><br><span> } with { extension "internal" };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- function NSStart(NSConfiguration init_config) runs on NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ function NSStart(NSConfiguration init_config, charstring id := testcasename()) runs on NS_CT {</span><br><span> config := init_config;</span><br><span style="color: hsl(0, 100%, 40%);">- f_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init(id & "-NSemu");</span><br><span> f_ScanEvents();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- private function f_init() runs on NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ private function f_init(charstring id) runs on NS_CT {</span><br><span> var Result res;</span><br><span> </span><br><span> if (ischosen(config.provider.ip)) {</span><br><span> /* Connect the UDP socket */</span><br><span style="color: hsl(0, 100%, 40%);">- vc_NSP_IP := NS_Provider_IPL4_CT.create;</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_NSP_IP := NS_Provider_IPL4_CT.create(id & "-provIP");</span><br><span> connect(self:NSCP, vc_NSP_IP:NSE);</span><br><span style="color: hsl(0, 100%, 40%);">- vc_NSP_IP.start(NS_Provider_IPL4.main(config));</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_NSP_IP.start(NS_Provider_IPL4.main(config, id));</span><br><span> #ifdef NS_EMULATION_FR</span><br><span> } else if (ischosen(config.provider.fr)) {</span><br><span style="color: hsl(0, 100%, 40%);">- vc_NSP_FR := NS_Provider_FR_CT.create;</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_NSP_FR := NS_Provider_FR_CT.create(id & "-provFR");</span><br><span> connect(self:NSCP, vc_NSP_FR:NSE);</span><br><span style="color: hsl(0, 100%, 40%);">- vc_NSP_FR.start(NS_Provider_FR.main(config));</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_NSP_FR.start(NS_Provider_FR.main(config, id));</span><br><span> #endif</span><br><span> }</span><br><span> </span><br><span>diff --git a/library/NS_Provider_FR.ttcn b/library/NS_Provider_FR.ttcn</span><br><span>index afa27d9..5387b0f 100644</span><br><span>--- a/library/NS_Provider_FR.ttcn</span><br><span>+++ b/library/NS_Provider_FR.ttcn</span><br><span>@@ -27,11 +27,12 @@</span><br><span> var boolean pvc_active := false;</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-function main(NSConfiguration config) runs on NS_Provider_FR_CT system af_packet {</span><br><span style="color: hsl(120, 100%, 40%);">+function main(NSConfiguration config, charstring id) runs on NS_Provider_FR_CT system af_packet {</span><br><span> </span><br><span> /* start Frame Relay Emulation */</span><br><span style="color: hsl(0, 100%, 40%);">- vc_FREMU := FR_Emulation_CT.create();</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_FREMU := FR_Emulation_CT.create(id & "-FRemu");</span><br><span> var Q933em_Config q933_cfg := valueof(ts_Q933em_Config(ats_is_user := not config.role_sgsn, bidirectional := false));</span><br><span style="color: hsl(120, 100%, 40%);">+ q933_cfg.T391 := 1.0;</span><br><span> map(vc_FREMU:FR, system:AF_PACKET) param (config.provider.fr.netdev);</span><br><span> vc_FREMU.start(FrameRelay_Emulation.main(q933_cfg));</span><br><span> </span><br><span>diff --git a/library/NS_Provider_IPL4.ttcn b/library/NS_Provider_IPL4.ttcn</span><br><span>index f1fda6c..3b9fcaf 100644</span><br><span>--- a/library/NS_Provider_IPL4.ttcn</span><br><span>+++ b/library/NS_Provider_IPL4.ttcn</span><br><span>@@ -23,7 +23,7 @@</span><br><span> var integer g_conn_id := -1;</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-function main(NSConfiguration config) runs on NS_Provider_IPL4_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+function main(NSConfiguration config, charstring id) runs on NS_Provider_IPL4_CT {</span><br><span> </span><br><span> /* connect socket */</span><br><span> map(self:IPL4, system:IPL4);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20128">change 20128</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/+/20128"/><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: I0fe650243953e4d85161684865acd0354b2e465f </div>
<div style="display:none"> Gerrit-Change-Number: 20128 </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: 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-CC: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>