aboutsummaryrefslogtreecommitdiffstats
path: root/src/osmo_gsm_tester
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2020-06-15 17:01:16 +0200
committerPau Espin Pedrol <pespin@sysmocom.de>2020-06-15 17:31:23 +0200
commite592de80561377fdbf87b0822d2ff1f7098c0bf0 (patch)
treefc72b0a0ff92ccdc520cf0e3a5f6a72b504b0a3c /src/osmo_gsm_tester
parent393cd61382405df93c3e5c5b135f6ccaacf2bb3f (diff)
srs: Convert additional_args attr to list to allow combining different params
Diffstat (limited to 'src/osmo_gsm_tester')
-rw-r--r--src/osmo_gsm_tester/obj/enb.py2
-rw-r--r--src/osmo_gsm_tester/obj/enb_srs.py4
-rw-r--r--src/osmo_gsm_tester/obj/ms_srs.py5
3 files changed, 8 insertions, 3 deletions
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 @@ def on_register_schemas():
'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 @@ class srsENB(enb.eNodeB):
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 @@ def on_register_schemas():
'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 @@ class srsUE(MS):
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))