.

software/ors-amarisoft/buildout.hash.cfg

@@ -24,11 +24,11 @@ md5sum = f5c76c3443b75569eb18503dce38e783
 
 [slaplte.jinja2]
 _update_hash_filename_ = slaplte.jinja2
-md5sum = 8c044b28682940fbca62657c16613157
+md5sum = dfef691a80951423d2ea11b3e91d7fa5
 
 [ru_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/libinstance.jinja2.cfg
-md5sum = 5c2397a594cc1244542ae818280e6cbb
+md5sum = 27c88f30192fe1bdc48c7cffdb6c9652
 
 [ru_sdr_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg
@@ -88,7 +88,7 @@ md5sum = 52da9fe3a569199e35ad89ae1a44c30e
 
 [template-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = 80cf65a70c2b8d9d7bf492a54092b1e7
+md5sum = 7edb848fdfd49c664e45b9acd534ddb7
 
 [template-ors-enb]
 _update_hash_filename_ = instance-ors-enb.jinja2.cfg
@@ -112,7 +112,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
 
 [enb.jinja2.cfg]
 filename = config/enb.jinja2.cfg
-md5sum = a8e67b3c9373fe4d97066a64d1ff8a98
+md5sum = 84c6c814a68e9fcf6fb58e4881eea5c0
 
 [drb_lte.jinja2.cfg]
 filename = config/drb_lte.jinja2.cfg

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

@@ -35,13 +35,13 @@
             {
 {%-           if cell2.cell_type == 'lte' %}
               rat:        "eutra",
-              cell_id:    {{ slapparameter_dict.enb_id }}{{ cell2.cell_id.removeprefix('0x') }}, // -> {{ cell2_ref }}
+              cell_id:    {{ slapparameter_dict.enb_id }}{{ cell2.cell_id.removeprefix('0x') }}, // -> {{ dumps(cell2_ref) }}
               n_id_cell:  {{ cell2.pci }},
               dl_earfcn:  {{ cell2.dl_earfcn }},
               tac:        {{ cell2.tac }},
 {%-           elif cell2.cell_type == 'nr' %}
               rat:        "nr",
-              cell_id:    {{ cell2.cell_id }},  // -> {{ cell2_ref }}
+              cell_id:    {{ cell2.cell_id }},  // -> {{ dumps(cell2_ref) }}
 {%-           else  %}
 {%-             do bug('unreachable') %}
 {%-           endif %}
@@ -58,13 +58,13 @@
             {
 {%-           if ncell.cell_type == 'lte' %}
               rat:          "eutra",
-              cell_id:      {{ ncell.e_cell_id }},  // -> {{ peercell_ref }}
+              cell_id:      {{ ncell.e_cell_id }},  // -> {{ dumps(peercell_ref) }}
               n_id_cell:    {{ ncell.pci }},
               dl_earfcn:    {{ ncell.dl_earfcn }},
               tac:          {{ ncell.tac }},
 {%-           elif ncell.cell_type == 'nr' %}
               rat:          "nr",
-              nr_cell_id:   {{ ncell.nr_cell_id }}, // -> {{ peercell_ref }}
+              nr_cell_id:   {{ ncell.nr_cell_id }}, // -> {{ dumps(peercell_ref) }}
               gnb_id_bits:  {{ ncell.gnb_id_bits }},
               n_id_cell:    {{ ncell.pci }},
               dl_nr_arfcn:  {{ ncell.dl_nr_arfcn }},
@@ -184,7 +184,7 @@
 {%-     set iru = iru_dict[ru_ref]  %}
 {%-     set ru = iru['_'] %}
 
-        // {{ cell_ref }}  ({{ ru_ref }})
+        // {{ dumps(cell_ref) }}  ({{ dumps(ru_ref) }})
         {
           rf_port:      {{ ru._rf_port }},
           n_antenna_dl: {{ ru.n_antenna_dl }},
@@ -208,7 +208,7 @@
 {%-         set cell2 = icell2['_'] %}
 {%-         if cell2_ref != cell_ref  and  cell2.cell_type == 'lte' %}
             {
-              cell_id: {{ cell2.cell_id }},  // + {{ cell2_ref }}
+              cell_id: {{ cell2.cell_id }},  // + {{ dumps(cell2_ref) }}
               cross_carrier_scheduling: false,
             },
 {%-         endif %}
@@ -222,7 +222,7 @@
 {%-           set cell2 = icell2['_'] %}
 {%-           if cell2_ref != cell_ref  and  cell2.cell_type == 'nr' %}
               {
-                cell_id: {{ cell2.cell_id }}, // + {{ cell2_ref }}
+                cell_id: {{ cell2.cell_id }}, // + {{ dumps(cell2_ref) }}
               },
 {%-           endif %}
 {%-         endfor  %}
@@ -421,7 +421,7 @@
 {%-     set iru = iru_dict[ru_ref]  %}
 {%-     set ru = iru['_'] %}
 
-        // {{ cell_ref }}  ({{ ru_ref }})
+        // {{ dumps(cell_ref) }}  ({{ dumps(ru_ref) }})
         {
           rf_port:      {{ ru._rf_port }},
           n_antenna_dl: {{ ru.n_antenna_dl }},
@@ -450,7 +450,7 @@
 {%-         set cell2 = icell2['_'] %}
 {%-         if cell2_ref != cell_ref  and  cell2.cell_type == 'nr' %}
             {
-              cell_id: {{ cell2.cell_id }},  // + {{ cell2_ref }}
+              cell_id: {{ cell2.cell_id }},  // + {{ dumps(cell2_ref) }}
             },
 {%-         endif %}
 {%-       endfor %}

software/ors-amarisoft/slaplte.jinja2

@@ -419,7 +419,7 @@
   {%- set rx_gainv = [] %}      {#- rx_gain by rx channel                     #}
   {%- for (ru_ref, iru) in iru_dict.items() | sort(attribute="1._._rf_port")  %}
   {%-   set ru = iru['_']                                                     %}
-      // {{ ru_ref }} {{ ru.n_antenna_dl }}T{{ ru.n_antenna_ul }}R  ({{ ru.ru_type }})
+      // {{ dumps(ru_ref) }} {{ ru.n_antenna_dl }}T{{ ru.n_antenna_ul }}R  ({{ ru.ru_type }})
   {%-   if ru.ru_type == 'sdr'                                                %}
   {%-     do ru_sdr_dict.update({len(dev_argv): ru})                          %}
   {%-     for n in ru.sdr_dev_list                                            %}