Change in docker-playground[master]: bts: Use osmo-config-merge to generate osmo-{bts, bsc}.cfg

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

laforge gerrit-no-reply at lists.osmocom.org
Mon Oct 12 19:17:03 UTC 2020 

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/20622 )


Change subject: bts: Use osmo-config-merge to generate osmo-{bts,bsc}.cfg
......................................................................

bts: Use osmo-config-merge to generate osmo-{bts,bsc}.cfg

This uses the config files from osmo-ttcn3-hacks.git instead of keeping
local copies around here, which has shown many times will get out of
sync.

Change-Id: If15461240f3037c142c176fc7da745a1701ae3f8
---
M make/Makefile
M ttcn3-bts-test/Makefile
D ttcn3-bts-test/osmo-bsc.cfg
A ttcn3-bts-test/osmo-bsc.confmerge
D ttcn3-bts-test/osmo-bts.cfg
A ttcn3-bts-test/osmo-bts.confmerge
6 files changed, 32 insertions(+), 339 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/22/20622/1

diff --git a/make/Makefile b/make/Makefile
index d483082..9b74fc6 100644
--- a/make/Makefile
+++ b/make/Makefile
@@ -35,6 +35,8 @@
 PULL?=
 DISTRO?=debian-stretch
 
+OSMO_TTCN3_DIR?=../../osmo-ttcn3-hacks
+
 RELEASE_SUPPORT := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))/.make-release-support
 IMAGE?=$(REGISTRY_HOST)/$(USER)/$(NAME)
 
diff --git a/ttcn3-bts-test/Makefile b/ttcn3-bts-test/Makefile
index 0895788..7ef5388 100644
--- a/ttcn3-bts-test/Makefile
+++ b/ttcn3-bts-test/Makefile
@@ -1,2 +1,13 @@
 
 include ../make/Makefile
+
+pre-build: osmo-bts.cfg osmo-bsc.cfg #fh/osmo-bsc.cfg oml/osmo-bts.cfg
+
+osmo-bts.cfg: $(OSMO_TTCN3_DIR)/bts/osmo-bts.cfg osmo-bts.confmerge
+	osmo-config-merge $^ > $@
+
+osmo-bsc.cfg: $(OSMO_TTCN3_DIR)/bts/osmo-bsc.cfg osmo-bsc.confmerge
+	osmo-config-merge $^ > $@
+
+clean:
+	@rm -f osmo-bts.cfg osmo-bsc.cfg
diff --git a/ttcn3-bts-test/osmo-bsc.cfg b/ttcn3-bts-test/osmo-bsc.cfg
deleted file mode 100644
index 3978548..0000000
--- a/ttcn3-bts-test/osmo-bsc.cfg
+++ /dev/null
@@ -1,253 +0,0 @@
-!
-! OsmoBSC (1.1.2.236-5f22) configuration saved from vty
-!!
-password foo
-!
-log gsmtap 172.18.9.10
- logging level set-all debug
- logging filter all 1
-!
-log stderr
- logging filter all 1
- logging color 1
- logging print category 1
- logging timestamp 1
- logging print extended-timestamp 1
- logging print file 1
- logging level set-all notice
- logging level rll info
- logging level rsl debug
- logging level msc debug
- logging level filter debug
- logging level pcu debug
- logging level lctrl info
- logging level lsccp info
-!
-stats interval 5
-!
-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
- ipa bind 0.0.0.0
-cs7 instance 0
- point-code 0.23.3
- asp asp-clnt-msc-0 2905 0 m3ua
- as as-clnt-msc-0 m3ua
-  asp asp-clnt-msc-0
-  routing-key 2 0.23.3
-network
- network country code 1
- mobile network code 1
- encryption a5 0
- neci 1
- paging any use tch 0
- handover 0
- handover1 window rxlev averaging 10
- handover1 window rxqual averaging 1
- handover1 window rxlev neighbor averaging 10
- handover1 power budget interval 6
- handover1 power budget hysteresis 3
- handover1 maximum distance 9999
- timer t3212 30
- bts 0
-  type sysmobts
-  band DCS1800
-  cell_identity 0
-  location_area_code 1
-  dtx uplink force
-  dtx downlink
-  base_station_id_code 63
-  ms max power 15
-  cell reselection hysteresis 4
-  rxlev access min 0
-  radio-link-timeout 32
-  channel allocator ascending
-  rach tx integer 9
-  rach max transmission 7
-  channel-descrption attach 1
-  channel-descrption bs-pa-mfrms 5
-  channel-descrption bs-ag-blks-res 1
-  early-classmark-sending forbidden
-  early-classmark-sending-3g allowed
-  ip.access unit_id 1234 0
-  ip.access rsl-ip 172.18.9.10
-  oml ip.access stream_id 255 line 0
-  neighbor-list mode manual-si5
-  neighbor-list add arfcn 100
-  neighbor-list add arfcn 200
-  si5 neighbor-list add arfcn 10
-  si5 neighbor-list add arfcn 20
-  codec-support fr
-  gprs mode gprs
-  gprs routing area 0
-  gprs network-control-order nc0
-  gprs cell bvci 1234
-  gprs cell timer blocking-timer 3
-  gprs cell timer blocking-retries 3
-  gprs cell timer unblocking-retries 3
-  gprs cell timer reset-timer 3
-  gprs cell timer reset-retries 3
-  gprs cell timer suspend-timer 10
-  gprs cell timer suspend-retries 3
-  gprs cell timer resume-timer 10
-  gprs cell timer resume-retries 3
-  gprs cell timer capability-update-timer 10
-  gprs cell timer capability-update-retries 3
-  gprs nsei 1234
-  gprs ns timer tns-block 3
-  gprs ns timer tns-block-retries 3
-  gprs ns timer tns-reset 3
-  gprs ns timer tns-reset-retries 3
-  gprs ns timer tns-test 30
-  gprs ns timer tns-alive 3
-  gprs ns timer tns-alive-retries 10
-  gprs nsvc 0 nsvci 1234
-  gprs nsvc 0 local udp port 23000
-  gprs nsvc 0 remote udp port 23000
-  gprs nsvc 0 remote ip 0.0.0.0
-  no force-combined-si
-  trx 0
-   rf_locked 0
-   arfcn 871
-   nominal power 50
-   max_power_red 20
-   rsl e1 tei 0
-   timeslot 0
-    phys_chan_config CCCH+SDCCH4
-    hopping enabled 0
-   timeslot 1
-    phys_chan_config TCH/F
-    hopping enabled 0
-   timeslot 2
-    phys_chan_config TCH/F
-    hopping enabled 0
-   timeslot 3
-    phys_chan_config TCH/F_PDCH
-    hopping enabled 0
-   timeslot 4
-    phys_chan_config TCH/F_TCH/H_PDCH
-    hopping enabled 0
-   timeslot 5
-    phys_chan_config TCH/H
-    hopping enabled 0
-   timeslot 6
-    phys_chan_config SDCCH8
-    hopping enabled 0
-   timeslot 7
-    phys_chan_config PDCH
-    hopping enabled 0
-  trx 1
-   rf_locked 0
-   arfcn 873
-   nominal power 50
-   max_power_red 20
-   rsl e1 tei 1
-   timeslot 0
-    phys_chan_config TCH/F
-    hopping enabled 0
-   timeslot 1
-    phys_chan_config SDCCH8
-    hopping enabled 0
-   timeslot 2
-    phys_chan_config PDCH
-    hopping enabled 0
-   timeslot 3
-    phys_chan_config TCH/F_TCH/H_PDCH
-    hopping enabled 0
-   timeslot 4
-    phys_chan_config TCH/F_PDCH
-    hopping enabled 0
-   timeslot 5
-    phys_chan_config SDCCH8
-    hopping enabled 0
-   timeslot 6
-    phys_chan_config PDCH
-    hopping enabled 0
-   timeslot 7
-    phys_chan_config PDCH
-    hopping enabled 0
-  trx 2
-   rf_locked 0
-   arfcn 875
-   nominal power 50
-   max_power_red 20
-   rsl e1 tei 2
-   timeslot 0
-    phys_chan_config TCH/H
-    hopping enabled 0
-   timeslot 1
-    phys_chan_config PDCH
-    hopping enabled 0
-   timeslot 2
-    phys_chan_config SDCCH8
-    hopping enabled 0
-   timeslot 3
-    phys_chan_config PDCH
-    hopping enabled 0
-   timeslot 4
-    phys_chan_config SDCCH8
-    hopping enabled 0
-   timeslot 5
-    phys_chan_config TCH/F
-    hopping enabled 0
-   timeslot 6
-    phys_chan_config PDCH
-    hopping enabled 0
-   timeslot 7
-    phys_chan_config PDCH
-    hopping enabled 0
-  trx 3
-   rf_locked 0
-   arfcn 877
-   nominal power 50
-   max_power_red 20
-   rsl e1 tei 3
-   timeslot 0
-    phys_chan_config PDCH
-    hopping enabled 0
-   timeslot 1
-    phys_chan_config TCH/H
-    hopping enabled 0
-   timeslot 2
-    phys_chan_config TCH/H
-    hopping enabled 0
-   timeslot 3
-    phys_chan_config SDCCH8
-    hopping enabled 0
-   timeslot 4
-    phys_chan_config PDCH
-    hopping enabled 0
-   timeslot 5
-    phys_chan_config TCH/F
-    hopping enabled 0
-   timeslot 6
-    phys_chan_config PDCH
-    hopping enabled 0
-   timeslot 7
-    phys_chan_config SDCCH8
-    hopping enabled 0
-msc 0
- core-location-area-code 666
- core-cell-identity 333
- no bsc-welcome-text
- no bsc-msc-lost-text
- no bsc-grace-text
- codec-list fr1 fr2 fr3
- type normal
- allow-emergency allow
- amr-config 12_2k forbidden
- amr-config 10_2k forbidden
- amr-config 7_95k forbidden
- amr-config 7_40k forbidden
- amr-config 6_70k forbidden
- amr-config 5_90k allowed
- amr-config 5_15k forbidden
- amr-config 4_75k forbidden
-bsc
- mid-call-timeout 0
- no missing-msc-text
diff --git a/ttcn3-bts-test/osmo-bsc.confmerge b/ttcn3-bts-test/osmo-bsc.confmerge
new file mode 100644
index 0000000..11f8076
--- /dev/null
+++ b/ttcn3-bts-test/osmo-bsc.confmerge
@@ -0,0 +1,8 @@
+log gsmtap 172.18.9.10
+line vty
+ bind 0.0.0.0
+e1_input
+ ipa bind 0.0.0.0
+network
+ bts 0
+  ip.access rsl-ip 172.18.9.10
diff --git a/ttcn3-bts-test/osmo-bts.cfg b/ttcn3-bts-test/osmo-bts.cfg
deleted file mode 100644
index 5357801..0000000
--- a/ttcn3-bts-test/osmo-bts.cfg
+++ /dev/null
@@ -1,86 +0,0 @@
-!
-! OsmoBTS (0.4.0.446-e0fb) configuration saved from vty
-!!
-!
-log gsmtap 172.18.9.10
- logging level set-all debug
- logging filter all 1
-!
-log stderr
- logging filter all 1
- logging color 1
- logging print category 1
- logging timestamp 1
- logging print extended-timestamp 1
- logging level set-all notice
- logging level rsl info
- logging level oml info
- logging level meas info
- logging level pag info
- logging level l1c info
- logging level dsp info
- logging level pcu debug
- logging level trx info
- logging level lmib debug
-!
-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
- instance 1
-  osmotrx rx-gain 10
- instance 2
-  osmotrx rx-gain 10
- instance 3
-  osmotrx rx-gain 10
-bts 0
- band DCS1800
- ipa unit-id 1234 0
- oml remote-ip 172.18.9.11
- 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 8000 mdB
-  power-ramp step-interval 1
-  phy 0 instance 0
- trx 1
-  power-ramp max-initial 0 mdBm
-  power-ramp step-size 8000 mdB
-  power-ramp step-interval 1
-  phy 0 instance 1
- trx 2
-  power-ramp max-initial 0 mdBm
-  power-ramp step-size 8000 mdB
-  power-ramp step-interval 1
-  phy 0 instance 2
- trx 3
-  power-ramp max-initial 0 mdBm
-  power-ramp step-size 8000 mdB
-  power-ramp step-interval 1
-  phy 0 instance 3
-ctrl
- bind 0.0.0.0
diff --git a/ttcn3-bts-test/osmo-bts.confmerge b/ttcn3-bts-test/osmo-bts.confmerge
new file mode 100644
index 0000000..2783da9
--- /dev/null
+++ b/ttcn3-bts-test/osmo-bts.confmerge
@@ -0,0 +1,11 @@
+log gsmtap 172.18.9.10
+line vty
+ bind 0.0.0.0
+phy 0
+ osmotrx ip local 172.18.9.20
+ osmotrx ip remote 172.18.9.21
+bts 0
+ oml remote-ip 172.18.9.11
+ pcu-socket /data/unix/pcu_sock
+ctrl
+ bind 0.0.0.0

-- 
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20622
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: If15461240f3037c142c176fc7da745a1701ae3f8
Gerrit-Change-Number: 20622
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201012/fe245543/attachment.htm>

More information about the gerrit-log mailing list