<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/20622">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bts: Use osmo-config-merge to generate osmo-{bts,bsc}.cfg<br><br>This uses the config files from osmo-ttcn3-hacks.git instead of keeping<br>local copies around here, which has shown many times will get out of<br>sync.<br><br>Change-Id: If15461240f3037c142c176fc7da745a1701ae3f8<br>---<br>M make/Makefile<br>M ttcn3-bts-test/Makefile<br>D ttcn3-bts-test/osmo-bsc.cfg<br>A ttcn3-bts-test/osmo-bsc.confmerge<br>D ttcn3-bts-test/osmo-bts.cfg<br>A ttcn3-bts-test/osmo-bts.confmerge<br>6 files changed, 32 insertions(+), 339 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/22/20622/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/make/Makefile b/make/Makefile</span><br><span>index d483082..9b74fc6 100644</span><br><span>--- a/make/Makefile</span><br><span>+++ b/make/Makefile</span><br><span>@@ -35,6 +35,8 @@</span><br><span> PULL?=</span><br><span> DISTRO?=debian-stretch</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_TTCN3_DIR?=../../osmo-ttcn3-hacks</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> RELEASE_SUPPORT := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))/.make-release-support</span><br><span> IMAGE?=$(REGISTRY_HOST)/$(USER)/$(NAME)</span><br><span> </span><br><span>diff --git a/ttcn3-bts-test/Makefile b/ttcn3-bts-test/Makefile</span><br><span>index 0895788..7ef5388 100644</span><br><span>--- a/ttcn3-bts-test/Makefile</span><br><span>+++ b/ttcn3-bts-test/Makefile</span><br><span>@@ -1,2 +1,13 @@</span><br><span> </span><br><span> include ../make/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+pre-build: osmo-bts.cfg osmo-bsc.cfg #fh/osmo-bsc.cfg oml/osmo-bts.cfg</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+osmo-bts.cfg: $(OSMO_TTCN3_DIR)/bts/osmo-bts.cfg osmo-bts.confmerge</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-config-merge $^ > $@</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+osmo-bsc.cfg: $(OSMO_TTCN3_DIR)/bts/osmo-bsc.cfg osmo-bsc.confmerge</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-config-merge $^ > $@</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+clean:</span><br><span style="color: hsl(120, 100%, 40%);">+ @rm -f osmo-bts.cfg osmo-bsc.cfg</span><br><span>diff --git a/ttcn3-bts-test/osmo-bsc.cfg b/ttcn3-bts-test/osmo-bsc.cfg</span><br><span>deleted file mode 100644</span><br><span>index 3978548..0000000</span><br><span>--- a/ttcn3-bts-test/osmo-bsc.cfg</span><br><span>+++ /dev/null</span><br><span>@@ -1,253 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-!</span><br><span style="color: hsl(0, 100%, 40%);">-! OsmoBSC (1.1.2.236-5f22) configuration saved from vty</span><br><span style="color: hsl(0, 100%, 40%);">-!!</span><br><span style="color: hsl(0, 100%, 40%);">-password foo</span><br><span style="color: hsl(0, 100%, 40%);">-!</span><br><span style="color: hsl(0, 100%, 40%);">-log gsmtap 172.18.9.10</span><br><span style="color: hsl(0, 100%, 40%);">- logging level set-all debug</span><br><span style="color: hsl(0, 100%, 40%);">- logging filter all 1</span><br><span style="color: hsl(0, 100%, 40%);">-!</span><br><span style="color: hsl(0, 100%, 40%);">-log stderr</span><br><span style="color: hsl(0, 100%, 40%);">- logging filter all 1</span><br><span style="color: hsl(0, 100%, 40%);">- logging color 1</span><br><span style="color: hsl(0, 100%, 40%);">- logging print category 1</span><br><span style="color: hsl(0, 100%, 40%);">- logging timestamp 1</span><br><span style="color: hsl(0, 100%, 40%);">- logging print extended-timestamp 1</span><br><span style="color: hsl(0, 100%, 40%);">- logging print file 1</span><br><span style="color: hsl(0, 100%, 40%);">- logging level set-all notice</span><br><span style="color: hsl(0, 100%, 40%);">- logging level rll info</span><br><span style="color: hsl(0, 100%, 40%);">- logging level rsl debug</span><br><span style="color: hsl(0, 100%, 40%);">- logging level msc debug</span><br><span style="color: hsl(0, 100%, 40%);">- logging level filter debug</span><br><span style="color: hsl(0, 100%, 40%);">- logging level pcu debug</span><br><span style="color: hsl(0, 100%, 40%);">- logging level lctrl info</span><br><span style="color: hsl(0, 100%, 40%);">- logging level lsccp info</span><br><span style="color: hsl(0, 100%, 40%);">-!</span><br><span style="color: hsl(0, 100%, 40%);">-stats interval 5</span><br><span style="color: hsl(0, 100%, 40%);">-!</span><br><span style="color: hsl(0, 100%, 40%);">-line vty</span><br><span style="color: hsl(0, 100%, 40%);">- no login</span><br><span style="color: hsl(0, 100%, 40%);">- bind 0.0.0.0</span><br><span style="color: hsl(0, 100%, 40%);">-!</span><br><span style="color: hsl(0, 100%, 40%);">-e1_input</span><br><span style="color: hsl(0, 100%, 40%);">- e1_line 0 driver ipa</span><br><span style="color: hsl(0, 100%, 40%);">- e1_line 0 port 0</span><br><span style="color: hsl(0, 100%, 40%);">- no e1_line 0 keepalive</span><br><span style="color: hsl(0, 100%, 40%);">- ipa bind 0.0.0.0</span><br><span style="color: hsl(0, 100%, 40%);">-cs7 instance 0</span><br><span style="color: hsl(0, 100%, 40%);">- point-code 0.23.3</span><br><span style="color: hsl(0, 100%, 40%);">- asp asp-clnt-msc-0 2905 0 m3ua</span><br><span style="color: hsl(0, 100%, 40%);">- as as-clnt-msc-0 m3ua</span><br><span style="color: hsl(0, 100%, 40%);">- asp asp-clnt-msc-0</span><br><span style="color: hsl(0, 100%, 40%);">- routing-key 2 0.23.3</span><br><span style="color: hsl(0, 100%, 40%);">-network</span><br><span style="color: hsl(0, 100%, 40%);">- network country code 1</span><br><span style="color: hsl(0, 100%, 40%);">- mobile network code 1</span><br><span style="color: hsl(0, 100%, 40%);">- encryption a5 0</span><br><span style="color: hsl(0, 100%, 40%);">- neci 1</span><br><span style="color: hsl(0, 100%, 40%);">- paging any use tch 0</span><br><span style="color: hsl(0, 100%, 40%);">- handover 0</span><br><span style="color: hsl(0, 100%, 40%);">- handover1 window rxlev averaging 10</span><br><span style="color: hsl(0, 100%, 40%);">- handover1 window rxqual averaging 1</span><br><span style="color: hsl(0, 100%, 40%);">- handover1 window rxlev neighbor averaging 10</span><br><span style="color: hsl(0, 100%, 40%);">- handover1 power budget interval 6</span><br><span style="color: hsl(0, 100%, 40%);">- handover1 power budget hysteresis 3</span><br><span style="color: hsl(0, 100%, 40%);">- handover1 maximum distance 9999</span><br><span style="color: hsl(0, 100%, 40%);">- timer t3212 30</span><br><span style="color: hsl(0, 100%, 40%);">- bts 0</span><br><span style="color: hsl(0, 100%, 40%);">- type sysmobts</span><br><span style="color: hsl(0, 100%, 40%);">- band DCS1800</span><br><span style="color: hsl(0, 100%, 40%);">- cell_identity 0</span><br><span style="color: hsl(0, 100%, 40%);">- location_area_code 1</span><br><span style="color: hsl(0, 100%, 40%);">- dtx uplink force</span><br><span style="color: hsl(0, 100%, 40%);">- dtx downlink</span><br><span style="color: hsl(0, 100%, 40%);">- base_station_id_code 63</span><br><span style="color: hsl(0, 100%, 40%);">- ms max power 15</span><br><span style="color: hsl(0, 100%, 40%);">- cell reselection hysteresis 4</span><br><span style="color: hsl(0, 100%, 40%);">- rxlev access min 0</span><br><span style="color: hsl(0, 100%, 40%);">- radio-link-timeout 32</span><br><span style="color: hsl(0, 100%, 40%);">- channel allocator ascending</span><br><span style="color: hsl(0, 100%, 40%);">- rach tx integer 9</span><br><span style="color: hsl(0, 100%, 40%);">- rach max transmission 7</span><br><span style="color: hsl(0, 100%, 40%);">- channel-descrption attach 1</span><br><span style="color: hsl(0, 100%, 40%);">- channel-descrption bs-pa-mfrms 5</span><br><span style="color: hsl(0, 100%, 40%);">- channel-descrption bs-ag-blks-res 1</span><br><span style="color: hsl(0, 100%, 40%);">- early-classmark-sending forbidden</span><br><span style="color: hsl(0, 100%, 40%);">- early-classmark-sending-3g allowed</span><br><span style="color: hsl(0, 100%, 40%);">- ip.access unit_id 1234 0</span><br><span style="color: hsl(0, 100%, 40%);">- ip.access rsl-ip 172.18.9.10</span><br><span style="color: hsl(0, 100%, 40%);">- oml ip.access stream_id 255 line 0</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor-list mode manual-si5</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor-list add arfcn 100</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor-list add arfcn 200</span><br><span style="color: hsl(0, 100%, 40%);">- si5 neighbor-list add arfcn 10</span><br><span style="color: hsl(0, 100%, 40%);">- si5 neighbor-list add arfcn 20</span><br><span style="color: hsl(0, 100%, 40%);">- codec-support fr</span><br><span style="color: hsl(0, 100%, 40%);">- gprs mode gprs</span><br><span style="color: hsl(0, 100%, 40%);">- gprs routing area 0</span><br><span style="color: hsl(0, 100%, 40%);">- gprs network-control-order nc0</span><br><span style="color: hsl(0, 100%, 40%);">- gprs cell bvci 1234</span><br><span style="color: hsl(0, 100%, 40%);">- gprs cell timer blocking-timer 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs cell timer blocking-retries 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs cell timer unblocking-retries 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs cell timer reset-timer 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs cell timer reset-retries 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs cell timer suspend-timer 10</span><br><span style="color: hsl(0, 100%, 40%);">- gprs cell timer suspend-retries 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs cell timer resume-timer 10</span><br><span style="color: hsl(0, 100%, 40%);">- gprs cell timer resume-retries 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs cell timer capability-update-timer 10</span><br><span style="color: hsl(0, 100%, 40%);">- gprs cell timer capability-update-retries 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs nsei 1234</span><br><span style="color: hsl(0, 100%, 40%);">- gprs ns timer tns-block 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs ns timer tns-block-retries 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs ns timer tns-reset 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs ns timer tns-reset-retries 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs ns timer tns-test 30</span><br><span style="color: hsl(0, 100%, 40%);">- gprs ns timer tns-alive 3</span><br><span style="color: hsl(0, 100%, 40%);">- gprs ns timer tns-alive-retries 10</span><br><span style="color: hsl(0, 100%, 40%);">- gprs nsvc 0 nsvci 1234</span><br><span style="color: hsl(0, 100%, 40%);">- gprs nsvc 0 local udp port 23000</span><br><span style="color: hsl(0, 100%, 40%);">- gprs nsvc 0 remote udp port 23000</span><br><span style="color: hsl(0, 100%, 40%);">- gprs nsvc 0 remote ip 0.0.0.0</span><br><span style="color: hsl(0, 100%, 40%);">- no force-combined-si</span><br><span style="color: hsl(0, 100%, 40%);">- trx 0</span><br><span style="color: hsl(0, 100%, 40%);">- rf_locked 0</span><br><span style="color: hsl(0, 100%, 40%);">- arfcn 871</span><br><span style="color: hsl(0, 100%, 40%);">- nominal power 50</span><br><span style="color: hsl(0, 100%, 40%);">- max_power_red 20</span><br><span style="color: hsl(0, 100%, 40%);">- rsl e1 tei 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 0</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config CCCH+SDCCH4</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 1</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config TCH/F</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 2</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config TCH/F</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 3</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config TCH/F_PDCH</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 4</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config TCH/F_TCH/H_PDCH</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 5</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config TCH/H</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 6</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config SDCCH8</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 7</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config PDCH</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- trx 1</span><br><span style="color: hsl(0, 100%, 40%);">- rf_locked 0</span><br><span style="color: hsl(0, 100%, 40%);">- arfcn 873</span><br><span style="color: hsl(0, 100%, 40%);">- nominal power 50</span><br><span style="color: hsl(0, 100%, 40%);">- max_power_red 20</span><br><span style="color: hsl(0, 100%, 40%);">- rsl e1 tei 1</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 0</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config TCH/F</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 1</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config SDCCH8</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 2</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config PDCH</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 3</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config TCH/F_TCH/H_PDCH</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 4</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config TCH/F_PDCH</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 5</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config SDCCH8</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 6</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config PDCH</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 7</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config PDCH</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- trx 2</span><br><span style="color: hsl(0, 100%, 40%);">- rf_locked 0</span><br><span style="color: hsl(0, 100%, 40%);">- arfcn 875</span><br><span style="color: hsl(0, 100%, 40%);">- nominal power 50</span><br><span style="color: hsl(0, 100%, 40%);">- max_power_red 20</span><br><span style="color: hsl(0, 100%, 40%);">- rsl e1 tei 2</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 0</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config TCH/H</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 1</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config PDCH</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 2</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config SDCCH8</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 3</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config PDCH</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 4</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config SDCCH8</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 5</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config TCH/F</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 6</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config PDCH</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 7</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config PDCH</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- trx 3</span><br><span style="color: hsl(0, 100%, 40%);">- rf_locked 0</span><br><span style="color: hsl(0, 100%, 40%);">- arfcn 877</span><br><span style="color: hsl(0, 100%, 40%);">- nominal power 50</span><br><span style="color: hsl(0, 100%, 40%);">- max_power_red 20</span><br><span style="color: hsl(0, 100%, 40%);">- rsl e1 tei 3</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 0</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config PDCH</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 1</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config TCH/H</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 2</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config TCH/H</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 3</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config SDCCH8</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 4</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config PDCH</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 5</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config TCH/F</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 6</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config PDCH</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 7</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config SDCCH8</span><br><span style="color: hsl(0, 100%, 40%);">- hopping enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">-msc 0</span><br><span style="color: hsl(0, 100%, 40%);">- core-location-area-code 666</span><br><span style="color: hsl(0, 100%, 40%);">- core-cell-identity 333</span><br><span style="color: hsl(0, 100%, 40%);">- no bsc-welcome-text</span><br><span style="color: hsl(0, 100%, 40%);">- no bsc-msc-lost-text</span><br><span style="color: hsl(0, 100%, 40%);">- no bsc-grace-text</span><br><span style="color: hsl(0, 100%, 40%);">- codec-list fr1 fr2 fr3</span><br><span style="color: hsl(0, 100%, 40%);">- type normal</span><br><span style="color: hsl(0, 100%, 40%);">- allow-emergency allow</span><br><span style="color: hsl(0, 100%, 40%);">- amr-config 12_2k forbidden</span><br><span style="color: hsl(0, 100%, 40%);">- amr-config 10_2k forbidden</span><br><span style="color: hsl(0, 100%, 40%);">- amr-config 7_95k forbidden</span><br><span style="color: hsl(0, 100%, 40%);">- amr-config 7_40k forbidden</span><br><span style="color: hsl(0, 100%, 40%);">- amr-config 6_70k forbidden</span><br><span style="color: hsl(0, 100%, 40%);">- amr-config 5_90k allowed</span><br><span style="color: hsl(0, 100%, 40%);">- amr-config 5_15k forbidden</span><br><span style="color: hsl(0, 100%, 40%);">- amr-config 4_75k forbidden</span><br><span style="color: hsl(0, 100%, 40%);">-bsc</span><br><span style="color: hsl(0, 100%, 40%);">- mid-call-timeout 0</span><br><span style="color: hsl(0, 100%, 40%);">- no missing-msc-text</span><br><span>diff --git a/ttcn3-bts-test/osmo-bsc.confmerge b/ttcn3-bts-test/osmo-bsc.confmerge</span><br><span>new file mode 100644</span><br><span>index 0000000..11f8076</span><br><span>--- /dev/null</span><br><span>+++ b/ttcn3-bts-test/osmo-bsc.confmerge</span><br><span>@@ -0,0 +1,8 @@</span><br><span style="color: hsl(120, 100%, 40%);">+log gsmtap 172.18.9.10</span><br><span style="color: hsl(120, 100%, 40%);">+line vty</span><br><span style="color: hsl(120, 100%, 40%);">+ bind 0.0.0.0</span><br><span style="color: hsl(120, 100%, 40%);">+e1_input</span><br><span style="color: hsl(120, 100%, 40%);">+ ipa bind 0.0.0.0</span><br><span style="color: hsl(120, 100%, 40%);">+network</span><br><span style="color: hsl(120, 100%, 40%);">+ bts 0</span><br><span style="color: hsl(120, 100%, 40%);">+ ip.access rsl-ip 172.18.9.10</span><br><span>diff --git a/ttcn3-bts-test/osmo-bts.cfg b/ttcn3-bts-test/osmo-bts.cfg</span><br><span>deleted file mode 100644</span><br><span>index 5357801..0000000</span><br><span>--- a/ttcn3-bts-test/osmo-bts.cfg</span><br><span>+++ /dev/null</span><br><span>@@ -1,86 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-!</span><br><span style="color: hsl(0, 100%, 40%);">-! OsmoBTS (0.4.0.446-e0fb) configuration saved from vty</span><br><span style="color: hsl(0, 100%, 40%);">-!!</span><br><span style="color: hsl(0, 100%, 40%);">-!</span><br><span style="color: hsl(0, 100%, 40%);">-log gsmtap 172.18.9.10</span><br><span style="color: hsl(0, 100%, 40%);">- logging level set-all debug</span><br><span style="color: hsl(0, 100%, 40%);">- logging filter all 1</span><br><span style="color: hsl(0, 100%, 40%);">-!</span><br><span style="color: hsl(0, 100%, 40%);">-log stderr</span><br><span style="color: hsl(0, 100%, 40%);">- logging filter all 1</span><br><span style="color: hsl(0, 100%, 40%);">- logging color 1</span><br><span style="color: hsl(0, 100%, 40%);">- logging print category 1</span><br><span style="color: hsl(0, 100%, 40%);">- logging timestamp 1</span><br><span style="color: hsl(0, 100%, 40%);">- logging print extended-timestamp 1</span><br><span style="color: hsl(0, 100%, 40%);">- logging level set-all notice</span><br><span style="color: hsl(0, 100%, 40%);">- logging level rsl info</span><br><span style="color: hsl(0, 100%, 40%);">- logging level oml info</span><br><span style="color: hsl(0, 100%, 40%);">- logging level meas info</span><br><span style="color: hsl(0, 100%, 40%);">- logging level pag info</span><br><span style="color: hsl(0, 100%, 40%);">- logging level l1c info</span><br><span style="color: hsl(0, 100%, 40%);">- logging level dsp info</span><br><span style="color: hsl(0, 100%, 40%);">- logging level pcu debug</span><br><span style="color: hsl(0, 100%, 40%);">- logging level trx info</span><br><span style="color: hsl(0, 100%, 40%);">- logging level lmib debug</span><br><span style="color: hsl(0, 100%, 40%);">-!</span><br><span style="color: hsl(0, 100%, 40%);">-line vty</span><br><span style="color: hsl(0, 100%, 40%);">- no login</span><br><span style="color: hsl(0, 100%, 40%);">- bind 0.0.0.0</span><br><span style="color: hsl(0, 100%, 40%);">-!</span><br><span style="color: hsl(0, 100%, 40%);">-e1_input</span><br><span style="color: hsl(0, 100%, 40%);">- e1_line 0 driver ipa</span><br><span style="color: hsl(0, 100%, 40%);">- e1_line 0 port 0</span><br><span style="color: hsl(0, 100%, 40%);">- no e1_line 0 keepalive</span><br><span style="color: hsl(0, 100%, 40%);">-phy 0</span><br><span style="color: hsl(0, 100%, 40%);">- osmotrx ip local 172.18.9.20</span><br><span style="color: hsl(0, 100%, 40%);">- osmotrx ip remote 172.18.9.21</span><br><span style="color: hsl(0, 100%, 40%);">- osmotrx fn-advance 20</span><br><span style="color: hsl(0, 100%, 40%);">- osmotrx rts-advance 5</span><br><span style="color: hsl(0, 100%, 40%);">- instance 0</span><br><span style="color: hsl(0, 100%, 40%);">- osmotrx rx-gain 10</span><br><span style="color: hsl(0, 100%, 40%);">- instance 1</span><br><span style="color: hsl(0, 100%, 40%);">- osmotrx rx-gain 10</span><br><span style="color: hsl(0, 100%, 40%);">- instance 2</span><br><span style="color: hsl(0, 100%, 40%);">- osmotrx rx-gain 10</span><br><span style="color: hsl(0, 100%, 40%);">- instance 3</span><br><span style="color: hsl(0, 100%, 40%);">- osmotrx rx-gain 10</span><br><span style="color: hsl(0, 100%, 40%);">-bts 0</span><br><span style="color: hsl(0, 100%, 40%);">- band DCS1800</span><br><span style="color: hsl(0, 100%, 40%);">- ipa unit-id 1234 0</span><br><span style="color: hsl(0, 100%, 40%);">- oml remote-ip 172.18.9.11</span><br><span style="color: hsl(0, 100%, 40%);">- rtp jitter-buffer 100</span><br><span style="color: hsl(0, 100%, 40%);">- paging queue-size 200</span><br><span style="color: hsl(0, 100%, 40%);">- paging lifetime 0</span><br><span style="color: hsl(0, 100%, 40%);">- uplink-power-target -75</span><br><span style="color: hsl(0, 100%, 40%);">- gsmtap-sapi rach</span><br><span style="color: hsl(0, 100%, 40%);">- gsmtap-sapi agch</span><br><span style="color: hsl(0, 100%, 40%);">- gsmtap-sapi bcch</span><br><span style="color: hsl(0, 100%, 40%);">- gsmtap-sapi pch</span><br><span style="color: hsl(0, 100%, 40%);">- gsmtap-sapi sdcch</span><br><span style="color: hsl(0, 100%, 40%);">- gsmtap-sapi sacch</span><br><span style="color: hsl(0, 100%, 40%);">- min-qual-rach 50</span><br><span style="color: hsl(0, 100%, 40%);">- min-qual-norm -5</span><br><span style="color: hsl(0, 100%, 40%);">- !settsc</span><br><span style="color: hsl(0, 100%, 40%);">- pcu-socket /data/unix/pcu_sock</span><br><span style="color: hsl(0, 100%, 40%);">- trx 0</span><br><span style="color: hsl(0, 100%, 40%);">- power-ramp max-initial 0 mdBm</span><br><span style="color: hsl(0, 100%, 40%);">- power-ramp step-size 8000 mdB</span><br><span style="color: hsl(0, 100%, 40%);">- power-ramp step-interval 1</span><br><span style="color: hsl(0, 100%, 40%);">- phy 0 instance 0</span><br><span style="color: hsl(0, 100%, 40%);">- trx 1</span><br><span style="color: hsl(0, 100%, 40%);">- power-ramp max-initial 0 mdBm</span><br><span style="color: hsl(0, 100%, 40%);">- power-ramp step-size 8000 mdB</span><br><span style="color: hsl(0, 100%, 40%);">- power-ramp step-interval 1</span><br><span style="color: hsl(0, 100%, 40%);">- phy 0 instance 1</span><br><span style="color: hsl(0, 100%, 40%);">- trx 2</span><br><span style="color: hsl(0, 100%, 40%);">- power-ramp max-initial 0 mdBm</span><br><span style="color: hsl(0, 100%, 40%);">- power-ramp step-size 8000 mdB</span><br><span style="color: hsl(0, 100%, 40%);">- power-ramp step-interval 1</span><br><span style="color: hsl(0, 100%, 40%);">- phy 0 instance 2</span><br><span style="color: hsl(0, 100%, 40%);">- trx 3</span><br><span style="color: hsl(0, 100%, 40%);">- power-ramp max-initial 0 mdBm</span><br><span style="color: hsl(0, 100%, 40%);">- power-ramp step-size 8000 mdB</span><br><span style="color: hsl(0, 100%, 40%);">- power-ramp step-interval 1</span><br><span style="color: hsl(0, 100%, 40%);">- phy 0 instance 3</span><br><span style="color: hsl(0, 100%, 40%);">-ctrl</span><br><span style="color: hsl(0, 100%, 40%);">- bind 0.0.0.0</span><br><span>diff --git a/ttcn3-bts-test/osmo-bts.confmerge b/ttcn3-bts-test/osmo-bts.confmerge</span><br><span>new file mode 100644</span><br><span>index 0000000..2783da9</span><br><span>--- /dev/null</span><br><span>+++ b/ttcn3-bts-test/osmo-bts.confmerge</span><br><span>@@ -0,0 +1,11 @@</span><br><span style="color: hsl(120, 100%, 40%);">+log gsmtap 172.18.9.10</span><br><span style="color: hsl(120, 100%, 40%);">+line vty</span><br><span style="color: hsl(120, 100%, 40%);">+ bind 0.0.0.0</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%);">+bts 0</span><br><span style="color: hsl(120, 100%, 40%);">+ oml remote-ip 172.18.9.11</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu-socket /data/unix/pcu_sock</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/c/docker-playground/+/20622">change 20622</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/+/20622"/><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: If15461240f3037c142c176fc7da745a1701ae3f8 </div>
<div style="display:none"> Gerrit-Change-Number: 20622 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>