.

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

 {# XXX ORS -> provide defaults for: cell_list #}
 
+{%- import 'lte.jinja2' as lte %}
+
 {# cell_list keeps cell slave instances #}
 {%- set cell_list = [] %}
 {%- for slave in slave_instance_list %}
@@ -14,9 +16,6 @@
 
 
 
-{%- set cell_count = cell_list|length %}
-
-
 # XXX <- from RRH
 #define N_ANTENNA_DL        {{ slapparameter_dict.get('n_antenna_dl', slap_configuration['configuration.default_n_antenna_dl']) }}
 #define N_ANTENNA_UL        {{ slapparameter_dict.get('n_antenna_ul', slap_configuration['configuration.default_n_antenna_ul']) }}
@@ -74,7 +73,7 @@
         {%- endfor -%}
         ",
       ifname: "
-        {%- if cell_count == 1 -%}
+        {%- if len(cell_list) == 1 -%}
           {{ slap_configuration.get('tap-name', '') }}
         {%- else -%}
           {%- for i, k in enumerate(cell_list) %}
@@ -136,7 +135,7 @@
 
   enb_id: {{ slapparameter_dict.get('enb_id', '0x1A2D0') }},
 
-
+  # LTE cells
   cell_list: [
 {%- for i, cell in enumerate(cell_list) %}
 {%-   if cell['cell_type'] == 'cell_lte' %}
@@ -271,7 +270,6 @@
 
     prach_freq_offset: -1,
 
-
     pusch_dedicated: {
       beta_offset_ack_index: 9,
       beta_offset_ri_index: 6,
@@ -322,4 +320,8 @@
       }
     ],
   },
+
+  # NR cells
+  XXX + nr_cell_list
+  XXX + nr_cell_default
 }

software/ors-amarisoft/config/lte.jinja2

-{# Package lte provides helpers related to configuring LTE cells. #}
+{# Package lte provides helpers for configuring LTE cells. #}
 
 {# cell_tdd_config returns tdd_config for an LTE cell. #}
 {%- macro cell_tdd_config(cell) %}