<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17310">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">srsue: Enable metrics csv file generation<br><br>Change-Id: I393afc49f553d9ebda29717c27d5eb907b3c5b60<br>---<br>M src/osmo_gsm_tester/srs_ue.py<br>M src/osmo_gsm_tester/templates/srsue.conf.tmpl<br>2 files changed, 14 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/srs_ue.py b/src/osmo_gsm_tester/srs_ue.py</span><br><span>index 38e2baf..11a6966 100644</span><br><span>--- a/src/osmo_gsm_tester/srs_ue.py</span><br><span>+++ b/src/osmo_gsm_tester/srs_ue.py</span><br><span>@@ -34,6 +34,7 @@</span><br><span> CFGFILE = 'srsue.conf'</span><br><span> PCAPFILE = 'srsue.pcap'</span><br><span> LOGFILE = 'srsue.log'</span><br><span style="color: hsl(120, 100%, 40%);">+ METRICSFILE = 'srsue_metrics.csv'</span><br><span> </span><br><span> def __init__(self, suite_run, conf):</span><br><span> self._addr = conf.get('addr', None)</span><br><span>@@ -45,11 +46,13 @@</span><br><span> self.config_file = None</span><br><span> self.log_file = None</span><br><span> self.pcap_file = None</span><br><span style="color: hsl(120, 100%, 40%);">+ self.metrics_file = None</span><br><span> self.process = None</span><br><span> self.rem_host = 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 style="color: hsl(120, 100%, 40%);">+ self.remote_metrics_file = None</span><br><span> self.suite_run = suite_run</span><br><span> self.nof_prb=50</span><br><span> if self.nof_prb == 75:</span><br><span>@@ -74,6 +77,10 @@</span><br><span> self.rem_host.scpfrom('scp-back-pcap', self.remote_pcap_file, self.pcap_file)</span><br><span> except Exception as e:</span><br><span> self.log(repr(e))</span><br><span style="color: hsl(120, 100%, 40%);">+ try:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.rem_host.scpfrom('scp-back-metrics', self.remote_metrics_file, self.metrics_file)</span><br><span style="color: hsl(120, 100%, 40%);">+ except Exception as e:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.log(repr(e))</span><br><span> </span><br><span> def setup_runs_locally(self):</span><br><span> return self.remote_user is None</span><br><span>@@ -106,6 +113,7 @@</span><br><span> self.remote_config_file = remote_run_dir.child(srsUE.CFGFILE)</span><br><span> self.remote_log_file = remote_run_dir.child(srsUE.LOGFILE)</span><br><span> 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> self.rem_host.recreate_remote_dir(remote_inst)</span><br><span> self.rem_host.scp('scp-inst-to-remote', str(self.inst), remote_prefix_dir)</span><br><span>@@ -134,7 +142,8 @@</span><br><span> '--gw.netns=' + self.netns(),</span><br><span> '--log.filename=' + 'stdout', #self.remote_log_file,</span><br><span> '--pcap.enable=true',</span><br><span style="color: hsl(0, 100%, 40%);">- '--pcap.filename=' + self.remote_pcap_file)</span><br><span style="color: hsl(120, 100%, 40%);">+ '--pcap.filename=' + self.remote_pcap_file,</span><br><span style="color: hsl(120, 100%, 40%);">+ '--general.metrics_csv_filename=' + self.remote_metrics_file)</span><br><span> </span><br><span> self.process = self.rem_host.RemoteProcessFixIgnoreSIGHUP(srsUE.BINFILE, util.Dir(srsUE.REMOTE_DIR), args)</span><br><span> #self.process = self.rem_host.RemoteProcessFixIgnoreSIGHUP(srsUE.BINFILE, remote_run_dir, args, remote_lib)</span><br><span>@@ -170,7 +179,8 @@</span><br><span> '--gw.netns=' + self.netns(),</span><br><span> '--log.filename=' + self.log_file,</span><br><span> '--pcap.enable=true',</span><br><span style="color: hsl(0, 100%, 40%);">- '--pcap.filename=' + self.pcap_file)</span><br><span style="color: hsl(120, 100%, 40%);">+ '--pcap.filename=' + self.pcap_file,</span><br><span style="color: hsl(120, 100%, 40%);">+ '--general.metrics_csv_filename=' + self.metrics_file)</span><br><span> </span><br><span> 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>@@ -181,6 +191,7 @@</span><br><span> self.config_file = self.run_dir.new_file(srsUE.CFGFILE)</span><br><span> self.log_file = self.run_dir.child(srsUE.LOGFILE)</span><br><span> self.pcap_file = self.run_dir.new_file(srsUE.PCAPFILE)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.metrics_file = self.run_dir.child(srsUE.METRICSFILE)</span><br><span> self.dbg(config_file=self.config_file)</span><br><span> </span><br><span> values = dict(ue=config.get_defaults('srsue'))</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 eef5a7e..5cca60c 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>@@ -344,6 +344,6 @@</span><br><span> #</span><br><span> #####################################################################</span><br><span> [general]</span><br><span style="color: hsl(0, 100%, 40%);">-#metrics_csv_enable = false</span><br><span style="color: hsl(120, 100%, 40%);">+metrics_csv_enable = true</span><br><span> #metrics_period_secs = 1</span><br><span> #metrics_csv_filename = /tmp/ue_metrics.csv</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17310">change 17310</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/+/17310"/><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: I393afc49f553d9ebda29717c27d5eb907b3c5b60 </div>
<div style="display:none"> Gerrit-Change-Number: 17310 </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-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>