.

software/ors-amarisoft/amari/slap.jinja2

@@ -235,7 +235,3 @@
 {%-   do qshared_instance_list.clear()              %}
 {%-   do qshared_instance_list.extend(qother)       %}
 {%- endmacro                                        %}
-
-
-
-{# ---- XXX ---- #}

software/ors-amarisoft/buildout.hash.cfg

@@ -16,7 +16,7 @@
 
 [template]
 filename = instance.cfg
-md5sum = e540cca07f4b1a7355b10dfb0aff35bd
+md5sum = 739cd223f6959fde38d658127cab51ed
 
 [amari_lte.jinja2]
 _update_hash_filename_ = amari/lte.jinja2
@@ -24,7 +24,7 @@ md5sum = ddee326ec6f0612c48b301f9b0913f44
 
 [amari_slap.jinja2]
 _update_hash_filename_ = amari/slap.jinja2
-md5sum = bdaf4f827fb1456513a2b9322f14dcfc
+md5sum = 1334a974be7a3fb143bc88d42de80616
 
 [ru_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/libinstance.jinja2.cfg
@@ -60,7 +60,7 @@ md5sum = a2ba0343ddb7f9cf2904a4c5c751f68a
 
 [template-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = 608c8430789d9189c58f2e9a6b63fa1c
+md5sum = ede29dcb6963abb79b03f4c61f8a3e45
 
 [template-gnb]
 _update_hash_filename_ = instance-gnb.jinja2.cfg
@@ -84,7 +84,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
 
 [enb.jinja2.cfg]
 filename = config/enb.jinja2.cfg
-md5sum = cdbd534a064f3f948845eadb2c2b786e
+md5sum = 1f271ff4cf140ebd57faa79c3f761abb
 
 [sib23.jinja2.asn]
 filename = config/sib23.jinja2.asn
@@ -112,7 +112,7 @@ md5sum = 36281b03597252cf75169417d02fc28c
 
 [ue.jinja2.cfg]
 filename = config/ue.jinja2.cfg
-md5sum = 8cdf69739dd573259eba0f952e7085a6
+md5sum = 16b02d96a137d1684e25be1fd07c735d
 
 [CreateProcessingEle.jinja2.xml]
 filename = netconf/CreateProcessingEle.jinja2.xml

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

@@ -8,16 +8,13 @@
 {%- endmacro %}
 
 {%- import 'amari_lte.jinja2' as lte  with context %}
-{%- set iru_dict        = lte.iru_dict %}
-{%- set icell_dict      = lte.icell_dict %}
-{%- set J               = lte.J %}
-{%- set jref_of_shared  = lte.jref_of_shared %}
-{%- set jcell_ru_ref    = lte.jcell_ru_ref %}
+{%- from 'amari_slap.jinja2' import J, jref_of_shared, jcell_ru_ref  with context %}
 
 
-{%- do lte.load_iru_and_icell(kind='enb') %}
-{%- do lte.load_ipeer_cell() %}
-{%- do lte.check_loaded_everything() %}
+{#- XXX kill: instance does this #}
+{#- {%- do lte.load_iru_and_icell(kind='enb') %}  #}
+{#- {%- do lte.load_ipeer_cell() %} #}
+{#- {%- do lte.check_loaded_everything() %} #}
 
 {#- start of the config -#}
 

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

@@ -8,9 +8,10 @@
 {%- set amari = lte %}{#- XXX temp #}
 
 
-{%- do lte.load_iru_and_icell(kind='ue')  %}
-{%- do lte.load_iue()                     %}
-{%- do lte.check_loaded_everything()      %}
+{#- XXX kill: instance does this #}
+{#- {%- do lte.load_iru_and_icell(kind='ue')  %}  #}
+{#- {%- do lte.load_iue()                     %}  #}
+{#- {%- do lte.check_loaded_everything()      %}  #}
 
 
 {#- start of the config -#}

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

@@ -537,9 +537,12 @@ url = {{ enb_template }}
 output = ${directory:etc}/enb.cfg
 extra-context =
     key sib23_file sib-config:output
+    json iru_dict {{ slaplte.iru_dict | tojson }}
+    json icell_dict {{ slaplte.icell_dict | tojson }}
     import json_module json
 import-list =
     rawfile amari_lte.jinja2 {{ amari_lte_template }}
+    rawfile amari_slap.jinja2 {{ amari_slap_template }}
 
 [publish-connection-information]
 <= monitor-publish

software/ors-amarisoft/instance.cfg

@@ -250,6 +250,7 @@ extra-context =
     key sdr amarisoft:sdr
     raw enb_template   ${enb.jinja2.cfg:target}
     raw amari_lte_template   ${amari_lte.jinja2:target}
+    raw amari_slap_template  ${amari_slap.jinja2:target}
     raw sib23_template   ${sib23.jinja2.asn:target}
     raw ltelogs_template   ${ltelogs.jinja2.sh:target}
     raw amarisoft_stats_template   ${amarisoft-stats.jinja2.py:target}