<p>srs_andre has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/20615">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">srs{enb,ue}: add rf_dev_sync option to config templates<br><br>pass-through the option so they can be used in templates<br><br>just concatenate with rf_dev_args for srsLTE eNB/UE, arguments<br>parsing will handle them<br><br>Change-Id: I3818026c159780f29968888f547163cdf730afad<br>---<br>M src/osmo_gsm_tester/obj/enb_srs.py<br>M src/osmo_gsm_tester/obj/ms_srs.py<br>M src/osmo_gsm_tester/templates/srsenb.conf.tmpl<br>M src/osmo_gsm_tester/templates/srsue.conf.tmpl<br>4 files changed, 7 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/15/20615/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/obj/enb_srs.py b/src/osmo_gsm_tester/obj/enb_srs.py</span><br><span>index ad92af5..63e5d7c 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/enb_srs.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/enb_srs.py</span><br><span>@@ -191,6 +191,7 @@</span><br><span>         config.overlay(values, dict(enb={'enable_pcap': self.enable_pcap}))</span><br><span> </span><br><span>         config.overlay(values, dict(enb={'enable_dl_awgn': util.str2bool(values['enb'].get('enable_dl_awgn', 'false'))}))</span><br><span style="color: hsl(120, 100%, 40%);">+        config.overlay(values, dict(enb={'rf_dev_sync': values['enb'].get('rf_dev_sync', None)}))</span><br><span> </span><br><span>         self._additional_args = []</span><br><span>         for add_args in values['enb'].get('additional_args', []):</span><br><span>diff --git a/src/osmo_gsm_tester/obj/ms_srs.py b/src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>index 2546624..be3e799 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>@@ -34,6 +34,7 @@</span><br><span>     resource_schema = {</span><br><span>         'rf_dev_type': schema.STR,</span><br><span>         'rf_dev_args': schema.STR,</span><br><span style="color: hsl(120, 100%, 40%);">+        'rf_dev_sync': schema.STR,</span><br><span>         'num_carriers': schema.UINT,</span><br><span>         'additional_args[]': schema.STR,</span><br><span>         'airplane_t_on_ms': schema.INT,</span><br><span>@@ -257,6 +258,9 @@</span><br><span> </span><br><span>         self.num_carriers = int(values['ue'].get('num_carriers', 1))</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+        # Simply pass-through the sync options</span><br><span style="color: hsl(120, 100%, 40%);">+        config.overlay(values, dict(ue={'rf_dev_sync': values['ue'].get('rf_dev_sync', None)}))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>         # We need to set some specific variables programatically here to match IP addresses:</span><br><span>         if self._conf.get('rf_dev_type') == 'zmq':</span><br><span>             base_srate = num_prb2base_srate(self.enb.num_prb())</span><br><span>diff --git a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl</span><br><span>index 7409b3a..5df432b 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl</span><br><span>@@ -75,7 +75,7 @@</span><br><span> # For best performance when BW<5 MHz (25 PRB), use the following device_args settings:</span><br><span> #     USRP B210: send_frame_size=512,recv_frame_size=512</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-device_args = ${enb.rf_dev_args}</span><br><span style="color: hsl(120, 100%, 40%);">+device_args = ${enb.rf_dev_args},${enb.rf_dev_sync}</span><br><span> #time_adv_nsamples = auto</span><br><span> #burst_preamble_us = auto</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/templates/srsue.conf.tmpl b/src/osmo_gsm_tester/templates/srsue.conf.tmpl</span><br><span>index be75347..284922b 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/srsue.conf.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/srsue.conf.tmpl</span><br><span>@@ -54,7 +54,7 @@</span><br><span> # For best performance when BW<5 MHz (25 PRB), use the following device_args settings:</span><br><span> #     USRP B210: send_frame_size=512,recv_frame_size=512</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-device_args = ${ue.rf_dev_args}</span><br><span style="color: hsl(120, 100%, 40%);">+device_args = ${ue.rf_dev_args},${ue.rf_dev_sync}</span><br><span> #time_adv_nsamples = auto</span><br><span> #burst_preamble_us = auto</span><br><span> #continuous_tx     = auto</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/20615">change 20615</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/20615"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I3818026c159780f29968888f547163cdf730afad </div>
<div style="display:none"> Gerrit-Change-Number: 20615 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: srs_andre <andre@softwareradiosystems.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>