<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17611">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">srs_{ue,enb}: Add modifier to pass arbitrary cmd line arguments<br><br>Change-Id: Ie438c8aa9992dbc61b2133473a83d565cf5c7056<br>---<br>A example/scenarios/mod-enb-args@.conf<br>A example/scenarios/mod-modem-args@.conf<br>M src/osmo_gsm_tester/resource.py<br>M src/osmo_gsm_tester/srs_enb.py<br>M src/osmo_gsm_tester/srs_ue.py<br>5 files changed, 18 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/example/scenarios/mod-enb-args@.conf b/example/scenarios/mod-enb-args@.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..a758d01</span><br><span>--- /dev/null</span><br><span>+++ b/example/scenarios/mod-enb-args@.conf</span><br><span>@@ -0,0 +1,3 @@</span><br><span style="color: hsl(120, 100%, 40%);">+modifiers:</span><br><span style="color: hsl(120, 100%, 40%);">+  enb:</span><br><span style="color: hsl(120, 100%, 40%);">+  - additional_args: ${param1}</span><br><span>diff --git a/example/scenarios/mod-modem-args@.conf b/example/scenarios/mod-modem-args@.conf</span><br><span>new file mode 100644</span><br><span>index 0000000..dde7796</span><br><span>--- /dev/null</span><br><span>+++ b/example/scenarios/mod-modem-args@.conf</span><br><span>@@ -0,0 +1,3 @@</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%);">+  - additional_args: ${param1}</span><br><span>diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py</span><br><span>index 3b6e341..c69617c 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>@@ -109,6 +110,7 @@</span><br><span>         'modem[].rf_dev_type': schema.STR,</span><br><span>         'modem[].rf_dev_args': schema.STR,</span><br><span>         'modem[].num_carriers': schema.STR,</span><br><span style="color: hsl(120, 100%, 40%);">+        'modem[].additional_args': schema.STR,</span><br><span>         'modem[].airplane_t_on_ms': schema.INT,</span><br><span>         'modem[].airplane_t_off_ms': schema.INT,</span><br><span>         'osmocon_phone[].serial_device': 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 4af2894..fe0e550 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>@@ -77,6 +77,7 @@</span><br><span>         self.enable_pcap = False</span><br><span>         self.suite_run = suite_run</span><br><span>         self.remote_user = conf.get('remote_user', None)</span><br><span style="color: hsl(120, 100%, 40%);">+        self._additional_args = []</span><br><span>         if not rf_type_valid(conf.get('rf_dev_type', None)):</span><br><span>             raise log.Error('Invalid rf_dev_type=%s' % conf.get('rf_dev_type', None))</span><br><span> </span><br><span>@@ -149,6 +150,7 @@</span><br><span>                 '--enb_files.drb_config=' + self.remote_config_drb_file,</span><br><span>                 '--log.filename=' + self.remote_log_file,</span><br><span>                 '--pcap.filename=' + self.remote_pcap_file)</span><br><span style="color: hsl(120, 100%, 40%);">+        args += tuple(self._additional_args)</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>@@ -173,6 +175,7 @@</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>                 '--pcap.filename=' + self.pcap_file)</span><br><span style="color: hsl(120, 100%, 40%);">+        args += tuple(self._additional_args)</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>@@ -193,6 +196,8 @@</span><br><span>         self.enable_pcap = util.str2bool(values['enb'].get('enable_pcap', 'false'))</span><br><span>         config.overlay(values, dict(enb={'enable_pcap': self.enable_pcap}))</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+        self._additional_args = values['enb'].get('additional_args', '').split()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>         self._num_cells = int(values['enb'].get('num_cells', None))</span><br><span>         assert self._num_cells</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/srs_ue.py b/src/osmo_gsm_tester/srs_ue.py</span><br><span>index 76ee2d1..00f729f 100644</span><br><span>--- a/src/osmo_gsm_tester/srs_ue.py</span><br><span>+++ b/src/osmo_gsm_tester/srs_ue.py</span><br><span>@@ -76,6 +76,7 @@</span><br><span>         self.enable_pcap = False</span><br><span>         self.suite_run = suite_run</span><br><span>         self.remote_user = conf.get('remote_user', None)</span><br><span style="color: hsl(120, 100%, 40%);">+        self._additional_args = []</span><br><span>         if not rf_type_valid(conf.get('rf_dev_type', None)):</span><br><span>             raise log.Error('Invalid rf_dev_type=%s' % conf.get('rf_dev_type', None))</span><br><span> </span><br><span>@@ -168,6 +169,7 @@</span><br><span>                 '--log.filename=' + self.remote_log_file,</span><br><span>                 '--pcap.filename=' + self.remote_pcap_file,</span><br><span>                 '--general.metrics_csv_filename=' + self.remote_metrics_file)</span><br><span style="color: hsl(120, 100%, 40%);">+        args += tuple(self._additional_args)</span><br><span> </span><br><span>         self.process = self.rem_host.RemoteProcess(srsUE.BINFILE, args)</span><br><span>         #self.process = self.rem_host.RemoteProcessFixIgnoreSIGHUP(srsUE.BINFILE, remote_run_dir, args, remote_lib)</span><br><span>@@ -203,6 +205,7 @@</span><br><span>                 '--log.filename=' + self.log_file,</span><br><span>                 '--pcap.filename=' + self.pcap_file,</span><br><span>                 '--general.metrics_csv_filename=' + self.metrics_file)</span><br><span style="color: hsl(120, 100%, 40%);">+        args += tuple(self._additional_args)</span><br><span> </span><br><span>         self.dbg(run_dir=self.run_dir, binary=binary, env=env)</span><br><span>         self.process = process.Process(self.name(), self.run_dir, args, env=env)</span><br><span>@@ -225,6 +228,8 @@</span><br><span>         self.enable_pcap = util.str2bool(values['ue'].get('enable_pcap', 'false'))</span><br><span>         config.overlay(values, dict(ue={'enable_pcap': self.enable_pcap}))</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+        self._additional_args = values['ue'].get('additional_args', '').split()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>         # We need to set some specific variables programatically here to match IP addresses:</span><br><span>         if self._conf.get('rf_dev_type') == 'zmq':</span><br><span>             base_srate = num_prb2base_srate(self.enb.num_prb())</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17611">change 17611</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/+/17611"/><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: Ie438c8aa9992dbc61b2133473a83d565cf5c7056 </div>
<div style="display:none"> Gerrit-Change-Number: 17611 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: srs_andre <andre@softwareradiosystems.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>