.

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

@@ -11,34 +11,30 @@
 
 {# XXX rrh_list ? #}
 
-{# lte_cell_tdd_config returns tdd_config for an lte cell #}
-{%- macro lte_cell_tdd_config(cell} %}
+{# lte_cell_tdd_config returns tdd_config of an LTE cell #}
+{%- macro lte_cell_tdd_config(cell) %}
 {%-   set _ = {'[Configuration 2] 5ms 2UL 6DL (default)':        2,
                '[Configuration 6] 5ms 5UL 3DL (maximum uplink)': 6} %}
 {{    _[cell.get('tdd_ul_dl_config', '[Configuration 2] 5ms 2UL 6DL (default)')]  }}
 {%- endmacro %}
 
+{# lte_cell_n_rb_dl returns n_rb_dl of an LTE cell #}
+{%- macro lte_cell_n_rb_dl(cell) %}
+{%-   set _ = {'1.4 MHz':  6,
+               '3 MHz':   15,
+               '5 MHz':   25,
+               '10 MHz':  50,
+               '15 MHz':  75,
+               '20 MHz': 100}
+{{    _[cell['bandwidth']] }}
+{%- endmacro %}
+
+
+
+
 {%- set cell_count = cell_list|length %}
 
-{%- if slapparameter_dict.get('tdd_ul_dl_config', '[Configuration 2] 5ms 2UL 6DL (default)') == '[Configuration 2] 5ms 2UL 6DL (default)' %}
-{%- set tdd_config = 2 %}
-{%- elif slapparameter_dict.get('tdd_ul_dl_config', '[Configuration 2] 5ms 2UL 6DL (default)') == '[Configuration 6] 5ms 5UL 3DL (maximum uplink)' %}
-{%- set tdd_config = 6 %}
-{%- endif %}
 
-{%- if   slapparameter_dict.get('bandwidth', slap_configuration['configuration.default_lte_bandwidth']) == '1.4 MHz' %}
-#define N_RB_DL             6
-{%- elif slapparameter_dict.get('bandwidth', slap_configuration['configuration.default_lte_bandwidth']) == '3 MHz' %}
-#define N_RB_DL             15
-{%- elif slapparameter_dict.get('bandwidth', slap_configuration['configuration.default_lte_bandwidth']) == '5 MHz' %}
-#define N_RB_DL             25
-{%- elif slapparameter_dict.get('bandwidth', slap_configuration['configuration.default_lte_bandwidth']) == '10 MHz' %}
-#define N_RB_DL             50
-{%- elif slapparameter_dict.get('bandwidth', slap_configuration['configuration.default_lte_bandwidth']) == '15 MHz' %}
-#define N_RB_DL             75
-{%- elif slapparameter_dict.get('bandwidth', slap_configuration['configuration.default_lte_bandwidth']) == '20 MHz' %}
-#define N_RB_DL             100
-{%- endif %}
 #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']) }}
 
@@ -183,13 +179,15 @@
 {%-       endfor %}
           ],
 
-{#      radio tuning #}
-{%-     set tdd = (cell['rf_mode'] == 'tdd') %}
-{%-     if tdd %}
-          uldl_config: {{ lte_cell_tdd_config(cell} }},
-          sp_config: 7,
-{%-     endif %}
-    n_rb_dl: N_RB_DL,
+{#        cell radio tuning #}
+{%-       set tdd = (cell['rf_mode'] == 'tdd') %}
+{%-       if tdd %}
+            uldl_config: {{ lte_cell_tdd_config(cell} }},
+            sp_config: 7,
+{%-       endif %}
+
+{%-       set n_rb_dl = lte_cell_n_rb_dl(cell) %}
+          n_rb_dl: {{ n_rb_dl }},
         },
 {%-   endif %}
 {%- endfor %}