.

software/ors-amarisoft/buildout.hash.cfg

@@ -28,7 +28,7 @@ md5sum = dfef691a80951423d2ea11b3e91d7fa5
 
 [ru_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/libinstance.jinja2.cfg
-md5sum = 27c88f30192fe1bdc48c7cffdb6c9652
+md5sum = fa300bb3415c95c8ab5e88b4e24750ba
 
 [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 = 7edb848fdfd49c664e45b9acd534ddb7
+md5sum = 132c70c88c5297765d300be0c53bdb26
 
 [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 = 84c6c814a68e9fcf6fb58e4881eea5c0
+md5sum = 96ac9a0cbd0aa5d94129e7d85e52af9d
 
 [drb_lte.jinja2.cfg]
 filename = config/drb_lte.jinja2.cfg

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

 {%- import 'slaplte.jinja2' as slaplte  with context %}
 {%- set J               = slaplte.J %}
 {%- set jcell_ru_ref    = slaplte.jcell_ru_ref %}
-{%- set cfg             = slaplte.cfg %}
+{%- set B               = xbuildout.encode  %}
 
 {#- for standalone testing via slapos-render-config.py
     NOTE: keep in sync with instance-enb.jinja2.cfg and ru/libinstance.jinja2.cfg   #}
@@ -35,13 +35,13 @@
             {
 {%-           if cell2.cell_type == 'lte' %}
               rat:        "eutra",
-              cell_id:    {{ slapparameter_dict.enb_id }}{{ cell2.cell_id.removeprefix('0x') }}, // -> {{ dumps(cell2_ref) }}
+              cell_id:    {{ slapparameter_dict.enb_id }}{{ cell2.cell_id.removeprefix('0x') }}, // -> {{ B(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 }},  // -> {{ dumps(cell2_ref) }}
+              cell_id:    {{ cell2.cell_id }},  // -> {{ B(cell2_ref) }}
 {%-           else  %}
 {%-             do bug('unreachable') %}
 {%-           endif %}
@@ -58,13 +58,13 @@
             {
 {%-           if ncell.cell_type == 'lte' %}
               rat:          "eutra",
-              cell_id:      {{ ncell.e_cell_id }},  // -> {{ dumps(peercell_ref) }}
+              cell_id:      {{ ncell.e_cell_id }},  // -> {{ B(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 }}, // -> {{ dumps(peercell_ref) }}
+              nr_cell_id:   {{ ncell.nr_cell_id }}, // -> {{ B(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['_'] %}
 
-        // {{ dumps(cell_ref) }}  ({{ dumps(ru_ref) }})
+        // {{ B(cell_ref) }}  ({{ B(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 }},  // + {{ dumps(cell2_ref) }}
+              cell_id: {{ cell2.cell_id }},  // + {{ B(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 }}, // + {{ dumps(cell2_ref) }}
+                cell_id: {{ cell2.cell_id }}, // + {{ B(cell2_ref) }}
               },
 {%-           endif %}
 {%-         endfor  %}
@@ -298,11 +298,11 @@
           manual_ref_signal_power: true,
 {%-       endif %}
 
-          drb_config: "{{ cell_ref }}-drb.cfg",
+          drb_config: "{{ B('%s-drb.cfg' % cell_ref) }}",
 
           sib_sched_list: [
             {
-              filename: "{{ cell_ref }}-sib23.asn",
+              filename: "{{ B('%s-sib23.asn' % cell_ref) }}",
               si_periodicity: 16,
             },
           ],
@@ -421,7 +421,7 @@
 {%-     set iru = iru_dict[ru_ref]  %}
 {%-     set ru = iru['_'] %}
 
-        // {{ dumps(cell_ref) }}  ({{ dumps(ru_ref) }})
+        // {{ B(cell_ref) }}  ({{ B(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 }},  // + {{ dumps(cell2_ref) }}
+              cell_id: {{ cell2.cell_id }},  // + {{ B(cell2_ref) }}
             },
 {%-         endif %}
 {%-       endfor %}
@@ -698,7 +698,7 @@
 
           },
 
-          drb_config: "{{ cell_ref }}-drb.cfg",
+          drb_config: "{{ B('%s-drb.cfg' % cell_ref) }}",
 
         },
 {%-   endif %}

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

@@ -192,7 +192,8 @@ context =
   key slapparameter_dict slap-configuration:configuration
   key gtp_addr_v6 slap-configuration:ipv6-random
   raw gtp_addr_v4 {{ lan_ipv4 }}
-  import  netaddr netaddr
+  import netaddr netaddr
+  import xbuildout xbuildout
   ${:extra-context}
 
 [enb-config]