.

software/ors-amarisoft/amari/slap.jinja2

@@ -221,12 +221,12 @@
 {%- endmacro                %}
 
 
-{#- iue_dict keeps ue shared instance:  reference -> iue
+{#- load_iue initializes UE registry.
 
-    use load_iue to initialize this ue registry.
+    iue_dict keeps ue shared instance:  reference -> iue
 #}
 {%- set iue_dict = {}                               %}
-{%- macro load_iue()                                %}
+{%- macro load_iue(iue_dict)                        %}
 {%-   set qother = []                               %}
 {%-   for ishared in qshared_instance_list          %}
 {%-     set ref = J(jref_of_shared(ishared))        %}

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

@@ -2,14 +2,13 @@
 {#- XXX icell vs cell / iru vs ru everyhere + document it #}
 {#- XXX TDD check   #}
 
-{%- import 'amari_lte.jinja2'  as lte  with context %}
-{%- import 'amari_slap.jinja2' as slaplte with context %}
+{%- import 'amari_lte.jinja2'  as lte      with context %}
+{%- import 'amari_slap.jinja2' as slaplte  with context %}
 {%- set J               = slaplte.J %}
 {%- set jref_of_shared  = slaplte.jref_of_shared %}
 {%- set jcell_ru_ref    = slaplte.jcell_ru_ref %}
 {%- set cfg             = slaplte.cfg %}
 
-
 {#- for standalone testing via slapos-render-config.py
     NOTE: keep in sync with instance-enb.jinja2.cfg and ru/libinstance.jinja2.cfg   #}
 {%- if _standalone is defined                                                 %}
@@ -17,13 +16,12 @@
 {%-   set icell_dict = {}                                                     %}
 {%-   set ipeercell_dict = {}                                                 %}
 {%-   do slaplte.load_iru_and_icell(iru_dict, icell_dict, icell_kind='enb')   %}
-{%-   do slaplte.load_ipeercell(ipeercell_dict)                              %}
+{%-   do slaplte.load_ipeercell(ipeercell_dict)                               %}
 {%-   do slaplte.check_loaded_everything()                                    %}
 {%- endif                                                                     %}
 
 
 {#- start of the config -#}
-
 {
   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,
 {%- if slapparameter_dict.get('log_phy_debug', False) -%}

software/ors-amarisoft/config/ue.cfg

@@ -34,7 +34,7 @@
           n_antenna_ul: 1,
 
           dl_earfcn: 38050,
-          bandwidth: 25,
+          bandwidth: 5,
 
           global_timing_advance: -1,
         },
@@ -76,7 +76,8 @@
       imsi: "001010123456789",
       K: "00112233445566778899aabbccddeeff",
       rue_addr: "host1",
-      ue_category: 12,
+      as_release: 13,
+      ue_category: 13,
       tun_setup_script: "ue-ifup",
       apn: "internet",
     },

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

-{%- 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 %}
-{%- set J               = lte.J %}
-{%- set jref_of_shared  = lte.jref_of_shared %}
-{%- set jcell_ru_ref    = lte.jcell_ru_ref %}
-{%- set amari = lte %}{#- XXX temp #}
-
-
-{#- XXX kill: instance does this #}
-{#- {%- do lte.load_iru_and_icell(kind='ue')  %}  #}
-{#- {%- do lte.load_iue()                     %}  #}
-{#- {%- do lte.check_loaded_everything()      %}  #}
+{%- import 'amari_lte.jinja2'  as lte      with context %}
+{%- import 'amari_slap.jinja2' as slaplte  with context %}
+{%- set J               = slaplte.J %}
+{%- set jcell_ru_ref    = slaplte.jcell_ru_ref %}
+
+{#- for standalone testing via slapos-render-config.py
+    NOTE: keep in sync with instance-ue.jinja2.cfg and ru/libinstance.jinja2.cfg   #}
+{%- if _standalone is defined                                                 %}
+{%-   set iru_dict   = {}                                                     %}
+{%-   set icell_dict = {}                                                     %}
+{%-   set iue_dict   = {}                                                     %}
+{%-   do slaplte.load_iru_and_icell(iru_dict, icell_dict, icell_kind='ue')    %}
+{%-   do slaplte.load_iue(iue_dict)                                           %}
+{%-   do slaplte.check_loaded_everything()                                    %}
+{%- endif                                                                     %}
 
 
 {#- start of the config -#}
-
 {
   log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1,phy.level=info,file.rotate=1G,file.path=/dev/null",
   log_filename: "{{ directory['log'] }}/ue.log",
@@ -24,7 +24,7 @@
   com_addr: "{{ pub_info['com_addr'] }}",
 
 {# instantiate radio units #}
-{{ amari.ru_config(iru_dict, slapparameter_dict) }}
+{{ lte.ru_config(iru_dict, slapparameter_dict) }}
 
 
   cell_groups: [{

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

@@ -58,12 +58,12 @@ eggs-directory = {{ eggs_directory }}
 develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
 
-{%- set icell_kind='enb' %}
-{%- import 'amari_slap.jinja2'     as slaplte with context %}
-{%- import 'ru_libinstance.jinja2.cfg' as rulib   with context %}
-{%- set ipeercell_dict = {}     %}
-{%- do slaplte.load_ipeercell() %}
-{%- do slaplte.check_loaded_everything() %}
+{%- set icell_kind='enb'                                        %}
+{%- import 'amari_slap.jinja2'         as slaplte with context  %}
+{%- import 'ru_libinstance.jinja2.cfg' as rulib   with context  %}
+{%- set ipeercell_dict = {}                                     %}
+{%- do slaplte.load_ipeercell(ipeercell_dict)                   %}
+{%- do slaplte.check_loaded_everything()                        %}
 
 
 [monitor-httpd-conf-parameter]