<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10582">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Add channel_allocator cfg attr to bts resources<br><br>Change-Id: I682809d4aeb91a36e3a35fc481e8d40d0b084fa0<br>---<br>M example/defaults.conf<br>M src/osmo_gsm_tester/resource.py<br>M src/osmo_gsm_tester/schema.py<br>M src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl<br>4 files changed, 10 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/82/10582/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 f7bd1b1..73188d5 100644</span><br><span>--- a/example/defaults.conf</span><br><span>+++ b/example/defaults.conf</span><br><span>@@ -28,6 +28,7 @@</span><br><span>   base_station_id_code: 63</span><br><span>   stream_id: 255</span><br><span>   osmobsc_bts_type: sysmobts</span><br><span style="color: hsl(120, 100%, 40%);">+  channel_allocator: ascending</span><br><span>   num_trx: 1</span><br><span>   max_trx: 1</span><br><span>   trx_list:</span><br><span>diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py</span><br><span>index 5204b61..e4e2f9d 100644</span><br><span>--- a/src/osmo_gsm_tester/resource.py</span><br><span>+++ b/src/osmo_gsm_tester/resource.py</span><br><span>@@ -58,6 +58,7 @@</span><br><span>         'bts[].launch_trx': schema.BOOL_STR,</span><br><span>         'bts[].direct_pcu': schema.BOOL_STR,</span><br><span>         'bts[].ciphers[]': schema.CIPHER,</span><br><span style="color: hsl(120, 100%, 40%);">+        'bts[].channel_allocator': schema.CHAN_ALLOCATOR,</span><br><span>         'bts[].num_trx': schema.UINT,</span><br><span>         'bts[].max_trx': schema.UINT,</span><br><span>         'bts[].trx_list[].addr': schema.IPV4,</span><br><span>diff --git a/src/osmo_gsm_tester/schema.py b/src/osmo_gsm_tester/schema.py</span><br><span>index 1473ad7..4a15bcd 100644</span><br><span>--- a/src/osmo_gsm_tester/schema.py</span><br><span>+++ b/src/osmo_gsm_tester/schema.py</span><br><span>@@ -105,6 +105,11 @@</span><br><span>         return</span><br><span>     raise ValueError('Unknown Physical channel config: %r' % val)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+def channel_allocator(val):</span><br><span style="color: hsl(120, 100%, 40%);">+    if val in ('ascending', 'descending'):</span><br><span style="color: hsl(120, 100%, 40%);">+        return</span><br><span style="color: hsl(120, 100%, 40%);">+    raise ValueError('Unknown Channel Allocator Policy %r' % val)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> INT = 'int'</span><br><span> STR = 'str'</span><br><span> UINT = 'uint'</span><br><span>@@ -120,6 +125,7 @@</span><br><span> CIPHER = 'cipher'</span><br><span> MODEM_FEATURE = 'modem_feature'</span><br><span> PHY_CHAN = 'chan'</span><br><span style="color: hsl(120, 100%, 40%);">+CHAN_ALLOCATOR = 'chan_allocator'</span><br><span> </span><br><span> SCHEMA_TYPES = {</span><br><span>         INT: int,</span><br><span>@@ -137,6 +143,7 @@</span><br><span>         CIPHER: cipher,</span><br><span>         MODEM_FEATURE: modem_feature,</span><br><span>         PHY_CHAN: phy_channel_config,</span><br><span style="color: hsl(120, 100%, 40%);">+        CHAN_ALLOCATOR: channel_allocator,</span><br><span>     }</span><br><span> </span><br><span> def validate(config, schema):</span><br><span>diff --git a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl</span><br><span>index 18303b6..edcf33f 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl</span><br><span>@@ -49,7 +49,7 @@</span><br><span>   ms max power 33</span><br><span>   cell reselection hysteresis 4</span><br><span>   rxlev access min 0</span><br><span style="color: hsl(0, 100%, 40%);">-  channel allocator ascending</span><br><span style="color: hsl(120, 100%, 40%);">+  channel allocator ${bts.channel_allocator}</span><br><span>   rach tx integer 9</span><br><span>   rach max transmission 7</span><br><span> % if bsc.net.get('rsl_ip', False):</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10582">change 10582</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/10582"/><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: I682809d4aeb91a36e3a35fc481e8d40d0b084fa0 </div>
<div style="display:none"> Gerrit-Change-Number: 10582 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>