.

software/ors-amarisoft/config/enb.cfg

@@ -3,7 +3,8 @@
   log_filename: "log/enb.log",
 
 
-// Radio Units
+
+  // Radio Units
   rf_driver: {
       name: "sdr",
       // _CELL1_a_ru 4T2R

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

@@ -35,7 +35,7 @@
 {{- slapparameter_dict.get(name, defaults.get(name)) }}
 {%- endmacro %}
 
-{%- import 'lte.jinja2' as lte -%}
+{%- import 'lte.jinja2' as lte with context -%}
 
 {#- J is used around macro calls to retrieve returned objects.
 
@@ -169,7 +169,7 @@
   log_filename: "{{ directory['log'] }}/enb.log",
 
 {# instantiate radio units #}
-{{ lte.ru_config(iru_dict) }}
+{{ lte.ru_config(iru_dict, slapparameter_dict) }}
 
   {%- if slapparameter_dict.get('websocket_password', '') %}
   com_addr: "[{{ gtp_addr_v6 }}]:9001",

software/ors-amarisoft/config/lte.jinja2

 {#- Package lte provides helpers for configuring Amarisoft LTE services. -#}
 {#- XXX rename to amari ? -#}
 
-{#- ru_config emits configuration for RF driver.
-#}
-{%- macro ru_config(iru_dict) %}
+{#- ru_config emits RF driver configuration for specified Radio Units. #}
+{%- macro ru_config(iru_dict, slapparameter_dict) %}
   // Radio Units
   rf_driver: {
   {%- if slapparameter_dict.get('disable_sdr', False) %}

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

@@ -15,6 +15,9 @@
     }
 %}
 
+{%- import 'lte.jinja2' as lte with context -%}
+{%- set amari = lte %}{#- XXX temp #}
+
 // XXX setup iru + icell
 
 
@@ -49,7 +52,7 @@
   com_addr: "{{ pub_info['com_addr'] }}",
 
 {# instantiate radio units #}
-{{ amari.ru_config(iru_dict) }}
+{{ amari.ru_config(iru_dict, slapparameter_dict) }}
 
 rf_driver: {
     name: "sdr",