.

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

@@ -186,7 +186,7 @@
 
           ],
 
-          // Carrier Aggregation in between all LTE cells
+          // Carrier Aggregation: LTE + LTE
           scell_list: [
 {%-       for cell2_ref, icell2 in icell_dict|dictsort %}
 {%-         set cell2 = icell2['_']                   %}
@@ -200,7 +200,7 @@
           ],
 
 {%-       if do_nr  %}
-          // Carrier Aggregation: LTE + all NR cells
+          // Carrier Aggregation: LTE + NR
           en_dc_scg_cell_list: [
 {%-         for cell2_ref, icell2 in icell_dict|dictsort %}
 {%-           set cell2 = icell2['_']                   %}
@@ -426,9 +426,32 @@
           root_sequence_index: 1,   // XXX adjust from cfg('root_sequence_index') XXX place
 
 
-        // XXX peers for HO
+          // XXX peers for HO
 
-        // XXX CA
+          // Carrier Aggregation: NR + NR
+          scell_list: [
+{%-       for cell2_ref, icell2 in icell_dict|dictsort %}
+{%-         set cell2 = icell2['_']                   %}
+{%-         if cell2_ref != cell_ref  and  cell2.cell_type == 'nr' %}
+            {
+              cell_id: {{ cell2.cell_id }},  // + {{ cell2_ref }}
+            },
+{%-         endif %}
+{%-       endfor %}
+          ],
+
+{%-       if do_lte %}
+          // Carrier Aggregation: NR + LTE
+          nr_dc_scg_cell_list: [
+{%-           for cell2_ref, icell2 in icell_dict|dictsort %}
+{%-             set cell2 = icell2['_']                   %}
+{%-             if cell2_ref != cell_ref  and  cell2.cell_type == 'lte' %}
+                {
+                  cell_id: {{ cell2.cell_id }}, // + {{ cell2_ref }}
+                },
+{%-             endif %}
+          ],
+{%-       endif %}
 
         // tune NR parameters for the cell
         {%- if slapparameter_dict.get('rrh', 'ORS') == "ORS" %}