<p>srs_andre has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/24042">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ms_amarisoft: extend AmariUE to support custom frequency bands<br><br>this patch adds generic support for custom frequency bands to the ms class.<br>it then extends the config template for AmariUE to use them.<br>we set the default values for EARFCNs for DL/UL to the old values.<br><br>Change-Id: I7b2250e13fc1161be1a1d73a4348f07b31c0f724<br>---<br>M src/osmo_gsm_tester/obj/ms.py<br>M src/osmo_gsm_tester/obj/ms_amarisoft.py<br>M src/osmo_gsm_tester/templates/amarisoft_lteue.cfg.tmpl<br>M sysmocom/defaults.conf<br>4 files changed, 35 insertions(+), 3 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/42/24042/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/obj/ms.py b/src/osmo_gsm_tester/obj/ms.py</span><br><span>index cd4a8a1..93226a8 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/ms.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/ms.py</span><br><span>@@ -32,7 +32,16 @@</span><br><span> 'auth_algo': schema.AUTH_ALGO,</span><br><span> 'apn_ipaddr': schema.IPV4,</span><br><span> 'ciphers[]': schema.CIPHER_2G,</span><br><span style="color: hsl(0, 100%, 40%);">- 'features[]': schema.MODEM_FEATURE</span><br><span style="color: hsl(120, 100%, 40%);">+ 'features[]': schema.MODEM_FEATURE,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'dl_earfcn': schema.UINT,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'ul_earfcn': schema.UINT,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'custom_band_list[].number': schema.UINT,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'custom_band_list[].dl_earfcn_min': schema.UINT,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'custom_band_list[].dl_earfcn_max': schema.UINT,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'custom_band_list[].dl_freq_min': schema.UINT,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'custom_band_list[].ul_freq_min': schema.UINT,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'custom_band_list[].ul_earfcn_min': schema.UINT,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'custom_band_list[].ul_earfcn_max': schema.UINT,</span><br><span> }</span><br><span> schema.register_resource_schema('modem', resource_schema)</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/obj/ms_amarisoft.py b/src/osmo_gsm_tester/obj/ms_amarisoft.py</span><br><span>index 9b6d64a..601d539 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/ms_amarisoft.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/ms_amarisoft.py</span><br><span>@@ -27,7 +27,9 @@</span><br><span> from .ms import MS</span><br><span> </span><br><span> def on_register_schemas():</span><br><span style="color: hsl(0, 100%, 40%);">- resource_schema = {}</span><br><span style="color: hsl(120, 100%, 40%);">+ resource_schema = {</span><br><span style="color: hsl(120, 100%, 40%);">+ 'use_custom_band255': schema.BOOL_STR</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> for key, val in RunNode.schema().items():</span><br><span> resource_schema['run_node.%s' % key] = val</span><br><span> schema.register_resource_schema('modem', resource_schema)</span><br><span>@@ -245,6 +247,9 @@</span><br><span> config.overlay(values, dict(ue=dict(log_filename=logfile,</span><br><span> ifup_filename=ifupfile)))</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ # Convert to Python bool and overlay config</span><br><span style="color: hsl(120, 100%, 40%);">+ config.overlay(values, dict(ue={'use_custom_band255': util.str2bool(values['ue'].get('use_custom_band255', 'false'))}))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # We need to set some specific variables programatically here to match IP addresses:</span><br><span> if self._conf.get('rf_dev_type') == 'zmq':</span><br><span> base_srate = num_prb2base_srate(self.enb.num_prb())</span><br><span>diff --git a/src/osmo_gsm_tester/templates/amarisoft_lteue.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_lteue.cfg.tmpl</span><br><span>index 6f38491..f9b2933 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/amarisoft_lteue.cfg.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/amarisoft_lteue.cfg.tmpl</span><br><span>@@ -30,9 +30,24 @@</span><br><span> allow dynamic UE creation from remote API */</span><br><span> multi_ue: true,</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ custom_freq_band: [</span><br><span style="color: hsl(120, 100%, 40%);">+%for band in ue.custom_band_list:</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ band: ${band.number},</span><br><span style="color: hsl(120, 100%, 40%);">+ dl_earfcn_min: ${band.dl_earfcn_min},</span><br><span style="color: hsl(120, 100%, 40%);">+ dl_earfcn_max: ${band.dl_earfcn_max},</span><br><span style="color: hsl(120, 100%, 40%);">+ dl_freq_min: ${band.dl_freq_min},</span><br><span style="color: hsl(120, 100%, 40%);">+ ul_freq_min: ${band.ul_freq_min},</span><br><span style="color: hsl(120, 100%, 40%);">+ ul_earfcn_min: ${band.ul_earfcn_min},</span><br><span style="color: hsl(120, 100%, 40%);">+ ul_earfcn_max: ${band.ul_earfcn_max},</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+%endfor</span><br><span style="color: hsl(120, 100%, 40%);">+ ],</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> cells: [</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- dl_earfcn: 2850,</span><br><span style="color: hsl(120, 100%, 40%);">+ dl_earfcn: ${ue.dl_earfcn},</span><br><span style="color: hsl(120, 100%, 40%);">+ ul_earfcn: ${ue.ul_earfcn},</span><br><span> n_antenna_dl: 1,</span><br><span> n_antenna_ul: 1,</span><br><span> </span><br><span>diff --git a/sysmocom/defaults.conf b/sysmocom/defaults.conf</span><br><span>index 39b81a8..8bbae42 100644</span><br><span>--- a/sysmocom/defaults.conf</span><br><span>+++ b/sysmocom/defaults.conf</span><br><span>@@ -192,6 +192,9 @@</span><br><span> tx_gain: 89</span><br><span> rx_gain: 60</span><br><span> rf_dev_sync: none</span><br><span style="color: hsl(120, 100%, 40%);">+ custom_band_list: []</span><br><span style="color: hsl(120, 100%, 40%);">+ dl_earfcn: 2850</span><br><span style="color: hsl(120, 100%, 40%);">+ ul_earfcn: 20850</span><br><span> </span><br><span> iperf3cli:</span><br><span> time: 60</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/24042">change 24042</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/c/osmo-gsm-tester/+/24042"/><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-Change-Id: I7b2250e13fc1161be1a1d73a4348f07b31c0f724 </div>
<div style="display:none"> Gerrit-Change-Number: 24042 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: srs_andre <andre@softwareradiosystems.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>