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/.
srs_andre gerrit-no-reply at lists.osmocom.orgsrs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17923 ) Change subject: ms_srs: fix ZMQ radio arguments for CA and MIMO configs ...................................................................... ms_srs: fix ZMQ radio arguments for CA and MIMO configs similar to the eNB patches this fixes the CA and MIMO radio parameters. In pricinple this could also be reused for the AmarisoftUE but since we currently don't have a means to test it I left it for a future commit. Change-Id: I16b00009f97d61a9ab4715e5d727024661d3d0be --- M src/osmo_gsm_tester/obj/ms_srs.py 1 file changed, 32 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/23/17923/1 diff --git a/src/osmo_gsm_tester/obj/ms_srs.py b/src/osmo_gsm_tester/obj/ms_srs.py index e6e9196..cdc8d18 100644 --- a/src/osmo_gsm_tester/obj/ms_srs.py +++ b/src/osmo_gsm_tester/obj/ms_srs.py @@ -75,6 +75,7 @@ self.remote_pcap_file = None self.remote_metrics_file = None self.enable_pcap = False + self.num_carriers = 1 self.suite_run = suite_run self.remote_user = conf.get('remote_user', None) self._additional_args = [] @@ -215,16 +216,40 @@ self._additional_args = values['ue'].get('additional_args', '').split() + self.num_carriers = int(values['ue'].get('num_carriers', 1)) + # 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' \ - + ',tx_port2=tcp://' + self.addr() + ':2003' \ - + ',rx_port=tcp://' + self.enb.addr() + ':2000' \ - + ',rx_port2=tcp://' + self.enb.addr() + ':2002' \ - + ',tx_freq=2510e6,rx_freq=2630e6,tx_freq2=2530e6,rx_freq2=2650e6' \ - + ',id=ue,base_srate='+ str(base_srate) - ))) + # Define all 8 possible RF ports (2x CA with 2x2 MIMO) + rf_dev_args = 'tx_port0=tcp://' + self.addr() + ':2001' \ + + ',tx_port1=tcp://' + self.addr() + ':2003' \ + + ',tx_port2=tcp://' + self.addr() + ':2005' \ + + ',tx_port3=tcp://' + self.addr() + ':2007' \ + + ',rx_port0=tcp://' + self.enb.addr() + ':2000' \ + + ',rx_port1=tcp://' + self.enb.addr() + ':2002' \ + + ',rx_port2=tcp://' + self.enb.addr() + ':2004' \ + + ',rx_port3=tcp://' + self.enb.addr() + ':2006' + + if self.num_carriers == 1: + # Single carrier + if self.enb.num_ports() == 1: + # SISO + rf_dev_args += ',rx_freq0=2630e6,tx_freq0=2510e6' + elif self.enb.num_ports() == 2: + # MIMO + rf_dev_args += ',rx_freq0=2630e6,rx_freq1=2630e6,tx_freq0=2510e6,tx_freq1=2510e6' + elif self.num_carriers == 2: + # 2x CA + if self.enb.num_ports() == 1: + # SISO + rf_dev_args += ',rx_freq0=2630e6,rx_freq1=2650e6,tx_freq0=2510e6,tx_freq1=2530e6' + elif self.enb.num_ports() == 2: + # MIMO + rf_dev_args += ',rx_freq0=2630e6,rx_freq1=2630e6,rx_freq2=2650e6,rx_freq3=2650e6,tx_freq0=2510e6,tx_freq1=2510e6,tx_freq2=2530e6,tx_freq3=2530e6' + + rf_dev_args += ',id=ue,base_srate='+ str(base_srate) + config.overlay(values, dict(ue=dict(rf_dev_args=rf_dev_args))) # Set UHD frame size as a function of the cell bandwidth on B2XX if self._conf.get('rf_dev_type') == 'uhd' and values['ue'].get('rf_dev_args', None) is not None: -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17923 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: I16b00009f97d61a9ab4715e5d727024661d3d0be Gerrit-Change-Number: 17923 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre <andre at softwareradiosystems.com> Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200420/9f98bf5f/attachment.htm>