commit a9fb751e69bb2ae7a2154e51c2ae0289456d8172
author Andre Puschmann <andre@softwareradiosystems.com> Wed Sep 16 21:16:46 2020 +0200
committer Andre Puschmann <andre@softwareradiosystems.com> Mon Oct 05 13:49:12 2020 +0200
tree 160d888e678f83f98756c22cde8f88f189c70712
parent eb991f5f5ab20a4456146171d3823079a780ae22

ms_srs: fix ZMQ config for 4xCA

add missing freq config for 4xCA

Change-Id: I88a389f5b03d6b55ff5ef403d5107c648a11686f

src/osmo_gsm_tester/obj/ms_srs.py

diff --git a/src/osmo_gsm_tester/obj/ms_srs.py b/src/osmo_gsm_tester/obj/ms_srs.py
index b5f5d70..701794f 100644
--- a/src/osmo_gsm_tester/obj/ms_srs.py
+++ b/src/osmo_gsm_tester/obj/ms_srs.py
@@ -285,6 +285,17 @@
                 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'
+            elif self.num_carriers == 4:
+                # 4x CA
+                if self.enb.num_ports() == 1:
+                    # SISO
+                    rf_dev_args += ',rx_freq0=2630e6,rx_freq1=2650e6,rx_freq2=2670e6,rx_freq3=2680e6,tx_freq0=2510e6,tx_freq1=2530e6,tx_freq2=2550e6,tx_freq3=2560e6'
+                elif self.enb.num_ports() == 2:
+                    # MIMO
+                    raise log.Error("4 carriers with MIMO isn't supported")
+            else:
+                # flag
+                raise log.Error('No rx/tx frequencies given for {} carriers' % self.num_carriers)
 
             rf_dev_args += ',id=ue,base_srate='+ str(base_srate)
             config.overlay(values, dict(ue=dict(rf_dev_args=rf_dev_args)))