commit 76b2c2a1081c039214b09d707a88700b4089ff7f
author Pau Espin Pedrol <pespin@sysmocom.de> Wed Apr 01 19:51:08 2020 +0200
committer Pau Espin Pedrol <pespin@sysmocom.de> Wed Apr 01 20:06:33 2020 +0200
tree 4becffca89dbf414ca105c0409ed3c468312f6e7
parent 20a49112e9e134d35be228be4a4ad59806b1d549

srs_{ue,enb}: Add modifier to pass arbitrary cmd line arguments

Change-Id: Ie438c8aa9992dbc61b2133473a83d565cf5c7056

src/osmo_gsm_tester/resource.py

diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py
index 3b6e341..c69617c 100644
--- a/src/osmo_gsm_tester/resource.py
+++ b/src/osmo_gsm_tester/resource.py
@@ -93,6 +93,7 @@
         'enb[].num_cells': schema.UINT,
         'enb[].rf_dev_type': schema.STR,
         'enb[].rf_dev_args': schema.STR,
+        'enb[].additional_args': schema.STR,
         'arfcn[].arfcn': schema.INT,
         'arfcn[].band': schema.BAND,
         'modem[].type': schema.STR,
@@ -109,6 +110,7 @@
         'modem[].rf_dev_type': schema.STR,
         'modem[].rf_dev_args': schema.STR,
         'modem[].num_carriers': schema.STR,
+        'modem[].additional_args': schema.STR,
         'modem[].airplane_t_on_ms': schema.INT,
         'modem[].airplane_t_off_ms': schema.INT,
         'osmocon_phone[].serial_device': schema.STR,

src/osmo_gsm_tester/srs_enb.py

diff --git a/src/osmo_gsm_tester/srs_enb.py b/src/osmo_gsm_tester/srs_enb.py
index 4af2894..fe0e550 100644
--- a/src/osmo_gsm_tester/srs_enb.py
+++ b/src/osmo_gsm_tester/srs_enb.py
@@ -77,6 +77,7 @@
         self.enable_pcap = False
         self.suite_run = suite_run
         self.remote_user = conf.get('remote_user', None)
+        self._additional_args = []
         if not rf_type_valid(conf.get('rf_dev_type', None)):
             raise log.Error('Invalid rf_dev_type=%s' % conf.get('rf_dev_type', None))
 
@@ -149,6 +150,7 @@
                 '--enb_files.drb_config=' + self.remote_config_drb_file,
                 '--log.filename=' + self.remote_log_file,
                 '--pcap.filename=' + self.remote_pcap_file)
+        args += tuple(self._additional_args)
 
         self.process = self.rem_host.RemoteProcess(srsENB.BINFILE, args, remote_env=remote_env)
         self.suite_run.remember_to_stop(self.process)
@@ -173,6 +175,7 @@
                 '--enb_files.drb_config=' + os.path.abspath(self.config_drb_file),
                 '--log.filename=' + self.log_file,
                 '--pcap.filename=' + self.pcap_file)
+        args += tuple(self._additional_args)
 
         self.process = process.Process(self.name(), self.run_dir, args, env=env)
         self.suite_run.remember_to_stop(self.process)
@@ -193,6 +196,8 @@
         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._num_cells = int(values['enb'].get('num_cells', None))
         assert self._num_cells
 

src/osmo_gsm_tester/srs_ue.py

diff --git a/src/osmo_gsm_tester/srs_ue.py b/src/osmo_gsm_tester/srs_ue.py
index 76ee2d1..00f729f 100644
--- a/src/osmo_gsm_tester/srs_ue.py
+++ b/src/osmo_gsm_tester/srs_ue.py
@@ -76,6 +76,7 @@
         self.enable_pcap = False
         self.suite_run = suite_run
         self.remote_user = conf.get('remote_user', None)
+        self._additional_args = []
         if not rf_type_valid(conf.get('rf_dev_type', None)):
             raise log.Error('Invalid rf_dev_type=%s' % conf.get('rf_dev_type', None))
 
@@ -168,6 +169,7 @@
                 '--log.filename=' + self.remote_log_file,
                 '--pcap.filename=' + self.remote_pcap_file,
                 '--general.metrics_csv_filename=' + self.remote_metrics_file)
+        args += tuple(self._additional_args)
 
         self.process = self.rem_host.RemoteProcess(srsUE.BINFILE, args)
         #self.process = self.rem_host.RemoteProcessFixIgnoreSIGHUP(srsUE.BINFILE, remote_run_dir, args, remote_lib)
@@ -203,6 +205,7 @@
                 '--log.filename=' + self.log_file,
                 '--pcap.filename=' + self.pcap_file,
                 '--general.metrics_csv_filename=' + self.metrics_file)
+        args += tuple(self._additional_args)
 
         self.dbg(run_dir=self.run_dir, binary=binary, env=env)
         self.process = process.Process(self.name(), self.run_dir, args, env=env)
@@ -225,6 +228,8 @@
         self.enable_pcap = util.str2bool(values['ue'].get('enable_pcap', 'false'))
         config.overlay(values, dict(ue={'enable_pcap': self.enable_pcap}))
 
+        self._additional_args = values['ue'].get('additional_args', '').split()
+
         # We need to set some specific variables programatically here to match IP addresses:
         if self._conf.get('rf_dev_type') == 'zmq':
             base_srate = num_prb2base_srate(self.enb.num_prb())