.

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

@@ -19,7 +19,7 @@
 {%-   do slaplte.check_loaded_everything()                                    %}
 {%- endif                                                                     %}
 
-{#- do we have LTE cells and/or NR cells ? #}
+{#- do_lte/do_nr indicate whether we have LTE and/or NR cells #}
 {%- set do_lte = len(list(icell_dict|dictsort | selectattr('1._.cell_type', '==', 'lte'))) > 0 %}
 {%- set do_nr  = len(list(icell_dict|dictsort | selectattr('1._.cell_type', '==', 'nr')))  > 0 %}
 
@@ -186,8 +186,7 @@
 
           ],
 
-          // Carrier Aggregation
-{#-       CA in between all LTE cells #}  // XXX + CA LTE-NR
+          // Carrier Aggregation in between all LTE cells
           scell_list: [
 {%-       for cell2_ref, icell2 in icell_dict|dictsort %}
 {%-         set cell2 = icell2['_']                   %}
@@ -200,6 +199,21 @@
 {%-       endfor %}
           ],
 
+{%-       if do_nr  %}
+          // Carrier Aggregation: LTE + all NR cells
+          en_dc_scg_cell_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  %}
+          ],
+          // XXX nr_p_max_eutra = ?   (needed ?)
+{%-       endif %}
+
 
           // tune LTE parameters for the cell
 {%-       set tdd = (cell.rf_mode == 'tdd') %}