Change in osmo-gsm-tester[master]: bts_osmotrx: Allow Setting Rx/TX paths through resources.conf

[pespin]

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/16228 )

Change subject: bts_osmotrx: Allow Setting Rx/TX paths through resources.conf
......................................................................

bts_osmotrx: Allow Setting Rx/TX paths through resources.conf

Change-Id: Iddb0f20366c3242098bdf869f39fc3e2244c13e7
---
M example/resources.conf.prod
M src/osmo_gsm_tester/bts_osmotrx.py
M src/osmo_gsm_tester/resource.py
3 files changed, 4 insertions(+), 1 deletion(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, but someone else must approve
  pespin: Looks good to me, approved



diff --git a/example/resources.conf.prod b/example/resources.conf.prod
index 5b4185b..e5911f1 100644
--- a/example/resources.conf.prod
+++ b/example/resources.conf.prod
@@ -62,6 +62,8 @@
     trx_ip: 10.42.42.117
     clock_reference: external
     dev_args: "LimeSDR-USB,serial=00090706024F0A22"
+    channels:
+      - rx_path: "LNAW"
 
 - label: sysmoCell 5000
   type: osmo-bts-trx
diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py
index 554a236..f1fbdd1 100644
--- a/src/osmo_gsm_tester/bts_osmotrx.py
+++ b/src/osmo_gsm_tester/bts_osmotrx.py
@@ -344,7 +344,6 @@
 
     def __init__(self, suite_run, conf):
         super().__init__(suite_run, conf)
-        self.conf['osmo_trx']['channels'][0]['rx_path'] = 'LNAW'
 
     def binary_name(self):
         return OsmoTrxLMS.BIN_TRX
diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py
index 1b18076..992734d 100644
--- a/src/osmo_gsm_tester/resource.py
+++ b/src/osmo_gsm_tester/resource.py
@@ -76,6 +76,8 @@
         'bts[].osmo_trx.dev_args': schema.STR,
         'bts[].osmo_trx.multi_arfcn': schema.BOOL_STR,
         'bts[].osmo_trx.max_trxd_version': schema.UINT,
+        'bts[].osmo_trx.channels[].rx_path': schema.STR,
+        'bts[].osmo_trx.channels[].tx_path': schema.STR,
         'arfcn[].arfcn': schema.INT,
         'arfcn[].band': schema.BAND,
         'modem[].type': schema.STR,

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/16228
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: Iddb0f20366c3242098bdf869f39fc3e2244c13e7
Gerrit-Change-Number: 16228
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20191127/fe85d62f/attachment.htm>