<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/16173">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">WIP<br><br>Change-Id: I15da34c9467e46ae92adbce5f671b344bea5ee5a<br>---<br>M example/resources.conf.prod<br>M src/osmo_gsm_tester/bts_osmotrx.py<br>M src/osmo_gsm_tester/process.py<br>M src/osmo_gsm_tester/resource.py<br>4 files changed, 71 insertions(+), 26 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/73/16173/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/example/resources.conf.prod b/example/resources.conf.prod</span><br><span>index 0bf9f45..826ed4f 100644</span><br><span>--- a/example/resources.conf.prod</span><br><span>+++ b/example/resources.conf.prod</span><br><span>@@ -62,6 +62,22 @@</span><br><span> trx_ip: 10.42.42.117</span><br><span> clock_reference: external</span><br><span> dev_args: "LimeSDR-USB,serial=00090706024F0A22"</span><br><span style="color: hsl(120, 100%, 40%);">+ channels:</span><br><span style="color: hsl(120, 100%, 40%);">+ - rx_path: "LNAW"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+- label: LimeNET-Micro</span><br><span style="color: hsl(120, 100%, 40%);">+ type: osmo-bts-trx</span><br><span style="color: hsl(120, 100%, 40%);">+ ipa_unit_id: 15</span><br><span style="color: hsl(120, 100%, 40%);">+ addr: 10.42.42.53</span><br><span style="color: hsl(120, 100%, 40%);">+ band: GSM-1800</span><br><span style="color: hsl(120, 100%, 40%);">+ ciphers: [a5_0, a5_1]</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_trx:</span><br><span style="color: hsl(120, 100%, 40%);">+ type: lms</span><br><span style="color: hsl(120, 100%, 40%);">+ launch_trx: true</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_user: pi</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_ip: 10.42.42.123</span><br><span style="color: hsl(120, 100%, 40%);">+ clock_reference: external</span><br><span style="color: hsl(120, 100%, 40%);">+ dev_args: "LimeNET-Micro,serial=005839AF25B352"</span><br><span> </span><br><span> - label: sysmoCell 5000</span><br><span> type: osmo-bts-trx</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 554a236..0578259 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>@@ -295,35 +295,55 @@</span><br><span> os.chmod(wrapper_script, st.st_mode | stat.S_IEXEC)</span><br><span> return wrapper_script</span><br><span> </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 = process.run_remote_sync(self.run_dir, self.remote_user, self.listen_ip, '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 start_remotely(self, keepalive):</span><br><span style="color: hsl(120, 100%, 40%);">+ # Run remotely through ssh. We need to run osmo-trx 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%);">+ remote_run_dir = util.Dir(OsmoTrx.REMOTE_DIR)</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ have_inst = self.inst_compatible_for_remote()</span><br><span style="color: hsl(120, 100%, 40%);">+ if have_inst:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmo-trx')))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 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(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%);">+</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_run_dir.child(OsmoTrx.WRAPPER_SCRIPT)</span><br><span style="color: hsl(120, 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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if have_inst:</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_wrapper_script, remote_binary, '-C', remote_config_file)</span><br><span style="color: hsl(120, 100%, 40%);">+ else: # Use whatever is available i nremote system PATH:</span><br><span style="color: hsl(120, 100%, 40%);">+ args = (remote_wrapper_script, self.binary_name(), '-C', remote_config_file)</span><br><span style="color: hsl(120, 100%, 40%);">+</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 style="color: hsl(120, 100%, 40%);">+</span><br><span> ##############</span><br><span> # PUBLIC (test API included)</span><br><span> ##############</span><br><span> def start(self, keepalive=False):</span><br><span> self.configure()</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.remote_user:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.start_remotely(keepalive)</span><br><span style="color: hsl(120, 100%, 40%);">+ return</span><br><span style="color: hsl(120, 100%, 40%);">+ # Run locally if ssh user is not set</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%);">- if not self.remote_user:</span><br><span style="color: hsl(0, 100%, 40%);">- # Run locally if ssh user is not set</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_local(keepalive, self.binary_name(),</span><br><span style="color: hsl(0, 100%, 40%);">- '-C', os.path.abspath(self.config_file))</span><br><span style="color: hsl(0, 100%, 40%);">- else:</span><br><span style="color: hsl(0, 100%, 40%);">- # Run remotely through ssh. We need to run osmo-trx under a wrapper</span><br><span style="color: hsl(0, 100%, 40%);">- # script since osmo-trx ignores SIGHUP and will keep running after</span><br><span style="color: hsl(0, 100%, 40%);">- # we close local ssh session. The wrapper script catches SIGHUP and</span><br><span style="color: hsl(0, 100%, 40%);">- # sends SIGINT to it.</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_run_dir = util.Dir(OsmoTrx.REMOTE_DIR)</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%);">- remote_wrapper_script = remote_run_dir.child(OsmoTrx.WRAPPER_SCRIPT)</span><br><span style="color: hsl(0, 100%, 40%);">- remote_config_file = remote_run_dir.child(OsmoTrx.CONF_OSMO_TRX)</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', self.binary_name())</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(0, 100%, 40%);">-</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(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%);">+ 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 style="color: hsl(120, 100%, 40%);">+ '-C', os.path.abspath(self.config_file))</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>@@ -344,7 +364,7 @@</span><br><span> </span><br><span> def __init__(self, suite_run, conf):</span><br><span> super().__init__(suite_run, conf)</span><br><span style="color: hsl(0, 100%, 40%);">- self.conf['osmo_trx']['channels'][0]['rx_path'] = 'LNAW'</span><br><span style="color: hsl(120, 100%, 40%);">+ #self.conf['osmo_trx']['channels'][0]['rx_path'] = 'LNAW'</span><br><span> </span><br><span> def binary_name(self):</span><br><span> return OsmoTrxLMS.BIN_TRX</span><br><span>diff --git a/src/osmo_gsm_tester/process.py b/src/osmo_gsm_tester/process.py</span><br><span>index b73673f..06da3bf 100644</span><br><span>--- a/src/osmo_gsm_tester/process.py</span><br><span>+++ b/src/osmo_gsm_tester/process.py</span><br><span>@@ -399,26 +399,33 @@</span><br><span> run_dir =run_dir.new_dir(name)</span><br><span> proc = Process(name, run_dir, popen_args)</span><br><span> proc.launch_sync()</span><br><span style="color: hsl(120, 100%, 40%);">+ return proc</span><br><span> </span><br><span> def run_local_netns_sync(run_dir, name, netns, popen_args):</span><br><span> run_dir =run_dir.new_dir(name)</span><br><span> proc = NetNSProcess(name, run_dir, netns, popen_args)</span><br><span> proc.launch_sync()</span><br><span style="color: hsl(120, 100%, 40%);">+ return proc</span><br><span> </span><br><span> def run_remote_sync(run_dir, remote_user, remote_addr, name, popen_args, remote_cwd=None):</span><br><span> run_dir = run_dir.new_dir(name)</span><br><span> proc = RemoteProcess(name, run_dir, remote_user, remote_addr, remote_cwd, popen_args)</span><br><span> proc.launch_sync()</span><br><span style="color: hsl(120, 100%, 40%);">+ return proc</span><br><span> </span><br><span> def scp(run_dir, remote_user, remote_addr, name, local_path, remote_path):</span><br><span> run_local_sync(run_dir, name, ('scp', '-r', local_path, '%s@%s:%s' % (remote_user, remote_addr, remote_path)))</span><br><span> </span><br><span style="color: hsl(120, 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> 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_inst = Dir(remote_dir.child(os.path.basename(str(inst))))</span><br><span> remote_dir_str = str(remote_dir)</span><br><span> 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> 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%);">- 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%);">+ if inst is not None:</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%);">+ 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%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_inst = None</span><br><span> </span><br><span> remote_run_dir = remote_dir.child(remote_rundir_append)</span><br><span> run_remote_sync(run_dir, remote_user, remote_addr, 'mk-remote-run-dir', ('mkdir', '-p', remote_run_dir))</span><br><span>diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py</span><br><span>index 1b18076..992734d 100644</span><br><span>--- a/src/osmo_gsm_tester/resource.py</span><br><span>+++ b/src/osmo_gsm_tester/resource.py</span><br><span>@@ -76,6 +76,8 @@</span><br><span> 'bts[].osmo_trx.dev_args': schema.STR,</span><br><span> 'bts[].osmo_trx.multi_arfcn': schema.BOOL_STR,</span><br><span> 'bts[].osmo_trx.max_trxd_version': schema.UINT,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'bts[].osmo_trx.channels[].rx_path': schema.STR,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'bts[].osmo_trx.channels[].tx_path': schema.STR,</span><br><span> 'arfcn[].arfcn': schema.INT,</span><br><span> 'arfcn[].band': schema.BAND,</span><br><span> 'modem[].type': schema.STR,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/16173">change 16173</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/+/16173"/><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: I15da34c9467e46ae92adbce5f671b344bea5ee5a </div>
<div style="display:none"> Gerrit-Change-Number: 16173 </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>