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 submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17611 )
Change subject: srs_{ue,enb}: Add modifier to pass arbitrary cmd line arguments
......................................................................
srs_{ue,enb}: Add modifier to pass arbitrary cmd line arguments
Change-Id: Ie438c8aa9992dbc61b2133473a83d565cf5c7056
---
A example/scenarios/mod-enb-args at .conf
A example/scenarios/mod-modem-args at .conf
M src/osmo_gsm_tester/resource.py
M src/osmo_gsm_tester/srs_enb.py
M src/osmo_gsm_tester/srs_ue.py
5 files changed, 18 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/example/scenarios/mod-enb-args at .conf b/example/scenarios/mod-enb-args at .conf
new file mode 100644
index 0000000..a758d01
--- /dev/null
+++ b/example/scenarios/mod-enb-args at .conf
@@ -0,0 +1,3 @@
+modifiers:
+ enb:
+ - additional_args: ${param1}
diff --git a/example/scenarios/mod-modem-args at .conf b/example/scenarios/mod-modem-args at .conf
new file mode 100644
index 0000000..dde7796
--- /dev/null
+++ b/example/scenarios/mod-modem-args at .conf
@@ -0,0 +1,3 @@
+modifiers:
+ modem:
+ - additional_args: ${param1}
diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py
index 3b6e341..c69617c 100644
--- a/src/osmo_gsm_tester/resource.py
+++ b/src/osmo_gsm_tester/resource.py
@@ -93,6 +93,7 @@
'enb[].num_cells': schema.UINT,
'enb[].rf_dev_type': schema.STR,
'enb[].rf_dev_args': schema.STR,
+ 'enb[].additional_args': schema.STR,
'arfcn[].arfcn': schema.INT,
'arfcn[].band': schema.BAND,
'modem[].type': schema.STR,
@@ -109,6 +110,7 @@
'modem[].rf_dev_type': schema.STR,
'modem[].rf_dev_args': schema.STR,
'modem[].num_carriers': schema.STR,
+ 'modem[].additional_args': schema.STR,
'modem[].airplane_t_on_ms': schema.INT,
'modem[].airplane_t_off_ms': schema.INT,
'osmocon_phone[].serial_device': schema.STR,
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
diff --git a/src/osmo_gsm_tester/srs_ue.py b/src/osmo_gsm_tester/srs_ue.py
index 76ee2d1..00f729f 100644
--- a/src/osmo_gsm_tester/srs_ue.py
+++ b/src/osmo_gsm_tester/srs_ue.py
@@ -76,6 +76,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))
@@ -168,6 +169,7 @@
'--log.filename=' + self.remote_log_file,
'--pcap.filename=' + self.remote_pcap_file,
'--general.metrics_csv_filename=' + self.remote_metrics_file)
+ args += tuple(self._additional_args)
self.process = self.rem_host.RemoteProcess(srsUE.BINFILE, args)
#self.process = self.rem_host.RemoteProcessFixIgnoreSIGHUP(srsUE.BINFILE, remote_run_dir, args, remote_lib)
@@ -203,6 +205,7 @@
'--log.filename=' + self.log_file,
'--pcap.filename=' + self.pcap_file,
'--general.metrics_csv_filename=' + self.metrics_file)
+ 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)
@@ -225,6 +228,8 @@
self.enable_pcap = util.str2bool(values['ue'].get('enable_pcap', 'false'))
config.overlay(values, dict(ue={'enable_pcap': self.enable_pcap}))
+ self._additional_args = values['ue'].get('additional_args', '').split()
+
# We need to set some specific variables programatically here to match IP addresses:
if self._conf.get('rf_dev_type') == 'zmq':
base_srate = num_prb2base_srate(self.enb.num_prb())
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17611
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: Ie438c8aa9992dbc61b2133473a83d565cf5c7056
Gerrit-Change-Number: 17611
Gerrit-PatchSet: 5
Gerrit-Owner: srs_andre <andre at softwareradiosystems.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200401/fd3d90b9/attachment.htm>