Commit 7eb0f6d1 authored by Joanne Hugé's avatar Joanne Hugé

wip

parent 11f07abf
......@@ -60,11 +60,11 @@ md5sum = 52da9fe3a569199e35ad89ae1a44c30e
[template-enb]
_update_hash_filename_ = instance-enb.jinja2.cfg
md5sum = b8fe01c16b18715d9ce866c6d0689129
md5sum = b5fafebe6d28fba36f7bdc4d5439a2f3
[template-ors-enb]
_update_hash_filename_ = instance-ors-enb.jinja2.cfg
md5sum = 8510fc889b673aefaedbd1e0f6176dd5
md5sum = 63ad79a9393ed8cd653dcdda2b75f59f
[template-ors-ue]
_update_hash_filename_ = instance-ors-ue.jinja2.cfg
......
......@@ -342,10 +342,10 @@ websocket-password = ${websocket-password:passwd}
enb-ipv6 = {{ my_ipv6 }}
enb-ipv4 = {{ lan_ipv4 }}
enb-mac = {{ mac }}
amarisoft-version = {{ amarisoft['version'] }}
amarisoft-host-id = {{ amarisoft['lteenb_host_id'] }}
amarisoft-available-versions = {{ amarisoft['version_installed'] }}
amarisoft-license-expiration = {{ amarisoft['lteenb_expiration'] }}
amarisoft-Version = {{ amarisoft['version'] }}
amarisoft-Host-ID = {{ amarisoft['lteenb_host_id'] }}
amarisoft-Available-Versions = {{ amarisoft['version_installed'] }}
amarisoft-License-Expiration = {{ amarisoft['lteenb_expiration'] }}
monitor-gadget-url = ${:monitor-base-url}/gadget/software.cfg.html
ru-list = {{ dumps(rulib.iru_dict.keys() | sort) }}
cell-list = {{ dumps(rulib.icell_dict.keys() | sort) }}
......
......@@ -230,18 +230,18 @@ ors-id-gNB-ID = {{ slapparameter_dict['gnb_id'] }}
ors-id-NR-Cell-ID = {{ ors_id['nr_cell_id'] }}
{%- endif %}
{%- if enb_mode == 'enb' %}
ors-frequency = {{ xearfcn_module.frequency(ors_version['earfcn']) }} MHz
ors-band = {{ xearfcn_module.band(ors_version['earfcn'])[0]["band"] }}
ors-earfcn = {{ ors_version['earfcn'] }}
ors-Frequency = {{ xearfcn_module.frequency(ors_version['earfcn']) }} MHz
ors-Band = {{ xearfcn_module.band(ors_version['earfcn'])[0]["band"] }}
ors-DL-EARFCN = {{ ors_version['earfcn'] }}
{%- elif enb_mode == 'gnb' %}
ors-frequency = {{ xnrarfcn_module.frequency(ors_version['nr-arfcn']) }} MHz
ors-nr-band = {{ ors_version['nr-band'] }}
ors-nr-arfcn = {{ ors_version['nr-arfcn'] }}
ors-Frequency = {{ xnrarfcn_module.frequency(ors_version['nr-arfcn']) }} MHz
ors-NR-Band = {{ ors_version['nr-band'] }}
ors-DL-NR-ARFCN = {{ ors_version['nr-arfcn'] }}
{%- if slapparameter_dict.get('ssb_nr_arfcn', False) %}
ors-ssb-nr-arfcn = {{ slapparameter_dict['ssb_nr_arfcn'] }}
ors-SSB-NR-ARFCN = {{ slapparameter_dict['ssb_nr_arfcn'] }}
{%- else %}
{%- set ssb_nr_arfcn, max_ssb_scs_khz = xnrarfcn_module.dl2ssb(ors_version['nr-arfcn'], ors_version['nr-band']) %}
ors-ssb-nr-arfcn = {{ ssb_nr_arfcn | tojson }}
ors-SSB-NR-ARFCN = {{ ssb_nr_arfcn | tojson }}
{%- endif %}
{%- endif %}
......
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