Commit 4fbd2cb9 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 81d78b86
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
"e_cell_id", "e_cell_id",
"pci", "pci",
"dl_earfcn", "dl_earfcn",
"bandwidth",
"tac" "tac"
], ],
...@@ -25,6 +26,7 @@ ...@@ -25,6 +26,7 @@
}, },
"pci": { "$ref": "../../../cell/lte/input-schema.json#/properties/pci" }, "pci": { "$ref": "../../../cell/lte/input-schema.json#/properties/pci" },
"dl_earfcn": { "$ref": "../../../cell/lte/input-schema.json#/properties/dl_earfcn" }, "dl_earfcn": { "$ref": "../../../cell/lte/input-schema.json#/properties/dl_earfcn" },
"bandwidth": { "$ref": "../../../cell/lte/input-schema.json#/properties/bandwidth" },
"tac": { "$ref": "../../../cell/lte/input-schema.json#/properties/tac" } "tac": { "$ref": "../../../cell/lte/input-schema.json#/properties/tac" }
} }
} }
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
n_id_cell: {{ cell2.pci }}, n_id_cell: {{ cell2.pci }},
dl_earfcn: {{ cell2.dl_earfcn }}, dl_earfcn: {{ cell2.dl_earfcn }},
tac: {{ cell2.tac }}, tac: {{ cell2.tac }},
allowed_meas_bandwidth: {{ jlte_n_rb_dl(cell2.bandwidth) }},
{%- elif cell2.cell_type == 'nr' %} {%- elif cell2.cell_type == 'nr' %}
rat: "nr", rat: "nr",
cell_id: {{ cell2.cell_id }}, // -> {{ cell2_ref }} cell_id: {{ cell2.cell_id }}, // -> {{ cell2_ref }}
...@@ -59,6 +60,7 @@ ...@@ -59,6 +60,7 @@
n_id_cell: {{ ncell.pci }}, n_id_cell: {{ ncell.pci }},
dl_earfcn: {{ ncell.dl_earfcn }}, dl_earfcn: {{ ncell.dl_earfcn }},
tac: {{ ncell.tac }}, tac: {{ ncell.tac }},
allowed_meas_bandwidth: {{ jlte_n_rb_dl(ncell.bandwidth) }},
{%- elif ncell.peer_cell_type == 'nr' %} {%- elif ncell.peer_cell_type == 'nr' %}
rat: "nr", rat: "nr",
nr_cell_id: {{ ncell.nr_cell_id }}, // -> {{ peercell_ref }} nr_cell_id: {{ ncell.nr_cell_id }}, // -> {{ peercell_ref }}
...@@ -81,6 +83,17 @@ ...@@ -81,6 +83,17 @@
], ],
{%- endmacro %} {%- endmacro %}
{#- jlte_n_rb_dl returns n_rb_dl for an LTE bandwidth. #}
{%- macro jlte_n_rb_dl(bandwidth) %}
{%- set _ = {'1.4 MHz': 6,
'3 MHz': 15,
'5 MHz': 25,
'10 MHz': 50,
'15 MHz': 75,
'20 MHz': 100} %}
{{- _[bandwidth] | tojson }}
{%- endmacro -%}
{#- start of the config -#} {#- start of the config -#}
{ {
...@@ -227,12 +240,7 @@ ...@@ -227,12 +240,7 @@
sp_config: 7, sp_config: 7,
{%- endif %} {%- endif %}
{%- set n_rb_dl = {'1.4 MHz': 6, {%- set n_rb_dl = J(jlte_n_rb_dl(cell.bandwidth)) %}
'3 MHz': 15,
'5 MHz': 25,
'10 MHz': 50,
'15 MHz': 75,
'20 MHz': 100} [cell.bandwidth] %}
n_rb_dl: {{ n_rb_dl }}, n_rb_dl: {{ n_rb_dl }},
si_coderate: {{ 0.30 if n_rb_dl == 6 else 0.20 }}, si_coderate: {{ 0.30 if n_rb_dl == 6 else 0.20 }},
......
...@@ -76,6 +76,7 @@ ...@@ -76,6 +76,7 @@
n_id_cell: 35, n_id_cell: 35,
dl_earfcn: 700, dl_earfcn: 700,
tac: 123, tac: 123,
allowed_meas_bandwidth: 50,
}, },
{ {
rat: "nr", rat: "nr",
...@@ -272,6 +273,7 @@ ...@@ -272,6 +273,7 @@
n_id_cell: 1, n_id_cell: 1,
dl_earfcn: 38050, dl_earfcn: 38050,
tac: 0x0001, tac: 0x0001,
allowed_meas_bandwidth: 25,
}, },
// Inter-ENB HO // Inter-ENB HO
...@@ -281,6 +283,7 @@ ...@@ -281,6 +283,7 @@
n_id_cell: 35, n_id_cell: 35,
dl_earfcn: 700, dl_earfcn: 700,
tac: 123, tac: 123,
allowed_meas_bandwidth: 50,
}, },
{ {
rat: "nr", rat: "nr",
......
...@@ -342,6 +342,7 @@ def do_enb(): ...@@ -342,6 +342,7 @@ def do_enb():
'e_cell_id': '0x12345', 'e_cell_id': '0x12345',
'pci': 35, 'pci': 35,
'dl_earfcn': 700, 'dl_earfcn': 700,
'bandwidth': '10 MHz',
'tac': 123, 'tac': 123,
}) })
ienb.ishared('PEER2', { ienb.ishared('PEER2', {
......
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