<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13113">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Integrate osmo-{bts,pcu}-oc2g<br><br>Change-Id: I446e27039f75e63c2870d751c190a4fd76947000<br>---<br>M example/defaults.conf<br>M example/resources.conf.prod<br>A example/scenarios/oc2g.conf<br>A src/osmo_gsm_tester/bts_oc2g.py<br>A src/osmo_gsm_tester/pcu_oc2g.py<br>M src/osmo_gsm_tester/resource.py<br>A src/osmo_gsm_tester/templates/osmo-bts-oc2g.cfg.tmpl<br>A src/osmo_gsm_tester/templates/osmo-pcu-oc2g.cfg.tmpl<br>8 files changed, 334 insertions(+), 1 deletion(-)<br><br></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 3de5e29..353cf9b 100644</span><br><span>--- a/example/defaults.conf</span><br><span>+++ b/example/defaults.conf</span><br><span>@@ -87,3 +87,8 @@</span><br><span> </span><br><span> osmo_bts_virtual:</span><br><span> max_trx: 1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_bts_oc2g:</span><br><span style="color: hsl(120, 100%, 40%);">+ max_trx: 1</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_list:</span><br><span style="color: hsl(120, 100%, 40%);">+ - nominal_power: 25</span><br><span>diff --git a/example/resources.conf.prod b/example/resources.conf.prod</span><br><span>index dc7e337..a65add0 100644</span><br><span>--- a/example/resources.conf.prod</span><br><span>+++ b/example/resources.conf.prod</span><br><span>@@ -117,6 +117,14 @@</span><br><span> addr: 10.42.42.55</span><br><span> band: GSM-1800</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+- label: OC-2G</span><br><span style="color: hsl(120, 100%, 40%);">+ type: osmo-bts-oc2g</span><br><span style="color: hsl(120, 100%, 40%);">+ ipa_unit_id: 14</span><br><span style="color: hsl(120, 100%, 40%);">+ addr: 10.42.42.100</span><br><span style="color: hsl(120, 100%, 40%);">+ band: GSM-900</span><br><span style="color: hsl(120, 100%, 40%);">+ direct_pcu: true</span><br><span style="color: hsl(120, 100%, 40%);">+ ciphers: [a5_0, a5_1, a5_3]</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/example/scenarios/oc2g.conf b/example/scenarios/oc2g.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..884e46b</span><br><span>--- /dev/null</span><br><span>+++ b/example/scenarios/oc2g.conf</span><br><span>@@ -0,0 +1,3 @@</span><br><span style="color: hsl(120, 100%, 40%);">+resources:</span><br><span style="color: hsl(120, 100%, 40%);">+ bts:</span><br><span style="color: hsl(120, 100%, 40%);">+ - type: osmo-bts-oc2g</span><br><span>diff --git a/src/osmo_gsm_tester/bts_oc2g.py b/src/osmo_gsm_tester/bts_oc2g.py</span><br><span>new file mode 100644</span><br><span>index 0000000..ec4ed3d</span><br><span>--- /dev/null</span><br><span>+++ b/src/osmo_gsm_tester/bts_oc2g.py</span><br><span>@@ -0,0 +1,137 @@</span><br><span style="color: hsl(120, 100%, 40%);">+# osmo_gsm_tester: specifics for running a osmo-bts-oc2g</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# Copyright (C) 2019 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%);">+from . import log, config, util, template, process, pcu_oc2g, bts_osmo</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+class OsmoBtsOC2G(bts_osmo.OsmoBts):</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%);">+ REMOTE_DIR = '/osmo-gsm-tester-bts'</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_OC2G_BIN = 'osmo-bts-oc2g'</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_OC2G_CFG = 'osmo-bts-oc2g.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%);">+ super().__init__(suite_run, conf, OsmoBtsOC2G.BTS_OC2G_BIN, 'osmo_bts_oc2g')</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.remote_inst = None</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_dir = None</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_user = 'root'</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def _direct_pcu_enabled(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ return util.str2bool(self.conf.get('direct_pcu'))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def launch_remote(self, name, popen_args, remote_cwd=None, keepalive=False):</span><br><span style="color: hsl(120, 100%, 40%);">+ run_dir = self.run_dir.new_dir(name)</span><br><span style="color: hsl(120, 100%, 40%);">+ proc = process.RemoteProcess(name, run_dir, self.remote_user, self.remote_addr(), remote_cwd,</span><br><span style="color: hsl(120, 100%, 40%);">+ popen_args)</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 create_pcu(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ return pcu_oc2g.OsmoPcuOC2G(self.suite_run, self, self.conf)</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%);">+ 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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ self.config_file = self.run_dir.new_file(OsmoBtsOC2G.BTS_OC2G_CFG)</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 = { 'osmo_bts_oc2g': config.get_defaults('osmo_bts_oc2g') }</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_oc2g': {</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_oc2g': self.conf })</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ self.dbg('OSMO-BTS-OC2G 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(OsmoBtsOC2G.BTS_OC2G_CFG, 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 pcu_socket_path(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ return os.path.join(OsmoBtsOC2G.REMOTE_DIR, 'pcu_bts')</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%);">+ values = self.conf_for_bsc_prepare()</span><br><span style="color: hsl(120, 100%, 40%);">+ # Hack until we have proper ARFCN resource allocation support (OS#2230)</span><br><span style="color: hsl(120, 100%, 40%);">+ band = values.get('band')</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_list = values.get('trx_list')</span><br><span style="color: hsl(120, 100%, 40%);">+ if band == 'GSM-900':</span><br><span style="color: hsl(120, 100%, 40%);">+ for trx_i in range(len(trx_list)):</span><br><span style="color: hsl(120, 100%, 40%);">+ config.overlay(trx_list[trx_i], { 'arfcn' : str(50 + trx_i * 2) })</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%);">+ # We get log from ssh stdout instead of usual stderr.</span><br><span style="color: hsl(120, 100%, 40%);">+ def ready_for_pcu(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ if not self.proc_bts or not self.proc_bts.is_running:</span><br><span style="color: hsl(120, 100%, 40%);">+ return False</span><br><span style="color: hsl(120, 100%, 40%);">+ return 'BTS is up' in (self.proc_bts.get_stdout() or '')</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%);">+ 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%);">+ log.log('Starting OsmoBtsOC2G 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(OsmoBtsOC2G.BTS_OC2G_BIN)))</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 log.Error('No lib/ in', self.inst)</span><br><span style="color: hsl(120, 100%, 40%);">+ if not self.inst.isfile('bin', OsmoBtsOC2G.BTS_OC2G_BIN):</span><br><span style="color: hsl(120, 100%, 40%);">+ raise log.Error('No osmo-bts-oc2g binary in', self.inst)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_run_dir = util.Dir(OsmoBtsOC2G.REMOTE_DIR)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_inst = process.copy_inst_ssh(self.run_dir, self.inst, remote_run_dir, self.remote_user,</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_addr(), OsmoBtsOC2G.BTS_OC2G_BIN, self.config_file)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_config_file = remote_run_dir.child(OsmoBtsOC2G.BTS_OC2G_CFG)</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_lib = self.remote_inst.child('lib')</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_binary = self.remote_inst.child('bin', 'osmo-bts-oc2g')</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ args = ('LD_LIBRARY_PATH=%s' % remote_lib,</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_binary, '-c', remote_config_file, '-r', '1',</span><br><span style="color: hsl(120, 100%, 40%);">+ '-i', self.bsc.addr())</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if self._direct_pcu_enabled():</span><br><span style="color: hsl(120, 100%, 40%);">+ args += ('-M',)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ self.proc_bts = self.launch_remote('osmo-bts-oc2g', args, remote_cwd=remote_run_dir, keepalive=keepalive)</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/pcu_oc2g.py b/src/osmo_gsm_tester/pcu_oc2g.py</span><br><span>new file mode 100644</span><br><span>index 0000000..b0572f4</span><br><span>--- /dev/null</span><br><span>+++ b/src/osmo_gsm_tester/pcu_oc2g.py</span><br><span>@@ -0,0 +1,125 @@</span><br><span style="color: hsl(120, 100%, 40%);">+# osmo_gsm_tester: specifics for running a osmo-pcu for OC-2G</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# Copyright (C) 2019 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%);">+from . import log, config, util, template, process</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+class OsmoPcuOC2G(log.Origin):</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ REMOTE_DIR = '/osmo-gsm-tester-pcu'</span><br><span style="color: hsl(120, 100%, 40%);">+ PCU_OC2G_BIN = 'osmo-pcu'</span><br><span style="color: hsl(120, 100%, 40%);">+ PCU_OC2G_CFG = 'osmo-pcu-oc2g.cfg'</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def __init__(self, suite_run, btsoc2g, conf):</span><br><span style="color: hsl(120, 100%, 40%);">+ super().__init__(log.C_RUN, self.PCU_OC2G_BIN)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = None</span><br><span style="color: hsl(120, 100%, 40%);">+ self.bsc = None</span><br><span style="color: hsl(120, 100%, 40%);">+ self.inst = 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_dir = None</span><br><span style="color: hsl(120, 100%, 40%);">+ self.btsoc2g = 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.btsoc2g = btsoc2g</span><br><span style="color: hsl(120, 100%, 40%);">+ self.conf = conf</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_env = {}</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_user = 'root'</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%);">+ 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-pcu-oc2g')))</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 log.Error('No lib/ in', self.inst)</span><br><span style="color: hsl(120, 100%, 40%);">+ if not self.inst.isfile('bin', OsmoPcuOC2G.PCU_OC2G_BIN):</span><br><span style="color: hsl(120, 100%, 40%);">+ raise log.Error('No osmo-pcu-oc2g binary in', self.inst)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_dir = util.Dir(OsmoPcuOC2G.REMOTE_DIR)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_inst = util.Dir(self.remote_dir.child(os.path.basename(str(self.inst))))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_remote('rm-remote-dir', ('test', '!', '-d', OsmoPcuOC2G.REMOTE_DIR, '||', 'rm', '-rf', OsmoPcuOC2G.REMOTE_DIR))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_remote('mk-remote-dir', ('mkdir', '-p', OsmoPcuOC2G.REMOTE_DIR))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_local('scp-inst-to-btsoc2g',</span><br><span style="color: hsl(120, 100%, 40%);">+ ('scp', '-r', str(self.inst), '%s@%s:%s' % (self.remote_user, self.btsoc2g.remote_addr(), str(self.remote_inst))))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_run_dir = self.remote_dir.child(OsmoPcuOC2G.PCU_OC2G_BIN)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_remote('mk-remote-run-dir', ('mkdir', '-p', remote_run_dir))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_config_file = self.remote_dir.child(OsmoPcuOC2G.PCU_OC2G_CFG)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_local('scp-cfg-to-btsoc2g',</span><br><span style="color: hsl(120, 100%, 40%);">+ ('scp', '-r', self.config_file, '%s@%s:%s' % (self.remote_user, self.btsoc2g.remote_addr(), remote_config_file)))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_lib = self.remote_inst.child('lib')</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_binary = self.remote_inst.child('bin', OsmoPcuOC2G.PCU_OC2G_BIN)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.launch_remote(OsmoPcuOC2G.PCU_OC2G_BIN,</span><br><span style="color: hsl(120, 100%, 40%);">+ ('LD_LIBRARY_PATH=%s' % remote_lib,</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_binary, '-c', remote_config_file, '-r', '1',</span><br><span style="color: hsl(120, 100%, 40%);">+ '-i', self.btsoc2g.bsc.addr()),</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_cwd=remote_run_dir, keepalive=keepalive)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def _process_remote(self, name, popen_args, remote_cwd=None):</span><br><span style="color: hsl(120, 100%, 40%);">+ run_dir = self.run_dir.new_dir(name)</span><br><span style="color: hsl(120, 100%, 40%);">+ return process.RemoteProcess(name, run_dir, self.remote_user, self.btsoc2g.remote_addr(), remote_cwd,</span><br><span style="color: hsl(120, 100%, 40%);">+ popen_args)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def run_remote(self, name, popen_args, remote_cwd=None):</span><br><span style="color: hsl(120, 100%, 40%);">+ proc = self._process_remote(name, popen_args, remote_cwd)</span><br><span style="color: hsl(120, 100%, 40%);">+ proc.launch()</span><br><span style="color: hsl(120, 100%, 40%);">+ proc.wait()</span><br><span style="color: hsl(120, 100%, 40%);">+ if proc.result != 0:</span><br><span style="color: hsl(120, 100%, 40%);">+ log.ctx(proc)</span><br><span style="color: hsl(120, 100%, 40%);">+ raise log.Error('Exited in error')</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def launch_remote(self, name, popen_args, remote_cwd=None, keepalive=False):</span><br><span style="color: hsl(120, 100%, 40%);">+ proc = self._process_remote(name, popen_args, remote_cwd)</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def run_local(self, name, popen_args):</span><br><span style="color: hsl(120, 100%, 40%);">+ run_dir = self.run_dir.new_dir(name)</span><br><span style="color: hsl(120, 100%, 40%);">+ proc = process.Process(name, run_dir, popen_args)</span><br><span style="color: hsl(120, 100%, 40%);">+ proc.launch()</span><br><span style="color: hsl(120, 100%, 40%);">+ proc.wait()</span><br><span style="color: hsl(120, 100%, 40%);">+ if proc.result != 0:</span><br><span style="color: hsl(120, 100%, 40%);">+ log.ctx(proc)</span><br><span style="color: hsl(120, 100%, 40%);">+ raise log.Error('Exited in error')</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.config_file = self.run_dir.new_file(OsmoPcuOC2G.PCU_OC2G_CFG)</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 = { 'osmo_pcu_oc2g': config.get_defaults('osmo_pcu_oc2g') }</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_pcu_oc2g': {</span><br><span style="color: hsl(120, 100%, 40%);">+ 'pcu_socket_path': self.btsoc2g.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_pcu_oc2g': self.conf })</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ self.dbg('OSMO-PCU-OC2G 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(OsmoPcuOC2G.PCU_OC2G_CFG, 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%);">+# 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 ce1966b..246b196 100644</span><br><span>--- a/src/osmo_gsm_tester/resource.py</span><br><span>+++ b/src/osmo_gsm_tester/resource.py</span><br><span>@@ -26,7 +26,7 @@</span><br><span> from . import config</span><br><span> from . import util</span><br><span> from . import schema</span><br><span style="color: hsl(0, 100%, 40%);">-from . import bts_sysmo, bts_osmotrx, bts_osmovirtual, 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, bts_oc2g</span><br><span> from . import modem</span><br><span> from . import ms_osmo_mobile</span><br><span> </span><br><span>@@ -101,6 +101,7 @@</span><br><span> KNOWN_BTS_TYPES = {</span><br><span> 'osmo-bts-sysmo': bts_sysmo.SysmoBts,</span><br><span> 'osmo-bts-trx': bts_osmotrx.OsmoBtsTrx,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'osmo-bts-oc2g': bts_oc2g.OsmoBtsOC2G,</span><br><span> 'osmo-bts-octphy': bts_octphy.OsmoBtsOctphy,</span><br><span> 'osmo-bts-virtual': bts_osmovirtual.OsmoBtsVirtual,</span><br><span> 'nanobts': bts_nanobts.NanoBts,</span><br><span>diff --git a/src/osmo_gsm_tester/templates/osmo-bts-oc2g.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bts-oc2g.cfg.tmpl</span><br><span>new file mode 100644</span><br><span>index 0000000..1927061</span><br><span>--- /dev/null</span><br><span>+++ b/src/osmo_gsm_tester/templates/osmo-bts-oc2g.cfg.tmpl</span><br><span>@@ -0,0 +1,42 @@</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%);">+ ! 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_oc2g.addr}</span><br><span style="color: hsl(120, 100%, 40%);">+ctrl</span><br><span style="color: hsl(120, 100%, 40%);">+ bind ${osmo_bts_oc2g.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%);">+ trx-calibration-path /mnt/rom/factory/calib</span><br><span style="color: hsl(120, 100%, 40%);">+bts 0</span><br><span style="color: hsl(120, 100%, 40%);">+ band ${osmo_bts_oc2g.band}</span><br><span style="color: hsl(120, 100%, 40%);">+ ipa unit-id ${osmo_bts_oc2g.ipa_unit_id} 0</span><br><span style="color: hsl(120, 100%, 40%);">+ oml remote-ip ${osmo_bts_oc2g.oml_remote_ip}</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu-socket ${osmo_bts_oc2g.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%);">+ phy 0 instance 0</span><br><span>diff --git a/src/osmo_gsm_tester/templates/osmo-pcu-oc2g.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-pcu-oc2g.cfg.tmpl</span><br><span>new file mode 100644</span><br><span>index 0000000..5c03636</span><br><span>--- /dev/null</span><br><span>+++ b/src/osmo_gsm_tester/templates/osmo-pcu-oc2g.cfg.tmpl</span><br><span>@@ -0,0 +1,12 @@</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 set-all info</span><br><span style="color: hsl(120, 100%, 40%);">+pcu</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu-socket ${osmo_pcu_oc2g.pcu_socket_path}</span><br><span style="color: hsl(120, 100%, 40%);">+ flow-control-interval 10</span><br><span style="color: hsl(120, 100%, 40%);">+ cs 2</span><br><span style="color: hsl(120, 100%, 40%);">+ alloc-algorithm dynamic</span><br><span style="color: hsl(120, 100%, 40%);">+ alpha 0</span><br><span style="color: hsl(120, 100%, 40%);">+ gamma 0</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13113">change 13113</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/13113"/><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: I446e27039f75e63c2870d751c190a4fd76947000 </div>
<div style="display:none"> Gerrit-Change-Number: 13113 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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: Omar Ramadan <omar.ramadan93@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>