<p>srs_andre has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17612">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">srs_enb: add modifier to pass arbitrary cmd line arguments<br><br>Change-Id: I3e8100e4e79acb49ee6e8bfb4f3bc2ea41c9f6b6<br>---<br>A example/scenarios/mod-srsenb-args@.conf<br>M src/osmo_gsm_tester/resource.py<br>M src/osmo_gsm_tester/srs_enb.py<br>3 files changed, 14 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/12/17612/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/example/scenarios/mod-srsenb-args@.conf b/example/scenarios/mod-srsenb-args@.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..5d6983d</span><br><span>--- /dev/null</span><br><span>+++ b/example/scenarios/mod-srsenb-args@.conf</span><br><span>@@ -0,0 +1,9 @@</span><br><span style="color: hsl(120, 100%, 40%);">+modifiers:</span><br><span style="color: hsl(120, 100%, 40%);">+  modem:</span><br><span style="color: hsl(120, 100%, 40%);">+<%</span><br><span style="color: hsl(120, 100%, 40%);">+    modifier = "  - additional_args: "</span><br><span style="color: hsl(120, 100%, 40%);">+    for key in context.keys():</span><br><span style="color: hsl(120, 100%, 40%);">+      if 'param' in str(key):</span><br><span style="color: hsl(120, 100%, 40%);">+        modifier += context.get(key) + ' '</span><br><span style="color: hsl(120, 100%, 40%);">+    context.write(modifier)</span><br><span style="color: hsl(120, 100%, 40%);">+%></span><br><span>diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py</span><br><span>index c9e9a49..3473abf 100644</span><br><span>--- a/src/osmo_gsm_tester/resource.py</span><br><span>+++ b/src/osmo_gsm_tester/resource.py</span><br><span>@@ -93,6 +93,7 @@</span><br><span>         'enb[].num_cells': schema.UINT,</span><br><span>         'enb[].rf_dev_type': schema.STR,</span><br><span>         'enb[].rf_dev_args': schema.STR,</span><br><span style="color: hsl(120, 100%, 40%);">+        'enb[].additional_args': schema.STR,</span><br><span>         'arfcn[].arfcn': schema.INT,</span><br><span>         'arfcn[].band': schema.BAND,</span><br><span>         'modem[].type': schema.STR,</span><br><span>diff --git a/src/osmo_gsm_tester/srs_enb.py b/src/osmo_gsm_tester/srs_enb.py</span><br><span>index 772b447..8cb612e 100644</span><br><span>--- a/src/osmo_gsm_tester/srs_enb.py</span><br><span>+++ b/src/osmo_gsm_tester/srs_enb.py</span><br><span>@@ -155,7 +155,8 @@</span><br><span>                 '--enb_files.rr_config=' + self.remote_config_rr_file,</span><br><span>                 '--enb_files.drb_config=' + self.remote_config_drb_file,</span><br><span>                 '--log.filename=' + self.remote_log_file,</span><br><span style="color: hsl(0, 100%, 40%);">-                '--pcap.filename=' + self.remote_pcap_file)</span><br><span style="color: hsl(120, 100%, 40%);">+                '--pcap.filename=' + self.remote_pcap_file,</span><br><span style="color: hsl(120, 100%, 40%);">+                self._conf.get('additional_args') if self._conf.get('additional_args') is not None else '')</span><br><span> </span><br><span>         self.process = self.rem_host.RemoteProcess(srsENB.BINFILE, args, remote_env=remote_env)</span><br><span>         self.suite_run.remember_to_stop(self.process)</span><br><span>@@ -179,7 +180,8 @@</span><br><span>                 '--enb_files.rr_config=' + os.path.abspath(self.config_rr_file),</span><br><span>                 '--enb_files.drb_config=' + os.path.abspath(self.config_drb_file),</span><br><span>                 '--log.filename=' + self.log_file,</span><br><span style="color: hsl(0, 100%, 40%);">-                '--pcap.filename=' + self.pcap_file)</span><br><span style="color: hsl(120, 100%, 40%);">+                '--pcap.filename=' + self.pcap_file,</span><br><span style="color: hsl(120, 100%, 40%);">+                self._conf.get('additional_args') if self._conf.get('additional_args') is not None else '')</span><br><span> </span><br><span>         self.process = process.Process(self.name(), self.run_dir, args, env=env)</span><br><span>         self.suite_run.remember_to_stop(self.process)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17612">change 17612</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17612"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I3e8100e4e79acb49ee6e8bfb4f3bc2ea41c9f6b6 </div>
<div style="display:none"> Gerrit-Change-Number: 17612 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: srs_andre <andre@softwareradiosystems.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>