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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Add testsuite + scenarios to test nanoBTS multiTRX<br><br>Currently only 2 nanoBTS in the 900 band are attached together as a<br>multiTRX setup. We thus set num_trx to 2 and set channel allocator<br>descending to force the BTS to use the 2nd TRX when allocating channels.<br><br>Change-Id: I12e1bcb047c4efac5693cf725739e0ce2e0532ee<br>---<br>M example/default-suites.conf<br>M example/defaults.conf<br>A example/scenarios/mod-bts0-chanallocdescend.conf<br>3 files changed, 18 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/example/default-suites.conf b/example/default-suites.conf</span><br><span>index 7ff8470..8d692fa 100644</span><br><span>--- a/example/default-suites.conf</span><br><span>+++ b/example/default-suites.conf</span><br><span>@@ -53,8 +53,10 @@</span><br><span> - voice:nanobts+band-900+mod-bts0-ts-tchf</span><br><span> - voice:nanobts+band-900+mod-bts0-ts-tchh</span><br><span> - voice:nanobts+band-900+mod-bts0-dynts-ipa</span><br><span style="color: hsl(120, 100%, 40%);">+- voice:nanobts+band-900+mod-bts0-numtrx2+mod-bts0-chanallocdescend</span><br><span> - gprs:nanobts+band-900</span><br><span> - gprs:nanobts+band-900+mod-bts0-dynts-ipa</span><br><span style="color: hsl(120, 100%, 40%);">+- gprs:nanobts+band-900+mod-bts0-numtrx2+mod-bts0-chanallocdescend</span><br><span> - smpp</span><br><span> - aoip_smpp</span><br><span> - aoip_encryption</span><br><span>diff --git a/example/defaults.conf b/example/defaults.conf</span><br><span>index 73188d5..61b09fb 100644</span><br><span>--- a/example/defaults.conf</span><br><span>+++ b/example/defaults.conf</span><br><span>@@ -54,11 +54,22 @@</span><br><span>     - phys_chan_config: TCH/F</span><br><span>     - phys_chan_config: TCH/F</span><br><span>     - phys_chan_config: TCH/F</span><br><span style="color: hsl(0, 100%, 40%);">-    - phys_chan_config: TCH/F</span><br><span style="color: hsl(0, 100%, 40%);">-    - phys_chan_config: TCH/F</span><br><span style="color: hsl(120, 100%, 40%);">+    - phys_chan_config: PDCH</span><br><span style="color: hsl(120, 100%, 40%);">+    - phys_chan_config: PDCH</span><br><span> </span><br><span> osmo_bts_octphy:</span><br><span>   max_trx: 2</span><br><span> </span><br><span> nanobts:</span><br><span>   max_trx: 2</span><br><span style="color: hsl(120, 100%, 40%);">+  trx_list:</span><br><span style="color: hsl(120, 100%, 40%);">+  - {}</span><br><span style="color: hsl(120, 100%, 40%);">+  - timeslot_list:</span><br><span style="color: hsl(120, 100%, 40%);">+    - {}</span><br><span style="color: hsl(120, 100%, 40%);">+    - {}</span><br><span style="color: hsl(120, 100%, 40%);">+    - {}</span><br><span style="color: hsl(120, 100%, 40%);">+    - {}</span><br><span style="color: hsl(120, 100%, 40%);">+    - {}</span><br><span style="color: hsl(120, 100%, 40%);">+    - {}</span><br><span style="color: hsl(120, 100%, 40%);">+    - phys_chan_config: TCH/F # nanobts only supports PDCH in TRX0.</span><br><span style="color: hsl(120, 100%, 40%);">+    - phys_chan_config: TCH/F</span><br><span>diff --git a/example/scenarios/mod-bts0-chanallocdescend.conf b/example/scenarios/mod-bts0-chanallocdescend.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..78cd02c</span><br><span>--- /dev/null</span><br><span>+++ b/example/scenarios/mod-bts0-chanallocdescend.conf</span><br><span>@@ -0,0 +1,3 @@</span><br><span style="color: hsl(120, 100%, 40%);">+modifiers:</span><br><span style="color: hsl(120, 100%, 40%);">+  bts:</span><br><span style="color: hsl(120, 100%, 40%);">+  - channel_allocator: descending</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10583">change 10583</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/10583"/><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: I12e1bcb047c4efac5693cf725739e0ce2e0532ee </div>
<div style="display:none"> Gerrit-Change-Number: 10583 </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: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>