osmo-trx: Enable multi_arfcn for B200 and only in multiTRX setup
Change-Id: I6a29e1813f0603b00b49b7b7c805be23a72cf0e3
This commit is contained in:
parent
b54d7c9261
commit
1ff03766be
|
@ -30,6 +30,7 @@ bts:
|
||||||
remote_user: jenkins
|
remote_user: jenkins
|
||||||
trx_ip: 10.42.42.230
|
trx_ip: 10.42.42.230
|
||||||
clock_reference: external
|
clock_reference: external
|
||||||
|
multi_arfcn: true
|
||||||
|
|
||||||
- label: sysmoCell 5000
|
- label: sysmoCell 5000
|
||||||
type: osmo-bts-trx
|
type: osmo-bts-trx
|
||||||
|
|
|
@ -28,6 +28,7 @@ bts:
|
||||||
type: uhd
|
type: uhd
|
||||||
launch_trx: true
|
launch_trx: true
|
||||||
clock_reference: external
|
clock_reference: external
|
||||||
|
multi_arfcn: true
|
||||||
remote_user: jenkins
|
remote_user: jenkins
|
||||||
trx_ip: 127.0.0.1
|
trx_ip: 127.0.0.1
|
||||||
ciphers: [a5_0, a5_1]
|
ciphers: [a5_0, a5_1]
|
||||||
|
|
|
@ -179,7 +179,12 @@ class OsmoTrx(log.Origin, metaclass=ABCMeta):
|
||||||
self.dbg(config_file=self.config_file)
|
self.dbg(config_file=self.config_file)
|
||||||
|
|
||||||
values = self.conf
|
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 } })
|
config.overlay(values, { 'osmo_trx': { 'multi_arfcn': multi_arfcn_bool } })
|
||||||
|
|
||||||
self.dbg('OSMO-TRX CONFIG:\n' + pprint.pformat(values))
|
self.dbg('OSMO-TRX CONFIG:\n' + pprint.pformat(values))
|
||||||
|
|
Loading…
Reference in New Issue