Commit 7c3c96e4 authored by Kirill Smelkov's avatar Kirill Smelkov

software/ors-amarisoft: enb.jinja2.cfg: Increase SNR in handover code

Don't repeat slapparameter_dict['ncell_list'][k] - we can introduce a name for
current neighbour cell, and use that name in the loop. And align entries to
that they read more clearly.

No non-whitespace changes in rendered enb.cfg and gnb.cfg .

/cc @jhuge, @lu.xu, @tomo, @xavier_thompson, @Daetalus
/proposed-for-review-on !1526
/reviewed-by TrustMe
parent 41d23ce2
...@@ -108,7 +108,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149 ...@@ -108,7 +108,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
[enb.jinja2.cfg] [enb.jinja2.cfg]
filename = config/enb.jinja2.cfg filename = config/enb.jinja2.cfg
md5sum = bc364da8033606bc8e6d9ae8bc7f718a md5sum = a7f898b48b15992b2c4a64a925f007aa
[drb_lte.jinja2.cfg] [drb_lte.jinja2.cfg]
filename = config/drb_lte.jinja2.cfg filename = config/drb_lte.jinja2.cfg
......
...@@ -25,24 +25,24 @@ ...@@ -25,24 +25,24 @@
{%- macro handover_config() %} {%- macro handover_config() %}
ncell_list: [ ncell_list: [
// Inter-ENB HO // Inter-ENB HO
{%- for k in slapparameter_dict.get('ncell_list', {}) %} {%- for _, ncell in slapparameter_dict.get('ncell_list', {})|dictsort %}
{ {
{%- if do_lte %} {%- if do_lte %}
rat: "eutra", rat: "eutra",
n_id_cell: {{ slapparameter_dict['ncell_list'][k].get('pci', '') }}, n_id_cell: {{ ncell.get('pci', '') }},
dl_earfcn: {{ slapparameter_dict['ncell_list'][k].get('dl_earfcn', '') }}, dl_earfcn: {{ ncell.get('dl_earfcn', '') }},
cell_id: {{ slapparameter_dict['ncell_list'][k].get('cell_id', '') }}, cell_id: {{ ncell.get('cell_id', '') }},
tac: {{ slapparameter_dict['ncell_list'][k].get('tac', 1) }}, tac: {{ ncell.get('tac', 1) }},
{%- elif do_nr %} {%- elif do_nr %}
rat: "nr", rat: "nr",
dl_nr_arfcn: {{ slapparameter_dict['ncell_list'][k].get('dl_nr_arfcn', '') }}, dl_nr_arfcn: {{ ncell.get('dl_nr_arfcn', '') }},
ssb_nr_arfcn: {{ slapparameter_dict['ncell_list'][k].get('ssb_nr_arfcn', '') }}, ssb_nr_arfcn: {{ ncell.get('ssb_nr_arfcn', '') }},
ul_nr_arfcn: {{ slapparameter_dict['ncell_list'][k].get('dl_nr_arfcn', '') }}, ul_nr_arfcn: {{ ncell.get('dl_nr_arfcn', '') }},
n_id_cell: {{ slapparameter_dict['ncell_list'][k].get('pci', '') }}, n_id_cell: {{ ncell.get('pci', '') }},
gnb_id_bits: {{ slapparameter_dict['ncell_list'][k].get('gnb_id_bits', '') }}, gnb_id_bits: {{ ncell.get('gnb_id_bits', '') }},
nr_cell_id: {{ slapparameter_dict['ncell_list'][k].get('nr_cell_id', '') }}, nr_cell_id: {{ ncell.get('nr_cell_id', '') }},
tac: {{ slapparameter_dict['ncell_list'][k].get('tac', 1) }}, tac: {{ ncell.get('tac', 1) }},
band: {{ slapparameter_dict['ncell_list'][k].get('nr_band', '') }}, band: {{ ncell.get('nr_band', '') }},
ssb_subcarrier_spacing: 30, ssb_subcarrier_spacing: 30,
ssb_period: 20, ssb_period: 20,
ssb_offset: 0, ssb_offset: 0,
......
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