<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15350">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sgsn: update configs for running without docker<br><br>Base on docker-playground.git's ttcn3-sgsn-test/*.cfg files, change IPs<br>to 127.0.0.* (keep last octet), log to stderr. The reasoning behind the<br>IP change is, that using almost the same IP as in the docker configs<br>makes it easier to compare the configs.<br><br>Change-Id: I15b5a943e9c665dfd4eb6b30bff84afc8adeb4a2<br>---<br>M sgsn/SGSN_Tests.cfg<br>M sgsn/osmo-sgsn.cfg<br>A sgsn/osmo-stp.cfg<br>3 files changed, 71 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/sgsn/SGSN_Tests.cfg b/sgsn/SGSN_Tests.cfg</span><br><span>index 8782845..5167750 100644</span><br><span>--- a/sgsn/SGSN_Tests.cfg</span><br><span>+++ b/sgsn/SGSN_Tests.cfg</span><br><span>@@ -9,8 +9,30 @@</span><br><span> [LOGGING]</span><br><span> </span><br><span> [TESTPORT_PARAMETERS]</span><br><span style="color: hsl(120, 100%, 40%);">+*.SGSNVTY.CTRL_HOSTNAME := "127.0.0.10"</span><br><span> </span><br><span> [MODULE_PARAMETERS]</span><br><span style="color: hsl(120, 100%, 40%);">+SGSN_Tests.mp_nsconfig := {</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ local_ip := "127.0.0.103",</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "127.0.0.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%);">+ local_ip := "127.0.0.103",</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "127.0.0.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%);">+ local_ip := "127.0.0.103",</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "127.0.0.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%);">+SGSN_Tests.mp_ranap_cfg := {</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ sctp_addr := { 23908, "127.0.0.103", 2905, "127.0.0.200" }</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%);">+SGSN_Tests.mp_hlr_ip := "127.0.0.103"</span><br><span style="color: hsl(120, 100%, 40%);">+SGSN_Tests.mp_ggsn_ip := "127.0.0.103"</span><br><span> </span><br><span> [MAIN_CONTROLLER]</span><br><span> </span><br><span>diff --git a/sgsn/osmo-sgsn.cfg b/sgsn/osmo-sgsn.cfg</span><br><span>index 09da510..7ac50bc 100644</span><br><span>--- a/sgsn/osmo-sgsn.cfg</span><br><span>+++ b/sgsn/osmo-sgsn.cfg</span><br><span>@@ -28,10 +28,17 @@</span><br><span> !</span><br><span> line vty</span><br><span> no login</span><br><span style="color: hsl(0, 100%, 40%);">- bind 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+ bind 127.0.0.10</span><br><span> ctrl</span><br><span style="color: hsl(0, 100%, 40%);">- bind 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+ bind 127.0.0.10</span><br><span> !</span><br><span style="color: hsl(120, 100%, 40%);">+cs7 instance 0</span><br><span style="color: hsl(120, 100%, 40%);">+ point-code 0.23.4</span><br><span style="color: hsl(120, 100%, 40%);">+ asp asp-clnt-OsmoSGSN-A 2905 0 m3ua</span><br><span style="color: hsl(120, 100%, 40%);">+ remote-ip 127.0.0.200</span><br><span style="color: hsl(120, 100%, 40%);">+ as as-clnt-OsmoSGSN-A m3ua</span><br><span style="color: hsl(120, 100%, 40%);">+ asp asp-clnt-OsmoSGSN-A</span><br><span style="color: hsl(120, 100%, 40%);">+ routing-key 3 0.23.4</span><br><span> ns</span><br><span> timer tns-block 3</span><br><span> timer tns-block-retries 3</span><br><span>@@ -40,15 +47,15 @@</span><br><span> timer tns-test 30</span><br><span> timer tns-alive 3</span><br><span> timer tns-alive-retries 10</span><br><span style="color: hsl(0, 100%, 40%);">- encapsulation udp local-ip 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+ encapsulation udp local-ip 127.0.0.10</span><br><span> encapsulation udp local-port 23000</span><br><span> encapsulation framerelay-gre enabled 0</span><br><span> bssgp</span><br><span> sgsn</span><br><span style="color: hsl(0, 100%, 40%);">- gtp local-ip 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">- ggsn 0 remote-ip 127.0.0.2</span><br><span style="color: hsl(120, 100%, 40%);">+ gtp local-ip 127.0.0.10</span><br><span style="color: hsl(120, 100%, 40%);">+ ggsn 0 remote-ip 127.0.0.103</span><br><span> ggsn 0 gtp-version 1</span><br><span style="color: hsl(0, 100%, 40%);">- gsup remote-ip 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup remote-ip 127.0.0.103</span><br><span> gsup remote-port 4222</span><br><span> auth-policy remote</span><br><span> gsup oap-id 0</span><br><span>diff --git a/sgsn/osmo-stp.cfg b/sgsn/osmo-stp.cfg</span><br><span>new file mode 100644</span><br><span>index 0000000..b42f967</span><br><span>--- /dev/null</span><br><span>+++ b/sgsn/osmo-stp.cfg</span><br><span>@@ -0,0 +1,36 @@</span><br><span style="color: hsl(120, 100%, 40%);">+!</span><br><span style="color: hsl(120, 100%, 40%);">+! OsmoSTP (0.8.1) configuration saved from vty</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%);">+log gsmtap 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level set-all debug</span><br><span style="color: hsl(120, 100%, 40%);">+!</span><br><span style="color: hsl(120, 100%, 40%);">+log stderr</span><br><span style="color: hsl(120, 100%, 40%);">+ logging color 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging filter all 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print level 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print category 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print category-hex 0</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print file basename last</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print extended-timestamp 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level set-all debug</span><br><span style="color: hsl(120, 100%, 40%);">+!</span><br><span style="color: hsl(120, 100%, 40%);">+line vty</span><br><span style="color: hsl(120, 100%, 40%);">+ no login</span><br><span style="color: hsl(120, 100%, 40%);">+!</span><br><span style="color: hsl(120, 100%, 40%);">+cs7 instance 0</span><br><span style="color: hsl(120, 100%, 40%);">+ xua rkm routing-key-allocation dynamic-permitted</span><br><span style="color: hsl(120, 100%, 40%);">+ asp virt-rnc0-0 23908 2905 m3ua</span><br><span style="color: hsl(120, 100%, 40%);">+ local-ip 127.0.0.200</span><br><span style="color: hsl(120, 100%, 40%);">+ remote-ip 127.0.0.103</span><br><span style="color: hsl(120, 100%, 40%);">+ as virt-rnc0 m3ua</span><br><span style="color: hsl(120, 100%, 40%);">+ asp virt-rnc0-0</span><br><span style="color: hsl(120, 100%, 40%);">+ routing-key 2 0.24.3</span><br><span style="color: hsl(120, 100%, 40%);">+ route-table system</span><br><span style="color: hsl(120, 100%, 40%);">+ update route 0.24.3 7.255.7 linkset virt-rnc0</span><br><span style="color: hsl(120, 100%, 40%);">+ listen m3ua 2905</span><br><span style="color: hsl(120, 100%, 40%);">+ local-ip 127.0.0.200</span><br><span style="color: hsl(120, 100%, 40%);">+ accept-asp-connections dynamic-permitted</span><br><span style="color: hsl(120, 100%, 40%);">+ listen ipa 5000</span><br><span style="color: hsl(120, 100%, 40%);">+ local-ip 127.0.0.200</span><br><span style="color: hsl(120, 100%, 40%);">+ accept-asp-connections dynamic-permitted</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15350">change 15350</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/+/15350"/><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: I15b5a943e9c665dfd4eb6b30bff84afc8adeb4a2 </div>
<div style="display:none"> Gerrit-Change-Number: 15350 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>