srs_{ue,enb}: Add modifier to pass arbitrary cmd line arguments
Change-Id: Ie438c8aa9992dbc61b2133473a83d565cf5c7056
diff --git a/src/osmo_gsm_tester/srs_enb.py b/src/osmo_gsm_tester/srs_enb.py
index 4af2894..fe0e550 100644
--- a/src/osmo_gsm_tester/srs_enb.py
+++ b/src/osmo_gsm_tester/srs_enb.py
@@ -77,6 +77,7 @@
self.enable_pcap = False
self.suite_run = suite_run
self.remote_user = conf.get('remote_user', None)
+ self._additional_args = []
if not rf_type_valid(conf.get('rf_dev_type', None)):
raise log.Error('Invalid rf_dev_type=%s' % conf.get('rf_dev_type', None))
@@ -149,6 +150,7 @@
'--enb_files.drb_config=' + self.remote_config_drb_file,
'--log.filename=' + self.remote_log_file,
'--pcap.filename=' + self.remote_pcap_file)
+ args += tuple(self._additional_args)
self.process = self.rem_host.RemoteProcess(srsENB.BINFILE, args, remote_env=remote_env)
self.suite_run.remember_to_stop(self.process)
@@ -173,6 +175,7 @@
'--enb_files.drb_config=' + os.path.abspath(self.config_drb_file),
'--log.filename=' + self.log_file,
'--pcap.filename=' + self.pcap_file)
+ args += tuple(self._additional_args)
self.process = process.Process(self.name(), self.run_dir, args, env=env)
self.suite_run.remember_to_stop(self.process)
@@ -193,6 +196,8 @@
self.enable_pcap = util.str2bool(values['enb'].get('enable_pcap', 'false'))
config.overlay(values, dict(enb={'enable_pcap': self.enable_pcap}))
+ self._additional_args = values['enb'].get('additional_args', '').split()
+
self._num_cells = int(values['enb'].get('num_cells', None))
assert self._num_cells