<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11191">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmotrx: Allow running osmo-trx from remote host<br><br>Change-Id: Ia31ac8eb41e02eda28d9f6f56774679300244ee8<br>---<br>M example/resources.conf.rnd<br>M src/osmo_gsm_tester/bts_osmotrx.py<br>M src/osmo_gsm_tester/resource.py<br>3 files changed, 31 insertions(+), 6 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/91/11191/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/example/resources.conf.rnd b/example/resources.conf.rnd</span><br><span>index 74b8e3e..2067efc 100644</span><br><span>--- a/example/resources.conf.rnd</span><br><span>+++ b/example/resources.conf.rnd</span><br><span>@@ -28,6 +28,8 @@</span><br><span> type: uhd</span><br><span> launch_trx: true</span><br><span> clock_reference: external</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_user: jenkins</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_ip: 127.0.0.1</span><br><span> ciphers: [a5_0, a5_1]</span><br><span> </span><br><span> - label: NanoBTS-ONW-1900</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 e7e3542..3ed596a 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>@@ -141,6 +141,7 @@</span><br><span> class OsmoTrx(log.Origin, metaclass=ABCMeta):</span><br><span> </span><br><span> CONF_OSMO_TRX = 'osmo-trx.cfg'</span><br><span style="color: hsl(120, 100%, 40%);">+ REMOTE_DIR = '/osmo-gsm-tester-trx/last_run'</span><br><span> </span><br><span> ##############</span><br><span> # PROTECTED</span><br><span>@@ -150,8 +151,10 @@</span><br><span> self.suite_run = suite_run</span><br><span> self.conf = conf</span><br><span> self.env = {}</span><br><span style="color: hsl(0, 100%, 40%);">- self.listen_ip = conf.get('trx_ip')</span><br><span style="color: hsl(0, 100%, 40%);">- self.bts_ip = conf.get('bts_ip')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.log("OSMOTRX CONF: %r" % conf)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.listen_ip = conf.get('osmo_trx', {}).get('trx_ip')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.bts_ip = conf.get('osmo_trx', {}).get('bts_ip')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_user = conf.get('osmo_trx', {}).get('remote_user', None)</span><br><span> self.run_dir = None</span><br><span> self.inst = None</span><br><span> self.proc_trx = None</span><br><span>@@ -184,7 +187,7 @@</span><br><span> self.dbg(r)</span><br><span> f.write(r)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def launch_process(self, keepalive, binary_name, *args):</span><br><span style="color: hsl(120, 100%, 40%);">+ def launch_process_local(self, keepalive, binary_name, *args):</span><br><span> binary = os.path.abspath(self.inst.child('bin', binary_name))</span><br><span> run_dir = self.run_dir.new_dir(binary_name)</span><br><span> if not os.path.isfile(binary):</span><br><span>@@ -196,6 +199,14 @@</span><br><span> proc.launch()</span><br><span> return proc</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def launch_process_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.listen_ip, 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> ##############</span><br><span> # PUBLIC (test API included)</span><br><span> ##############</span><br><span>@@ -203,10 +214,21 @@</span><br><span> self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name()))</span><br><span> self.configure()</span><br><span> self.inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmo-trx')))</span><br><span style="color: hsl(0, 100%, 40%);">- lib = self.inst.child('lib')</span><br><span style="color: hsl(0, 100%, 40%);">- self.env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) }</span><br><span style="color: hsl(0, 100%, 40%);">- self.proc_trx = self.launch_process(keepalive, self.binary_name(),</span><br><span style="color: hsl(120, 100%, 40%);">+ if not self.remote_user:</span><br><span style="color: hsl(120, 100%, 40%);">+ # Run locally if ssh user is not set</span><br><span style="color: hsl(120, 100%, 40%);">+ lib = self.inst.child('lib')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) }</span><br><span style="color: hsl(120, 100%, 40%);">+ self.proc_trx = self.launch_process_local(keepalive, self.binary_name(),</span><br><span> '-C', os.path.abspath(self.config_file))</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_run_dir = util.Dir(OsmoTrx.REMOTE_DIR)</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.listen_ip, self.binary_name(), self.config_file)</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_config_file = remote_run_dir.child(OsmoTrx.CONF_OSMO_TRX)</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', self.binary_name())</span><br><span style="color: hsl(120, 100%, 40%);">+ args = ('LD_LIBRARY_PATH=%s' % remote_lib, remote_binary, '-C', remote_config_file)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.proc_trx = self.launch_process_remote(self.binary_name(), args, remote_cwd=remote_run_dir, keepalive=keepalive)</span><br><span> </span><br><span> def trx_ready(self):</span><br><span> if not self.proc_trx or not self.proc_trx.is_running:</span><br><span>diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py</span><br><span>index e043d87..3f2ddc7 100644</span><br><span>--- a/src/osmo_gsm_tester/resource.py</span><br><span>+++ b/src/osmo_gsm_tester/resource.py</span><br><span>@@ -72,6 +72,7 @@</span><br><span> 'bts[].osmo_trx.type': schema.STR,</span><br><span> 'bts[].osmo_trx.clock_reference': schema.OSMO_TRX_CLOCK_REF,</span><br><span> 'bts[].osmo_trx.trx_ip': schema.IPV4,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'bts[].osmo_trx.remote_user': schema.STR,</span><br><span> 'bts[].osmo_trx.multi_arfcn': schema.BOOL_STR,</span><br><span> 'arfcn[].arfcn': schema.INT,</span><br><span> 'arfcn[].band': schema.BAND,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11191">change 11191</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/11191"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ia31ac8eb41e02eda28d9f6f56774679300244ee8 </div>
<div style="display:none"> Gerrit-Change-Number: 11191 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>