<p>srs_andre has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17923">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ms_srs: fix ZMQ radio arguments for CA and MIMO configs<br><br>similar to the eNB patches this fixes the CA and MIMO radio<br>parameters. In pricinple this could also be reused for the<br>AmarisoftUE but since we currently don't have a means to test<br>it I left it for a future commit.<br><br>Change-Id: I16b00009f97d61a9ab4715e5d727024661d3d0be<br>---<br>M src/osmo_gsm_tester/obj/ms_srs.py<br>1 file changed, 32 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/23/17923/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/obj/ms_srs.py b/src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>index e6e9196..cdc8d18 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>@@ -75,6 +75,7 @@</span><br><span> self.remote_pcap_file = None</span><br><span> self.remote_metrics_file = None</span><br><span> self.enable_pcap = False</span><br><span style="color: hsl(120, 100%, 40%);">+ self.num_carriers = 1</span><br><span> self.suite_run = suite_run</span><br><span> self.remote_user = conf.get('remote_user', None)</span><br><span> self._additional_args = []</span><br><span>@@ -215,16 +216,40 @@</span><br><span> </span><br><span> self._additional_args = values['ue'].get('additional_args', '').split()</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ self.num_carriers = int(values['ue'].get('num_carriers', 1))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # We need to set some specific variables programatically here to match IP addresses:</span><br><span> if self._conf.get('rf_dev_type') == 'zmq':</span><br><span> base_srate = num_prb2base_srate(self.enb.num_prb())</span><br><span style="color: hsl(0, 100%, 40%);">- config.overlay(values, dict(ue=dict(rf_dev_args = 'tx_port=tcp://' + self.addr() + ':2001' \</span><br><span style="color: hsl(0, 100%, 40%);">- + ',tx_port2=tcp://' + self.addr() + ':2003' \</span><br><span style="color: hsl(0, 100%, 40%);">- + ',rx_port=tcp://' + self.enb.addr() + ':2000' \</span><br><span style="color: hsl(0, 100%, 40%);">- + ',rx_port2=tcp://' + self.enb.addr() + ':2002' \</span><br><span style="color: hsl(0, 100%, 40%);">- + ',tx_freq=2510e6,rx_freq=2630e6,tx_freq2=2530e6,rx_freq2=2650e6' \</span><br><span style="color: hsl(0, 100%, 40%);">- + ',id=ue,base_srate='+ str(base_srate)</span><br><span style="color: hsl(0, 100%, 40%);">- )))</span><br><span style="color: hsl(120, 100%, 40%);">+ # Define all 8 possible RF ports (2x CA with 2x2 MIMO)</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args = 'tx_port0=tcp://' + self.addr() + ':2001' \</span><br><span style="color: hsl(120, 100%, 40%);">+ + ',tx_port1=tcp://' + self.addr() + ':2003' \</span><br><span style="color: hsl(120, 100%, 40%);">+ + ',tx_port2=tcp://' + self.addr() + ':2005' \</span><br><span style="color: hsl(120, 100%, 40%);">+ + ',tx_port3=tcp://' + self.addr() + ':2007' \</span><br><span style="color: hsl(120, 100%, 40%);">+ + ',rx_port0=tcp://' + self.enb.addr() + ':2000' \</span><br><span style="color: hsl(120, 100%, 40%);">+ + ',rx_port1=tcp://' + self.enb.addr() + ':2002' \</span><br><span style="color: hsl(120, 100%, 40%);">+ + ',rx_port2=tcp://' + self.enb.addr() + ':2004' \</span><br><span style="color: hsl(120, 100%, 40%);">+ + ',rx_port3=tcp://' + self.enb.addr() + ':2006'</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.num_carriers == 1:</span><br><span style="color: hsl(120, 100%, 40%);">+ # Single carrier</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.enb.num_ports() == 1:</span><br><span style="color: hsl(120, 100%, 40%);">+ # SISO</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args += ',rx_freq0=2630e6,tx_freq0=2510e6'</span><br><span style="color: hsl(120, 100%, 40%);">+ elif self.enb.num_ports() == 2:</span><br><span style="color: hsl(120, 100%, 40%);">+ # MIMO</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args += ',rx_freq0=2630e6,rx_freq1=2630e6,tx_freq0=2510e6,tx_freq1=2510e6'</span><br><span style="color: hsl(120, 100%, 40%);">+ elif self.num_carriers == 2:</span><br><span style="color: hsl(120, 100%, 40%);">+ # 2x CA</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.enb.num_ports() == 1:</span><br><span style="color: hsl(120, 100%, 40%);">+ # SISO</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args += ',rx_freq0=2630e6,rx_freq1=2650e6,tx_freq0=2510e6,tx_freq1=2530e6'</span><br><span style="color: hsl(120, 100%, 40%);">+ elif self.enb.num_ports() == 2:</span><br><span style="color: hsl(120, 100%, 40%);">+ # MIMO</span><br><span style="color: hsl(120, 100%, 40%);">+ 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'</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_dev_args += ',id=ue,base_srate='+ str(base_srate)</span><br><span style="color: hsl(120, 100%, 40%);">+ config.overlay(values, dict(ue=dict(rf_dev_args=rf_dev_args)))</span><br><span> </span><br><span> # Set UHD frame size as a function of the cell bandwidth on B2XX</span><br><span> if self._conf.get('rf_dev_type') == 'uhd' and values['ue'].get('rf_dev_args', None) is not None:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17923">change 17923</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17923"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I16b00009f97d61a9ab4715e5d727024661d3d0be </div>
<div style="display:none"> Gerrit-Change-Number: 17923 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: srs_andre <andre@softwareradiosystems.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>