Commit 85e31d7b authored by Kirill Smelkov's avatar Kirill Smelkov

software/ors-amarisoft: enb.jinja2.cfg: Inline cell.bandwidth for now

Even though I introduced cell object in 79370ebf (software/ors-amarisoft:
enb.jinja2.cfg: Stop using C Preprocessor and switch to Jinja2 completely) it
is currently only cell.bandwidth that is living there, while all other cell
parameters are still fetched from slapparameter_dict directly.

We will soon introduce cell variable - that will iterate over cell_dict, and
also keeping global cell won't work due to name shadowing. On the other hand we
are not yet ready to start migrating all cell parameters to be accessible via
cell object.

-> So inline code for lte bandwidth parameter until the time comes to rework
all cell parameters to be accessible via cell object.

Rendered enb.cfg and gnb.cfg stay the same.
parent ca3958da
...@@ -16,9 +16,8 @@ ...@@ -16,9 +16,8 @@
{%- do assert(not (do_lte and do_nr)) %} {%- do assert(not (do_lte and do_nr)) %}
{#- ru and cell are namespace objects that hold Radio Unit and Cell related parameters #} {#- ru is namespace object that holds Radio Unit related parameters #}
{%- set ru = namespace(ru_type=ru_type) %} {%- set ru = namespace(ru_type=ru_type) %}
{%- set cell = namespace() %}
{#- handover_config emits handover configuration #} {#- handover_config emits handover configuration #}
...@@ -85,10 +84,6 @@ ...@@ -85,10 +84,6 @@
{%- endif %} {%- endif %}
{%- endif %} {%- endif %}
{%- if do_lte %}
{%- set cell.bandwidth = slapparameter_dict.get('bandwidth', slap_configuration['configuration.default_lte_bandwidth']) %}
{%- endif %}
{%- set ru.n_antenna_dl = slapparameter_dict.get('n_antenna_dl', int(slap_configuration['configuration.default_n_antenna_dl'])) %} {%- set ru.n_antenna_dl = slapparameter_dict.get('n_antenna_dl', int(slap_configuration['configuration.default_n_antenna_dl'])) %}
{% if ru.ru_type == "m2ru" %} {% if ru.ru_type == "m2ru" %}
{%- set ru.n_antenna_ul = slapparameter_dict.get('n_antenna_ul', 1) %} {%- set ru.n_antenna_ul = slapparameter_dict.get('n_antenna_ul', 1) %}
...@@ -243,7 +238,7 @@ ...@@ -243,7 +238,7 @@
sp_config: 7, sp_config: 7,
{%- endif %} {%- endif %}
{%- set n_rb_dl = J(jlte_n_rb_dl(cell.bandwidth)) %} {%- set n_rb_dl = J(jlte_n_rb_dl(slapparameter_dict.get('bandwidth', slap_configuration['configuration.default_lte_bandwidth']))) %}
n_rb_dl: {{ n_rb_dl }}, n_rb_dl: {{ n_rb_dl }},
si_coderate: {{ 0.30 if n_rb_dl == 6 else 0.20 }}, si_coderate: {{ 0.30 if n_rb_dl == 6 else 0.20 }},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment