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

.

parent 1996c3e5
......@@ -104,7 +104,9 @@
{%- endfor %}
{#- icell_dict keeps cell shared instances: reference -> icell
{#- load_iru_and_icell initializes RU and cell registries.
icell_dict keeps cell shared instances: reference -> icell
iru_dict keeps RU shared instances + RU whose definition is embedded into a cell: reference -> iRU
in the kept instances _ is automatically json-decoded
......
......@@ -47,7 +47,7 @@
n_antenna_ul: {{ ru.n_antenna_ul }},
dl_earfcn: {{ cell.dl_earfcn }},
bandwidth: {{ lte.cell_n_rb_dl(cell) }},
bandwidth: {{ cell.bandwidth.removesuffix(' MHz') }},
global_timing_advance: -1,
},
......@@ -102,7 +102,8 @@
K: "{{ ue.k }}",
rue_addr: "{{ ue.rue_addr }}",
{%- if ue.ue_type == 'lte' %}
ue_category: 12,
as_release: 13,
ue_category: 13,
{%- elif ue.ue_type == 'nr' %}
as_release: 15,
ue_category: "nr",
......
{#- XXX need to be already loaded {%- import 'amari_slap.jinja2' as lte with context %} #}
{%- do slaplte.load_iru_and_icell(kind=icell_kind) %}
{%- set icell_dict = {} %}
{%- set iru_dict = {} %}
{%- do slaplte.load_iru_and_icell(iru_dict, icell_dict, kind=icell_kind) %}
......@@ -209,12 +209,68 @@ def iRU3_SDR1_fLTE2(ienb):
}
})
def iRU2_LOPCOMM_fLTE2(ienb):
# supports: 2110 - 2170 MHz
RU_0002 = {
'ru_type': 'lopcomm',
'ru_link_type': 'cpri',
# 'mac_addr': 'XXX',
'cpri_link': {
'sdr_dev': 0,
'sfp_port': 0,
'mult': 8,
'mapping': 'hw',
'rx_delay': 25.11,
'tx_delay': 14.71,
'tx_dbm': 63
},
'n_antenna_dl': 1,
'n_antenna_ul': 1,
'tx_gain': 0,
'rx_gain': 0,
}
# supports: 2110 - 2170 MHz
RU_0004 = copy.deepcopy(RU_0002)
# RU_0004['mac_addr'] = 'YYY'
RU_0004['cpri_link']['sfp_port'] = 1
if 1:
ienb.ishared('Radio Unit 2a', '_RU_0002', RU_0002)
ienb.ishared('Cell 2', '_CELL2', {
'cell_type': 'lte',
'rf_mode': 'fdd',
'bandwidth': '20 MHz',
'dl_earfcn': 100, # 2120 MHz @ B1
'pci': 21,
'cell_id': '0x21',
'ru': {
'ru_type': 'ru_ref',
'ru_ref': 'RU_0002'
}
})
if 1:
ienb.ishared('Radio Unit 2b', '_RU_0004', RU_0004)
ienb.ishared('Cell 4', '_CELL4', {
'cell_type': 'lte',
'rf_mode': 'fdd',
'bandwidth': '20 MHz',
'dl_earfcn': 500, # 2160 MHz @ B1
'pci': 22,
'cell_id': '0x22',
'ru': {
'ru_type': 'ru_ref',
'ru_ref': 'RU_0004'
}
})
def do_enb():
ienb = Instance('enb')
iRU1_SDR_tLTE2_tNR(ienb)
#iRU2_LOPCOMM_fLTE_fNR(ienb)
#iRU3_SDR1_fLTE2(ienb)
#iRU2_LOPCOMM_fLTE2(ienb)
jshared_instance_list = json.dumps(ienb.shared_instance_list)
json_params = """{
......
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