Commit c5b76d54 authored by Kirill Smelkov's avatar Kirill Smelkov

software/ors-amarisoft: enb.jinja2.cfg: Switch internal ru.ru_type to be...

software/ors-amarisoft: enb.jinja2.cfg: Switch internal ru.ru_type to be 'sunwave' for Sunwave M2RU Radio Unit

ru/libinstance and everything inside there already refer to that unit as 'sunwave'.
Do the same for uniformity in enb.cfg and because we already refer to Lopcomm
ORAN Radio Unit as just 'lopcomm'.

In the future, if we will need to distinguish different models of one
manufacturer, we could extend ru type to be e.g. manufacturer/model or do
something similar.

Template rendering is still done with ru='m2ru' coming from outside but
internally it is now ru.ru_type='sunwave' instead of ru.ru_type='m2ru'.
parent 85e31d7b
...@@ -18,6 +18,9 @@ ...@@ -18,6 +18,9 @@
{#- ru is namespace object that holds Radio Unit 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) %}
{%- if ru.ru_type == 'm2ru' %}
{%- do ru.update({'ru_type': 'sunwave'}) %}
{%- endif %}
{#- handover_config emits handover configuration #} {#- handover_config emits handover configuration #}
...@@ -85,7 +88,7 @@ ...@@ -85,7 +88,7 @@
{%- endif %} {%- 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 == "sunwave" %}
{%- set ru.n_antenna_ul = slapparameter_dict.get('n_antenna_ul', 1) %} {%- set ru.n_antenna_ul = slapparameter_dict.get('n_antenna_ul', 1) %}
{% else %} {% else %}
{%- set ru.n_antenna_ul = slapparameter_dict.get('n_antenna_ul', int(slap_configuration['configuration.default_n_antenna_ul'])) %} {%- set ru.n_antenna_ul = slapparameter_dict.get('n_antenna_ul', int(slap_configuration['configuration.default_n_antenna_ul'])) %}
...@@ -478,17 +481,17 @@ ...@@ -478,17 +481,17 @@
{% endif %} {% endif %}
prach: { prach: {
{% if ru.ru_type == "m2ru" %} {% if ru.ru_type == "sunwave" %}
msg1_frequency_start: 0, msg1_frequency_start: 0,
{% endif %} {% endif %}
}, },
pdcch: { pdcch: {
{% if ru.ru_type == "m2ru" %} {% if ru.ru_type == "sunwave" %}
n_rb_coreset0: 48, n_rb_coreset0: 48,
n_symb_coreset0: 1, n_symb_coreset0: 1,
dedicated_coreset: { dedicated_coreset: {
{% if ru.ru_type == "m2ru" %} {% if ru.ru_type == "sunwave" %}
duration: 1, duration: 1,
{% endif %} {% endif %}
}, },
...@@ -507,7 +510,7 @@ ...@@ -507,7 +510,7 @@
}, },
pdsch: { pdsch: {
{% if ru.ru_type == "m2ru" %} {% if ru.ru_type == "sunwave" %}
k0: 0, k0: 0,
k1: [ 8, 7, 7, 6, 5, 4, 12, 11 ], k1: [ 8, 7, 7, 6, 5, 4, 12, 11 ],
{% elif tdd_config == 3 %} {% elif tdd_config == 3 %}
...@@ -516,7 +519,7 @@ ...@@ -516,7 +519,7 @@
}, },
pusch: { pusch: {
{% if ru.ru_type == "m2ru" %} {% if ru.ru_type == "sunwave" %}
k2: 4, k2: 4,
msg3_k2: 7, msg3_k2: 7,
{% elif tdd_config == 3 %} {% elif tdd_config == 3 %}
......
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
}, },
tx_gain: 0, tx_gain: 0,
rx_gain: 0, rx_gain: 0,
{% elif ru.ru_type == "m2ru" %} {% elif ru.ru_type == "sunwave" %}
rf_driver: { rf_driver: {
{%- if slapparameter_dict.get('disable_sdr', False) %} {%- if slapparameter_dict.get('disable_sdr', False) %}
name: "dummy", name: "dummy",
......
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