.

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

@@ -5,7 +5,6 @@
 {%- import 'amari_lte.jinja2'  as lte      with context %}
 {%- import 'amari_slap.jinja2' as slaplte  with context %}
 {%- set J               = slaplte.J %}
-{%- set jref_of_shared  = slaplte.jref_of_shared %}
 {%- set jcell_ru_ref    = slaplte.jcell_ru_ref %}
 {%- set cfg             = slaplte.cfg %}
 
@@ -20,7 +19,7 @@
 {%-   do slaplte.check_loaded_everything()                                    %}
 {%- endif                                                                     %}
 
-{# do we have LTE cells and/or NR cells ? #}
+{#- do we have LTE cells 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 %}
 
@@ -138,14 +137,14 @@
             {
 {%-           if cell2.cell_type == 'lte' %}
               rat:        "eutra",
-              cell_id:    {{ cfg('enb_id') }}{{ cell2.cell_id.removeprefix('0x') }}, // -> {{ J(jref_of_shared(icell2)) }}
+              cell_id:    {{ cfg('enb_id') }}{{ cell2.cell_id.removeprefix('0x') }}, // -> {{ cell2_ref }}
               n_id_cell:  {{ cell2.pci }},
               dl_earfcn:  {{ cell2.dl_earfcn }},
               //ul_earfcn:  {{ cell2.ul_earfcn }},
               tac:        {{ cell2.tac }},
 {%-           elif cell2.cell_type == 'nr' %}
               rat:        "nr",
-              nr_cell_id: {{ cfg('gnb_id') }}{{ cell2.cell_id.removeprefix('0x') }}, // -> {{ J(jref_of_shared(icell2)) }}
+              nr_cell_id: {{ cfg('gnb_id') }}{{ cell2.cell_id.removeprefix('0x') }}, // -> {{ cell2_ref }}
               n_id_cell:  {{ cell2.pci }},
               gnb_id_bits
               dl_nr_arfcn
@@ -178,7 +177,7 @@
 {%-         set cell2 = icell2['_']                   %}
 {%-         if cell2_ref != cell_ref  and  cell2.cell_type == 'lte' %}
             {
-              cell_id: {{ cell2.cell_id }},  // + {{ J(jref_of_shared(icell2)) }}
+              cell_id: {{ cell2.cell_id }},  // + {{ cell2_ref }}
               cross_carrier_scheduling: false,
             },
 {%-         endif %}

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

@@ -24,8 +24,6 @@
   com_addr: "127.0.1.2:9001",
 
 
-
-
   // LTE core network + XXX X2 peers
   mme_list: [
     {