<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11190">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, but someone else must approve
Pau Espin Pedrol: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Make code copying inst through ssh generic<br><br>It can later on be used by other classes that need to run binaries in<br>inst remotely.<br><br>Change-Id: I838b999528695207e1147cfe76e6f7aaf3b1dd53<br>---<br>M src/osmo_gsm_tester/bts_sysmo.py<br>M src/osmo_gsm_tester/process.py<br>2 files changed, 46 insertions(+), 38 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/bts_sysmo.py b/src/osmo_gsm_tester/bts_sysmo.py</span><br><span>index e3f4823..bdf6bb7 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>@@ -41,34 +41,14 @@</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 _process_remote(self, name, popen_args, remote_cwd=None):</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%);">- return 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%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- def run_remote(self, name, popen_args, remote_cwd=None):</span><br><span style="color: hsl(0, 100%, 40%);">- proc = self._process_remote(name, popen_args, remote_cwd)</span><br><span style="color: hsl(0, 100%, 40%);">- proc.launch()</span><br><span style="color: hsl(0, 100%, 40%);">- proc.wait()</span><br><span style="color: hsl(0, 100%, 40%);">- if proc.result != 0:</span><br><span style="color: hsl(0, 100%, 40%);">- log.ctx(proc)</span><br><span style="color: hsl(0, 100%, 40%);">- raise log.Error('Exited in error')</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> def launch_remote(self, name, popen_args, remote_cwd=None, keepalive=False):</span><br><span style="color: hsl(0, 100%, 40%);">- proc = self._process_remote(name, popen_args, remote_cwd)</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> self.suite_run.remember_to_stop(proc, keepalive)</span><br><span> proc.launch()</span><br><span> return proc</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def run_local(self, name, popen_args):</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.Process(name, run_dir, popen_args)</span><br><span style="color: hsl(0, 100%, 40%);">- proc.launch()</span><br><span style="color: hsl(0, 100%, 40%);">- proc.wait()</span><br><span style="color: hsl(0, 100%, 40%);">- if proc.result != 0:</span><br><span style="color: hsl(0, 100%, 40%);">- log.ctx(proc)</span><br><span style="color: hsl(0, 100%, 40%);">- raise log.Error('Exited in error')</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>@@ -124,23 +104,14 @@</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%);">- self.remote_dir = util.Dir(SysmoBts.REMOTE_DIR)</span><br><span style="color: hsl(0, 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%);">+ remote_run_dir = util.Dir(SysmoBts.REMOTE_DIR)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- self.run_remote('rm-remote-dir', ('test', '!', '-d', SysmoBts.REMOTE_DIR, '||', 'rm', '-rf', SysmoBts.REMOTE_DIR))</span><br><span style="color: hsl(0, 100%, 40%);">- self.run_remote('mk-remote-dir', ('mkdir', '-p', SysmoBts.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.remote_addr(), str(self.remote_inst))))</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(), SysmoBts.BTS_SYSMO_BIN, self.config_file)</span><br><span style="color: hsl(120, 100%, 40%);">+ process.run_remote_sync(self.run_dir, self.remote_user, self.remote_addr(), 'reload-dsp-firmware',</span><br><span style="color: hsl(120, 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> </span><br><span style="color: hsl(0, 100%, 40%);">- remote_run_dir = self.remote_dir.child(SysmoBts.BTS_SYSMO_BIN)</span><br><span style="color: hsl(0, 100%, 40%);">- self.run_remote('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 = self.remote_dir.child(SysmoBts.BTS_SYSMO_CFG)</span><br><span style="color: hsl(0, 100%, 40%);">- 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.remote_addr(), remote_config_file)))</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- self.run_remote('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(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_config_file = remote_run_dir.child(SysmoBts.BTS_SYSMO_CFG)</span><br><span> remote_lib = self.remote_inst.child('lib')</span><br><span> remote_binary = self.remote_inst.child('bin', 'osmo-bts-sysmo')</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/process.py b/src/osmo_gsm_tester/process.py</span><br><span>index ad2405d..9db9241 100644</span><br><span>--- a/src/osmo_gsm_tester/process.py</span><br><span>+++ b/src/osmo_gsm_tester/process.py</span><br><span>@@ -233,4 +233,41 @@</span><br><span> ' '.join(self.popen_args))]</span><br><span> self.dbg(self.popen_args, dir=self.run_dir, conf=self.popen_kwargs)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+def run_local_sync(run_dir, name, popen_args):</span><br><span style="color: hsl(120, 100%, 40%);">+ run_dir =run_dir.new_dir(name)</span><br><span style="color: hsl(120, 100%, 40%);">+ proc = 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 run_remote_sync(run_dir, remote_user, remote_addr, name, popen_args, remote_cwd=None):</span><br><span style="color: hsl(120, 100%, 40%);">+ run_dir = run_dir.new_dir(name)</span><br><span style="color: hsl(120, 100%, 40%);">+ proc = RemoteProcess(name, run_dir, remote_user, remote_addr, remote_cwd,</span><br><span style="color: hsl(120, 100%, 40%);">+ 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 scp(run_dir, remote_user, remote_addr, name, local_path, remote_path):</span><br><span style="color: hsl(120, 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(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 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(120, 100%, 40%);">+ remote_inst = Dir(remote_dir.child(os.path.basename(str(inst))))</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_dir_str = str(remote_dir)</span><br><span style="color: hsl(120, 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(120, 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(120, 100%, 40%);">+ scp(run_dir, remote_user, remote_addr, 'scp-inst-to-remote', str(inst), remote_dir_str)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_run_dir = remote_dir.child(remote_rundir_append)</span><br><span style="color: hsl(120, 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(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_config_file = remote_dir.child(os.path.basename(cfg_file_name))</span><br><span style="color: hsl(120, 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(120, 100%, 40%);">+ return remote_inst</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # vim: expandtab tabstop=4 shiftwidth=4</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11190">change 11190</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/11190"/><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: I838b999528695207e1147cfe76e6f7aaf3b1dd53 </div>
<div style="display:none"> Gerrit-Change-Number: 11190 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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: Pau Espin Pedrol <pespin@sysmocom.de> </div>