<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21176">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gbproxy: Less redundant component naming<br><br>before this patch:<br>      GbProxy_Test-SGSN0-NS(SGSN)0-NSVCI101<br>after:<br> GbProxy_Test-NS(SGSN[0])-NSVCI101<br><br>Change-Id: I8fc6b7526707206c147aa3c269c0204495e9f15a<br>---<br>M gbproxy/GBProxy_Tests.ttcn<br>1 file changed, 14 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/76/21176/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn</span><br><span>index f18216e..5d312f7 100644</span><br><span>--- a/gbproxy/GBProxy_Tests.ttcn</span><br><span>+++ b/gbproxy/GBProxy_Tests.ttcn</span><br><span>@@ -270,13 +270,15 @@</span><br><span> };</span><br><span> </span><br><span> private function f_init_gb_pcu(inout GbInstance gb, charstring id, integer offset) runs on test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- gb.vc_NS := NS_CT.create(id & "-NS(PCU)" & int2str(offset));</span><br><span style="color: hsl(0, 100%, 40%);">-  gb.vc_BSSGP := BSSGP_CT.create(id & "-BSSGP(PCU)" & int2str(offset));</span><br><span style="color: hsl(120, 100%, 40%);">+       var charstring ns_id := id & "-NS(PCU[" & int2str(offset) & "])";</span><br><span style="color: hsl(120, 100%, 40%);">+     var charstring bssgp_id := id & "-BSSGP(PCU[" & int2str(offset) & "])";</span><br><span style="color: hsl(120, 100%, 40%);">+       gb.vc_NS := NS_CT.create(ns_id);</span><br><span style="color: hsl(120, 100%, 40%);">+      gb.vc_BSSGP := BSSGP_CT.create(bssgp_id);</span><br><span>    /* connect lower end of BSSGP emulation with NS upper port */</span><br><span>        connect(gb.vc_BSSGP:BSCP, gb.vc_NS:NS_SP);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  gb.vc_NS.start(NSStart(mp_nsconfig_pcu[offset]));</span><br><span style="color: hsl(0, 100%, 40%);">-       gb.vc_BSSGP.start(BssgpStart(gb.cfg, id));</span><br><span style="color: hsl(120, 100%, 40%);">+    gb.vc_NS.start(NSStart(mp_nsconfig_pcu[offset], ns_id));</span><br><span style="color: hsl(120, 100%, 40%);">+      gb.vc_BSSGP.start(BssgpStart(gb.cfg, bssgp_id));</span><br><span> </span><br><span>         for (var integer i := 0; i < lengthof(gb.cfg.bvc); i := i + 1) {</span><br><span>          connect(self:PROC, gb.vc_BSSGP:PROC);</span><br><span>@@ -286,13 +288,15 @@</span><br><span> }</span><br><span> </span><br><span> private function f_init_gb_sgsn(inout GbInstance gb, charstring id, integer offset) runs on test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- gb.vc_NS := NS_CT.create(id & "-NS(SGSN)" & int2str(offset));</span><br><span style="color: hsl(0, 100%, 40%);">- gb.vc_BSSGP := BSSGP_CT.create(id & "-BSSGP(SGSN)" & int2str(offset));</span><br><span style="color: hsl(120, 100%, 40%);">+      var charstring ns_id := id & "-NS(SGSN[" & int2str(offset) & "])";</span><br><span style="color: hsl(120, 100%, 40%);">+    var charstring bssgp_id := id & "-BSSGP(SGSN[" & int2str(offset) & "])";</span><br><span style="color: hsl(120, 100%, 40%);">+      gb.vc_NS := NS_CT.create(ns_id);</span><br><span style="color: hsl(120, 100%, 40%);">+      gb.vc_BSSGP := BSSGP_CT.create(bssgp_id);</span><br><span>    /* connect lower end of BSSGP emulation with NS upper port */</span><br><span>        connect(gb.vc_BSSGP:BSCP, gb.vc_NS:NS_SP);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  gb.vc_NS.start(NSStart(mp_nsconfig_sgsn[offset]));</span><br><span style="color: hsl(0, 100%, 40%);">-      gb.vc_BSSGP.start(BssgpStart(gb.cfg, id));</span><br><span style="color: hsl(120, 100%, 40%);">+    gb.vc_NS.start(NSStart(mp_nsconfig_sgsn[offset], ns_id));</span><br><span style="color: hsl(120, 100%, 40%);">+     gb.vc_BSSGP.start(BssgpStart(gb.cfg, bssgp_id));</span><br><span> </span><br><span>         for (var integer i := 0; i < lengthof(gb.cfg.bvc); i := i + 1) {</span><br><span>          connect(self:PROC, gb.vc_BSSGP:PROC);</span><br><span>@@ -329,11 +333,11 @@</span><br><span> </span><br><span>    f_init_vty();</span><br><span>        for (i := 0; i < lengthof(mp_nsconfig_sgsn); i := i+1) {</span><br><span style="color: hsl(0, 100%, 40%);">-             f_init_gb_sgsn(g_sgsn[0], "GbProxy_Test-SGSN" & int2str(i), 0);</span><br><span style="color: hsl(120, 100%, 40%);">+         f_init_gb_sgsn(g_sgsn[0], "GbProxy_Test", 0);</span><br><span>      }</span><br><span>    f_sleep(4.0);</span><br><span>        for (i := 0; i < lengthof(mp_nsconfig_pcu); i := i+1) {</span><br><span style="color: hsl(0, 100%, 40%);">-              f_init_gb_pcu(g_pcu[i], "GbProxy_Test-PCU" & int2str(i), i);</span><br><span style="color: hsl(120, 100%, 40%);">+            f_init_gb_pcu(g_pcu[i], "GbProxy_Test", i);</span><br><span>        }</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21176">change 21176</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/+/21176"/><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: I8fc6b7526707206c147aa3c269c0204495e9f15a </div>
<div style="display:none"> Gerrit-Change-Number: 21176 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>