software/ors-amarisoft: enb: Full Carrier Aggregation

We already had CA for LTE+LTE case. Let's also setup it for NR+NR and LTE+NR
cases as well. Add tests for everything.

software/ors-amarisoft/config/enb.jinja2.cfg

@@ -227,7 +227,7 @@
       // Handover
 {{- handover_config() }}
 
-      // Carrier Aggregation
+      // Carrier Aggregation: LTE + LTE
       scell_list: [
 {%-   for cell2_ref, icell2 in icell_dict_lte|dictsort %}
 {%-     set cell2 = icell2['_'] %}
@@ -240,6 +240,21 @@
 {%-   endfor %}
       ],
 
+{%-   if do_nr  %}
+      // Dual Connectivity: LTE + NR
+      en_dc_scg_cell_list: [
+{%-     for cell2_ref, icell2 in icell_dict_nr|dictsort %}
+{%-       set cell2 = icell2['_'] %}
+{%-       if cell2_ref != cell_ref %}
+          {
+            cell_id: {{ cell2.cell_id }}, // + {{ B(cell2_ref) }}
+          },
+{%-       endif %}
+{%-     endfor  %}
+      ],
+{%-   endif %}
+
+
     // tune LTE parameters for the cell
 {% if ors %}
     manual_ref_signal_power: true,
@@ -454,6 +469,21 @@
         // Handover
 {{-     handover_config() }}
 
+        // Carrier Aggregation: NR + NR
+        scell_list: [
+{%-     for cell2_ref, icell2 in icell_dict_nr|dictsort %}
+{%-       set cell2 = icell2['_'] %}
+{%-       if cell2_ref != cell_ref %}
+          {
+            cell_id: {{ cell2.cell_id }},  // + {{ B(cell2_ref) }}
+          },
+{%-       endif %}
+{%-     endfor %}
+        ],
+
+        {#- NOTE: NR + LTE Dual Connectivity is setup via EN-DC only - via en_dc_scg_cell_list.
+                  nr_dc_scg_cell_list sets up NR+NR Dual Connectivity #}
+
         // tune NR parameters for the cell
 {%-     if ors %}
         manual_ref_signal_power: true,

software/ors-amarisoft/test/test.py

@@ -406,6 +406,29 @@ class ENBTestCase4(RFTestCase4):
         ])
 
 
+    # Carrier Aggregation
+    def test_enb_cfg_ca(t):
+        assertMatch(t, t.enb_cfg['cell_list'],  [
+          { # CELL1
+            'scell_list':           [{'cell_id': 2}],                   # LTE + LTE
+            'en_dc_scg_cell_list':  [{'cell_id': 3}, {'cell_id': 4}],   # LTE + NR
+          },
+          { # CELL2
+            'scell_list':           [{'cell_id': 1}],                   # LTE + LTE
+            'en_dc_scg_cell_list':  [{'cell_id': 3}, {'cell_id': 4}],   # LTE + NR
+          },
+        ])
+
+        assertMatch(t, t.enb_cfg['nr_cell_list'], [
+          { # CELL3
+            'scell_list':           [{'cell_id': 4}],                   # NR  + NR
+          },
+          { # CELL4
+            'scell_list':           [{'cell_id': 3}],                   # NR  + NR
+          },
+        ])
+
+
 # ---- RU mixins to be used with RFTestCase4 ----
 
 # SDR4 is mixin to verify SDR driver wrt all LTE/NR x FDD/TDD modes.