<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11001">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-trx: Add multi_arfcn support<br><br>2nd TRX arfcn is changed in defaults.conf because multi_arfcn requires<br>them to be alocated in steps of 4 starting from TRX0.<br><br>It is not enabled by default yet on B200 (it must use it to support<br>several TRX) because current host running osmo-gsm-tester is not<br>performant enough and cannot keep up with timers due to multi-arfcn CPU<br>overhead.<br><br>Change-Id: I096df82ad1f4cbb41dfbd6a78466a845f34be385<br>---<br>M example/defaults.conf<br>M src/osmo_gsm_tester/bts_osmotrx.py<br>M src/osmo_gsm_tester/resource.py<br>M src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl<br>4 files changed, 9 insertions(+), 1 deletion(-)<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/01/11001/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/example/defaults.conf b/example/defaults.conf</span><br><span>index 7ad5e1f..42258a6 100644</span><br><span>--- a/example/defaults.conf</span><br><span>+++ b/example/defaults.conf</span><br><span>@@ -48,7 +48,7 @@</span><br><span>     - phys_chan_config: PDCH</span><br><span>   - nominal_power: 23</span><br><span>     max_power_red: 0</span><br><span style="color: hsl(0, 100%, 40%);">-    arfcn: 870</span><br><span style="color: hsl(120, 100%, 40%);">+    arfcn: 872</span><br><span>     timeslot_list:</span><br><span>     - phys_chan_config: TCH/F</span><br><span>     - phys_chan_config: TCH/F</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 a4bc082..e7e3542 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>@@ -174,6 +174,8 @@</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(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%);">+        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><span>diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py</span><br><span>index 9ca5665..e043d87 100644</span><br><span>--- a/src/osmo_gsm_tester/resource.py</span><br><span>+++ b/src/osmo_gsm_tester/resource.py</span><br><span>@@ -72,6 +72,7 @@</span><br><span>         'bts[].osmo_trx.type': schema.STR,</span><br><span>         'bts[].osmo_trx.clock_reference': schema.OSMO_TRX_CLOCK_REF,</span><br><span>         'bts[].osmo_trx.trx_ip': schema.IPV4,</span><br><span style="color: hsl(120, 100%, 40%);">+        'bts[].osmo_trx.multi_arfcn': schema.BOOL_STR,</span><br><span>         'arfcn[].arfcn': schema.INT,</span><br><span>         'arfcn[].band': schema.BAND,</span><br><span>         'modem[].label': schema.STR,</span><br><span>diff --git a/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl</span><br><span>index 2f6e830..0003f1b 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl</span><br><span>@@ -19,6 +19,11 @@</span><br><span>  remote-ip ${osmo_trx.bts_ip}</span><br><span>  base-port 5700</span><br><span>  egprs disable</span><br><span style="color: hsl(120, 100%, 40%);">+%if osmo_trx.get('multi_arfcn', False):</span><br><span style="color: hsl(120, 100%, 40%);">+ multi-arfcn enable</span><br><span style="color: hsl(120, 100%, 40%);">+%else:</span><br><span style="color: hsl(120, 100%, 40%);">+ multi-arfcn disable</span><br><span style="color: hsl(120, 100%, 40%);">+%endif</span><br><span>  tx-sps 4</span><br><span>  rx-sps 4</span><br><span>  clock-ref ${osmo_trx.clock_reference}</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11001">change 11001</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/11001"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I096df82ad1f4cbb41dfbd6a78466a845f34be385 </div>
<div style="display:none"> Gerrit-Change-Number: 11001 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>