cellular-infrastructure
/
osmo-gsm-tester
mirror of https://gerrit.osmocom.org/osmo-gsm-tester
9
0
Fork 0
Code Issues Releases Wiki Activity

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

Change-Id: Ie438c8aa9992dbc61b2133473a83d565cf5c7056
This commit is contained in:
Pau Espin 2020-04-01 19:51:08 +02:00
parent 20a49112e9
commit 76b2c2a108
5 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
example/scenarios/mod-enb-args@.conf Normal file
View File

@ -0,0 +1,3 @@
modifiers:
enb:
- additional_args: ${param1}

3
example/scenarios/mod-modem-args@.conf Normal file
View File

@ -0,0 +1,3 @@
modifiers:
modem:
- additional_args: ${param1}

2
src/osmo_gsm_tester/resource.py
View File

@ -93,6 +93,7 @@ RESOURCES_SCHEMA = {
'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 @@ RESOURCES_SCHEMA = {
'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,

5
src/osmo_gsm_tester/srs_enb.py
View File

@ -77,6 +77,7 @@ class srsENB(enb.eNodeB):
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 @@ class srsENB(enb.eNodeB):
'--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 @@ class srsENB(enb.eNodeB):
'--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 @@ 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._num_cells = int(values['enb'].get('num_cells', None))
assert self._num_cells

5
src/osmo_gsm_tester/srs_ue.py
View File

@ -76,6 +76,7 @@ class srsUE(MS):
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 @@ class srsUE(MS):
'--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 @@ class srsUE(MS):
'--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 @@ class srsUE(MS):
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())