Commit c24c339c authored by Kirill Smelkov's avatar Kirill Smelkov

X cell_list is non-optional - we have to include it even if there are only nr cells

Do the same for nr_cell_list for symmetry, even though nr_cell_list is optional.
parent 77bba2fa
...@@ -225,9 +225,9 @@ ...@@ -225,9 +225,9 @@
en_dc_support: true, en_dc_support: true,
{%- endif %} {%- endif %}
{% if do_lte %}
// LTE cells // LTE cells
cell_list: [ cell_list: [
{%- if do_lte %}
{%- for i, (cell_ref, icell) in enumerate(icell_dict|dictsort) %} {%- for i, (cell_ref, icell) in enumerate(icell_dict|dictsort) %}
{%- set cell = icell['_'] %} {%- set cell = icell['_'] %}
{%- if cell.cell_type == 'lte' %} {%- if cell.cell_type == 'lte' %}
...@@ -360,8 +360,10 @@ ...@@ -360,8 +360,10 @@
}, },
{%- endif %} {%- endif %}
{%- endfor %} {%- endfor %}
{%- endif %}
], ],
{%- if do_lte %}
cell_default: { cell_default: {
plmn_list: [ plmn_list: [
{%- for _, plmn in slapparameter_dict.plmn_list |dictsort %} {%- for _, plmn in slapparameter_dict.plmn_list |dictsort %}
...@@ -457,9 +459,9 @@ ...@@ -457,9 +459,9 @@
}, },
{%- endif %} {%- endif %}
{% if do_nr %}
// NR cells // NR cells
nr_cell_list: [ nr_cell_list: [
{%- if do_nr %}
{%- for i, (cell_ref, icell) in enumerate(icell_dict|dictsort) %} {%- for i, (cell_ref, icell) in enumerate(icell_dict|dictsort) %}
{%- set cell = icell['_'] %} {%- set cell = icell['_'] %}
{%- if cell.cell_type == 'nr' %} {%- if cell.cell_type == 'nr' %}
...@@ -749,8 +751,10 @@ ...@@ -749,8 +751,10 @@
}, },
{%- endif %} {%- endif %}
{%- endfor %} {%- endfor %}
{%- endif %}
], ],
{%- if do_nr %}
nr_cell_default: { nr_cell_default: {
ssb_period: 20, ssb_period: 20,
......
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
gnb_id_bits: 28, gnb_id_bits: 28,
en_dc_support: true, en_dc_support: true,
// LTE cells // LTE cells
cell_list: [ cell_list: [
...@@ -148,7 +147,6 @@ ...@@ -148,7 +147,6 @@
], ],
}, },
], ],
cell_default: { cell_default: {
plmn_list: [ plmn_list: [
{ {
...@@ -241,7 +239,6 @@ ...@@ -241,7 +239,6 @@
ho_from_meas: true, ho_from_meas: true,
}, },
// NR cells // NR cells
nr_cell_list: [ nr_cell_list: [
...@@ -449,7 +446,6 @@ ...@@ -449,7 +446,6 @@
}, },
], ],
nr_cell_default: { nr_cell_default: {
ssb_period: 20, ssb_period: 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