This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
pespin gerrit-no-reply at lists.osmocom.orgpespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17438 ) Change subject: srsue,srsenb: Configure num_ports for tmode > 1 ...................................................................... srsue,srsenb: Configure num_ports for tmode > 1 Change-Id: I35d8ee907738845e729f58c23f377a42bb665672 --- M example/defaults.conf M src/osmo_gsm_tester/resource.py M src/osmo_gsm_tester/srs_enb.py M src/osmo_gsm_tester/srs_ue.py M src/osmo_gsm_tester/templates/srsenb.conf.tmpl M src/osmo_gsm_tester/templates/srsue.conf.tmpl 6 files changed, 24 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/38/17438/1 diff --git a/example/defaults.conf b/example/defaults.conf index 9b92ad0..aa61bca 100644 --- a/example/defaults.conf +++ b/example/defaults.conf @@ -103,3 +103,6 @@ mnc: 70 num_prb: 100 transmission_mode: 1 + +srsue: + num_rx_ant: 1 diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py index 07d32e2..05d54e9 100644 --- a/src/osmo_gsm_tester/resource.py +++ b/src/osmo_gsm_tester/resource.py @@ -107,6 +107,7 @@ 'modem[].features[]': schema.MODEM_FEATURE, 'modem[].rf_dev_type': schema.STR, 'modem[].rf_dev_args': schema.STR, + 'modem[].num_rx_ant': schema.UINT, 'osmocon_phone[].serial_device': schema.STR, } diff --git a/src/osmo_gsm_tester/srs_enb.py b/src/osmo_gsm_tester/srs_enb.py index 1fb2db1..716217e 100644 --- a/src/osmo_gsm_tester/srs_enb.py +++ b/src/osmo_gsm_tester/srs_enb.py @@ -184,13 +184,17 @@ assert self._num_prb self._txmode = int(values['enb'].get('transmission_mode', None)) assert self._txmode + config.overlay(values, dict(enb={ 'num_ports': self.num_ports() })) # 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._num_prb) - rf_dev_args = 'fail_on_disconnect=true,tx_port=tcp://' + self.addr() \ - + ':2000,rx_port=tcp://' + self.ue.addr() \ - + ':2001,id=enb,base_srate=' + str(base_srate) + rf_dev_args = 'fail_on_disconnect=true' \ + + ',tx_port=tcp://' + self.addr() + ':2000' \ + + ',tx_port2=tcp://' + self.addr() + ':2002' \ + + ',rx_port=tcp://' + self.ue.addr() + ':2001' \ + + ',rx_port2=tcp://' + self.ue.addr() + ':2003' \ + + ',id=enb,base_srate=' + str(base_srate) config.overlay(values, dict(enb=dict(rf_dev_args=rf_dev_args))) self.dbg('srsENB ' + filename + ':\n' + pprint.pformat(values)) @@ -226,6 +230,11 @@ def num_prb(self): return self._num_prb + def num_ports(self): + if self._txmode == 1: + return 1 + return 2 + def ue_max_rate(self, downlink=True): # The max rate for a single UE per PRB in TM1 max_phy_rate_tm1_dl = { 6 : 2.3e6, diff --git a/src/osmo_gsm_tester/srs_ue.py b/src/osmo_gsm_tester/srs_ue.py index 2cb05a2..a453bc7 100644 --- a/src/osmo_gsm_tester/srs_ue.py +++ b/src/osmo_gsm_tester/srs_ue.py @@ -213,9 +213,12 @@ # 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()) - config.overlay(values, dict(ue=dict(rf_dev_args='tx_port=tcp://' + self.addr() - +':2001,rx_port=tcp://' + self.enb.addr() - +':2000,id=ue,base_srate='+ str(base_srate) + config.overlay(values, dict(ue=dict(rf_dev_args = 'tx_port=tcp://' + self.addr() + ':2001' \ + + ',tx_port2=tcp://' + self.addr() + ':2003' \ + + ',rx_port=tcp://' + self.enb.addr() + ':2000' \ + + ',rx_port2=tcp://' + self.enb.addr() + ':2002' \ + + ',id=ue,base_srate='+ str(base_srate), + num_rx_ant = self.enb.num_ports() ))) self.dbg('SRSUE CONFIG:\n' + pprint.pformat(values)) diff --git a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl index 7775947..dccade5 100644 --- a/src/osmo_gsm_tester/templates/srsenb.conf.tmpl +++ b/src/osmo_gsm_tester/templates/srsenb.conf.tmpl @@ -27,7 +27,7 @@ s1c_bind_addr = ${enb.addr} n_prb = ${enb.num_prb} tm = ${enb.transmission_mode} -#nof_ports = 2 +nof_ports = ${enb.num_ports} ##################################################################### # eNB configuration files diff --git a/src/osmo_gsm_tester/templates/srsue.conf.tmpl b/src/osmo_gsm_tester/templates/srsue.conf.tmpl index 627f592..0a4b426 100644 --- a/src/osmo_gsm_tester/templates/srsue.conf.tmpl +++ b/src/osmo_gsm_tester/templates/srsue.conf.tmpl @@ -37,7 +37,7 @@ #rx_gain = 40 #nof_radios = 1 -#nof_rx_ant = 1 +nof_rx_ant = ${ue.num_rx_ant} device_name = ${ue.rf_dev_type} -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17438 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: I35d8ee907738845e729f58c23f377a42bb665672 Gerrit-Change-Number: 17438 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin at sysmocom.de> Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200309/49c1587d/attachment.htm>