This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
pespin gerrit-no-reply at lists.osmocom.orgpespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17837 )
Change subject: ms_srs.py: Pass filenames to main cfg file template instead of cmdline args
......................................................................
ms_srs.py: Pass filenames to main cfg file template instead of cmdline args
Change-Id: Id2a6ba17d087d2ff67fe10b1dae6434259e74366
---
M src/osmo_gsm_tester/obj/ms_srs.py
M src/osmo_gsm_tester/templates/srsue.conf.tmpl
2 files changed, 39 insertions(+), 48 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/37/17837/1
diff --git a/src/osmo_gsm_tester/obj/ms_srs.py b/src/osmo_gsm_tester/obj/ms_srs.py
index c1803e3..e6e9196 100644
--- a/src/osmo_gsm_tester/obj/ms_srs.py
+++ b/src/osmo_gsm_tester/obj/ms_srs.py
@@ -69,6 +69,7 @@
self.metrics_file = None
self.process = None
self.rem_host = None
+ self.remote_inst = None
self.remote_config_file = None
self.remote_log_file = None
self.remote_pcap_file = None
@@ -126,29 +127,8 @@
self.process.stdin_write('t\n')
def start_remotely(self):
- self.inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('srslte')))
- lib = self.inst.child('lib')
- if not os.path.isdir(lib):
- raise log.Error('No lib/ in', self.inst)
- if not self.inst.isfile('bin', srsUE.BINFILE):
- raise log.Error('No %s binary in' % srsUE.BINFILE, self.inst)
-
- self.rem_host = remote.RemoteHost(self.run_dir, self.remote_user, self._addr)
- remote_prefix_dir = util.Dir(srsUE.REMOTE_DIR)
- remote_inst = util.Dir(remote_prefix_dir.child(os.path.basename(str(self.inst))))
- remote_run_dir = util.Dir(remote_prefix_dir.child(srsUE.BINFILE))
- 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)
- self.rem_host.recreate_remote_dir(remote_run_dir)
- self.rem_host.scp('scp-cfg-to-remote', self.config_file, self.remote_config_file)
-
- remote_lib = remote_inst.child('lib')
- remote_binary = remote_inst.child('bin', srsUE.BINFILE)
+ remote_lib = self.remote_inst.child('lib')
+ remote_binary = self.remote_inst.child('bin', srsUE.BINFILE)
# setting capabilities will later disable use of LD_LIBRARY_PATH from ELF loader -> modify RPATH instead.
self.log('Setting RPATH for srsue')
# srsue binary needs patchelf >= 0.9+52 to avoid failing during patch. OS#4389, patchelf-GH#192.
@@ -163,12 +143,7 @@
self.log('Creating netns %s' % self.netns())
self.rem_host.create_netns(self.netns())
- #'strace', '-ff',
- args = (remote_binary, self.remote_config_file,
- '--gw.netns=' + self.netns(),
- '--log.filename=' + self.remote_log_file,
- '--pcap.filename=' + self.remote_pcap_file,
- '--general.metrics_csv_filename=' + self.remote_metrics_file)
+ args = (remote_binary, self.remote_config_file, '--gw.netns=' + self.netns())
args += tuple(self._additional_args)
self.process = self.rem_host.RemoteProcess(srsUE.BINFILE, args)
@@ -177,15 +152,8 @@
self.process.launch()
def start_locally(self):
- inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('srslte')))
-
- binary = inst.child('bin', srsUE.BINFILE)
- if not os.path.isfile(binary):
- raise log.Error('Binary missing:', binary)
- lib = inst.child('lib')
- if not os.path.isdir(lib):
- raise log.Error('No lib/ in', inst)
-
+ binary = self.inst.child('bin', srsUE.BINFILE)
+ lib = self.inst.child('lib')
env = {}
# setting capabilities will later disable use of LD_LIBRARY_PATH from ELF loader -> modify RPATH instead.
@@ -200,30 +168,47 @@
self.log('Creating netns %s' % self.netns())
util.create_netns(self.netns(), self.run_dir.new_dir('create_netns'))
- args = (binary, os.path.abspath(self.config_file),
- '--gw.netns=' + self.netns(),
- '--log.filename=' + self.log_file,
- '--pcap.filename=' + self.pcap_file,
- '--general.metrics_csv_filename=' + self.metrics_file)
+ args = (binary, os.path.abspath(self.config_file), '--gw.netns=' + self.netns())
args += tuple(self._additional_args)
- self.dbg(run_dir=self.run_dir, binary=binary, env=env)
self.process = process.Process(self.name(), self.run_dir, args, env=env)
self.suite_run.remember_to_stop(self.process)
self.process.launch()
def configure(self):
+ self.inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('srslte')))
+ if not os.path.isdir(self.inst.child('lib')):
+ raise log.Error('No lib/ in', self.inst)
+ if not self.inst.isfile('bin', srsUE.BINFILE):
+ raise log.Error('No %s binary in' % srsUE.BINFILE, self.inst)
+
self.config_file = self.run_dir.child(srsUE.CFGFILE)
self.log_file = self.run_dir.child(srsUE.LOGFILE)
self.pcap_file = self.run_dir.child(srsUE.PCAPFILE)
self.metrics_file = self.run_dir.child(srsUE.METRICSFILE)
- self.dbg(config_file=self.config_file)
+
+ if not self.setup_runs_locally():
+ self.rem_host = remote.RemoteHost(self.run_dir, self.remote_user, self._addr)
+ remote_prefix_dir = util.Dir(srsUE.REMOTE_DIR)
+ self.remote_inst = util.Dir(remote_prefix_dir.child(os.path.basename(str(self.inst))))
+ remote_run_dir = util.Dir(remote_prefix_dir.child(srsUE.BINFILE))
+ 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)
values = dict(ue=config.get_defaults('srsue'))
config.overlay(values, dict(ue=self.suite_run.config().get('modem', {})))
config.overlay(values, dict(ue=self._conf))
config.overlay(values, dict(ue=dict(num_antennas = self.enb.num_ports())))
+ metricsfile = self.metrics_file if self.setup_runs_locally() else self.remote_metrics_file
+ logfile = self.log_file if self.setup_runs_locally() else self.remote_log_file
+ pcapfile = self.pcap_file if self.setup_runs_locally() else self.remote_pcap_file
+ config.overlay(values, dict(ue=dict(metrics_filename=metricsfile,
+ log_filename=logfile,
+ pcap_filename=pcapfile)))
+
# Convert parsed boolean string to Python boolean:
self.enable_pcap = util.str2bool(values['ue'].get('enable_pcap', 'false'))
config.overlay(values, dict(ue={'enable_pcap': self.enable_pcap}))
@@ -267,6 +252,12 @@
self.dbg(r)
f.write(r)
+ if not self.setup_runs_locally():
+ self.rem_host.recreate_remote_dir(self.remote_inst)
+ self.rem_host.scp('scp-inst-to-remote', str(self.inst), remote_prefix_dir)
+ self.rem_host.recreate_remote_dir(remote_run_dir)
+ self.rem_host.scp('scp-cfg-to-remote', self.config_file, self.remote_config_file)
+
def is_connected(self, mcc_mnc=None):
return 'Network attach successful.' in (self.process.get_stdout() or '')
diff --git a/src/osmo_gsm_tester/templates/srsue.conf.tmpl b/src/osmo_gsm_tester/templates/srsue.conf.tmpl
index d97b00c..37175dd 100644
--- a/src/osmo_gsm_tester/templates/srsue.conf.tmpl
+++ b/src/osmo_gsm_tester/templates/srsue.conf.tmpl
@@ -77,7 +77,7 @@
#####################################################################
[pcap]
enable = ${'true' if ue.enable_pcap else 'false'}
-filename = /tmp/ue.pcap
+filename = ${ue.pcap_filename}
nas_enable = false
nas_filename = /tmp/nas.pcap
@@ -105,7 +105,7 @@
all_level = warning
phy_lib_level = none
all_hex_limit = 32
-filename = /tmp/ue.log
+filename = ${ue.log_filename}
file_max_size = -1
#####################################################################
@@ -373,4 +373,4 @@
[general]
metrics_csv_enable = true
#metrics_period_secs = 1
-#metrics_csv_filename = /tmp/ue_metrics.csv
+metrics_csv_filename = ${ue.metrics_filename}
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17837
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: Id2a6ba17d087d2ff67fe10b1dae6434259e74366
Gerrit-Change-Number: 17837
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200416/83776107/attachment.htm>