.

software/ors-amarisoft/config/enb.cfg

-{
+  // XXX -> amari ?{
   log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,s1ap.level=debug,s1ap.max_size=1,x2ap.level=debug,x2ap.max_size=1,rrc.level=debug,rrc.max_size=1,ngap.level=debug,ngap.max_size=1,xnap.level=debug,xnap.max_size=1,phy.level=info,file.rotate=1G,file.path=/dev/null",
   log_filename: "log/enb.log",
 

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

@@ -2,7 +2,7 @@
 {#- XXX icell vs cell / iru vs ru everyhere + document it #}
 {#- XXX TDD check   #}
 
-{#- defaults provide default values for parameters.
+{#- defaults provide default values for enb parameters.
     it should be kept in sync with "default" in json schemas  #}
 {#- XXX ssb_pos_bitmap=10000000 is for TDD only; FDD -> "1000"  #}
 {%- set defaults = {
@@ -30,30 +30,22 @@
     }
 %}
 
-{#- cfg returns value of configuration parameter name #}
+{#- cfg returns value of configuration parameter name #}  // XXX -> amari ?
 {%- macro cfg(name)     %}
 {{- slapparameter_dict.get(name, defaults.get(name)) }}
 {%- endmacro %}
 
 {%- import '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 %}
-
-{#- XXX error(ishared, msg)  vvv is debug stub -#}
-{%- macro error(ishared, msg)   %}
-{%-   set msg = 'E: %s: %s\n' % (J(jref_of_shared(ishared)), msg)   %}
-{%-   do print('\n%s' % msg)                                        %}
-{%-   do assert(False, msg)                                         %}
-{%- endmacro  %}
-
+{%- 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 %}
 
 
 {%- do lte.load_iru_and_icell() %}
 {%- do lte.load_ipeer() %}
-{#- XXX verify that lte.qshared_instance_list is empty #}
+{%- do lte.check_loaded_everything() %}
 
 {#- start of the config -#}
 

software/ors-amarisoft/config/lte.jinja2

@@ -26,6 +26,16 @@
 {%-   do assert(False, msg)                                         %}
 {%- endmacro                                                        %}
 
+{#- error reports an error about shared instance #}
+{#- XXX -> ierror ?   #}
+{#- XXX error(ishared, msg)  vvv is debug stub -#}
+{%- macro error(ishared, msg)   %}
+{%-   set msg = 'E: %s: %s\n' % (J(jref_of_shared(ishared)), msg)   %}
+{%-   do print('\n%s' % msg)                                        %}
+{%-   do assert(False, msg)                                         %}
+{%- endmacro  %}
+
+
 
 
 {#- ---- loading ---- #}
@@ -35,6 +45,13 @@
 {%- set qshared_instance_list = slap_configuration.get('slave-instance-list', []) %}
 
 
+{#- check_loaded_everything verifies that all shared instances were handling during the load. #}
+{%- macro check_loaded_everything() %}
+{%-   for ishared in qshared_instance_list  %}
+{%-     do error(ishared, "shared instance of unsupported type")  %}
+{%-   endfor  %}
+{%- endmacro %}
+
 {#- icell_dict keeps cell shared instances:  reference -> icell
     iru_dict   keeps RU   shared instances + RU whose definition is embedded into a cell:  reference -> iRU
     in the kept instances _ is automatically json-decoded

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

@@ -43,12 +43,8 @@
 {#- XXX verify ue.ue_type in lte|nr  #}
 
 {%- do lte.load_iru_and_icell() %}
-{%- do lte.load_ipeer() %}
-{#- XXX verify that lte.qshared_instance_list is empty #}
+{%- do lte.check_loaded_everything() %}
 
-{%- for ishared in lte.qshared_instance_list  %}
-{%-   do error(ishared, "shared instance of unsupported type")  %}
-{%- endfor  %}
 
 {#- start of the config -#}