.

software/ors-amarisoft/buildout.hash.cfg

@@ -16,11 +16,11 @@
 
 [template]
 filename = instance.cfg
-md5sum = a38c699d77c9960db42bafe994c73744
+md5sum = a832f31fd13d995f46539ab99a53ad29
 
 [ru_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/libinstance.jinja2.cfg
-md5sum = d41d8cd98f00b204e9800998ecf8427e
+md5sum = 556f39ce967c52da3a8e5346680a50b3
 
 [amarisoft-stats.jinja2.py]
 _update_hash_filename_ = amarisoft-stats.jinja2.py
@@ -52,7 +52,7 @@ md5sum = a2ba0343ddb7f9cf2904a4c5c751f68a
 
 [template-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = 6c1e92444dd1e8eb91c85dc2cc46ec81
+md5sum = f4714928f53fe57dc6722b7c155276cf
 
 [template-gnb]
 _update_hash_filename_ = instance-gnb.jinja2.cfg
@@ -76,7 +76,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
 
 [enb.jinja2.cfg]
 filename = config/enb.jinja2.cfg
-md5sum = c1593d1ca6abee6262ad0aae9602bbaf
+md5sum = 9284afa98485ee4c81fa10c4e2a05d8a
 
 [sib23.jinja2.asn]
 filename = config/sib23.jinja2.asn
@@ -104,7 +104,7 @@ md5sum = 36281b03597252cf75169417d02fc28c
 
 [ue.jinja2.cfg]
 filename = config/ue.jinja2.cfg
-md5sum = 22bb841181c39f20b931358de2808371
+md5sum = 0a780e55ea53b1dc4850237c651adc43
 
 [CreateProcessingEle.jinja2.xml]
 filename = netconf/CreateProcessingEle.jinja2.xml

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

@@ -35,7 +35,7 @@
 {{- slapparameter_dict.get(name, defaults.get(name)) }}
 {%- endmacro %}
 
-{%- import 'lte.jinja2' as lte  with context %}
+{%- import 'amari_lte.jinja2' as lte  with context %}
 {%- set iru_dict        = lte.iru_dict %}
 {%- set icell_dict      = lte.icell_dict %}
 {%- set J               = lte.J %}

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

@@ -15,7 +15,7 @@
     }
 %}
 
-{%- import 'lte.jinja2' as lte  with context -%}
+{%- import 'amari_lte.jinja2' as lte  with context -%}
 {%- set iru_dict        = lte.iru_dict %}
 {%- set icell_dict      = lte.icell_dict %}
 {%- set iue_dict        = lte.iue_dict %}

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

@@ -58,8 +58,11 @@ eggs-directory = {{ eggs_directory }}
 develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
 
-
-{% import 'ru_libinstance.jinja2.cfg' as rulib with context %}
+{%- set icell_kind='enb' %}
+{%- import 'amari/slap.jinja2.cfg'     as slaplte with context %}
+{%- import 'ru/libinstance.jinja2.cfg' as rulib   with context %}
+{%- do slaplte.load_ipeer_cell() %}
+{%- do slaplte.check_loaded_everything() %}
 
 
 [monitor-httpd-conf-parameter]
@@ -536,7 +539,7 @@ extra-context =
     key sib23_file sib-config:output
     import json_module json
 import-list =
-    rawfile lte.jinja2 {{ lte_template }}
+    rawfile amari_lte.jinja2 {{ amari_lte_template }}
 
 [publish-connection-information]
 <= monitor-publish

software/ors-amarisoft/instance.cfg

@@ -247,7 +247,7 @@ extra-context =
     key enb amarisoft:enb
     key sdr amarisoft:sdr
     raw enb_template   ${enb.jinja2.cfg:target}
-    raw lte_template   ${lte.jinja2:target}
+    raw amari_lte_template   ${amari_lte.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}

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

+
+{%- import 'amari_lte.jinja2'  as lte     with context %}
+
+{%- do slaplte.load_iru_and_icell(kind=icell_kind) %}

software/ors-amarisoft/slapos-render-config.py

@@ -23,7 +23,7 @@ def j2render(config, jcfg):
       'url': 'config/{}.jinja2.cfg'.format(config),
       'output': 'config/{}.cfg'.format(config),
       'context': textctx,
-      'import-list': 'rawfile lte.jinja2 config/lte.jinja2',
+      'import-list': 'rawfile amari_lte.jinja2 amari/lte.jinja2',
       })
 
     # avoid dependency on zc.buildout.download and the need to use non-stub buildout section

software/ors-amarisoft/software-base.cfg

@@ -30,7 +30,7 @@ parts +=
   gnb.jinja2.cfg
   ue_db.jinja2.cfg
   ue.jinja2.cfg
-  lte.jinja2
+  amari_lte.jinja2
   CreateProcessingEle.jinja2.xml
   cu_config.jinja2.xml
   sib23.jinja2.asn
@@ -162,9 +162,9 @@ filename = ims.jinja2.cfg
 [ue.jinja2.cfg]
 <= copy-config-to-instance
 filename = ue.jinja2.cfg
-[lte.jinja2]
+[amari_lte.jinja2]
 <= copy-config-to-instance
-filename = lte.jinja2
+filename = amari/lte.jinja2
 
 # XXX -> ru/lopcomm
 [CreateProcessingEle.jinja2.xml]