<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18838">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: Convert additional_args attr to list to allow combining different params<br><br>Change-Id: I4b371332cd6fbe11b98c85c79a6f8fdcc776a57b<br>---<br>M src/osmo_gsm_tester/obj/enb.py<br>M src/osmo_gsm_tester/obj/enb_srs.py<br>M src/osmo_gsm_tester/obj/ms_srs.py<br>M sysmocom/scenarios/mod-enb-args@.conf<br>M sysmocom/scenarios/mod-modem-args@.conf<br>5 files changed, 12 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/obj/enb.py b/src/osmo_gsm_tester/obj/enb.py</span><br><span>index b221cb9..4a151d7 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/enb.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/enb.py</span><br><span>@@ -34,7 +34,7 @@</span><br><span>         'rx_gain': schema.UINT,</span><br><span>         'rf_dev_type': schema.STR,</span><br><span>         'rf_dev_args': schema.STR,</span><br><span style="color: hsl(0, 100%, 40%);">-        'additional_args': schema.STR,</span><br><span style="color: hsl(120, 100%, 40%);">+        'additional_args[]': schema.STR,</span><br><span>         'enable_measurements': schema.BOOL_STR,</span><br><span>         'a1_report_type': schema.STR,</span><br><span>         'a1_report_value': schema.INT,</span><br><span>diff --git a/src/osmo_gsm_tester/obj/enb_srs.py b/src/osmo_gsm_tester/obj/enb_srs.py</span><br><span>index 9dc8113..1b23172 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/enb_srs.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/enb_srs.py</span><br><span>@@ -176,7 +176,9 @@</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(0, 100%, 40%);">-        self._additional_args = values['enb'].get('additional_args', '').split()</span><br><span style="color: hsl(120, 100%, 40%);">+        self._additional_args = []</span><br><span style="color: hsl(120, 100%, 40%);">+        for add_args in values['enb'].get('additional_args', []):</span><br><span style="color: hsl(120, 100%, 40%);">+            self._additional_args += add_args.split()</span><br><span> </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>diff --git a/src/osmo_gsm_tester/obj/ms_srs.py b/src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>index 3aa6b0a..6241685 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>@@ -35,7 +35,7 @@</span><br><span>         'rf_dev_type': schema.STR,</span><br><span>         'rf_dev_args': schema.STR,</span><br><span>         'num_carriers': schema.UINT,</span><br><span style="color: hsl(0, 100%, 40%);">-        'additional_args': schema.STR,</span><br><span style="color: hsl(120, 100%, 40%);">+        'additional_args[]': schema.STR,</span><br><span>         'airplane_t_on_ms': schema.INT,</span><br><span>         'airplane_t_off_ms': schema.INT,</span><br><span>         'tx_gain': schema.UINT,</span><br><span>@@ -231,6 +231,9 @@</span><br><span>         config.overlay(values, dict(ue={'enable_pcap': self.enable_pcap}))</span><br><span> </span><br><span>         self._additional_args = values['ue'].get('additional_args', '').split()</span><br><span style="color: hsl(120, 100%, 40%);">+        for add_args in values['ue'].get('additional_args', []):</span><br><span style="color: hsl(120, 100%, 40%);">+            self._additional_args += add_args.split()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span>         self.num_carriers = int(values['ue'].get('num_carriers', 1))</span><br><span> </span><br><span>diff --git a/sysmocom/scenarios/mod-enb-args@.conf b/sysmocom/scenarios/mod-enb-args@.conf</span><br><span>index a758d01..3e09a99 100644</span><br><span>--- a/sysmocom/scenarios/mod-enb-args@.conf</span><br><span>+++ b/sysmocom/scenarios/mod-enb-args@.conf</span><br><span>@@ -1,3 +1,4 @@</span><br><span> modifiers:</span><br><span>   enb:</span><br><span style="color: hsl(0, 100%, 40%);">-  - additional_args: ${param1}</span><br><span style="color: hsl(120, 100%, 40%);">+  - additional_args:</span><br><span style="color: hsl(120, 100%, 40%);">+    - ${param1}</span><br><span>diff --git a/sysmocom/scenarios/mod-modem-args@.conf b/sysmocom/scenarios/mod-modem-args@.conf</span><br><span>index dde7796..2ec0834 100644</span><br><span>--- a/sysmocom/scenarios/mod-modem-args@.conf</span><br><span>+++ b/sysmocom/scenarios/mod-modem-args@.conf</span><br><span>@@ -1,3 +1,4 @@</span><br><span> modifiers:</span><br><span>   modem:</span><br><span style="color: hsl(0, 100%, 40%);">-  - additional_args: ${param1}</span><br><span style="color: hsl(120, 100%, 40%);">+  - additional_args:</span><br><span style="color: hsl(120, 100%, 40%);">+    - ${param1}</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18838">change 18838</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/+/18838"/><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: I4b371332cd6fbe11b98c85c79a6f8fdcc776a57b </div>
<div style="display:none"> Gerrit-Change-Number: 18838 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </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>