<p>daniel <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/19583">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  daniel: Looks good to me, approved; Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Update bsc tester config to enable stats testing<br><br>Change-Id: I6ed591cdc4d3108547eda2a1755ae6f6cef2b4d2<br>Related: SYS#4877<br>Depends: I8526b645dc4af59adcc1855699421a026f505c1d (osmo-ttcn3-hacks)<br>---<br>M ttcn3-bsc-test/BSC_Tests.cfg<br>M ttcn3-bsc-test/jenkins-sccplite.sh<br>M ttcn3-bsc-test/jenkins.sh<br>M ttcn3-bsc-test/osmo-bsc.cfg<br>M ttcn3-bsc-test/pre-mscpool-osmo-bsc.cfg<br>M ttcn3-bsc-test/sccplite/BSC_Tests.cfg<br>M ttcn3-bsc-test/sccplite/osmo-bsc.cfg<br>7 files changed, 46 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ttcn3-bsc-test/BSC_Tests.cfg b/ttcn3-bsc-test/BSC_Tests.cfg</span><br><span>index fab146d..9aef82a 100644</span><br><span>--- a/ttcn3-bsc-test/BSC_Tests.cfg</span><br><span>+++ b/ttcn3-bsc-test/BSC_Tests.cfg</span><br><span>@@ -7,6 +7,7 @@</span><br><span> </span><br><span> [TESTPORT_PARAMETERS]</span><br><span> *.BSCVTY.CTRL_HOSTNAME := "172.18.2.20"</span><br><span style="color: hsl(120, 100%, 40%);">+*.STATSVTY.CTRL_HOSTNAME := "172.18.2.20"</span><br><span> </span><br><span> [MODULE_PARAMETERS]</span><br><span> BSC_Tests.mp_bsc_ip   := "172.18.2.20";</span><br><span>@@ -51,6 +52,7 @@</span><br><span> BSC_Tests_CBSP.mp_cgi_bts1 := { '001'H, '01'H, 1, 1 };</span><br><span> BSC_Tests_CBSP.mp_cgi_bts2 := { '001'H, '01'H, 2, 1 };</span><br><span> BSC_Tests_CBSP.mp_cgi_bts3 := { '001'H, '01'H, 3, 3 };</span><br><span style="color: hsl(120, 100%, 40%);">+StatsD_Checker.mp_enable_stats := true;</span><br><span> </span><br><span> [MAIN_CONTROLLER]</span><br><span> </span><br><span>diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh</span><br><span>index ee4417c..f49474b 100755</span><br><span>--- a/ttcn3-bsc-test/jenkins-sccplite.sh</span><br><span>+++ b/ttcn3-bsc-test/jenkins-sccplite.sh</span><br><span>@@ -18,6 +18,13 @@</span><br><span> </span><br><span> network_create 12</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# Disable stats testing until libosmocore release > 1.4.0</span><br><span style="color: hsl(120, 100%, 40%);">+if [ "$IMAGE_SUFFIX" = "latest" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+     sed -i "s/^StatsD_Checker.mp_enable_stats.*/StatsD_Checker.mp_enable_stats := false;/" $VOL_BASE_DIR/bsc-tester/BSC_Tests.cfg</span><br><span style="color: hsl(120, 100%, 40%);">+       sed -i "s/stats interval 0//" $VOL_BASE_DIR/bsc/osmo-bsc.cfg</span><br><span style="color: hsl(120, 100%, 40%);">+        sed -i "s/flush-period 1//" $VOL_BASE_DIR/bsc/osmo-bsc.cfg</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> echo Starting container with BSC</span><br><span> docker run    --rm \</span><br><span>               --network $NET_NAME --ip 172.18.12.20 \</span><br><span>diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh</span><br><span>index 0218a8f..2319b9c 100755</span><br><span>--- a/ttcn3-bsc-test/jenkins.sh</span><br><span>+++ b/ttcn3-bsc-test/jenkins.sh</span><br><span>@@ -24,6 +24,13 @@</span><br><span>        cp pre-mscpool-osmo-bsc.cfg $VOL_BASE_DIR/bsc/osmo-bsc.cfg</span><br><span> fi</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# Disable stats testing until libosmocore release > 1.4.0</span><br><span style="color: hsl(120, 100%, 40%);">+if [ "$IMAGE_SUFFIX" = "latest" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+       sed -i "s/^StatsD_Checker.mp_enable_stats.*/StatsD_Checker.mp_enable_stats := false;/" $VOL_BASE_DIR/bsc-tester/BSC_Tests.cfg</span><br><span style="color: hsl(120, 100%, 40%);">+       sed -i "s/stats interval 0//" $VOL_BASE_DIR/bsc/osmo-bsc.cfg</span><br><span style="color: hsl(120, 100%, 40%);">+        sed -i "s/flush-period 1//" $VOL_BASE_DIR/bsc/osmo-bsc.cfg</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> network_create 2</span><br><span> </span><br><span> echo Starting container with STP</span><br><span>diff --git a/ttcn3-bsc-test/osmo-bsc.cfg b/ttcn3-bsc-test/osmo-bsc.cfg</span><br><span>index 13e7f60..bce5941 100644</span><br><span>--- a/ttcn3-bsc-test/osmo-bsc.cfg</span><br><span>+++ b/ttcn3-bsc-test/osmo-bsc.cfg</span><br><span>@@ -45,7 +45,15 @@</span><br><span>  logging level lm3ua notice</span><br><span>  logging level lmgcp notice</span><br><span> !</span><br><span style="color: hsl(0, 100%, 40%);">-stats interval 5</span><br><span style="color: hsl(120, 100%, 40%);">+stats interval 0</span><br><span style="color: hsl(120, 100%, 40%);">+stats reporter statsd</span><br><span style="color: hsl(120, 100%, 40%);">+ prefix TTCN3</span><br><span style="color: hsl(120, 100%, 40%);">+ level subscriber</span><br><span style="color: hsl(120, 100%, 40%);">+ remote-ip 172.18.2.203</span><br><span style="color: hsl(120, 100%, 40%);">+ remote-port 8125</span><br><span style="color: hsl(120, 100%, 40%);">+ flush-period 1</span><br><span style="color: hsl(120, 100%, 40%);">+ mtu 1024</span><br><span style="color: hsl(120, 100%, 40%);">+ enable</span><br><span> !</span><br><span> line vty</span><br><span>  no login</span><br><span>diff --git a/ttcn3-bsc-test/pre-mscpool-osmo-bsc.cfg b/ttcn3-bsc-test/pre-mscpool-osmo-bsc.cfg</span><br><span>index 3aa61d0..2ced140 100644</span><br><span>--- a/ttcn3-bsc-test/pre-mscpool-osmo-bsc.cfg</span><br><span>+++ b/ttcn3-bsc-test/pre-mscpool-osmo-bsc.cfg</span><br><span>@@ -34,7 +34,16 @@</span><br><span>  logging level lm3ua notice</span><br><span>  logging level lmgcp notice</span><br><span> !</span><br><span style="color: hsl(0, 100%, 40%);">-stats interval 5</span><br><span style="color: hsl(120, 100%, 40%);">+stats interval 0</span><br><span style="color: hsl(120, 100%, 40%);">+stats reporter statsd</span><br><span style="color: hsl(120, 100%, 40%);">+ prefix TTCN3</span><br><span style="color: hsl(120, 100%, 40%);">+ level subscriber</span><br><span style="color: hsl(120, 100%, 40%);">+ remote-ip 172.18.2.203</span><br><span style="color: hsl(120, 100%, 40%);">+ remote-port 8125</span><br><span style="color: hsl(120, 100%, 40%);">+ flush-period 1</span><br><span style="color: hsl(120, 100%, 40%);">+ mtu 1024</span><br><span style="color: hsl(120, 100%, 40%);">+ enable</span><br><span style="color: hsl(120, 100%, 40%);">+!</span><br><span> !</span><br><span> line vty</span><br><span>  no login</span><br><span>diff --git a/ttcn3-bsc-test/sccplite/BSC_Tests.cfg b/ttcn3-bsc-test/sccplite/BSC_Tests.cfg</span><br><span>index 5e0485c..519de4b 100644</span><br><span>--- a/ttcn3-bsc-test/sccplite/BSC_Tests.cfg</span><br><span>+++ b/ttcn3-bsc-test/sccplite/BSC_Tests.cfg</span><br><span>@@ -7,6 +7,7 @@</span><br><span> </span><br><span> [TESTPORT_PARAMETERS]</span><br><span> *.BSCVTY.CTRL_HOSTNAME := "172.18.12.20"</span><br><span style="color: hsl(120, 100%, 40%);">+*.STATSVTY.CTRL_HOSTNAME := "172.18.12.20"</span><br><span> </span><br><span> [MODULE_PARAMETERS]</span><br><span> BSC_Tests.mp_bsc_ip   := "172.18.12.20";</span><br><span>@@ -25,6 +26,7 @@</span><br><span>             rctx := 0</span><br><span>    }</span><br><span> };</span><br><span style="color: hsl(120, 100%, 40%);">+StatsD_Checker.mp_enable_stats := true;</span><br><span> </span><br><span> [MAIN_CONTROLLER]</span><br><span> </span><br><span>diff --git a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg</span><br><span>index 8d52884..2e349a4 100644</span><br><span>--- a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg</span><br><span>+++ b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg</span><br><span>@@ -34,7 +34,15 @@</span><br><span>  logging level lm3ua notice</span><br><span>  logging level lmgcp notice</span><br><span> !</span><br><span style="color: hsl(0, 100%, 40%);">-stats interval 5</span><br><span style="color: hsl(120, 100%, 40%);">+stats interval 0</span><br><span style="color: hsl(120, 100%, 40%);">+stats reporter statsd</span><br><span style="color: hsl(120, 100%, 40%);">+ prefix TTCN3</span><br><span style="color: hsl(120, 100%, 40%);">+ level subscriber</span><br><span style="color: hsl(120, 100%, 40%);">+ remote-ip 172.18.12.203</span><br><span style="color: hsl(120, 100%, 40%);">+ remote-port 8125</span><br><span style="color: hsl(120, 100%, 40%);">+ flush-period 1</span><br><span style="color: hsl(120, 100%, 40%);">+ mtu 1024</span><br><span style="color: hsl(120, 100%, 40%);">+ enable</span><br><span> !</span><br><span> line vty</span><br><span>  no login</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/19583">change 19583</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/+/19583"/><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: I6ed591cdc4d3108547eda2a1755ae6f6cef2b4d2 </div>
<div style="display:none"> Gerrit-Change-Number: 19583 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>