diff options
| -rw-r--r-- | example/defaults.conf | 4 | ||||
| -rw-r--r-- | example/resources.conf.prod | 12 | ||||
| -rw-r--r-- | example/resources.conf.rnd | 2 | ||||
| -rw-r--r-- | src/osmo_gsm_tester/bts_nanobts.py | 8 |
4 files changed, 20 insertions, 6 deletions
diff --git a/example/defaults.conf b/example/defaults.conf index 45c734a..c110dde 100644 --- a/example/defaults.conf +++ b/example/defaults.conf @@ -41,7 +41,3 @@ bsc_bts: - phys_chan_config: TCH/F - phys_chan_config: PDCH - phys_chan_config: PDCH - -nanobts: - trx_list: - - arfcn: 531 diff --git a/example/resources.conf.prod b/example/resources.conf.prod index 230976d..230f95d 100644 --- a/example/resources.conf.prod +++ b/example/resources.conf.prod @@ -44,7 +44,7 @@ bts: - hw_addr: 00:0c:90:2e:80:1e net_device: enp2s0 -- label: NanoBTS +- label: NanoBTS-ONW-1900 type: nanobts ipa_unit_id: 9 addr: 10.42.42.53 @@ -54,6 +54,16 @@ bts: device: '01:01:4d:98:24' port: '1' +- label: NanoBTS-ONW-900 + type: nanobts + ipa_unit_id: 10 + addr: 10.42.42.54 + band: GSM-900 + power_supply: + type: 'sispm' + device: '01:01:4d:98:24' + port: '2' + arfcn: - arfcn: 512 band: GSM-1800 diff --git a/example/resources.conf.rnd b/example/resources.conf.rnd index 8ccf749..c263bf3 100644 --- a/example/resources.conf.rnd +++ b/example/resources.conf.rnd @@ -27,7 +27,7 @@ bts: launch_trx: true ciphers: [a5_0, a5_1] -- label: NanoBTS +- label: NanoBTS-ONW-1900 type: nanobts ipa_unit_id: 9 addr: 10.42.42.53 diff --git a/src/osmo_gsm_tester/bts_nanobts.py b/src/osmo_gsm_tester/bts_nanobts.py index f42bc6e..1d4a14a 100644 --- a/src/osmo_gsm_tester/bts_nanobts.py +++ b/src/osmo_gsm_tester/bts_nanobts.py @@ -70,6 +70,14 @@ class NanoBts(bts.Bts): sgsn_conf = {} if self.sgsn is None else self.sgsn.conf_for_client() config.overlay(values, sgsn_conf) + # Hack until we have proper ARFCN resource allocation support (OS#2230) + band = values.get('band') + trx_list = values.get('trx_list') + if band == 'GSM-1900': + config.overlay(trx_list[0], { 'arfcn' : '531' }) + elif band == 'GSM-900': + config.overlay(trx_list[0], { 'arfcn' : '50' }) + config.overlay(values, { 'osmobsc_bts_type': 'nanobts' }) self.dbg(conf=values) |