Skip to content

S
slapos
Commit 548f1493 authored by Kirill Smelkov's avatar Kirill Smelkov
Browse files
Options

.

parent 6c4964f2
Hide whitespace changes
Inline Side-by-side
Showing with 167 additions and 15 deletions
software/ors-amarisoft/config/enb.cfg
View file @ 548f1493
......@@ -49,17 +49,48 @@
n_id_cell: 1,
dl_earfcn: 38050,
root_sequence_index: 204,
// Handover
ncell_list: [
// Intra-ENB HO
{
rat: eutra,
n_id_cell: 2,
dl_earfcn: 38100,
cell_id: 0x1A2D00x02, // -> CELL1_b
tac: 0x0001,
},
{
rat: eutra,
n_id_cell: 21,
dl_earfcn: 3350,
cell_id: 0x1A2D00x21, // -> CELL2_a
tac: 0x0001,
},
{
rat: eutra,
n_id_cell: 22,
dl_earfcn: 3410,
cell_id: 0x1A2D00x22, // -> CELL2_b
tac: 0x0001,
},
// Inter-ENB HO
],
// Carrier Aggregation // XXX + CA LTE-NR
scell_list: [
{
cell_id: 0x02, // CELL1_b
cell_id: 0x02, // + CELL1_b
cross_carrier_scheduling: false,
},
{
cell_id: 0x21, // CELL2_a
cell_id: 0x21, // + CELL2_a
cross_carrier_scheduling: false,
},
{
cell_id: 0x22, // CELL2_b
cell_id: 0x22, // + CELL2_b
cross_carrier_scheduling: false,
},
],
......@@ -609,17 +640,48 @@
n_id_cell: 2,
dl_earfcn: 38100,
root_sequence_index: 205,
// Handover
ncell_list: [
// Intra-ENB HO
{
rat: eutra,
n_id_cell: 1,
dl_earfcn: 38050,
cell_id: 0x1A2D00x01, // -> CELL1_a
tac: 0x0001,
},
{
rat: eutra,
n_id_cell: 21,
dl_earfcn: 3350,
cell_id: 0x1A2D00x21, // -> CELL2_a
tac: 0x0001,
},
{
rat: eutra,
n_id_cell: 22,
dl_earfcn: 3410,
cell_id: 0x1A2D00x22, // -> CELL2_b
tac: 0x0001,
},
// Inter-ENB HO
],
// Carrier Aggregation // XXX + CA LTE-NR
scell_list: [
{
cell_id: 0x01, // CELL1_a
cell_id: 0x01, // + CELL1_a
cross_carrier_scheduling: false,
},
{
cell_id: 0x21, // CELL2_a
cell_id: 0x21, // + CELL2_a
cross_carrier_scheduling: false,
},
{
cell_id: 0x22, // CELL2_b
cell_id: 0x22, // + CELL2_b
cross_carrier_scheduling: false,
},
],
......@@ -1169,17 +1231,48 @@
n_id_cell: 21,
dl_earfcn: 3350,
root_sequence_index: 206,
// Handover
ncell_list: [
// Intra-ENB HO
{
rat: eutra,
n_id_cell: 1,
dl_earfcn: 38050,
cell_id: 0x1A2D00x01, // -> CELL1_a
tac: 0x0001,
},
{
rat: eutra,
n_id_cell: 2,
dl_earfcn: 38100,
cell_id: 0x1A2D00x02, // -> CELL1_b
tac: 0x0001,
},
{
rat: eutra,
n_id_cell: 22,
dl_earfcn: 3410,
cell_id: 0x1A2D00x22, // -> CELL2_b
tac: 0x0001,
},
// Inter-ENB HO
],
// Carrier Aggregation // XXX + CA LTE-NR
scell_list: [
{
cell_id: 0x01, // CELL1_a
cell_id: 0x01, // + CELL1_a
cross_carrier_scheduling: false,
},
{
cell_id: 0x02, // CELL1_b
cell_id: 0x02, // + CELL1_b
cross_carrier_scheduling: false,
},
{
cell_id: 0x22, // CELL2_b
cell_id: 0x22, // + CELL2_b
cross_carrier_scheduling: false,
},
],
......@@ -1725,17 +1818,48 @@
n_id_cell: 22,
dl_earfcn: 3410,
root_sequence_index: 207,
// Handover
ncell_list: [
// Intra-ENB HO
{
rat: eutra,
n_id_cell: 1,
dl_earfcn: 38050,
cell_id: 0x1A2D00x01, // -> CELL1_a
tac: 0x0001,
},
{
rat: eutra,
n_id_cell: 2,
dl_earfcn: 38100,
cell_id: 0x1A2D00x02, // -> CELL1_b
tac: 0x0001,
},
{
rat: eutra,
n_id_cell: 21,
dl_earfcn: 3350,
cell_id: 0x1A2D00x21, // -> CELL2_a
tac: 0x0001,
},
// Inter-ENB HO
],
// Carrier Aggregation // XXX + CA LTE-NR
scell_list: [
{
cell_id: 0x01, // CELL1_a
cell_id: 0x01, // + CELL1_a
cross_carrier_scheduling: false,
},
{
cell_id: 0x02, // CELL1_b
cell_id: 0x02, // + CELL1_b
cross_carrier_scheduling: false,
},
{
cell_id: 0x21, // CELL2_a
cell_id: 0x21, // + CELL2_a
cross_carrier_scheduling: false,
},
],
......
software/ors-amarisoft/config/enb.jinja2.cfg
View file @ 548f1493
......@@ -5,6 +5,7 @@
{#- defaults provide default values for parameters.
it should be kept in sync with "default" in json schemas #}
{%- set defaults = {
'enb_id': '0x1A2D0',
'cell': {
'pci': 1,
'tac': "0x0001",
......@@ -19,6 +20,11 @@
}
%}
{#- cfg returns value of configuration parameter name #}
{%- macro cfg(name) %}
{{- slapparameter_dict.get(name, defaults.get(name)) }}
{%- endmacro %}
{%- import 'lte.jinja2' as lte -%}
{#- J is used around macro calls to retrieve returned objects.
......@@ -262,7 +268,7 @@
gtp_addr: "127.0.1.1",
{% endif %}
enb_id: {{ slapparameter_dict.get('enb_id', '0x1A2D0') }},
enb_id: {{ cfg('enb_id') }},
// LTE cells
cell_list: [
......@@ -286,13 +292,35 @@
slapparameter_dict.get('root_sequence_index',
204 + i)) }},
{#- CA in between all LTE cells #}
// Handover
ncell_list: [
// Intra-ENB HO
{%- for cell2_ref, icell2 in icell_dict|dictsort %}
{%- set cell2 = icell2['_'] %}
{%- if cell2_ref != cell_ref %} {#- NOTE: HO to both LTE and NR #}
{
rat: {{ {'lte':'eutra', 'nr':'nr'}.get(cell2['cell_type']) }},
n_id_cell: {{ cell2['pci'] }},
dl_earfcn: {{ cell2['dl_earfcn'] }},
cell_id: {{ cfg('enb_id')}}{{ cell2['cell_id'] }}, // -> {{ J(jref_of_shared(icell2)) }}
tac: {{ cell2['tac'] }},
{#- XXX handle nr properly (tac_5gc, gnb_id in cell_id) #}
},
{%- endif %}
{%- endfor %}
// Inter-ENB HO
],
// Carrier Aggregation
{#- CA in between all LTE cells #} // XXX + CA LTE-NR
scell_list: [
{%- for cell2_ref, icell2 in icell_dict|dictsort %}
{%- set cell2 = icell2['_'] %}
{%- if cell2_ref != cell_ref and cell2['cell_type'] == 'lte' %}
{
cell_id: {{ cell2['cell_id'] }}, // {{ J(jref_of_shared(icell2)) }}
cell_id: {{ cell2['cell_id'] }}, // + {{ J(jref_of_shared(icell2)) }}
cross_carrier_scheduling: false,
},
{%- 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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7