<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11000">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">WIP: osmo-bts-trx: Enable support for several TRX<br><br>Change-Id: If2bda5ec7ac9fa3fe6bc5d71f323c3ccc2a70158<br>---<br>M example/defaults.conf<br>M src/osmo_gsm_tester/bts_osmotrx.py<br>M src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl<br>M src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl<br>4 files changed, 15 insertions(+), 6 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/00/11000/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 fc4c324..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>@@ -76,6 +76,9 @@</span><br><span>     - phys_chan_config: TCH/F # nanobts only supports PDCH in TRX0.</span><br><span>     - phys_chan_config: TCH/F</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+osmo_bts_trx:</span><br><span style="color: hsl(120, 100%, 40%);">+  max_trx: 2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> osmo_trx:</span><br><span>   type: uhd</span><br><span>   launch_trx: true</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 1c7349f..f446dc3 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>@@ -77,7 +77,7 @@</span><br><span>                             'osmo_trx': {</span><br><span>                                 'bts_ip': self.remote_addr(),</span><br><span>                                 'trx_ip': self.trx_remote_ip(),</span><br><span style="color: hsl(0, 100%, 40%);">-                                'channels': [{}] # TODO: implement channels for multiTRX</span><br><span style="color: hsl(120, 100%, 40%);">+                                'channels': [{} for trx_i in range(self.num_trx())]</span><br><span>                             }</span><br><span>                         }</span><br><span>         })</span><br><span>@@ -134,7 +134,8 @@</span><br><span> </span><br><span>         self.proc_bts = self.launch_process(keepalive, OsmoBtsTrx.BIN_BTS_TRX, '-r', '1',</span><br><span>                             '-c', os.path.abspath(self.config_file),</span><br><span style="color: hsl(0, 100%, 40%);">-                            '-i', self.bsc.addr())</span><br><span style="color: hsl(120, 100%, 40%);">+                            '-i', self.bsc.addr(),</span><br><span style="color: hsl(120, 100%, 40%);">+                            '-t', self.num_trx())</span><br><span>         self.suite_run.poll()</span><br><span> </span><br><span> class OsmoTrx(log.Origin, metaclass=ABCMeta):</span><br><span>diff --git a/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl</span><br><span>index 5dba323..677b047 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl</span><br><span>@@ -23,9 +23,11 @@</span><br><span> phy 0</span><br><span>  osmotrx ip local ${osmo_bts_trx.osmo_trx.bts_ip}</span><br><span>  osmotrx ip remote ${osmo_bts_trx.osmo_trx.trx_ip}</span><br><span style="color: hsl(0, 100%, 40%);">- instance 0</span><br><span style="color: hsl(120, 100%, 40%);">+%for chan in osmo_bts_trx.osmo_trx.channels:</span><br><span style="color: hsl(120, 100%, 40%);">+ instance ${loop.index}</span><br><span>   osmotrx rx-gain 25</span><br><span>   osmotrx tx-attenuation oml</span><br><span style="color: hsl(120, 100%, 40%);">+%endfor</span><br><span> bts 0</span><br><span>  band ${osmo_bts_trx.band}</span><br><span>  ipa unit-id ${osmo_bts_trx.ipa_unit_id} 0</span><br><span>@@ -44,5 +46,7 @@</span><br><span>  gsmtap-sapi ptcch</span><br><span>  gsmtap-sapi cbch</span><br><span>  gsmtap-sapi sacch</span><br><span style="color: hsl(0, 100%, 40%);">- trx 0</span><br><span style="color: hsl(0, 100%, 40%);">-  phy 0 instance 0</span><br><span style="color: hsl(120, 100%, 40%);">+%for chan in osmo_bts_trx.osmo_trx.channels:</span><br><span style="color: hsl(120, 100%, 40%);">+ trx ${loop.index}</span><br><span style="color: hsl(120, 100%, 40%);">+  phy 0 instance ${loop.index}</span><br><span style="color: hsl(120, 100%, 40%);">+%endfor</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..fa87ed6 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,7 @@</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%);">+ multi-arfcn enable</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/11000">change 11000</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/11000"/><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: If2bda5ec7ac9fa3fe6bc5d71f323c3ccc2a70158 </div>
<div style="display:none"> Gerrit-Change-Number: 11000 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>