commit 0d45504267ace476c4da88fcaa702d026e3ae88a
author Pau Espin Pedrol <pespin@sysmocom.de> Mon Aug 27 17:07:41 2018 +0200
committer Pau Espin Pedrol <pespin@sysmocom.de> Wed Aug 29 12:30:48 2018 +0200
tree 598b1d6a44c3f6be38d8da960474c5f0c4a7bff1
parent a9fdda85af89c758f96fbeaaf69f2db347b22fcd

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

src/osmo_gsm_tester/resource.py

diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py
index 15f2711..9ca5665 100644
--- a/src/osmo_gsm_tester/resource.py
+++ b/src/osmo_gsm_tester/resource.py
@@ -54,8 +54,6 @@
         'bts[].ipa_unit_id': schema.UINT,
         'bts[].addr': schema.IPV4,
         'bts[].band': schema.BAND,
-        'bts[].trx_remote_ip': schema.IPV4,
-        'bts[].launch_trx': schema.BOOL_STR,
         'bts[].direct_pcu': schema.BOOL_STR,
         'bts[].ciphers[]': schema.CIPHER,
         'bts[].channel_allocator': schema.CHAN_ALLOCATOR,
@@ -70,6 +68,10 @@
         'bts[].trx_list[].power_supply.type': schema.STR,
         'bts[].trx_list[].power_supply.device': schema.STR,
         'bts[].trx_list[].power_supply.port': schema.STR,
+        'bts[].osmo_trx.launch_trx': schema.BOOL_STR,
+        'bts[].osmo_trx.type': schema.STR,
+        'bts[].osmo_trx.clock_reference': schema.OSMO_TRX_CLOCK_REF,
+        'bts[].osmo_trx.trx_ip': schema.IPV4,
         'arfcn[].arfcn': schema.INT,
         'arfcn[].band': schema.BAND,
         'modem[].label': schema.STR,