<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/21111">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved; Verified
pespin: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">NS_Configuration: Adjust config regarding support for NS-VCG<br><br>In osmo-ttcn3-hacks.git Change-Id If1220852785853f8a5d8de183d5053ddd6ccb958<br>we introduce support for multiple NS-VC inside a NS-VCG. This modifies<br>the configuration structures, and we need to adjust all config files<br>accordingly.<br><br>Change-Id: I6ac250555c3ac2aa8feb70bd3a052aafec5d4210<br>---<br>M ttcn3-gbproxy-test/GBProxy_Tests.cfg<br>M ttcn3-pcu-test/PCU_Tests.cfg<br>M ttcn3-pcu-test/sns/PCU_Tests.cfg<br>M ttcn3-sgsn-test/SGSN_Tests.cfg<br>4 files changed, 100 insertions(+), 66 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ttcn3-gbproxy-test/GBProxy_Tests.cfg b/ttcn3-gbproxy-test/GBProxy_Tests.cfg</span><br><span>index 7f6c303..6b097a3 100644</span><br><span>--- a/ttcn3-gbproxy-test/GBProxy_Tests.cfg</span><br><span>+++ b/ttcn3-gbproxy-test/GBProxy_Tests.cfg</span><br><span>@@ -14,44 +14,58 @@</span><br><span> [MODULE_PARAMETERS]</span><br><span> GBProxy_Tests.mp_nsconfig_sgsn := {</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- provider := {</span><br><span style="color: hsl(0, 100%, 40%);">- ip := {</span><br><span style="color: hsl(0, 100%, 40%);">- address_family := AF_INET,</span><br><span style="color: hsl(0, 100%, 40%);">- local_ip := "172.18.24.103",</span><br><span style="color: hsl(0, 100%, 40%);">- local_udp_port := 23000,</span><br><span style="color: hsl(0, 100%, 40%);">- remote_ip := "172.18.24.10"</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc := {</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ip := {</span><br><span style="color: hsl(120, 100%, 40%);">+ address_family := AF_INET,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_ip := "172.18.24.103",</span><br><span style="color: hsl(120, 100%, 40%);">+ local_udp_port := 23000,</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "172.18.24.10"</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span> GBProxy_Tests.mp_nsconfig_pcu := {</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- provider := {</span><br><span style="color: hsl(0, 100%, 40%);">- ip := {</span><br><span style="color: hsl(0, 100%, 40%);">- address_family := AF_INET,</span><br><span style="color: hsl(0, 100%, 40%);">- local_ip := "172.18.24.103",</span><br><span style="color: hsl(0, 100%, 40%);">- remote_ip := "172.18.24.10"</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- provider := {</span><br><span style="color: hsl(0, 100%, 40%);">- ip := {</span><br><span style="color: hsl(0, 100%, 40%);">- address_family := AF_INET,</span><br><span style="color: hsl(0, 100%, 40%);">- local_ip := "172.18.24.103",</span><br><span style="color: hsl(0, 100%, 40%);">- remote_ip := "172.18.24.10"</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- provider := {</span><br><span style="color: hsl(0, 100%, 40%);">- ip := {</span><br><span style="color: hsl(0, 100%, 40%);">- address_family := AF_INET,</span><br><span style="color: hsl(0, 100%, 40%);">- local_ip := "172.18.24.103",</span><br><span style="color: hsl(0, 100%, 40%);">- remote_ip := "172.18.24.10"</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc := {</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ip := {</span><br><span style="color: hsl(120, 100%, 40%);">+ address_family := AF_INET,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_ip := "172.18.24.103",</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "172.18.24.10"</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ }, {</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc := {</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ip := {</span><br><span style="color: hsl(120, 100%, 40%);">+ address_family := AF_INET,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_ip := "172.18.24.103",</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "172.18.24.10"</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }, {</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc := {</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ip := {</span><br><span style="color: hsl(120, 100%, 40%);">+ address_family := AF_INET,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_ip := "172.18.24.103",</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "172.18.24.10"</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> [MAIN_CONTROLLER]</span><br><span>diff --git a/ttcn3-pcu-test/PCU_Tests.cfg b/ttcn3-pcu-test/PCU_Tests.cfg</span><br><span>index 4bf2906..9e69f86 100644</span><br><span>--- a/ttcn3-pcu-test/PCU_Tests.cfg</span><br><span>+++ b/ttcn3-pcu-test/PCU_Tests.cfg</span><br><span>@@ -15,18 +15,22 @@</span><br><span> PCU_Tests.mp_pcu_sock_path := "/data/unix/pcu_bts"</span><br><span> PCU_Tests.mp_pcu_statsd_ip := "172.18.13.10"</span><br><span> SGSN_Components.mp_nsconfig := {</span><br><span style="color: hsl(0, 100%, 40%);">- provider := {</span><br><span style="color: hsl(0, 100%, 40%);">- ip := {</span><br><span style="color: hsl(0, 100%, 40%);">- address_family := AF_INET,</span><br><span style="color: hsl(0, 100%, 40%);">- local_ip := "172.18.13.10",</span><br><span style="color: hsl(0, 100%, 40%);">- local_udp_port := 23000,</span><br><span style="color: hsl(0, 100%, 40%);">- remote_ip := "172.18.13.101",</span><br><span style="color: hsl(0, 100%, 40%);">- remote_udp_port := 23000</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- nsvci := 1234,</span><br><span> nsei := 1234,</span><br><span style="color: hsl(0, 100%, 40%);">- handle_sns := false</span><br><span style="color: hsl(120, 100%, 40%);">+ handle_sns := false,</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc := {</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ip := {</span><br><span style="color: hsl(120, 100%, 40%);">+ address_family := AF_INET,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_ip := "172.18.13.10",</span><br><span style="color: hsl(120, 100%, 40%);">+ local_udp_port := 23000,</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "172.18.13.101",</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_udp_port := 23000</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvci := 1234</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoPCU";</span><br><span> StatsD_Checker.mp_enable_stats := true;</span><br><span>diff --git a/ttcn3-pcu-test/sns/PCU_Tests.cfg b/ttcn3-pcu-test/sns/PCU_Tests.cfg</span><br><span>index 45b3fc7..9cd4b38 100644</span><br><span>--- a/ttcn3-pcu-test/sns/PCU_Tests.cfg</span><br><span>+++ b/ttcn3-pcu-test/sns/PCU_Tests.cfg</span><br><span>@@ -9,17 +9,21 @@</span><br><span> [MODULE_PARAMETERS]</span><br><span> PCU_Tests.mp_pcu_sock_path := "/data/unix/pcu_bts"</span><br><span> SGSN_Components.mp_nsconfig := {</span><br><span style="color: hsl(0, 100%, 40%);">- provider := {</span><br><span style="color: hsl(0, 100%, 40%);">- ip := {</span><br><span style="color: hsl(0, 100%, 40%);">- address_family := AF_INET,</span><br><span style="color: hsl(0, 100%, 40%);">- local_ip := "172.18.14.10",</span><br><span style="color: hsl(0, 100%, 40%);">- local_udp_port := 23000,</span><br><span style="color: hsl(0, 100%, 40%);">- remote_ip := "172.18.14.101",</span><br><span style="color: hsl(0, 100%, 40%);">- remote_udp_port := 23000</span><br><span style="color: hsl(120, 100%, 40%);">+ nsei := 1234,</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc := {</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ip := {</span><br><span style="color: hsl(120, 100%, 40%);">+ address_family := AF_INET,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_ip := "172.18.14.10",</span><br><span style="color: hsl(120, 100%, 40%);">+ local_udp_port := 23000,</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "172.18.14.101",</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_udp_port := 23000</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvci := 1234</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- nsvci := 1234,</span><br><span style="color: hsl(0, 100%, 40%);">- nsei := 1234</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> [MAIN_CONTROLLER]</span><br><span>diff --git a/ttcn3-sgsn-test/SGSN_Tests.cfg b/ttcn3-sgsn-test/SGSN_Tests.cfg</span><br><span>index 612fe03..b77fffd 100644</span><br><span>--- a/ttcn3-sgsn-test/SGSN_Tests.cfg</span><br><span>+++ b/ttcn3-sgsn-test/SGSN_Tests.cfg</span><br><span>@@ -14,29 +14,41 @@</span><br><span> [MODULE_PARAMETERS]</span><br><span> SGSN_Tests.mp_nsconfig := {</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- provider := {</span><br><span style="color: hsl(0, 100%, 40%);">- ip := {</span><br><span style="color: hsl(0, 100%, 40%);">- address_family := AF_INET,</span><br><span style="color: hsl(0, 100%, 40%);">- local_ip := "172.18.8.103",</span><br><span style="color: hsl(0, 100%, 40%);">- remote_ip := "172.18.8.10"</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc := {</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ip := {</span><br><span style="color: hsl(120, 100%, 40%);">+ address_family := AF_INET,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_ip := "172.18.8.103",</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "172.18.8.10"</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> }</span><br><span> },</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- provider := {</span><br><span style="color: hsl(0, 100%, 40%);">- ip := {</span><br><span style="color: hsl(0, 100%, 40%);">- address_family := AF_INET,</span><br><span style="color: hsl(0, 100%, 40%);">- local_ip := "172.18.8.103",</span><br><span style="color: hsl(0, 100%, 40%);">- remote_ip := "172.18.8.10"</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc := {</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ip := {</span><br><span style="color: hsl(120, 100%, 40%);">+ address_family := AF_INET,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_ip := "172.18.8.103",</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "172.18.8.10"</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> }</span><br><span> },</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- provider := {</span><br><span style="color: hsl(0, 100%, 40%);">- ip := {</span><br><span style="color: hsl(0, 100%, 40%);">- address_family := AF_INET,</span><br><span style="color: hsl(0, 100%, 40%);">- local_ip := "172.18.8.103",</span><br><span style="color: hsl(0, 100%, 40%);">- remote_ip := "172.18.8.10"</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc := {</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ip := {</span><br><span style="color: hsl(120, 100%, 40%);">+ address_family := AF_INET,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_ip := "172.18.8.103",</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "172.18.8.10"</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</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/docker-playground/+/21111">change 21111</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/docker-playground/+/21111"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: docker-playground </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I6ac250555c3ac2aa8feb70bd3a052aafec5d4210 </div>
<div style="display:none"> Gerrit-Change-Number: 21111 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>