cellular-infrastructure
/
osmo-gsm-tester
mirror of https://gerrit.osmocom.org/osmo-gsm-tester
9
0
Fork 0
Code Issues Releases Wiki Activity

srsue: Enable metrics csv file generation 

Change-Id: I393afc49f553d9ebda29717c27d5eb907b3c5b60
This commit is contained in:
Pau Espin 2020-03-02 11:06:51 +01:00
parent a337695cd0
commit a031995762
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/osmo_gsm_tester/srs_ue.py
View File

@ -34,6 +34,7 @@ class srsUE(MS):
CFGFILE = 'srsue.conf'
PCAPFILE = 'srsue.pcap'
LOGFILE = 'srsue.log'
METRICSFILE = 'srsue_metrics.csv'
def __init__(self, suite_run, conf):
self._addr = conf.get('addr', None)
@ -45,11 +46,13 @@ class srsUE(MS):
self.config_file = None
self.log_file = None
self.pcap_file = None
self.metrics_file = None
self.process = None
self.rem_host = None
self.remote_config_file = None
self.remote_log_file = None
self.remote_pcap_file = None
self.remote_metrics_file = None
self.suite_run = suite_run
self.nof_prb=50
if self.nof_prb == 75:
@ -74,6 +77,10 @@ class srsUE(MS):
self.rem_host.scpfrom('scp-back-pcap', self.remote_pcap_file, self.pcap_file)
except Exception as e:
self.log(repr(e))
try:
self.rem_host.scpfrom('scp-back-metrics', self.remote_metrics_file, self.metrics_file)
except Exception as e:
self.log(repr(e))
def setup_runs_locally(self):
return self.remote_user is None
@ -106,6 +113,7 @@ class srsUE(MS):
self.remote_config_file = remote_run_dir.child(srsUE.CFGFILE)
self.remote_log_file = remote_run_dir.child(srsUE.LOGFILE)
self.remote_pcap_file = remote_run_dir.child(srsUE.PCAPFILE)
self.remote_metrics_file = remote_run_dir.child(srsUE.METRICSFILE)
self.rem_host.recreate_remote_dir(remote_inst)
self.rem_host.scp('scp-inst-to-remote', str(self.inst), remote_prefix_dir)
@ -134,7 +142,8 @@ class srsUE(MS):
'--gw.netns=' + self.netns(),
'--log.filename=' + 'stdout', #self.remote_log_file,
'--pcap.enable=true',
'--pcap.filename=' + self.remote_pcap_file)
'--pcap.filename=' + self.remote_pcap_file,
'--general.metrics_csv_filename=' + self.remote_metrics_file)
self.process = self.rem_host.RemoteProcessFixIgnoreSIGHUP(srsUE.BINFILE, util.Dir(srsUE.REMOTE_DIR), args)
#self.process = self.rem_host.RemoteProcessFixIgnoreSIGHUP(srsUE.BINFILE, remote_run_dir, args, remote_lib)
@ -170,7 +179,8 @@ class srsUE(MS):
'--gw.netns=' + self.netns(),
'--log.filename=' + self.log_file,
'--pcap.enable=true',
'--pcap.filename=' + self.pcap_file)
'--pcap.filename=' + self.pcap_file,
'--general.metrics_csv_filename=' + self.metrics_file)
self.dbg(run_dir=self.run_dir, binary=binary, env=env)
self.process = process.Process(self.name(), self.run_dir, args, env=env)
@ -181,6 +191,7 @@ class srsUE(MS):
self.config_file = self.run_dir.new_file(srsUE.CFGFILE)
self.log_file = self.run_dir.child(srsUE.LOGFILE)
self.pcap_file = self.run_dir.new_file(srsUE.PCAPFILE)
self.metrics_file = self.run_dir.child(srsUE.METRICSFILE)
self.dbg(config_file=self.config_file)
values = dict(ue=config.get_defaults('srsue'))

2
src/osmo_gsm_tester/templates/srsue.conf.tmpl
View File

@ -344,6 +344,6 @@ enable = false
#
#####################################################################
[general]
#metrics_csv_enable = false
metrics_csv_enable = true
#metrics_period_secs = 1
#metrics_csv_filename = /tmp/ue_metrics.csv