X keep icell_dict LTE/NR slices in icell_dict_lte and icell_dict_nr

We will need to analyze how many LTE/NR cells we have and it helps to
pre-build those dicts in the beginning.

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

@@ -18,9 +18,12 @@
 {%- endif %}
 
 
-{#- 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 %}
+{#- do_lte/do_nr indicate whether we have LTE and/or NR cells
+    icell_dict_lte/icell_dict_nr keep LTE/NR parts of icell_dict registry #}
+{%- set icell_dict_lte = dict(icell_dict|dictsort | selectattr('1._.cell_type', '==', 'lte')) %}
+{%- set icell_dict_nr  = dict(icell_dict|dictsort | selectattr('1._.cell_type', '==', 'nr' )) %}
+{%- set do_lte = len(icell_dict_lte) > 0 %}
+{%- set do_nr  = len(icell_dict_nr)  > 0 %}
 
 
 {#- handover_config emits handover configuration for specified cell #}
@@ -228,9 +231,8 @@
   // LTE cells
   cell_list: [
 {%- if do_lte %}
-{%- for i, (cell_ref, icell) in enumerate(icell_dict|dictsort) %}
+{%- for i, (cell_ref, icell) in enumerate(icell_dict_lte|dictsort) %}
 {%-   set cell = icell['_'] %}
-{%-   if cell.cell_type == 'lte'  %}
 {%-   set ru_ref = J(jcell_ru_ref(icell, icell_dict)) %}
 {%-   set iru = iru_dict[ru_ref]  %}
 {%-   set ru = iru['_'] %}
@@ -255,9 +257,9 @@
 
         // Carrier Aggregation: LTE + LTE
         scell_list: [
-{%-       for cell2_ref, icell2 in icell_dict|dictsort %}
+{%-     for cell2_ref, icell2 in icell_dict_lte|dictsort %}
 {%-       set cell2 = icell2['_'] %}
-{%-         if cell2_ref != cell_ref  and  cell2.cell_type == 'lte' %}
+{%-       if cell2_ref != cell_ref  %}
           {
             cell_id: {{ cell2.cell_id }},  // + {{ B(cell2_ref) }}
             cross_carrier_scheduling: false,
@@ -269,9 +271,9 @@
 {%-     if do_nr  %}
         // Dual Connectivity: LTE + NR
         en_dc_scg_cell_list: [
-{%-         for cell2_ref, icell2 in icell_dict|dictsort %}
+{%-       for cell2_ref, icell2 in icell_dict_nr|dictsort %}
 {%-         set cell2 = icell2['_'] %}
-{%-           if cell2_ref != cell_ref  and  cell2.cell_type == 'nr' %}
+{%-         if cell2_ref != cell_ref %}
             {
               cell_id: {{ cell2.cell_id }}, // + {{ B(cell2_ref) }}
             },
@@ -357,7 +359,6 @@
           },
         ],
       },
-{%-   endif %}
 {%- endfor %}
 {%- endif %}
   ],
@@ -459,9 +460,8 @@
   // NR cells
   nr_cell_list: [
 {%- if do_nr  %}
-{%- for i, (cell_ref, icell) in enumerate(icell_dict|dictsort) %}
+{%- for i, (cell_ref, icell) in enumerate(icell_dict_nr|dictsort) %}
 {%-   set cell = icell['_'] %}
-{%-   if cell.cell_type == 'nr' %}
 {%-   set ru_ref = J(jcell_ru_ref(icell, icell_dict)) %}
 {%-   set iru = iru_dict[ru_ref]  %}
 {%-   set ru = iru['_'] %}
@@ -491,9 +491,9 @@
 
         // Carrier Aggregation: NR + NR
         scell_list: [
-{%-       for cell2_ref, icell2 in icell_dict|dictsort %}
+{%-     for cell2_ref, icell2 in icell_dict_nr|dictsort %}
 {%-       set cell2 = icell2['_'] %}
-{%-         if cell2_ref != cell_ref  and  cell2.cell_type == 'nr' %}
+{%-       if cell2_ref != cell_ref %}
           {
             cell_id: {{ cell2.cell_id }},  // + {{ B(cell2_ref) }}
           },
@@ -746,7 +746,6 @@
         drb_config: "{{ B('%s-drb.cfg' % cell_ref) }}",
 
       },
-{%-   endif %}
 {%- endfor %}
 {%- endif %}
   ],

software/ors-amarisoft/config/out/enb/iRU1_SDR_tLTE2_tNR/enb.cfg

@@ -386,7 +386,7 @@
         ssb_nr_arfcn:   522990,
         ssb_pos_bitmap: "10000000",
 
-          root_sequence_index: 3,
+        root_sequence_index: 1,
         inactivity_timer: 10000,
 
         // Handover

software/ors-amarisoft/config/out/enb/iRU2_LOPCOMM_fLTE_fNR/enb.cfg

@@ -258,7 +258,7 @@
         ssb_nr_arfcn:   537170,
         ssb_pos_bitmap: "1000",
 
-          root_sequence_index: 2,
+        root_sequence_index: 1,
         inactivity_timer: 10000,
 
         // Handover

software/ors-amarisoft/config/out/enb/iRU2_SDR_tLTE_tNR/enb.cfg

@@ -257,7 +257,7 @@
         ssb_nr_arfcn:   522990,
         ssb_pos_bitmap: "10000000",
 
-          root_sequence_index: 2,
+        root_sequence_index: 1,
         inactivity_timer: 10000,
 
         // Handover