From 1d60e6be3e9ff05992d33b039a92b18873b02605 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Wed, 29 May 2019 19:04:51 +0000 Subject: ttcn3-bts-test: Execute OML tests without BSC Run the testsuite one more time; this time for OML tests which require us to run without a BSC. We can run those with trxcon and omso-bts-trx and don't need virtphy for them. Related: OS#4031 Depends: osmo-ttcn3-hacks I82bb85b684d2db3a6b1e96a68ffde03e22affa6b Change-Id: I97db9c74c56ca93c75e5e5226955799cd945eec0 --- ttcn3-bts-test/jenkins.sh | 19 +++++++-- ttcn3-bts-test/oml/BTS_Tests.cfg | 25 ++++++++++++ ttcn3-bts-test/oml/osmo-bts.cfg | 85 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 126 insertions(+), 3 deletions(-) create mode 100644 ttcn3-bts-test/oml/BTS_Tests.cfg create mode 100644 ttcn3-bts-test/oml/osmo-bts.cfg diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index 4feb8f5..2d49e0b 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -118,13 +118,26 @@ start_bts virtual start_virtphy # ... and execute the testsuite again with different cfg cp virtphy/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester/ -start_testsuite +#start_testsuite +# 3) OML tests require us to run without BSC +docker container kill ${BUILD_TAG}-bsc +# switch back from virtphy + osmo-bts-virtual to osmo-bts-trx +docker container kill ${BUILD_TAG}-virtphy +docker container kill ${BUILD_TAG}-bts +cp oml/osmo-bts.cfg $VOL_BASE_DIR/bts/ +start_bts trx +start_fake_trx +start_trxcon +# ... and execute the testsuite again with different cfg +cp oml/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester/ +start_testsuite echo Stopping containers -docker container kill ${BUILD_TAG}-virtphy +docker container kill ${BUILD_TAG}-trxcon +docker container kill ${BUILD_TAG}-fake_trx docker container kill ${BUILD_TAG}-bts -docker container kill ${BUILD_TAG}-bsc + network_remove rm -rf $VOL_BASE_DIR/unix diff --git a/ttcn3-bts-test/oml/BTS_Tests.cfg b/ttcn3-bts-test/oml/BTS_Tests.cfg new file mode 100644 index 0000000..c7215e1 --- /dev/null +++ b/ttcn3-bts-test/oml/BTS_Tests.cfg @@ -0,0 +1,25 @@ +[ORDERED_INCLUDE] +"/osmo-ttcn3-hacks/Common.cfg" +"/osmo-ttcn3-hacks/bts/BTS_Tests.default" + +[LOGGING] +*.JUnitLogger.filename_stem := "junit-xml-oml" + +[TESTPORT_PARAMETERS] +*.BTSVTY.CTRL_HOSTNAME := "172.18.9.20" +*.BSCVTY.CTRL_HOSTNAME := "172.18.9.11" + +[MODULE_PARAMETERS] +BTS_Tests.mp_rsl_ip := "172.18.9.10" +BTS_Tests.mp_bts_trxc_ip := "172.18.9.21" +BTS_Tests.mp_pcu_socket := "/data/unix/pcu_sock" +L1CTL_PortType.m_l1ctl_sock_path := "/data/unix/osmocom_l2" +BTS_Tests.mp_ctrl_ip := "172.18.9.20" + +BTS_Tests_OML.mp_oml_ip := "172.18.9.10" +BTS_Tests_OML.mp_oml_port := 3002 + +[MAIN_CONTROLLER] + +[EXECUTE] +BTS_Tests_OML.control diff --git a/ttcn3-bts-test/oml/osmo-bts.cfg b/ttcn3-bts-test/oml/osmo-bts.cfg new file mode 100644 index 0000000..4ed1951 --- /dev/null +++ b/ttcn3-bts-test/oml/osmo-bts.cfg @@ -0,0 +1,85 @@ +! +! OsmoBTS (0.4.0.446-e0fb) configuration saved from vty +!! +! +log file /data/osmo-bts.log + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging print extended-timestamp 1 + logging level rsl info + logging level oml info + logging level rll notice + logging level rr notice + logging level meas info + logging level pag info + logging level l1c info + logging level l1p notice + logging level dsp info + logging level pcu debug + logging level ho notice + logging level trx info + logging level loop notice + logging level abis notice + logging level rtp notice + logging level sum notice + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib debug + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice +! +line vty + no login + bind 0.0.0.0 +! +e1_input + e1_line 0 driver ipa + e1_line 0 port 0 + no e1_line 0 keepalive +phy 0 + osmotrx ip local 172.18.9.20 + osmotrx ip remote 172.18.9.21 + osmotrx fn-advance 20 + osmotrx rts-advance 5 + instance 0 + osmotrx rx-gain 10 + osmotrx tx-attenuation 0 +bts 0 + band DCS1800 + ipa unit-id 1234 0 + oml remote-ip 172.18.9.10 + rtp jitter-buffer 100 + paging queue-size 200 + paging lifetime 0 + uplink-power-target -75 + gsmtap-sapi rach + gsmtap-sapi agch + gsmtap-sapi bcch + gsmtap-sapi pch + gsmtap-sapi sdcch + gsmtap-sapi sacch + min-qual-rach 50 + min-qual-norm -5 + !settsc + pcu-socket /data/unix/pcu_sock + trx 0 + power-ramp max-initial 0 mdBm + power-ramp step-size 2000 mdB + power-ramp step-interval 1 + ms-power-control dsp + phy 0 instance 0 +ctrl + bind 0.0.0.0 -- cgit v1.2.3