<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17769">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pcu_{sysmo,oc2g}: Inherit from pcu abstract class<br><br>For some reason these classes were still not inheriting from the base<br>class (probably because it was added after they existed) and they<br>started failing after recent changes which presumed they where already<br>inheriting.<br><br>Change-Id: I88217baf490ec45373d0743585377ed2639a8cfd<br>---<br>M src/osmo_gsm_tester/pcu_oc2g.py<br>M src/osmo_gsm_tester/pcu_sysmo.py<br>2 files changed, 19 insertions(+), 27 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/69/17769/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/pcu_oc2g.py b/src/osmo_gsm_tester/pcu_oc2g.py</span><br><span>index 36aef60..67c49b3 100644</span><br><span>--- a/src/osmo_gsm_tester/pcu_oc2g.py</span><br><span>+++ b/src/osmo_gsm_tester/pcu_oc2g.py</span><br><span>@@ -19,25 +19,21 @@</span><br><span> </span><br><span> import os</span><br><span> import pprint</span><br><span style="color: hsl(0, 100%, 40%);">-from . import log, config, util, template, process</span><br><span style="color: hsl(120, 100%, 40%);">+from . import log, config, util, template, process, pcu</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-class OsmoPcuOC2G(log.Origin):</span><br><span style="color: hsl(120, 100%, 40%);">+class OsmoPcuOC2G(pcu.Pcu):</span><br><span> </span><br><span> REMOTE_DIR = '/osmo-gsm-tester-pcu'</span><br><span> PCU_OC2G_BIN = 'osmo-pcu'</span><br><span> PCU_OC2G_CFG = 'osmo-pcu-oc2g.cfg'</span><br><span> </span><br><span> def __init__(self, suite_run, btsoc2g, conf):</span><br><span style="color: hsl(0, 100%, 40%);">- super().__init__(log.C_RUN, self.PCU_OC2G_BIN)</span><br><span style="color: hsl(120, 100%, 40%);">+ super().__init__(suite_run, btsoc2g, conf, self.PCU_OC2G_BIN)</span><br><span> self.run_dir = None</span><br><span> self.bsc = None</span><br><span> self.inst = None</span><br><span> self.remote_inst = None</span><br><span> self.remote_dir = None</span><br><span style="color: hsl(0, 100%, 40%);">- self.btsoc2g = None</span><br><span style="color: hsl(0, 100%, 40%);">- self.suite_run = suite_run</span><br><span style="color: hsl(0, 100%, 40%);">- self.btsoc2g = btsoc2g</span><br><span style="color: hsl(0, 100%, 40%);">- self.conf = conf</span><br><span> self.remote_env = {}</span><br><span> self.remote_user = 'root'</span><br><span> </span><br><span>@@ -58,26 +54,26 @@</span><br><span> self.run_remote('rm-remote-dir', ('test', '!', '-d', OsmoPcuOC2G.REMOTE_DIR, '||', 'rm', '-rf', OsmoPcuOC2G.REMOTE_DIR))</span><br><span> self.run_remote('mk-remote-dir', ('mkdir', '-p', OsmoPcuOC2G.REMOTE_DIR))</span><br><span> self.run_local('scp-inst-to-btsoc2g',</span><br><span style="color: hsl(0, 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%);">+ ('scp', '-r', str(self.inst), '%s@%s:%s' % (self.remote_user, self.bts.remote_addr(), str(self.remote_inst))))</span><br><span> </span><br><span> remote_run_dir = self.remote_dir.child(OsmoPcuOC2G.PCU_OC2G_BIN)</span><br><span> self.run_remote('mk-remote-run-dir', ('mkdir', '-p', remote_run_dir))</span><br><span> </span><br><span> remote_config_file = self.remote_dir.child(OsmoPcuOC2G.PCU_OC2G_CFG)</span><br><span> self.run_local('scp-cfg-to-btsoc2g',</span><br><span style="color: hsl(0, 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%);">+ ('scp', '-r', self.config_file, '%s@%s:%s' % (self.remote_user, self.bts.remote_addr(), remote_config_file)))</span><br><span> </span><br><span> remote_lib = self.remote_inst.child('lib')</span><br><span> remote_binary = self.remote_inst.child('bin', OsmoPcuOC2G.PCU_OC2G_BIN)</span><br><span> self.launch_remote(OsmoPcuOC2G.PCU_OC2G_BIN,</span><br><span> ('LD_LIBRARY_PATH=%s' % remote_lib,</span><br><span> remote_binary, '-c', remote_config_file, '-r', '1',</span><br><span style="color: hsl(0, 100%, 40%);">- '-i', self.btsoc2g.bsc.addr()),</span><br><span style="color: hsl(120, 100%, 40%);">+ '-i', self.bts.bsc.addr()),</span><br><span> remote_cwd=remote_run_dir, keepalive=keepalive)</span><br><span> </span><br><span> def _process_remote(self, name, popen_args, remote_cwd=None):</span><br><span> run_dir = self.run_dir.new_dir(name)</span><br><span style="color: hsl(0, 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%);">+ return process.RemoteProcess(name, run_dir, self.remote_user, self.bts.remote_addr(), remote_cwd,</span><br><span> popen_args)</span><br><span> </span><br><span> def run_remote(self, name, popen_args, remote_cwd=None):</span><br><span>@@ -110,8 +106,8 @@</span><br><span> config.overlay(values, self.suite_run.config())</span><br><span> config.overlay(values, {</span><br><span> 'osmo_pcu_oc2g': {</span><br><span style="color: hsl(0, 100%, 40%);">- 'bts_addr': self.btsoc2g.remote_addr(),</span><br><span style="color: hsl(0, 100%, 40%);">- 'pcu_socket_path': self.btsoc2g.pcu_socket_path(),</span><br><span style="color: hsl(120, 100%, 40%);">+ 'bts_addr': self.bts.remote_addr(),</span><br><span style="color: hsl(120, 100%, 40%);">+ 'pcu_socket_path': self.bts.pcu_socket_path(),</span><br><span> 'egprs_enabled': self.egprs_enabled(),</span><br><span> }</span><br><span> })</span><br><span>diff --git a/src/osmo_gsm_tester/pcu_sysmo.py b/src/osmo_gsm_tester/pcu_sysmo.py</span><br><span>index 8998622..55d6f53 100644</span><br><span>--- a/src/osmo_gsm_tester/pcu_sysmo.py</span><br><span>+++ b/src/osmo_gsm_tester/pcu_sysmo.py</span><br><span>@@ -19,25 +19,21 @@</span><br><span> </span><br><span> import os</span><br><span> import pprint</span><br><span style="color: hsl(0, 100%, 40%);">-from . import log, config, util, template, process</span><br><span style="color: hsl(120, 100%, 40%);">+from . import log, config, util, template, process, pcu</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-class OsmoPcuSysmo(log.Origin):</span><br><span style="color: hsl(120, 100%, 40%);">+class OsmoPcuSysmo(pcu.Pcu):</span><br><span> </span><br><span> REMOTE_DIR = '/osmo-gsm-tester-pcu'</span><br><span> PCU_SYSMO_BIN = 'osmo-pcu'</span><br><span> PCU_SYSMO_CFG = 'osmo-pcu-sysmo.cfg'</span><br><span> </span><br><span> def __init__(self, suite_run, sysmobts, conf):</span><br><span style="color: hsl(0, 100%, 40%);">- super().__init__(log.C_RUN, self.PCU_SYSMO_BIN)</span><br><span style="color: hsl(120, 100%, 40%);">+ super().__init__(suite_run, sysmobts, conf, self.PCU_SYSMO_BIN)</span><br><span> self.run_dir = None</span><br><span> self.bsc = None</span><br><span> self.inst = None</span><br><span> self.remote_inst = None</span><br><span> self.remote_dir = None</span><br><span style="color: hsl(0, 100%, 40%);">- self.sysmobts = None</span><br><span style="color: hsl(0, 100%, 40%);">- self.suite_run = suite_run</span><br><span style="color: hsl(0, 100%, 40%);">- self.sysmobts = sysmobts</span><br><span style="color: hsl(0, 100%, 40%);">- self.conf = conf</span><br><span> self.remote_env = {}</span><br><span> self.remote_user = 'root'</span><br><span> </span><br><span>@@ -57,27 +53,27 @@</span><br><span> </span><br><span> self.run_remote('rm-remote-dir', ('test', '!', '-d', OsmoPcuSysmo.REMOTE_DIR, '||', 'rm', '-rf', OsmoPcuSysmo.REMOTE_DIR))</span><br><span> self.run_remote('mk-remote-dir', ('mkdir', '-p', OsmoPcuSysmo.REMOTE_DIR))</span><br><span style="color: hsl(0, 100%, 40%);">- self.run_local('scp-inst-to-sysmobts',</span><br><span style="color: hsl(0, 100%, 40%);">- ('scp', '-r', str(self.inst), '%s@%s:%s' % (self.remote_user, self.sysmobts.remote_addr(), str(self.remote_inst))))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_local('scp-inst-to-bts',</span><br><span style="color: hsl(120, 100%, 40%);">+ ('scp', '-r', str(self.inst), '%s@%s:%s' % (self.remote_user, self.bts.remote_addr(), str(self.remote_inst))))</span><br><span> </span><br><span> remote_run_dir = self.remote_dir.child(OsmoPcuSysmo.PCU_SYSMO_BIN)</span><br><span> self.run_remote('mk-remote-run-dir', ('mkdir', '-p', remote_run_dir))</span><br><span> </span><br><span> remote_config_file = self.remote_dir.child(OsmoPcuSysmo.PCU_SYSMO_CFG)</span><br><span> self.run_local('scp-cfg-to-sysmobts',</span><br><span style="color: hsl(0, 100%, 40%);">- ('scp', '-r', self.config_file, '%s@%s:%s' % (self.remote_user, self.sysmobts.remote_addr(), remote_config_file)))</span><br><span style="color: hsl(120, 100%, 40%);">+ ('scp', '-r', self.config_file, '%s@%s:%s' % (self.remote_user, self.bts.remote_addr(), remote_config_file)))</span><br><span> </span><br><span> remote_lib = self.remote_inst.child('lib')</span><br><span> remote_binary = self.remote_inst.child('bin', OsmoPcuSysmo.PCU_SYSMO_BIN)</span><br><span> self.launch_remote(OsmoPcuSysmo.PCU_SYSMO_BIN,</span><br><span> ('LD_LIBRARY_PATH=%s' % remote_lib,</span><br><span> remote_binary, '-c', remote_config_file, '-r', '1',</span><br><span style="color: hsl(0, 100%, 40%);">- '-i', self.sysmobts.bsc.addr()),</span><br><span style="color: hsl(120, 100%, 40%);">+ '-i', self.bts.bsc.addr()),</span><br><span> remote_cwd=remote_run_dir, keepalive=keepalive)</span><br><span> </span><br><span> def _process_remote(self, name, popen_args, remote_cwd=None):</span><br><span> run_dir = self.run_dir.new_dir(name)</span><br><span style="color: hsl(0, 100%, 40%);">- return process.RemoteProcess(name, run_dir, self.remote_user, self.sysmobts.remote_addr(), remote_cwd,</span><br><span style="color: hsl(120, 100%, 40%);">+ return process.RemoteProcess(name, run_dir, self.remote_user, self.bts.remote_addr(), remote_cwd,</span><br><span> popen_args)</span><br><span> </span><br><span> def run_remote(self, name, popen_args, remote_cwd=None):</span><br><span>@@ -110,8 +106,8 @@</span><br><span> config.overlay(values, self.suite_run.config())</span><br><span> config.overlay(values, {</span><br><span> 'osmo_pcu_sysmo': {</span><br><span style="color: hsl(0, 100%, 40%);">- 'bts_addr': self.sysmobts.remote_addr(),</span><br><span style="color: hsl(0, 100%, 40%);">- 'pcu_socket_path': self.sysmobts.pcu_socket_path(),</span><br><span style="color: hsl(120, 100%, 40%);">+ 'bts_addr': self.bts.remote_addr(),</span><br><span style="color: hsl(120, 100%, 40%);">+ 'pcu_socket_path': self.bts.pcu_socket_path(),</span><br><span> 'egprs_enabled': self.egprs_enabled(),</span><br><span> }</span><br><span> })</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17769">change 17769</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/+/17769"/><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: I88217baf490ec45373d0743585377ed2639a8cfd </div>
<div style="display:none"> Gerrit-Change-Number: 17769 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>