Commit bf13989a authored by Kirill Smelkov's avatar Kirill Smelkov

software/ors-amarisoft: enb: lte: Simplify Carrier Aggregation code

So far CA was setup only for lte case and it is possible to simplify generation
of all pair of cells to be done without extra loop and state.

Tests will be added later as full tests for generic MultiRU.

Backward compatibility: no change for ORS, which has only one cell, and
rendered enb.cfg and gnb.cfg stay the same.
parent c362e5cd
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
// LTE cells // LTE cells
cell_list: [ cell_list: [
{%- if do_lte %} {%- if do_lte %}
{%- for i, (cell_ref, cell) in enumerate(cell_dict|dictsort) %} {%- for cell_ref, cell in cell_dict|dictsort %}
{%- set ru_ref = cell.ru_ref %} {%- set ru_ref = cell.ru_ref %}
{%- set ru = ru_dict[ru_ref] %} {%- set ru = ru_dict[ru_ref] %}
...@@ -205,23 +205,15 @@ ...@@ -205,23 +205,15 @@
{{- handover_config() }} {{- handover_config() }}
// Carrier Aggregation // Carrier Aggregation
{%- set scell_list = [] %}
{%- for j, l in enumerate(cell_dict) %}
{%- if j != i %}
{%- do scell_list.append([j, l]) %}
{%- endif %}
{%- endfor %}
scell_list: [ scell_list: [
{%- for j, l in enumerate(scell_list) %} {%- for cell2_ref, cell2 in cell_dict|dictsort %}
{%- if j == 0 -%} {%- if cell2_ref != cell_ref %}
{ {
{%- else -%} cell_id: {{ cell2.cell_id }}, // + {{ cell2_ref }}
, {
{%- endif %}
cell_id: {{ cell_dict[l[1]].cell_id }},
cross_carrier_scheduling: false, cross_carrier_scheduling: false,
} },
{%- endfor %} {%- endif %}
{%- endfor %}
], ],
// tune LTE parameters for the cell // tune LTE parameters for the cell
......
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