<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/14271">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved; Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ttcn3-bts-test: Execute OML tests without BSC<br><br>Run the testsuite one more time; this time for OML tests which<br>require us to run without a BSC. We can run those with trxcon<br>and omso-bts-trx and don't need virtphy for them.<br><br>Related: OS#4031<br>Depends: osmo-ttcn3-hacks I82bb85b684d2db3a6b1e96a68ffde03e22affa6b<br>Change-Id: I97db9c74c56ca93c75e5e5226955799cd945eec0<br>---<br>M ttcn3-bts-test/jenkins.sh<br>A ttcn3-bts-test/oml/BTS_Tests.cfg<br>A ttcn3-bts-test/oml/osmo-bts.cfg<br>3 files changed, 127 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh</span><br><span>index 4feb8f5..2d49e0b 100755</span><br><span>--- a/ttcn3-bts-test/jenkins.sh</span><br><span>+++ b/ttcn3-bts-test/jenkins.sh</span><br><span>@@ -118,13 +118,26 @@</span><br><span> start_virtphy</span><br><span> # ... and execute the testsuite again with different cfg</span><br><span> cp virtphy/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester/</span><br><span style="color: hsl(0, 100%, 40%);">-start_testsuite</span><br><span style="color: hsl(120, 100%, 40%);">+#start_testsuite</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-echo Stopping containers</span><br><span style="color: hsl(120, 100%, 40%);">+# 3) OML tests require us to run without BSC</span><br><span style="color: hsl(120, 100%, 40%);">+docker container kill ${BUILD_TAG}-bsc</span><br><span style="color: hsl(120, 100%, 40%);">+# switch back from virtphy + osmo-bts-virtual to osmo-bts-trx</span><br><span> docker container kill ${BUILD_TAG}-virtphy</span><br><span> docker container kill ${BUILD_TAG}-bts</span><br><span style="color: hsl(0, 100%, 40%);">-docker container kill ${BUILD_TAG}-bsc</span><br><span style="color: hsl(120, 100%, 40%);">+cp oml/osmo-bts.cfg $VOL_BASE_DIR/bts/</span><br><span style="color: hsl(120, 100%, 40%);">+start_bts trx</span><br><span style="color: hsl(120, 100%, 40%);">+start_fake_trx</span><br><span style="color: hsl(120, 100%, 40%);">+start_trxcon</span><br><span style="color: hsl(120, 100%, 40%);">+# ... and execute the testsuite again with different cfg</span><br><span style="color: hsl(120, 100%, 40%);">+cp oml/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester/</span><br><span style="color: hsl(120, 100%, 40%);">+start_testsuite</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+echo Stopping containers</span><br><span style="color: hsl(120, 100%, 40%);">+docker container kill ${BUILD_TAG}-trxcon</span><br><span style="color: hsl(120, 100%, 40%);">+docker container kill ${BUILD_TAG}-fake_trx</span><br><span style="color: hsl(120, 100%, 40%);">+docker container kill ${BUILD_TAG}-bts</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> network_remove</span><br><span> rm -rf $VOL_BASE_DIR/unix</span><br><span>diff --git a/ttcn3-bts-test/oml/BTS_Tests.cfg b/ttcn3-bts-test/oml/BTS_Tests.cfg</span><br><span>new file mode 100644</span><br><span>index 0000000..c7215e1</span><br><span>--- /dev/null</span><br><span>+++ b/ttcn3-bts-test/oml/BTS_Tests.cfg</span><br><span>@@ -0,0 +1,25 @@</span><br><span style="color: hsl(120, 100%, 40%);">+[ORDERED_INCLUDE]</span><br><span style="color: hsl(120, 100%, 40%);">+"/osmo-ttcn3-hacks/Common.cfg"</span><br><span style="color: hsl(120, 100%, 40%);">+"/osmo-ttcn3-hacks/bts/BTS_Tests.default"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[LOGGING]</span><br><span style="color: hsl(120, 100%, 40%);">+*.JUnitLogger.filename_stem := "junit-xml-oml"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[TESTPORT_PARAMETERS]</span><br><span style="color: hsl(120, 100%, 40%);">+*.BTSVTY.CTRL_HOSTNAME := "172.18.9.20"</span><br><span style="color: hsl(120, 100%, 40%);">+*.BSCVTY.CTRL_HOSTNAME := "172.18.9.11"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[MODULE_PARAMETERS]</span><br><span style="color: hsl(120, 100%, 40%);">+BTS_Tests.mp_rsl_ip := "172.18.9.10"</span><br><span style="color: hsl(120, 100%, 40%);">+BTS_Tests.mp_bts_trxc_ip := "172.18.9.21"</span><br><span style="color: hsl(120, 100%, 40%);">+BTS_Tests.mp_pcu_socket := "/data/unix/pcu_sock"</span><br><span style="color: hsl(120, 100%, 40%);">+L1CTL_PortType.m_l1ctl_sock_path := "/data/unix/osmocom_l2"</span><br><span style="color: hsl(120, 100%, 40%);">+BTS_Tests.mp_ctrl_ip := "172.18.9.20"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+BTS_Tests_OML.mp_oml_ip := "172.18.9.10"</span><br><span style="color: hsl(120, 100%, 40%);">+BTS_Tests_OML.mp_oml_port := 3002</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[MAIN_CONTROLLER]</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+[EXECUTE]</span><br><span style="color: hsl(120, 100%, 40%);">+BTS_Tests_OML.control</span><br><span>diff --git a/ttcn3-bts-test/oml/osmo-bts.cfg b/ttcn3-bts-test/oml/osmo-bts.cfg</span><br><span>new file mode 100644</span><br><span>index 0000000..4ed1951</span><br><span>--- /dev/null</span><br><span>+++ b/ttcn3-bts-test/oml/osmo-bts.cfg</span><br><span>@@ -0,0 +1,85 @@</span><br><span style="color: hsl(120, 100%, 40%);">+!</span><br><span style="color: hsl(120, 100%, 40%);">+! OsmoBTS (0.4.0.446-e0fb) 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 file /data/osmo-bts.log</span><br><span style="color: hsl(120, 100%, 40%);">+ logging filter all 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging color 0</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print category 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging timestamp 1</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 rsl info</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level oml info</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level rll notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level rr notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level meas info</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level pag info</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level l1c info</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level l1p notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level dsp info</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level pcu debug</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level ho notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level trx info</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level loop notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level abis notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level rtp notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level sum notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lglobal notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level llapd notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level linp notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lmux notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lmi notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lmib debug</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lsms notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lctrl notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lgtp notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lstats notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lgsup notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level loap notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lss7 notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lsccp notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lsua notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lm3ua notice</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%);">+ bind 0.0.0.0</span><br><span style="color: hsl(120, 100%, 40%);">+!</span><br><span style="color: hsl(120, 100%, 40%);">+e1_input</span><br><span style="color: hsl(120, 100%, 40%);">+ e1_line 0 driver ipa</span><br><span style="color: hsl(120, 100%, 40%);">+ e1_line 0 port 0</span><br><span style="color: hsl(120, 100%, 40%);">+ no e1_line 0 keepalive</span><br><span style="color: hsl(120, 100%, 40%);">+phy 0</span><br><span style="color: hsl(120, 100%, 40%);">+ osmotrx ip local 172.18.9.20</span><br><span style="color: hsl(120, 100%, 40%);">+ osmotrx ip remote 172.18.9.21</span><br><span style="color: hsl(120, 100%, 40%);">+ osmotrx fn-advance 20</span><br><span style="color: hsl(120, 100%, 40%);">+ osmotrx rts-advance 5</span><br><span style="color: hsl(120, 100%, 40%);">+ instance 0</span><br><span style="color: hsl(120, 100%, 40%);">+ osmotrx rx-gain 10</span><br><span style="color: hsl(120, 100%, 40%);">+ osmotrx tx-attenuation 0</span><br><span style="color: hsl(120, 100%, 40%);">+bts 0</span><br><span style="color: hsl(120, 100%, 40%);">+ band DCS1800</span><br><span style="color: hsl(120, 100%, 40%);">+ ipa unit-id 1234 0</span><br><span style="color: hsl(120, 100%, 40%);">+ oml remote-ip 172.18.9.10</span><br><span style="color: hsl(120, 100%, 40%);">+ rtp jitter-buffer 100</span><br><span style="color: hsl(120, 100%, 40%);">+ paging queue-size 200</span><br><span style="color: hsl(120, 100%, 40%);">+ paging lifetime 0</span><br><span style="color: hsl(120, 100%, 40%);">+ uplink-power-target -75</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-sapi rach</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-sapi agch</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-sapi bcch</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-sapi pch</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-sapi sdcch</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-sapi sacch</span><br><span style="color: hsl(120, 100%, 40%);">+ min-qual-rach 50</span><br><span style="color: hsl(120, 100%, 40%);">+ min-qual-norm -5</span><br><span style="color: hsl(120, 100%, 40%);">+ !settsc</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu-socket /data/unix/pcu_sock</span><br><span style="color: hsl(120, 100%, 40%);">+ trx 0</span><br><span style="color: hsl(120, 100%, 40%);">+ power-ramp max-initial 0 mdBm</span><br><span style="color: hsl(120, 100%, 40%);">+ power-ramp step-size 2000 mdB</span><br><span style="color: hsl(120, 100%, 40%);">+ power-ramp step-interval 1</span><br><span style="color: hsl(120, 100%, 40%);">+ ms-power-control dsp</span><br><span style="color: hsl(120, 100%, 40%);">+ phy 0 instance 0</span><br><span style="color: hsl(120, 100%, 40%);">+ctrl</span><br><span style="color: hsl(120, 100%, 40%);">+ bind 0.0.0.0</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14271">change 14271</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/14271"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I97db9c74c56ca93c75e5e5226955799cd945eec0 </div>
<div style="display:none"> Gerrit-Change-Number: 14271 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>