From 1ff03766be8d48b7e84656544d64111466327271 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Tue, 2 Oct 2018 15:50:48 +0200 Subject: [PATCH] osmo-trx: Enable multi_arfcn for B200 and only in multiTRX setup Change-Id: I6a29e1813f0603b00b49b7b7c805be23a72cf0e3 --- example/resources.conf.prod | 1 + example/resources.conf.rnd | 1 + src/osmo_gsm_tester/bts_osmotrx.py | 7 ++++++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/example/resources.conf.prod b/example/resources.conf.prod index e3c5ad81..88358ac5 100644 --- a/example/resources.conf.prod +++ b/example/resources.conf.prod @@ -30,6 +30,7 @@ bts: remote_user: jenkins trx_ip: 10.42.42.230 clock_reference: external + multi_arfcn: true - label: sysmoCell 5000 type: osmo-bts-trx diff --git a/example/resources.conf.rnd b/example/resources.conf.rnd index 2067efc0..dbdf3cce 100644 --- a/example/resources.conf.rnd +++ b/example/resources.conf.rnd @@ -28,6 +28,7 @@ bts: type: uhd launch_trx: true clock_reference: external + multi_arfcn: true remote_user: jenkins trx_ip: 127.0.0.1 ciphers: [a5_0, a5_1] diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py index a1814dc6..79c541d7 100644 --- a/src/osmo_gsm_tester/bts_osmotrx.py +++ b/src/osmo_gsm_tester/bts_osmotrx.py @@ -179,7 +179,12 @@ class OsmoTrx(log.Origin, metaclass=ABCMeta): self.dbg(config_file=self.config_file) values = self.conf - multi_arfcn_bool = util.str2bool(values.get('osmo_trx', {}).get('multi_arfcn', False)) + + # we don't need to enable multi-arfcn for single channel + if len(values.get('osmo_trx', {}).get('channels', [])) > 1: + multi_arfcn_bool = util.str2bool(values.get('osmo_trx', {}).get('multi_arfcn', False)) + else: + multi_arfcn_bool = False config.overlay(values, { 'osmo_trx': { 'multi_arfcn': multi_arfcn_bool } }) self.dbg('OSMO-TRX CONFIG:\n' + pprint.pformat(values))