<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11197">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-trx: Enable multi_arfcn for B200 and only in multiTRX setup<br><br>Change-Id: I6a29e1813f0603b00b49b7b7c805be23a72cf0e3<br>---<br>M example/resources.conf.prod<br>M example/resources.conf.rnd<br>M src/osmo_gsm_tester/bts_osmotrx.py<br>3 files changed, 8 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/example/resources.conf.prod b/example/resources.conf.prod</span><br><span>index e3c5ad8..88358ac 100644</span><br><span>--- a/example/resources.conf.prod</span><br><span>+++ b/example/resources.conf.prod</span><br><span>@@ -30,6 +30,7 @@</span><br><span>     remote_user: jenkins</span><br><span>     trx_ip: 10.42.42.230</span><br><span>     clock_reference: external</span><br><span style="color: hsl(120, 100%, 40%);">+    multi_arfcn: true</span><br><span> </span><br><span> - label: sysmoCell 5000</span><br><span>   type: osmo-bts-trx</span><br><span>diff --git a/example/resources.conf.rnd b/example/resources.conf.rnd</span><br><span>index 2067efc..dbdf3cc 100644</span><br><span>--- a/example/resources.conf.rnd</span><br><span>+++ b/example/resources.conf.rnd</span><br><span>@@ -28,6 +28,7 @@</span><br><span>     type: uhd</span><br><span>     launch_trx: true</span><br><span>     clock_reference: external</span><br><span style="color: hsl(120, 100%, 40%);">+    multi_arfcn: true</span><br><span>     remote_user: jenkins</span><br><span>     trx_ip: 127.0.0.1</span><br><span>   ciphers: [a5_0, a5_1]</span><br><span>diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py</span><br><span>index a1814dc..79c541d 100644</span><br><span>--- a/src/osmo_gsm_tester/bts_osmotrx.py</span><br><span>+++ b/src/osmo_gsm_tester/bts_osmotrx.py</span><br><span>@@ -179,7 +179,12 @@</span><br><span>         self.dbg(config_file=self.config_file)</span><br><span> </span><br><span>         values = self.conf</span><br><span style="color: hsl(0, 100%, 40%);">-        multi_arfcn_bool = util.str2bool(values.get('osmo_trx', {}).get('multi_arfcn', False))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+        # we don't need to enable multi-arfcn for single channel</span><br><span style="color: hsl(120, 100%, 40%);">+        if len(values.get('osmo_trx', {}).get('channels', [])) > 1:</span><br><span style="color: hsl(120, 100%, 40%);">+            multi_arfcn_bool = util.str2bool(values.get('osmo_trx', {}).get('multi_arfcn', False))</span><br><span style="color: hsl(120, 100%, 40%);">+        else:</span><br><span style="color: hsl(120, 100%, 40%);">+            multi_arfcn_bool = False</span><br><span>         config.overlay(values, { 'osmo_trx': { 'multi_arfcn': multi_arfcn_bool } })</span><br><span> </span><br><span>         self.dbg('OSMO-TRX CONFIG:\n' + pprint.pformat(values))</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11197">change 11197</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/11197"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I6a29e1813f0603b00b49b7b7c805be23a72cf0e3 </div>
<div style="display:none"> Gerrit-Change-Number: 11197 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>