<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17837">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ms_srs.py: Pass filenames to main cfg file template instead of cmdline args<br><br>Change-Id: Id2a6ba17d087d2ff67fe10b1dae6434259e74366<br>---<br>M src/osmo_gsm_tester/obj/ms_srs.py<br>M src/osmo_gsm_tester/templates/srsue.conf.tmpl<br>2 files changed, 39 insertions(+), 48 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/37/17837/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/obj/ms_srs.py b/src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>index c1803e3..e6e9196 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>@@ -69,6 +69,7 @@</span><br><span> self.metrics_file = None</span><br><span> self.process = None</span><br><span> self.rem_host = None</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_inst = None</span><br><span> self.remote_config_file = None</span><br><span> self.remote_log_file = None</span><br><span> self.remote_pcap_file = None</span><br><span>@@ -126,29 +127,8 @@</span><br><span> self.process.stdin_write('t\n')</span><br><span> </span><br><span> def start_remotely(self):</span><br><span style="color: hsl(0, 100%, 40%);">- self.inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('srslte')))</span><br><span style="color: hsl(0, 100%, 40%);">- lib = self.inst.child('lib')</span><br><span style="color: hsl(0, 100%, 40%);">- if not os.path.isdir(lib):</span><br><span style="color: hsl(0, 100%, 40%);">- raise log.Error('No lib/ in', self.inst)</span><br><span style="color: hsl(0, 100%, 40%);">- if not self.inst.isfile('bin', srsUE.BINFILE):</span><br><span style="color: hsl(0, 100%, 40%);">- raise log.Error('No %s binary in' % srsUE.BINFILE, self.inst)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- self.rem_host = remote.RemoteHost(self.run_dir, self.remote_user, self._addr)</span><br><span style="color: hsl(0, 100%, 40%);">- remote_prefix_dir = util.Dir(srsUE.REMOTE_DIR)</span><br><span style="color: hsl(0, 100%, 40%);">- remote_inst = util.Dir(remote_prefix_dir.child(os.path.basename(str(self.inst))))</span><br><span style="color: hsl(0, 100%, 40%);">- remote_run_dir = util.Dir(remote_prefix_dir.child(srsUE.BINFILE))</span><br><span style="color: hsl(0, 100%, 40%);">- self.remote_config_file = remote_run_dir.child(srsUE.CFGFILE)</span><br><span style="color: hsl(0, 100%, 40%);">- self.remote_log_file = remote_run_dir.child(srsUE.LOGFILE)</span><br><span style="color: hsl(0, 100%, 40%);">- self.remote_pcap_file = remote_run_dir.child(srsUE.PCAPFILE)</span><br><span style="color: hsl(0, 100%, 40%);">- self.remote_metrics_file = remote_run_dir.child(srsUE.METRICSFILE)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- self.rem_host.recreate_remote_dir(remote_inst)</span><br><span style="color: hsl(0, 100%, 40%);">- self.rem_host.scp('scp-inst-to-remote', str(self.inst), remote_prefix_dir)</span><br><span style="color: hsl(0, 100%, 40%);">- self.rem_host.recreate_remote_dir(remote_run_dir)</span><br><span style="color: hsl(0, 100%, 40%);">- self.rem_host.scp('scp-cfg-to-remote', self.config_file, self.remote_config_file)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- remote_lib = remote_inst.child('lib')</span><br><span style="color: hsl(0, 100%, 40%);">- remote_binary = remote_inst.child('bin', srsUE.BINFILE)</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', srsUE.BINFILE)</span><br><span> # setting capabilities will later disable use of LD_LIBRARY_PATH from ELF loader -> modify RPATH instead.</span><br><span> self.log('Setting RPATH for srsue')</span><br><span> # srsue binary needs patchelf >= 0.9+52 to avoid failing during patch. OS#4389, patchelf-GH#192.</span><br><span>@@ -163,12 +143,7 @@</span><br><span> self.log('Creating netns %s' % self.netns())</span><br><span> self.rem_host.create_netns(self.netns())</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- #'strace', '-ff',</span><br><span style="color: hsl(0, 100%, 40%);">- args = (remote_binary, self.remote_config_file,</span><br><span style="color: hsl(0, 100%, 40%);">- '--gw.netns=' + self.netns(),</span><br><span style="color: hsl(0, 100%, 40%);">- '--log.filename=' + self.remote_log_file,</span><br><span style="color: hsl(0, 100%, 40%);">- '--pcap.filename=' + self.remote_pcap_file,</span><br><span style="color: hsl(0, 100%, 40%);">- '--general.metrics_csv_filename=' + self.remote_metrics_file)</span><br><span style="color: hsl(120, 100%, 40%);">+ args = (remote_binary, self.remote_config_file, '--gw.netns=' + self.netns())</span><br><span> args += tuple(self._additional_args)</span><br><span> </span><br><span> self.process = self.rem_host.RemoteProcess(srsUE.BINFILE, args)</span><br><span>@@ -177,15 +152,8 @@</span><br><span> self.process.launch()</span><br><span> </span><br><span> def start_locally(self):</span><br><span style="color: hsl(0, 100%, 40%);">- inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('srslte')))</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- binary = inst.child('bin', srsUE.BINFILE)</span><br><span style="color: hsl(0, 100%, 40%);">- if not os.path.isfile(binary):</span><br><span style="color: hsl(0, 100%, 40%);">- raise log.Error('Binary missing:', binary)</span><br><span style="color: hsl(0, 100%, 40%);">- lib = inst.child('lib')</span><br><span style="color: hsl(0, 100%, 40%);">- if not os.path.isdir(lib):</span><br><span style="color: hsl(0, 100%, 40%);">- raise log.Error('No lib/ in', inst)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ binary = self.inst.child('bin', srsUE.BINFILE)</span><br><span style="color: hsl(120, 100%, 40%);">+ lib = self.inst.child('lib')</span><br><span> env = {}</span><br><span> </span><br><span> # setting capabilities will later disable use of LD_LIBRARY_PATH from ELF loader -> modify RPATH instead.</span><br><span>@@ -200,30 +168,47 @@</span><br><span> self.log('Creating netns %s' % self.netns())</span><br><span> util.create_netns(self.netns(), self.run_dir.new_dir('create_netns'))</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- args = (binary, os.path.abspath(self.config_file),</span><br><span style="color: hsl(0, 100%, 40%);">- '--gw.netns=' + self.netns(),</span><br><span style="color: hsl(0, 100%, 40%);">- '--log.filename=' + self.log_file,</span><br><span style="color: hsl(0, 100%, 40%);">- '--pcap.filename=' + self.pcap_file,</span><br><span style="color: hsl(0, 100%, 40%);">- '--general.metrics_csv_filename=' + self.metrics_file)</span><br><span style="color: hsl(120, 100%, 40%);">+ args = (binary, os.path.abspath(self.config_file), '--gw.netns=' + self.netns())</span><br><span> args += tuple(self._additional_args)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- self.dbg(run_dir=self.run_dir, binary=binary, env=env)</span><br><span> self.process = process.Process(self.name(), self.run_dir, args, env=env)</span><br><span> self.suite_run.remember_to_stop(self.process)</span><br><span> self.process.launch()</span><br><span> </span><br><span> def configure(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ self.inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('srslte')))</span><br><span style="color: hsl(120, 100%, 40%);">+ if not os.path.isdir(self.inst.child('lib')):</span><br><span style="color: hsl(120, 100%, 40%);">+ raise log.Error('No lib/ in', self.inst)</span><br><span style="color: hsl(120, 100%, 40%);">+ if not self.inst.isfile('bin', srsUE.BINFILE):</span><br><span style="color: hsl(120, 100%, 40%);">+ raise log.Error('No %s binary in' % srsUE.BINFILE, self.inst)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> self.config_file = self.run_dir.child(srsUE.CFGFILE)</span><br><span> self.log_file = self.run_dir.child(srsUE.LOGFILE)</span><br><span> self.pcap_file = self.run_dir.child(srsUE.PCAPFILE)</span><br><span> self.metrics_file = self.run_dir.child(srsUE.METRICSFILE)</span><br><span style="color: hsl(0, 100%, 40%);">- self.dbg(config_file=self.config_file)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if not self.setup_runs_locally():</span><br><span style="color: hsl(120, 100%, 40%);">+ self.rem_host = remote.RemoteHost(self.run_dir, self.remote_user, self._addr)</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_prefix_dir = util.Dir(srsUE.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(srsUE.BINFILE))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_config_file = remote_run_dir.child(srsUE.CFGFILE)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_log_file = remote_run_dir.child(srsUE.LOGFILE)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_pcap_file = remote_run_dir.child(srsUE.PCAPFILE)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_metrics_file = remote_run_dir.child(srsUE.METRICSFILE)</span><br><span> </span><br><span> values = dict(ue=config.get_defaults('srsue'))</span><br><span> config.overlay(values, dict(ue=self.suite_run.config().get('modem', {})))</span><br><span> config.overlay(values, dict(ue=self._conf))</span><br><span> config.overlay(values, dict(ue=dict(num_antennas = self.enb.num_ports())))</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ metricsfile = self.metrics_file if self.setup_runs_locally() else self.remote_metrics_file</span><br><span style="color: hsl(120, 100%, 40%);">+ logfile = self.log_file if self.setup_runs_locally() else self.remote_log_file</span><br><span style="color: hsl(120, 100%, 40%);">+ pcapfile = self.pcap_file if self.setup_runs_locally() else self.remote_pcap_file</span><br><span style="color: hsl(120, 100%, 40%);">+ config.overlay(values, dict(ue=dict(metrics_filename=metricsfile,</span><br><span style="color: hsl(120, 100%, 40%);">+ log_filename=logfile,</span><br><span style="color: hsl(120, 100%, 40%);">+ pcap_filename=pcapfile)))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # Convert parsed boolean string to Python boolean:</span><br><span> self.enable_pcap = util.str2bool(values['ue'].get('enable_pcap', 'false'))</span><br><span> config.overlay(values, dict(ue={'enable_pcap': self.enable_pcap}))</span><br><span>@@ -267,6 +252,12 @@</span><br><span> self.dbg(r)</span><br><span> f.write(r)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if not self.setup_runs_locally():</span><br><span style="color: hsl(120, 100%, 40%);">+ self.rem_host.recreate_remote_dir(self.remote_inst)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.rem_host.scp('scp-inst-to-remote', str(self.inst), remote_prefix_dir)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.rem_host.recreate_remote_dir(remote_run_dir)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.rem_host.scp('scp-cfg-to-remote', self.config_file, self.remote_config_file)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def is_connected(self, mcc_mnc=None):</span><br><span> return 'Network attach successful.' in (self.process.get_stdout() or '')</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/templates/srsue.conf.tmpl b/src/osmo_gsm_tester/templates/srsue.conf.tmpl</span><br><span>index d97b00c..37175dd 100644</span><br><span>--- a/src/osmo_gsm_tester/templates/srsue.conf.tmpl</span><br><span>+++ b/src/osmo_gsm_tester/templates/srsue.conf.tmpl</span><br><span>@@ -77,7 +77,7 @@</span><br><span> #####################################################################</span><br><span> [pcap]</span><br><span> enable = ${'true' if ue.enable_pcap else 'false'}</span><br><span style="color: hsl(0, 100%, 40%);">-filename = /tmp/ue.pcap</span><br><span style="color: hsl(120, 100%, 40%);">+filename = ${ue.pcap_filename}</span><br><span> nas_enable = false</span><br><span> nas_filename = /tmp/nas.pcap</span><br><span> </span><br><span>@@ -105,7 +105,7 @@</span><br><span> all_level = warning</span><br><span> phy_lib_level = none</span><br><span> all_hex_limit = 32</span><br><span style="color: hsl(0, 100%, 40%);">-filename = /tmp/ue.log</span><br><span style="color: hsl(120, 100%, 40%);">+filename = ${ue.log_filename}</span><br><span> file_max_size = -1</span><br><span> </span><br><span> #####################################################################</span><br><span>@@ -373,4 +373,4 @@</span><br><span> [general]</span><br><span> metrics_csv_enable = true</span><br><span> #metrics_period_secs = 1</span><br><span style="color: hsl(0, 100%, 40%);">-#metrics_csv_filename = /tmp/ue_metrics.csv</span><br><span style="color: hsl(120, 100%, 40%);">+metrics_csv_filename = ${ue.metrics_filename}</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17837">change 17837</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/+/17837"/><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: Id2a6ba17d087d2ff67fe10b1dae6434259e74366 </div>
<div style="display:none"> Gerrit-Change-Number: 17837 </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>