.

software/ors-amarisoft/buildout.hash.cfg

@@ -28,7 +28,7 @@ md5sum = 8c044b28682940fbca62657c16613157
 
 [ru_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/libinstance.jinja2.cfg
-md5sum = c1b46d5322fdf3c6396d3ac8828ff6e3
+md5sum = 5c2397a594cc1244542ae818280e6cbb
 
 [ru_sdr_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg
@@ -80,7 +80,7 @@ md5sum = 2b8b57c5771b2a2203c0e7767e629e55
 
 [ru_xbuildout.py]
 _update_hash_filename_ = ru/xbuildout.py
-md5sum = d569421cb4ce2f4b999d82582680eb58
+md5sum = 7e8dbafbb51b9ee6dc3cdda9546702da
 
 [ru_capdo.c]
 _update_hash_filename_ = ru/capdo.c
@@ -88,7 +88,7 @@ md5sum = 52da9fe3a569199e35ad89ae1a44c30e
 
 [template-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = 1b2cdab298461bfd6d2bee7ffd753756
+md5sum = 80cf65a70c2b8d9d7bf492a54092b1e7
 
 [template-ors-enb]
 _update_hash_filename_ = instance-ors-enb.jinja2.cfg

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

@@ -207,14 +207,14 @@ import-list =
     rawfile slaplte.jinja2 {{ slaplte_template }}
 extra-context =
     import json_module json
-    jsonkey iru_dict       :jiru_dict
-    jsonkey icell_dict     :jicell_dict
-    jsonkey ipeer_dict     :jipeer_dict
-    jsonkey ipeercell_dict :jipeercell_dict
-jiru_dict       = {{ Q(rulib.iru_dict | tojson) }}
-jicell_dict     = {{ Q(rulib.icell_dict | tojson) }}
-jipeer_dict     = {{ Q(ipeer_dict | tojson) }}
-jipeercell_dict = {{ Q(ipeercell_dict | tojson) }}
+    key iru_dict       :iru_dict
+    key icell_dict     :icell_dict
+    key ipeer_dict     :ipeer_dict
+    key ipeercell_dict :ipeercell_dict
+iru_dict       = {{ Q(rulib.iru_dict) }}
+icell_dict     = {{ Q(rulib.icell_dict) }}
+ipeer_dict     = {{ Q(ipeer_dict) }}
+ipeercell_dict = {{ Q(ipeercell_dict) }}
 
 
 [publish-connection-information]
@@ -228,8 +228,8 @@ enb-ipv4 = {{ lan_ipv4 }}
 amarisoft-version = {{ lte_version }}
 license-expiration = {{ lte_expiration }}
 monitor-gadget-url = ${:monitor-base-url}/gadget/software.cfg.html
-ru-list   = {{ Q(rulib.iru_dict.keys()   | sort | tojson) }}
-cell-list = {{ Q(rulib.icell_dict.keys() | sort | tojson) }}
+ru-list   = {{ Q(rulib.iru_dict.keys()   | sort) }}
+cell-list = {{ Q(rulib.icell_dict.keys() | sort) }}
 # TODO peer-list peer-cell-list
 peer-list = XXX
 peer-cell-list = XXX

software/ors-amarisoft/ru/libinstance.jinja2.cfg

@@ -153,8 +153,8 @@ context =
   import netaddr netaddr
   section directory directory
   section vtap_jdict vtap_jdict
-  jsonkey iru_dict :jiru_dict
-jiru_dict = {{ Q(iru_dict | tojson) }}
+  key iru_dict :iru_dict
+iru_dict = {{ Q(iru_dict) }}
 
 {{ part('dnsmasq-service') }}
 recipe = slapos.cookbook:wrapper
@@ -236,7 +236,7 @@ recipe = slapos.cookbook:publish.serialised
 {%-     for icell in iru_icell_list %}
 {%-       do iru_icell_ref_list.append(J(jref_of_shared(icell)))  %}
 {%-     endfor  %}
-cell-list = {{ Q(iru_icell_ref_list | tojson) }}
+cell-list = {{ Q(iru_icell_ref_list) }}
 {%-     if ru.ru_link_type == 'cpri'  %}
 ipv6 = ${vtap.{{ ru.cpri_link._tap }}:gateway}
 {%-     endif %}
@@ -258,28 +258,28 @@ ipv6 = ${vtap.{{ ru.cpri_link._tap }}:gateway}
 url = {{ {'lte': drb_lte_template, 'nr': drb_nr_template} [cell.cell_type] }}
 output = ${directory:etc}/{{B(cell_ref)}}-drb.cfg
 extra-context =
-    jsonkey cell_ref :jcell_ref
-    jsonkey cell     :jcell
-    jsonkey ru_ref   :jru_ref
-    jsonkey ru       :jru
-jcell_ref = {{ Q(cell_ref | tojson) }}
-jcell     = {{ Q(cell     | tojson) }}
-jru_ref   = {{ Q(ru_ref   | tojson) }}
-jru       = {{ Q(ru       | tojson) }}
+    key cell_ref :cell_ref
+    key cell     :cell
+    key ru_ref   :ru_ref
+    key ru       :ru
+cell_ref = {{ Q(cell_ref) }}
+cell     = {{ Q(cell    ) }}
+ru_ref   = {{ Q(ru_ref  ) }}
+ru       = {{ Q(ru      ) }}
 
 {{ part('sib23-config-%s' % cell_ref) }}
 <= config-base
 url = {{ sib23_template }}
 output = ${directory:etc}/{{B(cell_ref)}}-sib23.asn
 extra-context =
-    jsonkey cell_ref :jcell_ref
-    jsonkey cell     :jcell
-    jsonkey ru_ref   :jru_ref
-    jsonkey ru       :jru
-jcell_ref = {{ Q(cell_ref | tojson) }}
-jcell     = {{ Q(cell     | tojson) }}
-jru_ref   = {{ Q(ru_ref   | tojson) }}
-jru       = {{ Q(ru       | tojson) }}
+    key cell_ref :cell_ref
+    key cell     :cell
+    key ru_ref   :ru_ref
+    key ru       :ru
+cell_ref = {{ Q(cell_ref) }}
+cell     = {{ Q(cell    ) }}
+ru_ref   = {{ Q(ru_ref  ) }}
+ru       = {{ Q(ru      ) }}
 {%-     endif %}
 
 {#-     publish information about the cell #}
@@ -330,8 +330,8 @@ context =
   raw stats_period {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
   raw testing {{ testing }}
   raw python_path {{ buildout_directory}}/bin/pythonwitheggs
-  jsonkey iru_dict :jiru_dict
-jiru_dict = {{ Q(iru_dict | tojson) }}
+  key iru_dict :iru_dict
+iru_dict = {{ Q(iru_dict) }}
 mode = 0775
 url = {{ ru_amarisoft_stats_template }}
 output = ${directory:bin}/amarisoft-stats.py