Change in osmo-gsm-tester[master]: srs{enb, ue}: add rf_dev_sync option to config templates

[pespin]

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

Change subject: srs{enb,ue}: add rf_dev_sync option to config templates
......................................................................

srs{enb,ue}: add rf_dev_sync option to config templates

pass-through the option so they can be used in templates

just concatenate with rf_dev_args for srsLTE eNB/UE, arguments
parsing will handle them

Change-Id: I3818026c159780f29968888f547163cdf730afad
---
M src/osmo_gsm_tester/obj/enb_srs.py
M src/osmo_gsm_tester/obj/ms_srs.py
M src/osmo_gsm_tester/templates/srsenb.conf.tmpl
M src/osmo_gsm_tester/templates/srsue.conf.tmpl
4 files changed, 7 insertions(+), 2 deletions(-)

Approvals:
  pespin: Looks good to me, approved; Verified



diff --git a/src/osmo_gsm_tester/obj/enb_srs.py b/src/osmo_gsm_tester/obj/enb_srs.py
index ad92af5..63e5d7c 100644
--- a/src/osmo_gsm_tester/obj/enb_srs.py
+++ b/src/osmo_gsm_tester/obj/enb_srs.py
@@ -191,6 +191,7 @@
         config.overlay(values, dict(enb={'enable_pcap': self.enable_pcap}))
 
         config.overlay(values, dict(enb={'enable_dl_awgn': util.str2bool(values['enb'].get('enable_dl_awgn', 'false'))}))
+        config.overlay(values, dict(enb={'rf_dev_sync': values['enb'].get('rf_dev_sync', None)}))
 
         self._additional_args = []
         for add_args in values['enb'].get('additional_args', []):
diff --git a/src/osmo_gsm_tester/obj/ms_srs.py b/src/osmo_gsm_tester/obj/ms_srs.py
index 2546624..be3e799 100644
--- a/src/osmo_gsm_tester/obj/ms_srs.py
+++ b/src/osmo_gsm_tester/obj/ms_srs.py
@@ -34,6 +34,7 @@
     resource_schema = {
         'rf_dev_type': schema.STR,
         'rf_dev_args': schema.STR,
+        'rf_dev_sync': schema.STR,
         'num_carriers': schema.UINT,
         'additional_args[]': schema.STR,
         'airplane_t_on_ms': schema.INT,
@@ -257,6 +258,9 @@
 
         self.num_carriers = int(values['ue'].get('num_carriers', 1))
 
+        # Simply pass-through the sync options
+        config.overlay(values, dict(ue={'rf_dev_sync': values['ue'].get('rf_dev_sync', None)}))
+
         # We need to set some specific variables programatically here to match IP addresses:
         if self._conf.get('rf_dev_type') == 'zmq':
             base_srate = num_prb2base_srate(self.enb.num_prb())
diff --git a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl
index 7409b3a..5df432b 100644
--- a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl
+++ b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl
@@ -75,7 +75,7 @@
 # For best performance when BW<5 MHz (25 PRB), use the following device_args settings:
 #     USRP B210: send_frame_size=512,recv_frame_size=512
 
-device_args = ${enb.rf_dev_args}
+device_args = ${enb.rf_dev_args},${enb.rf_dev_sync}
 #time_adv_nsamples = auto
 #burst_preamble_us = auto
 
diff --git a/src/osmo_gsm_tester/templates/srsue.conf.tmpl b/src/osmo_gsm_tester/templates/srsue.conf.tmpl
index be75347..284922b 100644
--- a/src/osmo_gsm_tester/templates/srsue.conf.tmpl
+++ b/src/osmo_gsm_tester/templates/srsue.conf.tmpl
@@ -54,7 +54,7 @@
 # For best performance when BW<5 MHz (25 PRB), use the following device_args settings:
 #     USRP B210: send_frame_size=512,recv_frame_size=512
 
-device_args = ${ue.rf_dev_args}
+device_args = ${ue.rf_dev_args},${ue.rf_dev_sync}
 #time_adv_nsamples = auto
 #burst_preamble_us = auto
 #continuous_tx     = auto

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/20615
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: I3818026c159780f29968888f547163cdf730afad
Gerrit-Change-Number: 20615
Gerrit-PatchSet: 1
Gerrit-Owner: srs_andre <andre at softwareradiosystems.com>
Gerrit-Reviewer: Jenkins Builder
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/20201013/aab58e73/attachment.htm>