<p>srs_andre has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/20614">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">enb_amarisoft: add rf_dev_sync option to specify the sync type<br><br>this allows to specify "external_clock" for example to use<br>the external REF input of an USRP<br><br>Change-Id: Ie066993440840cbd2c18e8f0c0c577b92ac7092d<br>---<br>M src/osmo_gsm_tester/obj/enb.py<br>M src/osmo_gsm_tester/obj/enb_amarisoft.py<br>M src/osmo_gsm_tester/templates/amarisoft_rf_driver.cfg.tmpl<br>M sysmocom/defaults.conf<br>4 files changed, 4 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/14/20614/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/obj/enb.py b/src/osmo_gsm_tester/obj/enb.py</span><br><span>index 6384f15..fea78de 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/enb.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/enb.py</span><br><span>@@ -34,6 +34,7 @@</span><br><span>         'rx_gain': schema.UINT,</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>         'additional_args[]': schema.STR,</span><br><span>         'inactivity_timer': schema.INT,</span><br><span>         'enable_measurements': schema.BOOL_STR,</span><br><span>diff --git a/src/osmo_gsm_tester/obj/enb_amarisoft.py b/src/osmo_gsm_tester/obj/enb_amarisoft.py</span><br><span>index 0f8944f..1fc4485 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/enb_amarisoft.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/enb_amarisoft.py</span><br><span>@@ -214,6 +214,7 @@</span><br><span>         # different cfg namespace 'trx'. Copy needed values over there:</span><br><span>         config.overlay(values, dict(trx=dict(rf_dev_type=values['enb'].get('rf_dev_type', None),</span><br><span>                                              rf_dev_args=values['enb'].get('rf_dev_args', None),</span><br><span style="color: hsl(120, 100%, 40%);">+                                             rf_dev_sync=values['enb'].get('rf_dev_sync', None),</span><br><span>                                              rx_gain=values['enb'].get('rx_gain', None),</span><br><span>                                              tx_gain=values['enb'].get('tx_gain', None),</span><br><span>                                             )))</span><br><span>diff --git a/src/osmo_gsm_tester/templates/amarisoft_rf_driver.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_rf_driver.cfg.tmpl</span><br><span>index cd08835..05689c7 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/amarisoft_rf_driver.cfg.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/amarisoft_rf_driver.cfg.tmpl</span><br><span>@@ -1,8 +1,7 @@</span><br><span> rf_driver: {</span><br><span>     name: "${trx.rf_dev_type}",</span><br><span style="color: hsl(0, 100%, 40%);">-    sync: "${'1' if trx.rf_dev_type == 'zmq' else 'none'}",</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>     args: "${trx.rf_dev_args}",</span><br><span style="color: hsl(120, 100%, 40%);">+    sync: "${trx.rf_dev_sync}",</span><br><span> </span><br><span> % if trx.rf_dev_type == 'zmq':</span><br><span>     dl_sample_bits: 16,</span><br><span>diff --git a/sysmocom/defaults.conf b/sysmocom/defaults.conf</span><br><span>index b175cbb..ed0b575 100644</span><br><span>--- a/sysmocom/defaults.conf</span><br><span>+++ b/sysmocom/defaults.conf</span><br><span>@@ -154,6 +154,7 @@</span><br><span>   enable_pcap: false</span><br><span>   tx_gain: 89</span><br><span>   rx_gain: 60</span><br><span style="color: hsl(120, 100%, 40%);">+  rf_dev_sync: none</span><br><span>   log_options: all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,s1ap.level=debug,s1ap.max_size=1,x2ap.level=debug,x2ap.max_size=1,rrc.level=debug,rrc.max_size=1</span><br><span> </span><br><span> srsue:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/20614">change 20614</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/+/20614"/><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: Ie066993440840cbd2c18e8f0c0c577b92ac7092d </div>
<div style="display:none"> Gerrit-Change-Number: 20614 </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>