<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17714">View Change</a></p><div style="white-space:pre-wrap">Approvals:
pespin: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">amarisoftUE: adding basic support for Amarisoft UE<br><br>Change-Id: Idda0d3a040663969dd71781814198b47fff7daf3<br>---<br>A example/scenarios/amarisoftue-rftype@.conf<br>M src/osmo_gsm_tester/amarisoft_enb.py<br>A src/osmo_gsm_tester/amarisoft_ue.py<br>M src/osmo_gsm_tester/resource.py<br>A src/osmo_gsm_tester/templates/amarisoft_lteue.cfg.tmpl<br>M src/osmo_gsm_tester/templates/amarisoft_rf_driver.cfg.tmpl<br>6 files changed, 359 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/example/scenarios/amarisoftue-rftype@.conf b/example/scenarios/amarisoftue-rftype@.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..5bf4cfe</span><br><span>--- /dev/null</span><br><span>+++ b/example/scenarios/amarisoftue-rftype@.conf</span><br><span>@@ -0,0 +1,4 @@</span><br><span style="color: hsl(120, 100%, 40%);">+resources:</span><br><span style="color: hsl(120, 100%, 40%);">+ modem:</span><br><span style="color: hsl(120, 100%, 40%);">+ - type: amarisoftue</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_type: ${param1}</span><br><span>diff --git a/src/osmo_gsm_tester/amarisoft_enb.py b/src/osmo_gsm_tester/amarisoft_enb.py</span><br><span>index 374393a..e6e214f 100644</span><br><span>--- a/src/osmo_gsm_tester/amarisoft_enb.py</span><br><span>+++ b/src/osmo_gsm_tester/amarisoft_enb.py</span><br><span>@@ -201,6 +201,11 @@</span><br><span> logfile = self.log_file if self.setup_runs_locally() else self.remote_log_file</span><br><span> config.overlay(values, dict(enb=dict(log_filename=logfile)))</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ # rf driver is shared between amarisoft enb and ue, so it has a</span><br><span style="color: hsl(120, 100%, 40%);">+ # different cfg namespace 'trx'. Copy needed values over there:</span><br><span style="color: hsl(120, 100%, 40%);">+ config.overlay(values, dict(trx=dict(rf_dev_type=values['enb'].get('rf_dev_type', None),</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args=values['enb'].get('rf_dev_args', None))))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> self.gen_conf_file(self.config_file, AmarisoftENB.CFGFILE, values)</span><br><span> self.gen_conf_file(self.config_sib1_file, AmarisoftENB.CFGFILE_SIB1, values)</span><br><span> self.gen_conf_file(self.config_sib23_file, AmarisoftENB.CFGFILE_SIB23, values)</span><br><span>diff --git a/src/osmo_gsm_tester/amarisoft_ue.py b/src/osmo_gsm_tester/amarisoft_ue.py</span><br><span>new file mode 100644</span><br><span>index 0000000..31e814e</span><br><span>--- /dev/null</span><br><span>+++ b/src/osmo_gsm_tester/amarisoft_ue.py</span><br><span>@@ -0,0 +1,273 @@</span><br><span style="color: hsl(120, 100%, 40%);">+# osmo_gsm_tester: specifics for running an SRS UE process</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# Copyright (C) 2020 by sysmocom - s.f.m.c. GmbH</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# Author: Pau Espin Pedrol <pespin@sysmocom.de></span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# This program is free software: you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+# it under the terms of the GNU General Public License as</span><br><span style="color: hsl(120, 100%, 40%);">+# published by the Free Software Foundation, either version 3 of the</span><br><span style="color: hsl(120, 100%, 40%);">+# License, or (at your option) any later version.</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+# but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+# GNU General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# You should have received a copy of the GNU General Public License</span><br><span style="color: hsl(120, 100%, 40%);">+# along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+import os</span><br><span style="color: hsl(120, 100%, 40%);">+import pprint</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+from . import log, util, config, template, process, remote</span><br><span style="color: hsl(120, 100%, 40%);">+from .run_node import RunNode</span><br><span style="color: hsl(120, 100%, 40%);">+from .event_loop import MainLoop</span><br><span style="color: hsl(120, 100%, 40%);">+from .ms import MS</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+def rf_type_valid(rf_type_str):</span><br><span style="color: hsl(120, 100%, 40%);">+ return rf_type_str in ('uhd', 'zmq')</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#reference: srsLTE.git srslte_symbol_sz()</span><br><span style="color: hsl(120, 100%, 40%);">+def num_prb2symbol_sz(num_prb):</span><br><span style="color: hsl(120, 100%, 40%);">+ if num_prb <= 6:</span><br><span style="color: hsl(120, 100%, 40%);">+ return 128</span><br><span style="color: hsl(120, 100%, 40%);">+ if num_prb <= 15:</span><br><span style="color: hsl(120, 100%, 40%);">+ return 256</span><br><span style="color: hsl(120, 100%, 40%);">+ if num_prb <= 25:</span><br><span style="color: hsl(120, 100%, 40%);">+ return 384</span><br><span style="color: hsl(120, 100%, 40%);">+ if num_prb <= 50:</span><br><span style="color: hsl(120, 100%, 40%);">+ return 768</span><br><span style="color: hsl(120, 100%, 40%);">+ if num_prb <= 75:</span><br><span style="color: hsl(120, 100%, 40%);">+ return 1024</span><br><span style="color: hsl(120, 100%, 40%);">+ if num_prb <= 110:</span><br><span style="color: hsl(120, 100%, 40%);">+ return 1536</span><br><span style="color: hsl(120, 100%, 40%);">+ raise log.Error('invalid num_prb %r', num_prb)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+def num_prb2base_srate(num_prb):</span><br><span style="color: hsl(120, 100%, 40%);">+ return num_prb2symbol_sz(num_prb) * 15 * 1000</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+class AmarisoftUE(MS):</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ REMOTE_DIR = '/osmo-gsm-tester-amarisoftue'</span><br><span style="color: hsl(120, 100%, 40%);">+ BINFILE = 'lteue'</span><br><span style="color: hsl(120, 100%, 40%);">+ CFGFILE = 'amarisoft_lteue.cfg'</span><br><span style="color: hsl(120, 100%, 40%);">+ CFGFILE_RF = 'amarisoft_rf_driver.cfg'</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGFILE = 'lteue.log'</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def __init__(self, suite_run, conf):</span><br><span style="color: hsl(120, 100%, 40%);">+ self._addr = conf.get('addr', None)</span><br><span style="color: hsl(120, 100%, 40%);">+ if self._addr is None:</span><br><span style="color: hsl(120, 100%, 40%);">+ raise log.Error('addr not set')</span><br><span style="color: hsl(120, 100%, 40%);">+ super().__init__('amarisoftue_%s' % self._addr, conf)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.enb = None</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = None</span><br><span style="color: hsl(120, 100%, 40%);">+ self.inst = None</span><br><span style="color: hsl(120, 100%, 40%);">+ self._bin_prefix = None</span><br><span style="color: hsl(120, 100%, 40%);">+ self.config_file = None</span><br><span style="color: hsl(120, 100%, 40%);">+ self.config_rf_file = None</span><br><span style="color: hsl(120, 100%, 40%);">+ self.log_file = None</span><br><span style="color: hsl(120, 100%, 40%);">+ self.process = None</span><br><span style="color: hsl(120, 100%, 40%);">+ self.rem_host = None</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_inst = None</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_config_file = None</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_config_rf_file = None</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_log_file = None</span><br><span style="color: hsl(120, 100%, 40%);">+ self.suite_run = suite_run</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_user = conf.get('remote_user', None)</span><br><span style="color: hsl(120, 100%, 40%);">+ if not rf_type_valid(conf.get('rf_dev_type', None)):</span><br><span style="color: hsl(120, 100%, 40%);">+ raise log.Error('Invalid rf_dev_type=%s' % conf.get('rf_dev_type', None))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def bin_prefix(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ if self._bin_prefix is None:</span><br><span style="color: hsl(120, 100%, 40%);">+ self._bin_prefix = os.getenv('AMARISOFT_PATH_UE', None)</span><br><span style="color: hsl(120, 100%, 40%);">+ if self._bin_prefix == None:</span><br><span style="color: hsl(120, 100%, 40%);">+ self._bin_prefix = self.suite_run.trial.get_inst('amarisoftue')</span><br><span style="color: hsl(120, 100%, 40%);">+ return self._bin_prefix</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def cleanup(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.process is None:</span><br><span style="color: hsl(120, 100%, 40%);">+ return</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.setup_runs_locally():</span><br><span style="color: hsl(120, 100%, 40%);">+ return</span><br><span style="color: hsl(120, 100%, 40%);">+ # copy back files (may not exist, for instance if there was an early error of process):</span><br><span style="color: hsl(120, 100%, 40%);">+ try:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.rem_host.scpfrom('scp-back-log', self.remote_log_file, self.log_file)</span><br><span style="color: hsl(120, 100%, 40%);">+ except Exception as e:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.log(repr(e))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def setup_runs_locally(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ return self.remote_user is None</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def netns(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ return "amarisoftue1"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def stop(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ self.suite_run.stop_process(self.process)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def connect(self, enb):</span><br><span style="color: hsl(120, 100%, 40%);">+ self.log('Starting amarisoftue')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.enb = enb</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name()))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.configure()</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.setup_runs_locally():</span><br><span style="color: hsl(120, 100%, 40%);">+ self.start_locally()</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.start_remotely()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # send t+Enter to enable console trace</span><br><span style="color: hsl(120, 100%, 40%);">+ self.dbg('Enabling console trace')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.process.stdin_write('t\n')</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def start_remotely(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_binary = self.remote_inst.child('', AmarisoftUE.BINFILE)</span><br><span style="color: hsl(120, 100%, 40%);">+ # setting capabilities will later disable use of LD_LIBRARY_PATH from ELF loader -> modify RPATH instead.</span><br><span style="color: hsl(120, 100%, 40%);">+ self.log('Setting RPATH for ltetue')</span><br><span style="color: hsl(120, 100%, 40%);">+ # amarisoftue binary needs patchelf >= 0.9+52 to avoid failing during patch. OS#4389, patchelf-GH#192.</span><br><span style="color: hsl(120, 100%, 40%);">+ self.rem_host.set_remote_env({'PATCHELF_BIN': '/opt/bin/patchelf-v0.10' })</span><br><span style="color: hsl(120, 100%, 40%);">+ self.rem_host.change_elf_rpath(remote_binary, str(self.remote_inst))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # amarisoftue requires CAP_SYS_ADMIN to cjump to net network namespace: netns(CLONE_NEWNET):</span><br><span style="color: hsl(120, 100%, 40%);">+ # amarisoftue requires CAP_NET_ADMIN to create tunnel devices: ioctl(TUNSETIFF):</span><br><span style="color: hsl(120, 100%, 40%);">+ self.log('Applying CAP_SYS_ADMIN+CAP_NET_ADMIN capability to ltetue')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.rem_host.setcap_netsys_admin(remote_binary)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ self.log('Creating netns %s' % self.netns())</span><br><span style="color: hsl(120, 100%, 40%);">+ self.rem_host.create_netns(self.netns())</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ args = (remote_binary, self.remote_config_file)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.process = self.rem_host.RemoteProcess(AmarisoftUE.BINFILE, args)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.suite_run.remember_to_stop(self.process)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.process.launch()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def start_locally(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ binary = self.inst.child('', AmarisoftUE.BINFILE)</span><br><span style="color: hsl(120, 100%, 40%);">+ env = {}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # setting capabilities will later disable use of LD_LIBRARY_PATH from ELF loader -> modify RPATH instead.</span><br><span style="color: hsl(120, 100%, 40%);">+ self.log('Setting RPATH for lteue')</span><br><span style="color: hsl(120, 100%, 40%);">+ util.change_elf_rpath(binary, util.prepend_library_path(self.inst), self.run_dir.new_dir('patchelf'))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # amarisoftue requires CAP_SYS_ADMIN to cjump to net network namespace: netns(CLONE_NEWNET):</span><br><span style="color: hsl(120, 100%, 40%);">+ # amarisoftue requires CAP_NET_ADMIN to create tunnel devices: ioctl(TUNSETIFF):</span><br><span style="color: hsl(120, 100%, 40%);">+ self.log('Applying CAP_SYS_ADMIN+CAP_NET_ADMIN capability to lteue')</span><br><span style="color: hsl(120, 100%, 40%);">+ util.setcap_netsys_admin(binary, self.run_dir.new_dir('setcap_netsys_admin'))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ self.log('Creating netns %s' % self.netns())</span><br><span style="color: hsl(120, 100%, 40%);">+ util.create_netns(self.netns(), self.run_dir.new_dir('create_netns'))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ args = (binary, os.path.abspath(self.config_file))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.dbg(run_dir=self.run_dir, binary=binary, env=env)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.process = process.Process(self.name(), self.run_dir, args, env=env)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.suite_run.remember_to_stop(self.process)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.process.launch()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def gen_conf_file(self, path, filename, values):</span><br><span style="color: hsl(120, 100%, 40%);">+ self.dbg('AmarisoftUE ' + filename + ':\n' + pprint.pformat(values))</span><br><span style="color: hsl(120, 100%, 40%);">+ with open(path, 'w') as f:</span><br><span style="color: hsl(120, 100%, 40%);">+ r = template.render(filename, values)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.dbg(r)</span><br><span style="color: hsl(120, 100%, 40%);">+ f.write(r)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def configure(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ self.inst = util.Dir(os.path.abspath(self.bin_prefix()))</span><br><span style="color: hsl(120, 100%, 40%);">+ if not self.inst.isfile('', AmarisoftUE.BINFILE):</span><br><span style="color: hsl(120, 100%, 40%);">+ raise log.Error('No %s binary in' % AmarisoftUE.BINFILE, self.inst)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ self.config_file = self.run_dir.child(AmarisoftUE.CFGFILE)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.config_rf_file = self.run_dir.child(AmarisoftUE.CFGFILE_RF)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.log_file = self.run_dir.child(AmarisoftUE.LOGFILE)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if not self.setup_runs_locally():</span><br><span style="color: hsl(120, 100%, 40%);">+ self.rem_host = remote.RemoteHost(self.run_dir, self.remote_user, self._addr)</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_prefix_dir = util.Dir(AmarisoftUE.REMOTE_DIR)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_inst = util.Dir(remote_prefix_dir.child(os.path.basename(str(self.inst))))</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_run_dir = util.Dir(remote_prefix_dir.child(AmarisoftUE.BINFILE))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_config_file = remote_run_dir.child(AmarisoftUE.CFGFILE)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_config_rf_file = remote_run_dir.child(AmarisoftUE.CFGFILE_RF)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_log_file = remote_run_dir.child(AmarisoftUE.LOGFILE)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ values = dict(ue=config.get_defaults('amarisoft'))</span><br><span style="color: hsl(120, 100%, 40%);">+ config.overlay(values, dict(ue=config.get_defaults('amarisoftue')))</span><br><span style="color: hsl(120, 100%, 40%);">+ config.overlay(values, dict(ue=self.suite_run.config().get('amarisoft', {})))</span><br><span style="color: hsl(120, 100%, 40%);">+ config.overlay(values, dict(ue=self.suite_run.config().get('modem', {})))</span><br><span style="color: hsl(120, 100%, 40%);">+ config.overlay(values, dict(ue=self._conf))</span><br><span style="color: hsl(120, 100%, 40%);">+ config.overlay(values, dict(ue=dict(num_antennas = self.enb.num_ports())))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ logfile = self.log_file if self.setup_runs_locally() else self.remote_log_file</span><br><span style="color: hsl(120, 100%, 40%);">+ config.overlay(values, dict(ue=dict(log_filename=logfile)))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # We need to set some specific variables programatically here to match IP addresses:</span><br><span style="color: hsl(120, 100%, 40%);">+ if self._conf.get('rf_dev_type') == 'zmq':</span><br><span style="color: hsl(120, 100%, 40%);">+ base_srate = num_prb2base_srate(self.enb.num_prb())</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args = 'tx_port0=tcp://' + self.addr() + ':2001' \</span><br><span style="color: hsl(120, 100%, 40%);">+ + ',tx_port1=tcp://' + self.addr() + ':2003' \</span><br><span style="color: hsl(120, 100%, 40%);">+ + ',rx_port0=tcp://' + self.enb.addr() + ':2000' \</span><br><span style="color: hsl(120, 100%, 40%);">+ + ',rx_port1=tcp://' + self.enb.addr() + ':2002' \</span><br><span style="color: hsl(120, 100%, 40%);">+ + ',tx_freq=2510e6,rx_freq=2630e6,tx_freq2=2530e6,rx_freq2=2650e6' \</span><br><span style="color: hsl(120, 100%, 40%);">+ + ',id=ue,base_srate='+ str(base_srate)</span><br><span style="color: hsl(120, 100%, 40%);">+ config.overlay(values, dict(ue=dict(sample_rate = base_srate / (1000*1000),</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args = rf_dev_args)))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Set UHD frame size as a function of the cell bandwidth on B2XX</span><br><span style="color: hsl(120, 100%, 40%);">+ if self._conf.get('rf_dev_type') == 'UHD' and values['ue'].get('rf_dev_args', None) is not None:</span><br><span style="color: hsl(120, 100%, 40%);">+ if 'b200' in values['ue'].get('rf_dev_args'):</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args = values['ue'].get('rf_dev_args', '')</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args += ',' if rf_dev_args != '' and not rf_dev_args.endswith(',') else ''</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.enb.num_prb() < 25:</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args += 'send_frame_size=512,recv_frame_size=512'</span><br><span style="color: hsl(120, 100%, 40%);">+ elif self.enb.num_prb() == 25:</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args += 'send_frame_size=1024,recv_frame_size=1024'</span><br><span style="color: hsl(120, 100%, 40%);">+ elif self.enb.num_prb() > 50:</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args += 'num_recv_frames=64,num_send_frames=64'</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # For 15 and 20 MHz, further reduce over the wire format to sc12</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.enb.num_prb() >= 75:</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args += ',otw_format=sc12'</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ config.overlay(values, dict(ue=dict(rf_dev_args=rf_dev_args)))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # rf driver is shared between amarisoft enb and ue, so it has a</span><br><span style="color: hsl(120, 100%, 40%);">+ # different cfg namespace 'trx'. Copy needed values over there:</span><br><span style="color: hsl(120, 100%, 40%);">+ config.overlay(values, dict(trx=dict(rf_dev_type=values['ue'].get('rf_dev_type', None),</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args=values['ue'].get('rf_dev_args', None))))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ self.gen_conf_file(self.config_file, AmarisoftUE.CFGFILE, values)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.gen_conf_file(self.config_rf_file, AmarisoftUE.CFGFILE_RF, values)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if not self.setup_runs_locally():</span><br><span style="color: hsl(120, 100%, 40%);">+ self.rem_host.recreate_remote_dir(self.remote_inst)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.rem_host.scp('scp-inst-to-remote', str(self.inst), remote_prefix_dir)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.rem_host.recreate_remote_dir(remote_run_dir)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.rem_host.scp('scp-cfg-to-remote', self.config_file, self.remote_config_file)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.rem_host.scp('scp-cfg-rf-to-remote', self.config_rf_file, self.remote_config_rf_file)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def is_connected(self, mcc_mnc=None):</span><br><span style="color: hsl(120, 100%, 40%);">+ return 'Network attach successful.' in (self.process.get_stdout() or '')</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def is_attached(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ return self.is_connected()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def running(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ return not self.process.terminated()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def addr(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ return self._addr</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def run_node(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ return RunNode(RunNode.T_REM_SSH, self._addr, self.remote_user, self._addr)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def run_netns_wait(self, name, popen_args):</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.setup_runs_locally():</span><br><span style="color: hsl(120, 100%, 40%);">+ proc = process.NetNSProcess(name, self.run_dir.new_dir(name), self.netns(), popen_args, env={})</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ proc = self.rem_host.RemoteNetNSProcess(name, self.netns(), popen_args, env={})</span><br><span style="color: hsl(120, 100%, 40%);">+ proc.launch_sync()</span><br><span style="color: hsl(120, 100%, 40%);">+ return proc</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def verify_metric(self, value, operation='avg', metric='dl_brate', criterion='gt'):</span><br><span style="color: hsl(120, 100%, 40%);">+ return 'metrics not yet implemented with Amarisoft UE'</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# vim: expandtab tabstop=4 shiftwidth=4</span><br><span>diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py</span><br><span>index bff8282..ea1b543 100644</span><br><span>--- a/src/osmo_gsm_tester/resource.py</span><br><span>+++ b/src/osmo_gsm_tester/resource.py</span><br><span>@@ -29,7 +29,7 @@</span><br><span> from . import bts_sysmo, bts_osmotrx, bts_osmovirtual, bts_octphy, bts_nanobts, bts_oc2g</span><br><span> from . import modem</span><br><span> from . import ms_osmo_mobile</span><br><span style="color: hsl(0, 100%, 40%);">-from . import srs_ue, srs_enb, amarisoft_enb, srs_epc, amarisoft_epc</span><br><span style="color: hsl(120, 100%, 40%);">+from . import srs_ue, amarisoft_ue, srs_enb, amarisoft_enb, srs_epc, amarisoft_epc</span><br><span> </span><br><span> from .util import is_dict, is_list</span><br><span> </span><br><span>@@ -159,6 +159,7 @@</span><br><span> 'ofono': modem.Modem,</span><br><span> 'osmo-mobile': ms_osmo_mobile.MSOsmoMobile,</span><br><span> 'srsue': srs_ue.srsUE,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'amarisoftue': amarisoft_ue.AmarisoftUE,</span><br><span> }</span><br><span> </span><br><span> </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>new file mode 100644</span><br><span>index 0000000..fb34917</span><br><span>--- /dev/null</span><br><span>+++ b/src/osmo_gsm_tester/templates/amarisoft_lteue.cfg.tmpl</span><br><span>@@ -0,0 +1,70 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/* UE simulator configuration file version 2018-10-18</span><br><span style="color: hsl(120, 100%, 40%);">+ * Copyright (C) 2015-2018 Amarisoft</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%);">+%if ue.license_server_addr != '0.0.0.0':</span><br><span style="color: hsl(120, 100%, 40%);">+ license_server: {</span><br><span style="color: hsl(120, 100%, 40%);">+ server_addr: "${ue.license_server_addr}",</span><br><span style="color: hsl(120, 100%, 40%);">+ name: "amarisoft",</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+%endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+% if ue.rf_dev_type == 'zmq':</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Force sampling rate (if uncommented) */</span><br><span style="color: hsl(120, 100%, 40%);">+ sample_rate: ${ue.sample_rate},</span><br><span style="color: hsl(120, 100%, 40%);">+%endif</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%);">+// log_options: "all.level=debug,all.max_size=32",</span><br><span style="color: hsl(120, 100%, 40%);">+ log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",</span><br><span style="color: hsl(120, 100%, 40%);">+ log_filename: "${ue.log_filename}",</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Enable remote API and Web interface */</span><br><span style="color: hsl(120, 100%, 40%);">+ com_addr: "${ue.addr}:9002",</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ include "amarisoft_rf_driver.cfg",</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bandwidth: 5,</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If true, allow the simulation of several UEs at the same time and</span><br><span style="color: hsl(120, 100%, 40%);">+ allow dynamic UE creation from remote API */</span><br><span style="color: hsl(120, 100%, 40%);">+ multi_ue: false,</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ cells: [</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ dl_earfcn: 3350, /* 2850 MHz (band 7) */</span><br><span style="color: hsl(120, 100%, 40%);">+// dl_earfcn: 40620, /* 3500 MHz (band 41) */</span><br><span style="color: hsl(120, 100%, 40%);">+ n_antenna_dl: 1, /* number of downlink antennas */</span><br><span style="color: hsl(120, 100%, 40%);">+ n_antenna_ul: 1,</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* must be provided if multi_ue = true */</span><br><span style="color: hsl(120, 100%, 40%);">+ //global_timing_advance: 1,</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%);">+ ue_list: [</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* UE capabilities */</span><br><span style="color: hsl(120, 100%, 40%);">+ as_release: 8,</span><br><span style="color: hsl(120, 100%, 40%);">+ ue_category: 4,</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* USIM data */</span><br><span style="color: hsl(120, 100%, 40%);">+ imsi: "${ue.imsi}",</span><br><span style="color: hsl(120, 100%, 40%);">+ K: "${ue.ki}",</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If enabled, will try to use external SIM card using libpcsclite */</span><br><span style="color: hsl(120, 100%, 40%);">+ //external_sim: true,</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Enable it to create a TUN interface for each UE PDN */</span><br><span style="color: hsl(120, 100%, 40%);">+ //tun_setup_script: "ue-ifup",</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%);">+ /* If case your system have a high SNR and you are running high number of</span><br><span style="color: hsl(120, 100%, 40%);">+ * UEs, enable this option to optimize PDCCH decoding and save CPU</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+ pdcch_decode_opt: false,</span><br><span style="color: hsl(120, 100%, 40%);">+ pdcch_decode_opt_threshold: 0.1,</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/osmo_gsm_tester/templates/amarisoft_rf_driver.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_rf_driver.cfg.tmpl</span><br><span>index 7f9d929..1e385d0 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/amarisoft_rf_driver.cfg.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/amarisoft_rf_driver.cfg.tmpl</span><br><span>@@ -1,10 +1,10 @@</span><br><span> rf_driver: {</span><br><span style="color: hsl(0, 100%, 40%);">- name: "${enb.rf_dev_type}",</span><br><span style="color: hsl(0, 100%, 40%);">- sync: "${'1' if enb.rf_dev_type == 'zmq' else 'none'}",</span><br><span style="color: hsl(120, 100%, 40%);">+ name: "${trx.rf_dev_type}",</span><br><span style="color: hsl(120, 100%, 40%);">+ sync: "${'1' if trx.rf_dev_type == 'zmq' else 'none'}",</span><br><span> </span><br><span> /* Use this for b2x0 devices. Bandwidth >= 10 Mhz */</span><br><span style="color: hsl(0, 100%, 40%);">- args: "${enb.rf_dev_args}",</span><br><span style="color: hsl(0, 100%, 40%);">-% if enb.rf_dev_type == 'zmq':</span><br><span style="color: hsl(120, 100%, 40%);">+ args: "${trx.rf_dev_args}",</span><br><span style="color: hsl(120, 100%, 40%);">+% if trx.rf_dev_type == 'zmq':</span><br><span> dl_sample_bits: 16,</span><br><span> ul_sample_bits: 16,</span><br><span> % endif</span><br><span>@@ -12,7 +12,7 @@</span><br><span> </span><br><span> tx_gain: 89.0, /* TX gain (in dB) B2x0: 0 to 89.8 dB */</span><br><span> rx_gain: 60.0, /* RX gain (in dB) B2x0: 0 to 73 dB */</span><br><span style="color: hsl(0, 100%, 40%);">-% if enb.rf_dev_type == 'zmq':</span><br><span style="color: hsl(120, 100%, 40%);">+% if trx.rf_dev_type == 'zmq':</span><br><span> tx_time_offset: 0,</span><br><span> % else:</span><br><span> tx_time_offset: -150,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17714">change 17714</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/+/17714"/><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: Idda0d3a040663969dd71781814198b47fff7daf3 </div>
<div style="display:none"> Gerrit-Change-Number: 17714 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: srs_andre <andre@softwareradiosystems.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>