From 0d45504267ace476c4da88fcaa702d026e3ae88a Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Mon, 27 Aug 2018 17:07:41 +0200 Subject: osmo-bts-trx: Big refactor and cleanup of osmo-trx related code * This commit is a preparation for future commits to add support for different osmo-trx devices and backends like osmo-trx-lms. * Drop deprecated osmo-trx-* cmd line params and use VTY cfg to set them. * As number of osmo-trx related osmo-gsm-tester attributes grow, group them togther in an "osmo_trx" dictionary. Change-Id: I77d29413c9e3b600b796627ba366f80c3281b7e1 --- example/defaults.conf | 5 +++++ example/resources.conf.prod | 9 +++++++-- example/resources.conf.rnd | 5 ++++- 3 files changed, 16 insertions(+), 3 deletions(-) (limited to 'example') diff --git a/example/defaults.conf b/example/defaults.conf index 5bdf257..fc4c324 100644 --- a/example/defaults.conf +++ b/example/defaults.conf @@ -75,3 +75,8 @@ nanobts: - {} - phys_chan_config: TCH/F # nanobts only supports PDCH in TRX0. - phys_chan_config: TCH/F + +osmo_trx: + type: uhd + launch_trx: true + clock_reference: internal diff --git a/example/resources.conf.prod b/example/resources.conf.prod index 31a737c..41ab009 100644 --- a/example/resources.conf.prod +++ b/example/resources.conf.prod @@ -24,16 +24,21 @@ bts: ipa_unit_id: 6 addr: 10.42.42.50 band: GSM-1800 - launch_trx: true ciphers: [a5_0, a5_1] + osmo_trx: + launch_trx: true + clock_reference: external - label: sysmoCell 5000 type: osmo-bts-trx ipa_unit_id: 7 addr: 10.42.42.51 band: GSM-1800 - trx_remote_ip: 10.42.42.112 ciphers: [a5_0, a5_1] + osmo_trx: + launch_trx: false + clock_reference: external + trx_ip: 10.42.42.112 - label: OCTBTS 3500 type: osmo-bts-octphy diff --git a/example/resources.conf.rnd b/example/resources.conf.rnd index 4e5c173..74b8e3e 100644 --- a/example/resources.conf.rnd +++ b/example/resources.conf.rnd @@ -24,7 +24,10 @@ bts: ipa_unit_id: 6 addr: 10.42.42.50 band: GSM-1800 - launch_trx: true + osmo_trx: + type: uhd + launch_trx: true + clock_reference: external ciphers: [a5_0, a5_1] - label: NanoBTS-ONW-1900 -- cgit v1.2.3