<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17065">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Introduce RemoteHost and refactor code to use it<br><br>Let's move code related to coping stuff to remote hosts and managing<br>remote processes under a class where relevant information is stored.<br>This simplifies parameters being passed all over and allows to reuse<br>more code.<br>Change-Id: Ifff5ded8fdb28e8ef267cebe6c5f30a910cae11a<br>---<br>M src/osmo_gsm_tester/bts_oc2g.py<br>M src/osmo_gsm_tester/bts_osmotrx.py<br>M src/osmo_gsm_tester/bts_sysmo.py<br>M src/osmo_gsm_tester/process.py<br>A src/osmo_gsm_tester/remote.py<br>5 files changed, 169 insertions(+), 117 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/65/17065/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/bts_oc2g.py b/src/osmo_gsm_tester/bts_oc2g.py</span><br><span>index ec4ed3d..7b46fc8 100644</span><br><span>--- a/src/osmo_gsm_tester/bts_oc2g.py</span><br><span>+++ b/src/osmo_gsm_tester/bts_oc2g.py</span><br><span>@@ -41,14 +41,6 @@</span><br><span> def _direct_pcu_enabled(self):</span><br><span> return util.str2bool(self.conf.get('direct_pcu'))</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def launch_remote(self, name, popen_args, remote_cwd=None, keepalive=False):</span><br><span style="color: hsl(0, 100%, 40%);">- run_dir = self.run_dir.new_dir(name)</span><br><span style="color: hsl(0, 100%, 40%);">- proc = process.RemoteProcess(name, run_dir, self.remote_user, self.remote_addr(), remote_cwd,</span><br><span style="color: hsl(0, 100%, 40%);">- popen_args)</span><br><span style="color: hsl(0, 100%, 40%);">- self.suite_run.remember_to_stop(proc, keepalive)</span><br><span style="color: hsl(0, 100%, 40%);">- proc.launch()</span><br><span style="color: hsl(0, 100%, 40%);">- return proc</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> def create_pcu(self):</span><br><span> return pcu_oc2g.OsmoPcuOC2G(self.suite_run, self, self.conf)</span><br><span> </span><br><span>@@ -116,15 +108,19 @@</span><br><span> if not self.inst.isfile('bin', OsmoBtsOC2G.BTS_OC2G_BIN):</span><br><span> raise log.Error('No osmo-bts-oc2g binary in', self.inst)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- remote_run_dir = util.Dir(OsmoBtsOC2G.REMOTE_DIR)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 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(0, 100%, 40%);">- self.remote_addr(), OsmoBtsOC2G.BTS_OC2G_BIN, self.config_file)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ rem_host = remote.RemoteHost(self.run_dir, self.remote_user, self.remote_addr())</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_prefix_dir = util.Dir(OsmoBtsOC2G.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(OsmoBtsOC2G.BTS_OC2G_BIN))</span><br><span> remote_config_file = remote_run_dir.child(OsmoBtsOC2G.BTS_OC2G_CFG)</span><br><span style="color: hsl(0, 100%, 40%);">- remote_lib = self.remote_inst.child('lib')</span><br><span style="color: hsl(0, 100%, 40%);">- remote_binary = self.remote_inst.child('bin', 'osmo-bts-oc2g')</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ rem_host.recreate_remote_dir(self.remote_inst)</span><br><span style="color: hsl(120, 100%, 40%);">+ rem_host.scp('scp-inst-to-remote', str(self.inst), remote_prefix_dir)</span><br><span style="color: hsl(120, 100%, 40%);">+ rem_host.create_remote_dir(remote_run_dir)</span><br><span style="color: hsl(120, 100%, 40%);">+ rem_host.scp('scp-cfg-to-remote', self.config_file, 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', OsmoBtsOC2G.BTS_OC2G_BIN)</span><br><span> args = ('LD_LIBRARY_PATH=%s' % remote_lib,</span><br><span> remote_binary, '-c', remote_config_file, '-r', '1',</span><br><span> '-i', self.bsc.addr())</span><br><span>@@ -132,6 +128,7 @@</span><br><span> if self._direct_pcu_enabled():</span><br><span> args += ('-M',)</span><br><span> </span><br><span style="color: hsl(0, 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(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ proc = rem_host.RemoteProcess(OsmoBtsOC2G.BTS_OC2G_BIN, 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> # vim: expandtab tabstop=4 shiftwidth=4</span><br><span>diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py</span><br><span>index 9110d8a..78c17cc 100644</span><br><span>--- a/src/osmo_gsm_tester/bts_osmotrx.py</span><br><span>+++ b/src/osmo_gsm_tester/bts_osmotrx.py</span><br><span>@@ -18,10 +18,9 @@</span><br><span> # along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span> </span><br><span> import os</span><br><span style="color: hsl(0, 100%, 40%);">-import stat</span><br><span> import pprint</span><br><span> from abc import ABCMeta, abstractmethod</span><br><span style="color: hsl(0, 100%, 40%);">-from . import log, config, util, template, process, bts_osmo</span><br><span style="color: hsl(120, 100%, 40%);">+from . import log, config, util, template, process, remote, bts_osmo</span><br><span> from . import powersupply</span><br><span> from .event_loop import MainLoop</span><br><span> </span><br><span>@@ -263,72 +262,41 @@</span><br><span> proc.launch()</span><br><span> return proc</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def launch_process_remote(self, name, popen_args, remote_cwd=None, keepalive=False):</span><br><span style="color: hsl(0, 100%, 40%);">- run_dir = self.run_dir.new_dir(name)</span><br><span style="color: hsl(0, 100%, 40%);">- proc = process.RemoteProcess(name, run_dir, self.remote_user, self.listen_ip, remote_cwd,</span><br><span style="color: hsl(0, 100%, 40%);">- popen_args)</span><br><span style="color: hsl(0, 100%, 40%);">- self.suite_run.remember_to_stop(proc, keepalive)</span><br><span style="color: hsl(0, 100%, 40%);">- proc.launch()</span><br><span style="color: hsl(0, 100%, 40%);">- return proc</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- def generate_wrapper_script(self):</span><br><span style="color: hsl(0, 100%, 40%);">- wrapper_script = self.run_dir.new_file(OsmoTrx.WRAPPER_SCRIPT)</span><br><span style="color: hsl(0, 100%, 40%);">- with open(wrapper_script, 'w') as f:</span><br><span style="color: hsl(0, 100%, 40%);">- r = """#!/bin/bash</span><br><span style="color: hsl(0, 100%, 40%);">- mypid=0</span><br><span style="color: hsl(0, 100%, 40%);">- sign_handler() {</span><br><span style="color: hsl(0, 100%, 40%);">- sig=$1</span><br><span style="color: hsl(0, 100%, 40%);">- echo "received signal handler $sig, killing $mypid"</span><br><span style="color: hsl(0, 100%, 40%);">- kill $mypid</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- trap 'sign_handler SIGTERM' SIGTERM</span><br><span style="color: hsl(0, 100%, 40%);">- trap 'sign_handler SIGINT' SIGINT</span><br><span style="color: hsl(0, 100%, 40%);">- trap 'sign_handler SIGHUP' SIGHUP</span><br><span style="color: hsl(0, 100%, 40%);">- "$@" &</span><br><span style="color: hsl(0, 100%, 40%);">- mypid=$!</span><br><span style="color: hsl(0, 100%, 40%);">- echo "waiting for $mypid"</span><br><span style="color: hsl(0, 100%, 40%);">- wait $mypid</span><br><span style="color: hsl(0, 100%, 40%);">- echo "process $mypid finished"</span><br><span style="color: hsl(0, 100%, 40%);">- """</span><br><span style="color: hsl(0, 100%, 40%);">- f.write(r)</span><br><span style="color: hsl(0, 100%, 40%);">- st = os.stat(wrapper_script)</span><br><span style="color: hsl(0, 100%, 40%);">- os.chmod(wrapper_script, st.st_mode | stat.S_IEXEC)</span><br><span style="color: hsl(0, 100%, 40%);">- return wrapper_script</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- def inst_compatible_for_remote(self):</span><br><span style="color: hsl(0, 100%, 40%);">- proc = process.run_remote_sync(self.run_dir, self.remote_user, self.listen_ip, 'uname-m', ('uname', '-m'))</span><br><span style="color: hsl(0, 100%, 40%);">- if "x86_64" in (proc.get_stdout() or ''):</span><br><span style="color: hsl(0, 100%, 40%);">- return True</span><br><span style="color: hsl(0, 100%, 40%);">- return False</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> def start_remotely(self, keepalive):</span><br><span> # Run remotely through ssh. We need to run osmo-trx under a wrapper</span><br><span> # script since osmo-trx ignores SIGHUP and will keep running after</span><br><span> # we close local ssh session. The wrapper script catches SIGHUP and</span><br><span> # sends SIGINT to it.</span><br><span style="color: hsl(0, 100%, 40%);">- remote_run_dir = util.Dir(OsmoTrx.REMOTE_DIR)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rem_host = remote.RemoteHost(self.run_dir, self.remote_user, self.listen_ip)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_prefix_dir = util.Dir(OsmoTrx.REMOTE_DIR)</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_run_dir = util.Dir(remote_prefix_dir.child(self.binary_name()))</span><br><span> remote_config_file = remote_run_dir.child(OsmoTrx.CONF_OSMO_TRX)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- have_inst = self.inst_compatible_for_remote()</span><br><span style="color: hsl(120, 100%, 40%);">+ have_inst = rem_host.inst_compatible_for_remote()</span><br><span> if have_inst:</span><br><span> self.inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmo-trx')))</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- # if self.inst is None, we still want to copy config file, create remote run dir, etc.</span><br><span style="color: hsl(0, 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(0, 100%, 40%);">- self.listen_ip, self.binary_name(), self.config_file)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- wrapper_script = self.generate_wrapper_script()</span><br><span style="color: hsl(0, 100%, 40%);">- remote_wrapper_script = remote_run_dir.child(OsmoTrx.WRAPPER_SCRIPT)</span><br><span style="color: hsl(0, 100%, 40%);">- process.scp(self.run_dir, self.remote_user, self.listen_ip, 'scp-wrapper-to-remote', wrapper_script, remote_wrapper_script)</span><br><span style="color: hsl(120, 100%, 40%);">+ rem_host.recreate_remote_dir(remote_prefix_dir)</span><br><span style="color: hsl(120, 100%, 40%);">+ if have_inst:</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%);">+ rem_host.create_remote_dir(self.remote_inst)</span><br><span style="color: hsl(120, 100%, 40%);">+ rem_host.scp('scp-inst-to-remote', str(self.inst), remote_prefix_dir)</span><br><span style="color: hsl(120, 100%, 40%);">+ rem_host.create_remote_dir(remote_run_dir)</span><br><span style="color: hsl(120, 100%, 40%);">+ rem_host.scp('scp-cfg-to-remote', self.config_file, remote_config_file)</span><br><span> </span><br><span> if have_inst:</span><br><span> remote_lib = self.remote_inst.child('lib')</span><br><span> remote_binary = self.remote_inst.child('bin', self.binary_name())</span><br><span style="color: hsl(0, 100%, 40%);">- args = ('LD_LIBRARY_PATH=%s' % remote_lib, remote_wrapper_script, remote_binary, '-C', remote_config_file)</span><br><span style="color: hsl(120, 100%, 40%);">+ args = (remote_binary, '-C', remote_config_file)</span><br><span> else: # Use whatever is available i nremote system PATH:</span><br><span style="color: hsl(0, 100%, 40%);">- args = (remote_wrapper_script, self.binary_name(), '-C', remote_config_file)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- self.proc_trx = self.launch_process_remote(self.binary_name(), args, remote_cwd=remote_run_dir, keepalive=keepalive)</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_lib = None</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_binary = self.binary_name()</span><br><span style="color: hsl(120, 100%, 40%);">+ args = (remote_binary, '-C', remote_config_file)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.proc_trx = rem_host.RemoteProcessFixIgnoreSIGHUP(self.binary_name(), remote_run_dir, args, prepend_ldlibpath=remote_lib)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.suite_run.remember_to_stop(self.proc_trx, keepalive)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.proc_trx.launch()</span><br><span> </span><br><span> ##############</span><br><span> # PUBLIC (test API included)</span><br><span>diff --git a/src/osmo_gsm_tester/bts_sysmo.py b/src/osmo_gsm_tester/bts_sysmo.py</span><br><span>index 66d305a..90d4790 100644</span><br><span>--- a/src/osmo_gsm_tester/bts_sysmo.py</span><br><span>+++ b/src/osmo_gsm_tester/bts_sysmo.py</span><br><span>@@ -19,7 +19,7 @@</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, pcu_sysmo, bts_osmo</span><br><span style="color: hsl(120, 100%, 40%);">+from . import log, config, util, template, process, remote, pcu_sysmo, bts_osmo</span><br><span> </span><br><span> class SysmoBts(bts_osmo.OsmoBts):</span><br><span> ##############</span><br><span>@@ -41,14 +41,6 @@</span><br><span> def _direct_pcu_enabled(self):</span><br><span> return util.str2bool(self.conf.get('direct_pcu'))</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def launch_remote(self, name, popen_args, remote_cwd=None, keepalive=False):</span><br><span style="color: hsl(0, 100%, 40%);">- run_dir = self.run_dir.new_dir(name)</span><br><span style="color: hsl(0, 100%, 40%);">- proc = process.RemoteProcess(name, run_dir, self.remote_user, self.remote_addr(), remote_cwd,</span><br><span style="color: hsl(0, 100%, 40%);">- popen_args)</span><br><span style="color: hsl(0, 100%, 40%);">- self.suite_run.remember_to_stop(proc, keepalive)</span><br><span style="color: hsl(0, 100%, 40%);">- proc.launch()</span><br><span style="color: hsl(0, 100%, 40%);">- return proc</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> def create_pcu(self):</span><br><span> return pcu_sysmo.OsmoPcuSysmo(self.suite_run, self, self.conf)</span><br><span> </span><br><span>@@ -110,17 +102,21 @@</span><br><span> if not self.inst.isfile('bin', SysmoBts.BTS_SYSMO_BIN):</span><br><span> raise log.Error('No osmo-bts-sysmo binary in', self.inst)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- remote_run_dir = util.Dir(SysmoBts.REMOTE_DIR)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 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(0, 100%, 40%);">- self.remote_addr(), SysmoBts.BTS_SYSMO_BIN, self.config_file)</span><br><span style="color: hsl(0, 100%, 40%);">- process.run_remote_sync(self.run_dir, self.remote_user, self.remote_addr(), 'reload-dsp-firmware',</span><br><span style="color: hsl(0, 100%, 40%);">- ('/bin/sh', '-c', '"cat /lib/firmware/sysmobts-v?.bit > /dev/fpgadl_par0 ; cat /lib/firmware/sysmobts-v?.out > /dev/dspdl_dm644x_0"'))</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ rem_host = remote.RemoteHost(self.run_dir, self.remote_user, self.remote_addr())</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_prefix_dir = util.Dir(SysmoBts.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(SysmoBts.BTS_SYSMO_BIN))</span><br><span> remote_config_file = remote_run_dir.child(SysmoBts.BTS_SYSMO_CFG)</span><br><span style="color: hsl(0, 100%, 40%);">- remote_lib = self.remote_inst.child('lib')</span><br><span style="color: hsl(0, 100%, 40%);">- remote_binary = self.remote_inst.child('bin', 'osmo-bts-sysmo')</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ rem_host.recreate_remote_dir(self.remote_inst)</span><br><span style="color: hsl(120, 100%, 40%);">+ rem_host.scp('scp-inst-to-remote', str(self.inst), remote_prefix_dir)</span><br><span style="color: hsl(120, 100%, 40%);">+ rem_host.create_remote_dir(remote_run_dir)</span><br><span style="color: hsl(120, 100%, 40%);">+ rem_host.scp('scp-cfg-to-remote', self.config_file, remote_config_file)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rem_host.run_remote_sync('reload-dsp-firmware', ('/bin/sh', '-c', '"cat /lib/firmware/sysmobts-v?.bit > /dev/fpgadl_par0 ; cat /lib/firmware/sysmobts-v?.out > /dev/dspdl_dm644x_0"'))</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', SysmoBts.BTS_SYSMO_BIN)</span><br><span> args = ('LD_LIBRARY_PATH=%s' % remote_lib,</span><br><span> remote_binary, '-c', remote_config_file, '-r', '1',</span><br><span> '-i', self.bsc.addr())</span><br><span>@@ -128,6 +124,8 @@</span><br><span> if self._direct_pcu_enabled():</span><br><span> args += ('-M',)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- self.proc_bts = self.launch_remote('osmo-bts-sysmo', args, remote_cwd=remote_run_dir, keepalive=keepalive)</span><br><span style="color: hsl(120, 100%, 40%);">+ proc = rem_host.RemoteProcess(SysmoBts.BTS_SYSMO_BIN, 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> </span><br><span> # vim: expandtab tabstop=4 shiftwidth=4</span><br><span>diff --git a/src/osmo_gsm_tester/process.py b/src/osmo_gsm_tester/process.py</span><br><span>index 06da3bf..1c2f592 100644</span><br><span>--- a/src/osmo_gsm_tester/process.py</span><br><span>+++ b/src/osmo_gsm_tester/process.py</span><br><span>@@ -406,32 +406,4 @@</span><br><span> proc = NetNSProcess(name, run_dir, netns, popen_args)</span><br><span> proc.launch_sync()</span><br><span> return proc</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-def run_remote_sync(run_dir, remote_user, remote_addr, name, popen_args, remote_cwd=None):</span><br><span style="color: hsl(0, 100%, 40%);">- run_dir = run_dir.new_dir(name)</span><br><span style="color: hsl(0, 100%, 40%);">- proc = RemoteProcess(name, run_dir, remote_user, remote_addr, remote_cwd, popen_args)</span><br><span style="color: hsl(0, 100%, 40%);">- proc.launch_sync()</span><br><span style="color: hsl(0, 100%, 40%);">- return proc</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-def scp(run_dir, remote_user, remote_addr, name, local_path, remote_path):</span><br><span style="color: hsl(0, 100%, 40%);">- run_local_sync(run_dir, name, ('scp', '-r', local_path, '%s@%s:%s' % (remote_user, remote_addr, remote_path)))</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-# If no inst binaries copying is required (eg. because binary+libs is already available in distro), inst can be None.</span><br><span style="color: hsl(0, 100%, 40%);">-def copy_inst_ssh(run_dir, inst, remote_dir, remote_user, remote_addr, remote_rundir_append, cfg_file_name):</span><br><span style="color: hsl(0, 100%, 40%);">- remote_dir_str = str(remote_dir)</span><br><span style="color: hsl(0, 100%, 40%);">- run_remote_sync(run_dir, remote_user, remote_addr, 'rm-remote-dir', ('test', '!', '-d', remote_dir_str, '||', 'rm', '-rf', remote_dir_str))</span><br><span style="color: hsl(0, 100%, 40%);">- run_remote_sync(run_dir, remote_user, remote_addr, 'mk-remote-dir', ('mkdir', '-p', remote_dir_str))</span><br><span style="color: hsl(0, 100%, 40%);">- if inst is not None:</span><br><span style="color: hsl(0, 100%, 40%);">- remote_inst = Dir(remote_dir.child(os.path.basename(str(inst))))</span><br><span style="color: hsl(0, 100%, 40%);">- scp(run_dir, remote_user, remote_addr, 'scp-inst-to-remote', str(inst), remote_dir_str)</span><br><span style="color: hsl(0, 100%, 40%);">- else:</span><br><span style="color: hsl(0, 100%, 40%);">- remote_inst = None</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- remote_run_dir = remote_dir.child(remote_rundir_append)</span><br><span style="color: hsl(0, 100%, 40%);">- run_remote_sync(run_dir, remote_user, remote_addr, 'mk-remote-run-dir', ('mkdir', '-p', remote_run_dir))</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- remote_config_file = remote_dir.child(os.path.basename(cfg_file_name))</span><br><span style="color: hsl(0, 100%, 40%);">- scp(run_dir, remote_user, remote_addr, 'scp-cfg-to-remote', cfg_file_name, remote_config_file)</span><br><span style="color: hsl(0, 100%, 40%);">- return remote_inst</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> # vim: expandtab tabstop=4 shiftwidth=4</span><br><span>diff --git a/src/osmo_gsm_tester/remote.py b/src/osmo_gsm_tester/remote.py</span><br><span>new file mode 100644</span><br><span>index 0000000..92dd113</span><br><span>--- /dev/null</span><br><span>+++ b/src/osmo_gsm_tester/remote.py</span><br><span>@@ -0,0 +1,117 @@</span><br><span style="color: hsl(120, 100%, 40%);">+# osmo_gsm_tester: specifics for remote nodes</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 stat</span><br><span style="color: hsl(120, 100%, 40%);">+import os</span><br><span style="color: hsl(120, 100%, 40%);">+import re</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, osmo_ctrl, pcap_recorder</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+class RemoteHost(log.Origin):</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ WRAPPER_SCRIPT = 'ssh_sigkiller.sh'</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def __init__(self, run_dir, remote_user = 'root', remote_host = 'localhost', remote_cwd=None):</span><br><span style="color: hsl(120, 100%, 40%);">+ super().__init__(log.C_RUN, 'host-' + remote_user + '@' + remote_host)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = util.Dir(run_dir.new_dir(self.name()))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_user = remote_user</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_host = remote_host</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_cwd = remote_cwd</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def user(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ return self.remote_user</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def host(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ return self.remote_host</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def cwd(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ return self.remote_cwd</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def RemoteProcess(self, name, popen_args, **popen_kwargs):</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.user(), self.host(), self.cwd(), popen_args, **popen_kwargs)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def generate_wrapper_script(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ wrapper_script = self.run_dir.new_file(RemoteHost.WRAPPER_SCRIPT)</span><br><span style="color: hsl(120, 100%, 40%);">+ with open(wrapper_script, 'w') as f:</span><br><span style="color: hsl(120, 100%, 40%);">+ r = """#!/bin/bash</span><br><span style="color: hsl(120, 100%, 40%);">+ mypid=0</span><br><span style="color: hsl(120, 100%, 40%);">+ sign_handler() {</span><br><span style="color: hsl(120, 100%, 40%);">+ sig=$1</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "received signal handler $sig, killing $mypid"</span><br><span style="color: hsl(120, 100%, 40%);">+ kill $mypid</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ trap 'sign_handler SIGTERM' SIGTERM</span><br><span style="color: hsl(120, 100%, 40%);">+ trap 'sign_handler SIGINT' SIGINT</span><br><span style="color: hsl(120, 100%, 40%);">+ trap 'sign_handler SIGHUP' SIGHUP</span><br><span style="color: hsl(120, 100%, 40%);">+ $@ &</span><br><span style="color: hsl(120, 100%, 40%);">+ mypid=$!</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "waiting for $mypid"</span><br><span style="color: hsl(120, 100%, 40%);">+ wait $mypid</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "process $mypid finished"</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+ f.write(r)</span><br><span style="color: hsl(120, 100%, 40%);">+ st = os.stat(wrapper_script)</span><br><span style="color: hsl(120, 100%, 40%);">+ os.chmod(wrapper_script, st.st_mode | stat.S_IEXEC)</span><br><span style="color: hsl(120, 100%, 40%);">+ return wrapper_script</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def RemoteProcessFixIgnoreSIGHUP(self, name, remote_dir, popen_args, prepend_ldlibpath=None, **popen_kwargs):</span><br><span style="color: hsl(120, 100%, 40%);">+ # Run remotely through ssh. We need to run binary under a wrapper</span><br><span style="color: hsl(120, 100%, 40%);">+ # script since osmo-trx ignores SIGHUP and will keep running after</span><br><span style="color: hsl(120, 100%, 40%);">+ # we close local ssh session. The wrapper script catches SIGHUP and</span><br><span style="color: hsl(120, 100%, 40%);">+ # sends SIGINT to it.</span><br><span style="color: hsl(120, 100%, 40%);">+ self.create_remote_dir(remote_dir)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ wrapper_script = self.generate_wrapper_script()</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_wrapper_script = remote_dir.child(RemoteHost.WRAPPER_SCRIPT)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.scp('scp-wrapper-to-remote', wrapper_script, remote_wrapper_script)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Used fi to run stuff from an osmo-gsm-tester copied inst</span><br><span style="color: hsl(120, 100%, 40%);">+ if prepend_ldlibpath is not None:</span><br><span style="color: hsl(120, 100%, 40%);">+ args = ('LD_LIBRARY_PATH=%s' % prepend_ldlibpath, remote_wrapper_script,) + popen_args</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ args = (remote_wrapper_script,) + popen_args</span><br><span style="color: hsl(120, 100%, 40%);">+ return self.RemoteProcess(name, args, **popen_kwargs)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def run_remote_sync(self, name, popen_args):</span><br><span style="color: hsl(120, 100%, 40%);">+ proc = self.RemoteProcess(name, popen_args)</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 rm_remote_dir(self, remote_dir):</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_dir_str = str(remote_dir)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_remote_sync('rm-remote-dir', ('test', '!', '-d', remote_dir_str, '||', 'rm', '-rf', remote_dir_str))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def create_remote_dir(self, remote_dir):</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_dir_str = str(remote_dir)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_remote_sync('mk-remote-dir', ('mkdir', '-p', remote_dir_str))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def recreate_remote_dir(self, remote_dir):</span><br><span style="color: hsl(120, 100%, 40%);">+ self.rm_remote_dir(remote_dir)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.create_remote_dir(remote_dir)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def inst_compatible_for_remote(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ proc = self.run_remote_sync('uname-m', ('uname', '-m'))</span><br><span style="color: hsl(120, 100%, 40%);">+ if "x86_64" in (proc.get_stdout() or ''):</span><br><span style="color: hsl(120, 100%, 40%);">+ return True</span><br><span style="color: hsl(120, 100%, 40%);">+ return False</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def scp(self, name, local_path, remote_path):</span><br><span style="color: hsl(120, 100%, 40%);">+ process.run_local_sync(self.run_dir, name, ('scp', '-r', local_path, '%s@%s:%s' % (self.user(), self.host(), remote_path)))</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17065">change 17065</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/+/17065"/><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: Ifff5ded8fdb28e8ef267cebe6c5f30a910cae11a </div>
<div style="display:none"> Gerrit-Change-Number: 17065 </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>