<p>Holger Freyther has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12209">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ms_driver: Add a virtual bts and make use of it<br><br>It's very close to the osmo-bts-trx but without osmo-trx. Modify<br>the suite to make use of this BTS.<br><br>Change-Id: I9f5a2501eb4473ccf2287c902ee207c6a45a1bc5<br>---<br>M example/defaults.conf<br>M example/resources.conf.prod<br>A src/osmo_gsm_tester/bts_osmovirtual.py<br>M src/osmo_gsm_tester/resource.py<br>A src/osmo_gsm_tester/templates/osmo-bts-virtual.cfg.tmpl<br>M suites/nitb_netreg_mass/suite.conf<br>6 files changed, 176 insertions(+), 2 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/09/12209/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 eee17b1..3de5e29 100644</span><br><span>--- a/example/defaults.conf</span><br><span>+++ b/example/defaults.conf</span><br><span>@@ -84,3 +84,6 @@</span><br><span> type: uhd</span><br><span> launch_trx: true</span><br><span> clock_reference: internal</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_bts_virtual:</span><br><span style="color: hsl(120, 100%, 40%);">+ max_trx: 1</span><br><span>diff --git a/example/resources.conf.prod b/example/resources.conf.prod</span><br><span>index e786836..c6bc4e9 100644</span><br><span>--- a/example/resources.conf.prod</span><br><span>+++ b/example/resources.conf.prod</span><br><span>@@ -110,6 +110,13 @@</span><br><span> device: '01:01:4d:98:24'</span><br><span> port: '3'</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+- label: OsmoBTS Virtual</span><br><span style="color: hsl(120, 100%, 40%);">+ type: osmo-bts-virtual</span><br><span style="color: hsl(120, 100%, 40%);">+ ipa_unit_id: 11</span><br><span style="color: hsl(120, 100%, 40%);">+ addr: 10.42.42.123</span><br><span style="color: hsl(120, 100%, 40%);">+ band: GSM-1800</span><br><span style="color: hsl(120, 100%, 40%);">+ num_trx: 1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> arfcn:</span><br><span> - arfcn: 512</span><br><span> band: GSM-1800</span><br><span>diff --git a/src/osmo_gsm_tester/bts_osmovirtual.py b/src/osmo_gsm_tester/bts_osmovirtual.py</span><br><span>new file mode 100644</span><br><span>index 0000000..516d992</span><br><span>--- /dev/null</span><br><span>+++ b/src/osmo_gsm_tester/bts_osmovirtual.py</span><br><span>@@ -0,0 +1,115 @@</span><br><span style="color: hsl(120, 100%, 40%);">+# osmo_gsm_tester: specifics for running an osmo-bts-virtual</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# Copyright (C) 2016-2017 by sysmocom - s.f.m.c. GmbH</span><br><span style="color: hsl(120, 100%, 40%);">+# Copyright (C) 2018 Holger Hans Peter Freyther</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# Author: Neels Hofmeyr <neels@hofmeyr.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%);">+from . import config, util, template, process, bts_osmo</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+class OsmoBtsVirtual(bts_osmo.OsmoBtsMainUnit):</span><br><span style="color: hsl(120, 100%, 40%);">+##############</span><br><span style="color: hsl(120, 100%, 40%);">+# PROTECTED</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%);">+ BIN_BTS = 'osmo-bts-virtual'</span><br><span style="color: hsl(120, 100%, 40%);">+ BIN_PCU = 'osmo-pcu'</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ CONF_BTS = 'osmo-bts-virtual.cfg'</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%);">+ """Initializes the OsmoBtsVirtual."""</span><br><span style="color: hsl(120, 100%, 40%);">+ super().__init__(suite_run, conf, OsmoBtsVirtual.BIN_BTS, 'osmo_bts_virtual')</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.env = {}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def launch_process(self, keepalive, binary_name, *args):</span><br><span style="color: hsl(120, 100%, 40%);">+ """Launches the osmo-bts-virtual process."""</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ binary = os.path.abspath(self.inst.child('bin', binary_name))</span><br><span style="color: hsl(120, 100%, 40%);">+ run_dir = self.run_dir.new_dir(binary_name)</span><br><span style="color: hsl(120, 100%, 40%);">+ if not os.path.isfile(binary):</span><br><span style="color: hsl(120, 100%, 40%);">+ raise RuntimeError('Binary missing: %r' % binary)</span><br><span style="color: hsl(120, 100%, 40%);">+ proc = process.Process(binary_name, run_dir,</span><br><span style="color: hsl(120, 100%, 40%);">+ (binary,) + args,</span><br><span style="color: hsl(120, 100%, 40%);">+ env=self.env)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.suite_run.remember_to_stop(proc, keepalive)</span><br><span style="color: hsl(120, 100%, 40%);">+ proc.launch()</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 configure(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ """Builds the configuration for osmo-bts-virtual and writes it to a file."""</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.bsc is None:</span><br><span style="color: hsl(120, 100%, 40%);">+ raise RuntimeError('BTS needs to be added to a BSC or NITB before it can be configured')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.config_file = self.run_dir.new_file(OsmoBtsVirtual.CONF_BTS)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.dbg(config_file=self.config_file)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ values = dict(osmo_bts_virtual=config.get_defaults('osmo_bts_virtual'))</span><br><span style="color: hsl(120, 100%, 40%);">+ config.overlay(values, self.suite_run.config())</span><br><span style="color: hsl(120, 100%, 40%);">+ config.overlay(values, {</span><br><span style="color: hsl(120, 100%, 40%);">+ 'osmo_bts_virtual': {</span><br><span style="color: hsl(120, 100%, 40%);">+ 'oml_remote_ip': self.bsc.addr(),</span><br><span style="color: hsl(120, 100%, 40%);">+ 'pcu_socket_path': self.pcu_socket_path(),</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%);">+ config.overlay(values, { 'osmo_bts_virtual': self.conf })</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ self.dbg('OSMO-BTS-VIRTUAL CONFIG:\n' + pprint.pformat(values))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ with open(self.config_file, 'w') as f:</span><br><span style="color: hsl(120, 100%, 40%);">+ r = template.render(OsmoBtsVirtual.CONF_BTS, 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%);">+########################</span><br><span style="color: hsl(120, 100%, 40%);">+# PUBLIC - INTERNAL API</span><br><span style="color: hsl(120, 100%, 40%);">+########################</span><br><span style="color: hsl(120, 100%, 40%);">+ def conf_for_bsc(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ """Returns the configuration for the BSC (including the BSC/NITB IP)."""</span><br><span style="color: hsl(120, 100%, 40%);">+ values = self.conf_for_bsc_prepare()</span><br><span style="color: hsl(120, 100%, 40%);">+ self.dbg(conf=values)</span><br><span style="color: hsl(120, 100%, 40%);">+ return values</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%);">+# PUBLIC (test API included)</span><br><span style="color: hsl(120, 100%, 40%);">+###################</span><br><span style="color: hsl(120, 100%, 40%);">+ def start(self, keepalive=False):</span><br><span style="color: hsl(120, 100%, 40%);">+ """Handles starting/turning-up the osmo-bts-virtual process."""</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.bsc is None:</span><br><span style="color: hsl(120, 100%, 40%);">+ raise RuntimeError('BTS needs to be added to a BSC or NITB before it can be started')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.suite_run.poll()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ self.log('Starting to connect to', self.bsc)</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ self.inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmo-bts')))</span><br><span style="color: hsl(120, 100%, 40%);">+ lib = self.inst.child('lib')</span><br><span style="color: hsl(120, 100%, 40%);">+ if not os.path.isdir(lib):</span><br><span style="color: hsl(120, 100%, 40%);">+ raise RuntimeError('No lib/ in %r' % self.inst)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ self.proc_bts = self.launch_process(keepalive, OsmoBtsVirtual.BIN_BTS, '-r', '1',</span><br><span style="color: hsl(120, 100%, 40%);">+ '-c', os.path.abspath(self.config_file),</span><br><span style="color: hsl(120, 100%, 40%);">+ '-i', self.bsc.addr())</span><br><span style="color: hsl(120, 100%, 40%);">+ self.suite_run.poll()</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 style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py</span><br><span>index e71f4cd..4f48dc4 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 schema</span><br><span> from . import modem</span><br><span> from . import osmo_nitb</span><br><span style="color: hsl(0, 100%, 40%);">-from . import bts_sysmo, bts_osmotrx, bts_octphy, bts_nanobts</span><br><span style="color: hsl(120, 100%, 40%);">+from . import bts_sysmo, bts_osmotrx, bts_osmovirtual, bts_octphy, bts_nanobts</span><br><span> </span><br><span> from .util import is_dict, is_list</span><br><span> </span><br><span>@@ -102,6 +102,7 @@</span><br><span> 'osmo-bts-sysmo': bts_sysmo.SysmoBts,</span><br><span> 'osmo-bts-trx': bts_osmotrx.OsmoBtsTrx,</span><br><span> 'osmo-bts-octphy': bts_octphy.OsmoBtsOctphy,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'osmo-bts-virtual': bts_osmovirtual.OsmoBtsVirtual,</span><br><span> 'nanobts': bts_nanobts.NanoBts,</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/templates/osmo-bts-virtual.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bts-virtual.cfg.tmpl</span><br><span>new file mode 100644</span><br><span>index 0000000..be4f50c</span><br><span>--- /dev/null</span><br><span>+++ b/src/osmo_gsm_tester/templates/osmo-bts-virtual.cfg.tmpl</span><br><span>@@ -0,0 +1,48 @@</span><br><span style="color: hsl(120, 100%, 40%);">+! Configuration rendered by osmo-gsm-tester</span><br><span style="color: hsl(120, 100%, 40%);">+log stderr</span><br><span style="color: hsl(120, 100%, 40%);">+ logging color 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print extended-timestamp 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print category 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level abis debug</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level oml debug</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level pag debug</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level rll debug</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level rr debug</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level rsl debug</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level l1c info</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level l1p error</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level trx info</span><br><span style="color: hsl(120, 100%, 40%);">+ ! Level required by ready_for_pcu(): pcu info</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level pcu info</span><br><span style="color: hsl(120, 100%, 40%);">+!</span><br><span style="color: hsl(120, 100%, 40%);">+line vty</span><br><span style="color: hsl(120, 100%, 40%);">+ bind ${osmo_bts_virtual.addr}</span><br><span style="color: hsl(120, 100%, 40%);">+ctrl</span><br><span style="color: hsl(120, 100%, 40%);">+ bind ${osmo_bts_virtual.addr}</span><br><span style="color: hsl(120, 100%, 40%);">+!</span><br><span style="color: hsl(120, 100%, 40%);">+phy 0</span><br><span style="color: hsl(120, 100%, 40%);">+ instance 0</span><br><span style="color: hsl(120, 100%, 40%);">+bts 0</span><br><span style="color: hsl(120, 100%, 40%);">+ band ${osmo_bts_virtual.band}</span><br><span style="color: hsl(120, 100%, 40%);">+ ipa unit-id ${osmo_bts_virtual.ipa_unit_id} 0</span><br><span style="color: hsl(120, 100%, 40%);">+ oml remote-ip ${osmo_bts_virtual.oml_remote_ip}</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu-socket ${osmo_bts_virtual.pcu_socket_path}</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-sapi bcch</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-sapi ccch</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-sapi rach</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-sapi agch</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-sapi pch</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-sapi sdcch</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-sapi tch/f</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-sapi tch/h</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-sapi pacch</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-sapi pdtch</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-sapi ptcch</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-sapi cbch</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap-sapi sacch</span><br><span style="color: hsl(120, 100%, 40%);">+ trx 0</span><br><span style="color: hsl(120, 100%, 40%);">+ power-ramp max-initial 23000 mdBm</span><br><span style="color: hsl(120, 100%, 40%);">+ power-ramp step-size 2000 mdB</span><br><span style="color: hsl(120, 100%, 40%);">+ power-ramp step-interval 1</span><br><span style="color: hsl(120, 100%, 40%);">+ ms-power-control dsp</span><br><span style="color: hsl(120, 100%, 40%);">+ phy 0 instance 0</span><br><span>diff --git a/suites/nitb_netreg_mass/suite.conf b/suites/nitb_netreg_mass/suite.conf</span><br><span>index bfb23cd..94ec603 100644</span><br><span>--- a/suites/nitb_netreg_mass/suite.conf</span><br><span>+++ b/suites/nitb_netreg_mass/suite.conf</span><br><span>@@ -2,7 +2,7 @@</span><br><span> ip_address:</span><br><span> - times: 1</span><br><span> bts:</span><br><span style="color: hsl(0, 100%, 40%);">- - times: 1</span><br><span style="color: hsl(120, 100%, 40%);">+ - type: osmo-bts-virtual</span><br><span> </span><br><span> defaults:</span><br><span> timeout: 40s</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12209">change 12209</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/12209"/><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: I9f5a2501eb4473ccf2287c902ee207c6a45a1bc5 </div>
<div style="display:none"> Gerrit-Change-Number: 12209 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Holger Freyther <holger@freyther.de> </div>