configure fixed ARFCN per bts
Remove ARFCNs as a concept from resource pool, assign a fixed ARFCN to
each BTS and TRX in the resource pools.
Using ARFCNs on specific bands as resources was an idea that is hard to
implement, because specific BTS dictate selection of bands which
influences which ARFCNs can be picked. That means reserving ARFCN
resources is only possible after reserving specific BTS resources, but
the tester is currently not capable of such two-stage resolution.
Writing handover tests, I got the problem that both BTS in a scenario
attempt to use the same ARFCN.
The by far easiest solution is to assign one fixed ARFCN to each BTS and
TRX. If ever needed, a scenario modifier can still configure different
ARFCNs.
(Due to uncertainty about OC2G operation stability, I prefer to leave
OC2G on ARFCN 50, as it happened to end up being configured before this
patch.)
Change-Id: I0a6c60544226f4261f9106013478d6a27fc39f38
diff --git a/sysmocom/resources.conf.prod b/sysmocom/resources.conf.prod
index 01a03f1..0444cf4 100644
--- a/sysmocom/resources.conf.prod
+++ b/sysmocom/resources.conf.prod
@@ -23,6 +23,8 @@
ipa_unit_id: 1
addr: 10.42.42.114
band: GSM-1800
+ trx_list:
+ - arfcn: 868
direct_pcu: true
ciphers: [a5_0, a5_1, a5_3]
@@ -31,6 +33,9 @@
ipa_unit_id: 6
addr: 10.42.42.50
band: GSM-1800
+ trx_list:
+ - arfcn: 850
+ - arfcn: 852
ciphers: [a5_0, a5_1, a5_3]
osmo_trx:
type: uhd
@@ -46,6 +51,9 @@
ipa_unit_id: 12
addr: 10.42.42.54
band: GSM-1800
+ trx_list:
+ - arfcn: 854
+ - arfcn: 856
ciphers: [a5_0, a5_1, a5_3]
osmo_trx:
type: uhd
@@ -60,6 +68,8 @@
ipa_unit_id: 11
addr: 10.42.42.53
band: GSM-1800
+ trx_list:
+ - arfcn: 858
ciphers: [a5_0, a5_1, a5_3]
osmo_trx:
type: lms
@@ -76,6 +86,8 @@
ipa_unit_id: 15
addr: 10.42.42.53
band: GSM-1800
+ trx_list:
+ - arfcn: 860
ciphers: [a5_0, a5_1]
osmo_trx:
type: lms
@@ -96,6 +108,7 @@
type: 'intellinet'
device: '10.42.42.250'
port: '5'
+ arfcn: 862
osmo_trx:
type: sc5
launch_trx: true
@@ -111,6 +124,7 @@
trx_list:
- hw_addr: 00:0c:90:2e:80:1e
net_device: enp2s0
+ arfcn: 864
- label: NanoBTS-ONW-1900
type: nanobts
@@ -122,6 +136,8 @@
type: 'intellinet'
device: '10.42.42.250'
port: '1'
+ arfcn: 533
+ - arfcn: 535
- label: NanoBTS-ONW-900
type: nanobts
@@ -134,23 +150,29 @@
type: 'intellinet'
device: '10.42.42.250'
port: '2'
+ arfcn: 52
- addr: 10.42.42.122
power_supply:
type: 'intellinet'
device: '10.42.42.250'
port: '3'
+ arfcn: 54
- label: OsmoBTS Virtual
type: osmo-bts-virtual
ipa_unit_id: 13
addr: 10.42.42.55
band: GSM-1800
+ trx_list:
+ - arfcn: 882
- label: OC-2G
type: osmo-bts-oc2g
ipa_unit_id: 14
addr: 10.42.42.100
band: GSM-900
+ trx_list:
+ - arfcn: 50
direct_pcu: true
ciphers: [a5_0, a5_1, a5_3]
@@ -175,28 +197,6 @@
ssh_user: jenkins
ssh_addr: 10.42.42.117
-arfcn:
- - arfcn: 512
- band: GSM-1800
- - arfcn: 514
- band: GSM-1800
- - arfcn: 516
- band: GSM-1800
- - arfcn: 518
- band: GSM-1800
- - arfcn: 520
- band: GSM-1800
- - arfcn: 540
- band: GSM-1900
- - arfcn: 542
- band: GSM-1900
- - arfcn: 544
- band: GSM-1900
- - arfcn: 546
- band: GSM-1900
- - arfcn: 548
- band: GSM-1900
-
modem:
- label: sierra_1st
path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-5/1-5.2/1-5.2.2'