Commit 03f4e76d authored by Joanne Hugé's avatar Joanne Hugé

wip

parent 80c8c670
......@@ -64,7 +64,7 @@ md5sum = dd4dd35e440380286c09c7f2338d07f6
[template-ors-enb]
_update_hash_filename_ = instance-ors-enb.jinja2.cfg
md5sum = 7b2e07ff83106b01659ec57571d80de3
md5sum = f2cea843b9f667194f317b6b15840437
[template-ors-ue]
_update_hash_filename_ = instance-ors-ue.jinja2.cfg
......
......@@ -91,8 +91,8 @@
'sdr_dev_list': [0],
'n_antenna_dl': slapparameter_dict.n_antenna_dl,
'n_antenna_ul': slapparameter_dict.n_antenna_ul,
'tx_gain': ors_version['current-tx-gain'],
'rx_gain': ors_version['current-rx-gain'],
'tx_gain': ors_version['tx-gain'],
'rx_gain': ors_version['rx-gain'],
'txrx_active': 'ACTIVE' if (not slapparameter_dict.disable_sdr) else 'INACTIVE',
} |tojson
})
......@@ -101,7 +101,7 @@
{%- if enb_mode == 'enb' %}
{%- set cell = {
'cell_type': 'lte',
'dl_earfcn': ors_version['current-earfcn'],
'dl_earfcn': ors_version['earfcn'],
'bandwidth': float(slapparameter_dict.bandwidth.removesuffix(' MHz')),
'tac': slapparameter_dict.tac,
'root_sequence_index': slapparameter_dict.root_sequence_index,
......@@ -110,8 +110,8 @@
{%- elif enb_mode == 'gnb' %}
{%- set cell = {
'cell_type': 'nr',
'dl_nr_arfcn': ors_version['current-nr-arfcn'],
'nr_band': ors_version['current-nr-band'],
'dl_nr_arfcn': ors_version['nr-arfcn'],
'nr_band': ors_version['nr-band'],
'bandwidth': slapparameter_dict.nr_bandwidth,
'ssb_pos_bitmap': slapparameter_dict.ssb_pos_bitmap,
'root_sequence_index': slapparameter_dict.root_sequence_index,
......@@ -217,9 +217,9 @@ ors = {{ dumps(ors_version) }}
[publish-connection-information]
ors-version = {{ ors_version['ors-version'] }}
frequency-range-rating = {{ ors_version['range'] }}
current-tx-power-estimate = {{ ors_version['power-estimate'] }}
current-tx-gain = {{ ors_version['current-tx-gain'] }}
current-rx-gain = {{ ors_version['current-rx-gain'] }}
tx-power = {{ ors_version['power-estimate'] }}
tx-gain = {{ ors_version['tx-gain'] }}
rx-gain = {{ ors_version['rx-gain'] }}
cell-id = {{ slapparameter_dict['cell_id'] }}
physical-cell-id = {{ slapparameter_dict['pci'] }}
root-sequence-index = {{ slapparameter_dict['root_sequence_index'] }}
......@@ -231,18 +231,18 @@ gnb-id = {{ slapparameter_dict['gnb_id'] }}
nr-cell-id = {{ ors_id['nr_cell_id'] }}
{%- endif %}
{%- if enb_mode == 'enb' %}
current-frequency = {{ xearfcn_module.frequency(ors_version['current-earfcn']) }} MHz
current-band = {{ xearfcn_module.band(ors_version['current-earfcn'])[0]["band"] }}
current-earfcn = {{ ors_version['current-earfcn'] }}
frequency = {{ xearfcn_module.frequency(ors_version['earfcn']) }} MHz
band = {{ xearfcn_module.band(ors_version['earfcn'])[0]["band"] }}
earfcn = {{ ors_version['earfcn'] }}
{%- elif enb_mode == 'gnb' %}
current-frequency = {{ xnrarfcn_module.frequency(ors_version['current-nr-arfcn']) }} MHz
current-nr-band = {{ ors_version['current-nr-band'] }}
current-nr-arfcn = {{ ors_version['current-nr-arfcn'] }}
frequency = {{ xnrarfcn_module.frequency(ors_version['nr-arfcn']) }} MHz
nr-band = {{ ors_version['nr-band'] }}
nr-arfcn = {{ ors_version['nr-arfcn'] }}
{%- if slapparameter_dict.get('ssb_nr_arfcn', False) %}
current-ssb-nr-arfcn = {{ slapparameter_dict['ssb_nr_arfcn'] }}
ssb-nr-arfcn = {{ slapparameter_dict['ssb_nr_arfcn'] }}
{%- else %}
{%- set ssb_nr_arfcn, max_ssb_scs_khz = xnrarfcn_module.dl2ssb(ors_version['current-nr-arfcn'], ors_version['current-nr-band']) %}
current-ssb-nr-arfcn = {{ ssb_nr_arfcn | tojson }}
{%- set ssb_nr_arfcn, max_ssb_scs_khz = xnrarfcn_module.dl2ssb(ors_version['nr-arfcn'], ors_version['nr-band']) %}
ssb-nr-arfcn = {{ ssb_nr_arfcn | tojson }}
{%- endif %}
{%- endif %}
......@@ -264,9 +264,9 @@ init =
<= macro.promise
promise = check_frequency_outofbounds
{%- if enb_mode == 'enb' %}
config-frequency = {{ xearfcn_module.frequency(ors_version['current-earfcn']) }}
config-frequency = {{ xearfcn_module.frequency(ors_version['earfcn']) }}
{%- elif enb_mode == 'gnb' %}
config-frequency = {{ xnrarfcn_module.frequency(ors_version['current-nr-arfcn']) }}
config-frequency = {{ xnrarfcn_module.frequency(ors_version['nr-arfcn']) }}
{%- endif %}
config-range-rating = {{ ors_version['range'] }}
......
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