<p>ninjab3s has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21300">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Process: Add remote_port as new parameter<br><br>remote_port defines a custom/additional port for<br>connections over ssh. It may be used in case several<br>ssh instances are running on a single mashine.<br><br>Change-Id: I2c93fd2ea1c10c333d00eafd3c1066c35796e398<br>---<br>M src/osmo_gsm_tester/core/process.py<br>M src/osmo_gsm_tester/core/remote.py<br>M src/osmo_gsm_tester/obj/run_node.py<br>3 files changed, 19 insertions(+), 5 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/00/21300/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/core/process.py b/src/osmo_gsm_tester/core/process.py</span><br><span>index ffc42c1..122f62c 100644</span><br><span>--- a/src/osmo_gsm_tester/core/process.py</span><br><span>+++ b/src/osmo_gsm_tester/core/process.py</span><br><span>@@ -381,12 +381,14 @@</span><br><span> </span><br><span> class RemoteProcess(Process):</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def __init__(self, name, run_dir, remote_user, remote_host, remote_cwd, popen_args, remote_env={}, **popen_kwargs):</span><br><span style="color: hsl(120, 100%, 40%);">+ def __init__(self, name, run_dir, remote_user, remote_host, remote_cwd, popen_args,</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_env={}, remote_port=None, **popen_kwargs):</span><br><span> super().__init__(name, run_dir, popen_args, **popen_kwargs)</span><br><span> self.remote_user = remote_user</span><br><span> self.remote_host = remote_host</span><br><span> self.remote_cwd = remote_cwd</span><br><span> self.remote_env = remote_env</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_port = remote_port</span><br><span> </span><br><span> # hacky: instead of just prepending ssh, i.e. piping stdout and stderr</span><br><span> # over the ssh link, we should probably run on the remote side,</span><br><span>@@ -402,6 +404,12 @@</span><br><span> '%s %s %s' % (cd,</span><br><span> ' '.join(['%s=%r'%(k,v) for k,v in self.remote_env.items()]),</span><br><span> ' '.join(self.popen_args))]</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # If remote_port is set the command will be executed over ssh on the Android UE.</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.remote_port:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.popen_args.insert(1, '-p')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.popen_args.insert(2, self.remote_port)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> self.dbg(self.popen_args, dir=self.run_dir, conf=self.popen_kwargs, remote_env=self.remote_env)</span><br><span> </span><br><span> def RunError(self, msg_prefix):</span><br><span>diff --git a/src/osmo_gsm_tester/core/remote.py b/src/osmo_gsm_tester/core/remote.py</span><br><span>index 8deb25d..6848f29 100644</span><br><span>--- a/src/osmo_gsm_tester/core/remote.py</span><br><span>+++ b/src/osmo_gsm_tester/core/remote.py</span><br><span>@@ -51,9 +51,10 @@</span><br><span> def get_remote_env(self):</span><br><span> return self.remote_env</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def RemoteProcess(self, name, popen_args, remote_env={}, **popen_kwargs):</span><br><span style="color: hsl(120, 100%, 40%);">+ def RemoteProcess(self, name, popen_args, remote_env={}, remote_port=None, **popen_kwargs):</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.user(), self.host(), self.cwd(), popen_args, remote_env=remote_env, **popen_kwargs)</span><br><span style="color: hsl(120, 100%, 40%);">+ return process.RemoteProcess(name, run_dir, self.user(), self.host(), self.cwd(), popen_args,</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_env=remote_env, remote_port=remote_port, **popen_kwargs)</span><br><span> </span><br><span> def generate_wrapper_script(self, wait_time_sec):</span><br><span> wrapper_script = self.run_dir.new_file(RemoteHost.WRAPPER_SCRIPT)</span><br><span>diff --git a/src/osmo_gsm_tester/obj/run_node.py b/src/osmo_gsm_tester/obj/run_node.py</span><br><span>index 6a030ac..d3ee398 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/run_node.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/run_node.py</span><br><span>@@ -30,13 +30,14 @@</span><br><span> T_LOCAL = 'local'</span><br><span> T_REM_SSH = 'ssh'</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def __init__(self, type=None, run_addr=None, ssh_user=None, ssh_addr=None, run_label=None):</span><br><span style="color: hsl(120, 100%, 40%);">+ def __init__(self, type=None, run_addr=None, ssh_user=None, ssh_addr=None, run_label=None, remote_port=None):</span><br><span> super().__init__(log.C_RUN, 'runnode')</span><br><span> self._type = type</span><br><span> self._run_addr = run_addr</span><br><span> self._ssh_user = ssh_user</span><br><span> self._ssh_addr = ssh_addr</span><br><span> self._run_label = run_label</span><br><span style="color: hsl(120, 100%, 40%);">+ self._remote_port = remote_port</span><br><span> if not self._type:</span><br><span> raise log.Error('run_type not set')</span><br><span> if not self._run_addr:</span><br><span>@@ -55,7 +56,7 @@</span><br><span> def from_conf(cls, conf):</span><br><span> return cls(conf.get('run_type', None), conf.get('run_addr', None),</span><br><span> conf.get('ssh_user', None), conf.get('ssh_addr', None),</span><br><span style="color: hsl(0, 100%, 40%);">- conf.get('run_label', None))</span><br><span style="color: hsl(120, 100%, 40%);">+ conf.get('run_label', None), conf.get('remote_port', None))</span><br><span> </span><br><span> @classmethod</span><br><span> def schema(cls):</span><br><span>@@ -65,6 +66,7 @@</span><br><span> 'ssh_user': schema.STR,</span><br><span> 'ssh_addr': schema.IPV4,</span><br><span> 'run_label': schema.STR,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'remote_port': schema.STR,</span><br><span> }</span><br><span> return resource_schema</span><br><span> </span><br><span>@@ -89,4 +91,7 @@</span><br><span> def run_label(self):</span><br><span> return self._run_label</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def remote_port(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ return self._remote_port</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/c/osmo-gsm-tester/+/21300">change 21300</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/+/21300"/><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: I2c93fd2ea1c10c333d00eafd3c1066c35796e398 </div>
<div style="display:none"> Gerrit-Change-Number: 21300 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: ninjab3s <nils.fuerste@softwareradiosystems.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>