Commit ebbebbf2 authored by Kirill Smelkov's avatar Kirill Smelkov

X Restore publication of primary cell (& ru) parameters

I originally thought it is ORS-only, but more careful review showed that e.g.
dl_earfcn is published for both ORS and not-ORS cases:

https://lab.nexedi.com/nexedi/slapos/blob/81a83ffe/software/ors-amarisoft/instance-enb.jinja2.cfg#L224-239
parent 4cb107b3
...@@ -36,7 +36,7 @@ md5sum = d2fe2fbe70c6824c514a7c4034a2ddb3 ...@@ -36,7 +36,7 @@ md5sum = d2fe2fbe70c6824c514a7c4034a2ddb3
[ru_libinstance.jinja2.cfg] [ru_libinstance.jinja2.cfg]
_update_hash_filename_ = ru/libinstance.jinja2.cfg _update_hash_filename_ = ru/libinstance.jinja2.cfg
md5sum = 39031a3b7f043c905b49986984d49a4b md5sum = 1a14718cd3c19380d32dd37d27577ed7
[ru_sdr_libinstance.jinja2.cfg] [ru_sdr_libinstance.jinja2.cfg]
_update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg _update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg
...@@ -88,7 +88,7 @@ md5sum = 52da9fe3a569199e35ad89ae1a44c30e ...@@ -88,7 +88,7 @@ md5sum = 52da9fe3a569199e35ad89ae1a44c30e
[template-enb] [template-enb]
_update_hash_filename_ = instance-enb.jinja2.cfg _update_hash_filename_ = instance-enb.jinja2.cfg
md5sum = 51ce7e6fd96f3c8ad086723722b91c3f md5sum = 98153725add6d377989c4d50b2054dd2
[template-ors-enb] [template-ors-enb]
_update_hash_filename_ = instance-ors-enb.jinja2.cfg _update_hash_filename_ = instance-ors-enb.jinja2.cfg
...@@ -112,7 +112,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149 ...@@ -112,7 +112,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
[enb.jinja2.cfg] [enb.jinja2.cfg]
filename = config/enb.jinja2.cfg filename = config/enb.jinja2.cfg
md5sum = 5637fa338ffbc1015b5b6349ede91170 md5sum = b0d21e7b2c34f457e230d1cc950ce7fb
[drb_lte.jinja2.cfg] [drb_lte.jinja2.cfg]
filename = config/drb_lte.jinja2.cfg filename = config/drb_lte.jinja2.cfg
......
...@@ -249,6 +249,9 @@ cell-list = {{ dumps(iru_icell_ref_list) }} ...@@ -249,6 +249,9 @@ cell-list = {{ dumps(iru_icell_ref_list) }}
{%- if ru.ru_link_type == 'cpri' %} {%- if ru.ru_link_type == 'cpri' %}
ipv6 = ${vtap.{{ ru.cpri_link._tap }}:gateway} ipv6 = ${vtap.{{ ru.cpri_link._tap }}:gateway}
{%- endif %} {%- endif %}
tx_gain = {{ ru.tx_gain }}
rx_gain = {{ ru.tx_gain }}
txrx_active = {{ ru.txrx_active }}
{%- endif %} {%- endif %}
{%- endfor %} {%- endfor %}
...@@ -298,6 +301,19 @@ recipe = slapos.cookbook:publish.serialised ...@@ -298,6 +301,19 @@ recipe = slapos.cookbook:publish.serialised
-slave-reference = {{ dumps(icell.slave_reference) }} -slave-reference = {{ dumps(icell.slave_reference) }}
{{ slap_configuration['slap-software-type'] }} = {{ dumps(root) }} {{ slap_configuration['slap-software-type'] }} = {{ dumps(root) }}
ru = {{ dumps(ru_ref) }} ru = {{ dumps(ru_ref) }}
{%- if cell.cell_type == 'lte' %}
band = b{{ xearfcn_module.band(cell.dl_earfcn)[0].band }}
dl_earfcn = {{ cell.dl_earfcn }}
ul_earfcn = {{ cell.ul_earfcn }}
{%- elif cell.cell_type == 'nr' %}
band = n{{ cell.nr_band }}
dl_nr_arfcn = {{ cell.dl_nr_arfcn }}
ul_nr_arfcn = {{ cell.ul_nr_arfcn }}
ssb_nr_arfcn= {{ cell.ssb_nr_arfcn }}
{%- else %}
{%- do bug('unreachable') %}
{%- endif %}
{%- endif %} {%- endif %}
{%- endfor %} {%- endfor %}
......
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