Change in osmo-gsm-tester[master]: srs_enb: add modifier to pass arbitrary cmd line arguments

[srs_andre]

srs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17612 )


Change subject: srs_enb: add modifier to pass arbitrary cmd line arguments
......................................................................

srs_enb: add modifier to pass arbitrary cmd line arguments

Change-Id: I3e8100e4e79acb49ee6e8bfb4f3bc2ea41c9f6b6
---
A example/scenarios/mod-srsenb-args at .conf
M src/osmo_gsm_tester/resource.py
M src/osmo_gsm_tester/srs_enb.py
3 files changed, 14 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/12/17612/1

diff --git a/example/scenarios/mod-srsenb-args at .conf b/example/scenarios/mod-srsenb-args at .conf
new file mode 100644
index 0000000..5d6983d
--- /dev/null
+++ b/example/scenarios/mod-srsenb-args at .conf
@@ -0,0 +1,9 @@
+modifiers:
+  modem:
+<%
+    modifier = "  - additional_args: "
+    for key in context.keys():
+      if 'param' in str(key):
+        modifier += context.get(key) + ' '
+    context.write(modifier)
+%>
diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py
index c9e9a49..3473abf 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,
diff --git a/src/osmo_gsm_tester/srs_enb.py b/src/osmo_gsm_tester/srs_enb.py
index 772b447..8cb612e 100644
--- a/src/osmo_gsm_tester/srs_enb.py
+++ b/src/osmo_gsm_tester/srs_enb.py
@@ -155,7 +155,8 @@
                 '--enb_files.rr_config=' + self.remote_config_rr_file,
                 '--enb_files.drb_config=' + self.remote_config_drb_file,
                 '--log.filename=' + self.remote_log_file,
-                '--pcap.filename=' + self.remote_pcap_file)
+                '--pcap.filename=' + self.remote_pcap_file,
+                self._conf.get('additional_args') if self._conf.get('additional_args') is not None else '')
 
         self.process = self.rem_host.RemoteProcess(srsENB.BINFILE, args, remote_env=remote_env)
         self.suite_run.remember_to_stop(self.process)
@@ -179,7 +180,8 @@
                 '--enb_files.rr_config=' + os.path.abspath(self.config_rr_file),
                 '--enb_files.drb_config=' + os.path.abspath(self.config_drb_file),
                 '--log.filename=' + self.log_file,
-                '--pcap.filename=' + self.pcap_file)
+                '--pcap.filename=' + self.pcap_file,
+                self._conf.get('additional_args') if self._conf.get('additional_args') is not None else '')
 
         self.process = process.Process(self.name(), self.run_dir, args, env=env)
         self.suite_run.remember_to_stop(self.process)

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17612
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: I3e8100e4e79acb49ee6e8bfb4f3bc2ea41c9f6b6
Gerrit-Change-Number: 17612
Gerrit-PatchSet: 1
Gerrit-Owner: srs_andre <andre at softwareradiosystems.com>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200325/0a2cc9bd/attachment.htm>