From 7879143d34629abd3a1b54738fc1fd9131d23b05 Mon Sep 17 00:00:00 2001
From: Andre Puschmann <andre@softwareradiosystems.com>
Date: Tue, 4 May 2021 21:38:53 +0200
Subject: [PATCH] amarisoftue: solve conflict of sample rate param in rf_driver

move sample_rate setting into rf_driver template that is shared
between enb and ue

Change-Id: Icc8042c3eec2a1e8bfc6823c06430c1cb18355b7
---
 .../templates/amarisoft_lteue.cfg.tmpl        |  5 ----
 .../templates/amarisoft_rf_driver.cfg.tmpl    | 27 +++++++++++++++----
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/osmo_gsm_tester/templates/amarisoft_lteue.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_lteue.cfg.tmpl
index f9b29334..448c23c6 100644
--- a/src/osmo_gsm_tester/templates/amarisoft_lteue.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/amarisoft_lteue.cfg.tmpl
@@ -10,12 +10,7 @@
   },
 %endif
 
-% if ue.rf_dev_type == 'zmq':
-  /* Force sampling rate (if uncommented) */
-  sample_rate: ${ue.sample_rate},
-% else:
   bandwidth: ${ue.bandwidth},
-%endif
 
 //  log_options: "all.level=debug,all.max_size=32",
   log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
diff --git a/src/osmo_gsm_tester/templates/amarisoft_rf_driver.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_rf_driver.cfg.tmpl
index f2942d79..d33b743c 100644
--- a/src/osmo_gsm_tester/templates/amarisoft_rf_driver.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/amarisoft_rf_driver.cfg.tmpl
@@ -15,8 +15,12 @@ rf_driver: {
 tx_gain: ${trx.tx_gain}, /* TX gain (in dB) B2x0: 0 to 89.8 dB */
 rx_gain: ${trx.rx_gain}, /* RX gain (in dB) B2x0: 0 to 73 dB */
 
+// Only SDR and ZMQ devices require dedicated rf_port parameters
+% if trx.rf_dev_type != 'uhd':
+
 rf_ports: [
   % if trx.rf_dev_type == 'sdr':
+    // NSA specific configuration
     {
         sample_rate: 23.04,
     },
@@ -26,15 +30,28 @@ rf_ports: [
         ul_freq: 3502.8, // Moves NR UL LO frequency -5.76 MHz
     }
   % else:
+    // default case for UHD and ZMQ usage
+    <%
+       # determine ports and sample rate from either eNB or UE object
+       num_ports = 1
+       try:
+         obj_sample_rate = enb.sample_rate
+         num_ports = int(enb.num_cells) + int(enb.num_nr_cells)
+       except AttributeError:
+         obj_sample_rate = ue.sample_rate
+    %>
+
+    %for port in range(num_ports):
     {
-      sample_rate: ${enb.sample_rate},
+      sample_rate: ${obj_sample_rate},
     },
-    {
-      sample_rate: ${enb.sample_rate},
-    }
-  % endif
+    %endfor
+
+ % endif
 ],
 
+% endif
+
 // only the B210 requires a sample offset
 % if "b200" in trx.rf_dev_args:
 tx_time_offset: -150,