<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/20191">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved; Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">PCU+SGSN: Adjust to new "provider" structure of NSConfiguration<br><br>In Change-Id I6904520d8c2f546327029777d68b1907611a8cf5 of<br>osmo-ttcn3-hacks, we change the structure of NSConfiguration. Let's<br>adjust the configs accordingly.<br><br>Change-Id: I8c5e59e79b69c13632d69f5011be9279b827a4fa<br>Depends: osmo-ttcn3-hacks I6904520d8c2f546327029777d68b1907611a8cf5<br>---<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>3 files changed, 39 insertions(+), 19 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ttcn3-pcu-test/PCU_Tests.cfg b/ttcn3-pcu-test/PCU_Tests.cfg</span><br><span>index 89c997e..b5331f1 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,11 +15,15 @@</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%);">- 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(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> nsvci := 1234,</span><br><span> nsei := 1234</span><br><span> }</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 f441d18..45b3fc7 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,11 +9,15 @@</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%);">- 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%);">+ 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> nsvci := 1234,</span><br><span> nsei := 1234</span><br><span> }</span><br><span>diff --git a/ttcn3-sgsn-test/SGSN_Tests.cfg b/ttcn3-sgsn-test/SGSN_Tests.cfg</span><br><span>index 055ae5a..612fe03 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,19 +14,31 @@</span><br><span> [MODULE_PARAMETERS]</span><br><span> SGSN_Tests.mp_nsconfig := {</span><br><span> {</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%);">+ 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 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%);">+ 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 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%);">+ 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> SGSN_Tests.mp_ranap_cfg := {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/20191">change 20191</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/+/20191"/><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: I8c5e59e79b69c13632d69f5011be9279b827a4fa </div>
<div style="display:none"> Gerrit-Change-Number: 20191 </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-MessageType: merged </div>