Change in osmo-gsm-tester[master]: srs: Convert additional_args attr to list to allow combining differen...

[pespin]

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18838 )

Change subject: srs: Convert additional_args attr to list to allow combining different params
......................................................................

srs: Convert additional_args attr to list to allow combining different params

Change-Id: I4b371332cd6fbe11b98c85c79a6f8fdcc776a57b
---
M src/osmo_gsm_tester/obj/enb.py
M src/osmo_gsm_tester/obj/enb_srs.py
M src/osmo_gsm_tester/obj/ms_srs.py
M sysmocom/scenarios/mod-enb-args at .conf
M sysmocom/scenarios/mod-modem-args at .conf
5 files changed, 12 insertions(+), 5 deletions(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, approved



diff --git a/src/osmo_gsm_tester/obj/enb.py b/src/osmo_gsm_tester/obj/enb.py
index b221cb9..4a151d7 100644
--- a/src/osmo_gsm_tester/obj/enb.py
+++ b/src/osmo_gsm_tester/obj/enb.py
@@ -34,7 +34,7 @@
         'rx_gain': schema.UINT,
         'rf_dev_type': schema.STR,
         'rf_dev_args': schema.STR,
-        'additional_args': schema.STR,
+        'additional_args[]': schema.STR,
         'enable_measurements': schema.BOOL_STR,
         'a1_report_type': schema.STR,
         'a1_report_value': schema.INT,
diff --git a/src/osmo_gsm_tester/obj/enb_srs.py b/src/osmo_gsm_tester/obj/enb_srs.py
index 9dc8113..1b23172 100644
--- a/src/osmo_gsm_tester/obj/enb_srs.py
+++ b/src/osmo_gsm_tester/obj/enb_srs.py
@@ -176,7 +176,9 @@
         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._additional_args = []
+        for add_args in values['enb'].get('additional_args', []):
+            self._additional_args += add_args.split()
 
         # We need to set some specific variables programatically here to match IP addresses:
         if self._conf.get('rf_dev_type') == 'zmq':
diff --git a/src/osmo_gsm_tester/obj/ms_srs.py b/src/osmo_gsm_tester/obj/ms_srs.py
index 3aa6b0a..6241685 100644
--- a/src/osmo_gsm_tester/obj/ms_srs.py
+++ b/src/osmo_gsm_tester/obj/ms_srs.py
@@ -35,7 +35,7 @@
         'rf_dev_type': schema.STR,
         'rf_dev_args': schema.STR,
         'num_carriers': schema.UINT,
-        'additional_args': schema.STR,
+        'additional_args[]': schema.STR,
         'airplane_t_on_ms': schema.INT,
         'airplane_t_off_ms': schema.INT,
         'tx_gain': schema.UINT,
@@ -231,6 +231,9 @@
         config.overlay(values, dict(ue={'enable_pcap': self.enable_pcap}))
 
         self._additional_args = values['ue'].get('additional_args', '').split()
+        for add_args in values['ue'].get('additional_args', []):
+            self._additional_args += add_args.split()
+
 
         self.num_carriers = int(values['ue'].get('num_carriers', 1))
 
diff --git a/sysmocom/scenarios/mod-enb-args at .conf b/sysmocom/scenarios/mod-enb-args at .conf
index a758d01..3e09a99 100644
--- a/sysmocom/scenarios/mod-enb-args at .conf
+++ b/sysmocom/scenarios/mod-enb-args at .conf
@@ -1,3 +1,4 @@
 modifiers:
   enb:
-  - additional_args: ${param1}
+  - additional_args:
+    - ${param1}
diff --git a/sysmocom/scenarios/mod-modem-args at .conf b/sysmocom/scenarios/mod-modem-args at .conf
index dde7796..2ec0834 100644
--- a/sysmocom/scenarios/mod-modem-args at .conf
+++ b/sysmocom/scenarios/mod-modem-args at .conf
@@ -1,3 +1,4 @@
 modifiers:
   modem:
-  - additional_args: ${param1}
+  - additional_args:
+    - ${param1}

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18838
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: I4b371332cd6fbe11b98c85c79a6f8fdcc776a57b
Gerrit-Change-Number: 18838
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
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/20200615/d913ac22/attachment.htm>