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.

Tests will be added later as full tests for generic MultiRU.

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

@@ -186,7 +186,7 @@
       // Handover
 {{- handover_config() }}
 
-      // Carrier Aggregation
+      // Carrier Aggregation: LTE + LTE
       scell_list: [
 {%-   for cell2_ref, cell2 in cell_dict_lte|dictsort %}
 {%-     if cell2_ref != cell_ref  %}
@@ -198,6 +198,21 @@
 {%-   endfor %}
       ],
 
+{%-   if do_nr  %}
+      // Dual Connectivity: LTE + NR
+      en_dc_scg_cell_list: [
+{%-     for cell2_ref, cell2 in cell_dict_nr|dictsort %}
+{%-       set cell2 = cell2['_'] %}
+{%-       if cell2_ref != cell_ref %}
+          {
+            cell_id: {{ cell2.cell_id }}, // + {{ cell2_ref }}
+          },
+{%-       endif %}
+{%-     endfor  %}
+      ],
+{%-   endif %}
+
+
     // tune LTE parameters for the cell
 {% if ors %}
     manual_ref_signal_power: true,
@@ -416,6 +431,20 @@
         // Handover
 {{-     handover_config() }}
 
+        // Carrier Aggregation: NR + NR
+        scell_list: [
+{%-     for cell2_ref, cell2 in cell_dict_nr|dictsort %}
+{%-       if cell2_ref != cell_ref %}
+          {
+            cell_id: {{ cell2.cell_id }},  // + {{ 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,