Skip to content

S
slapos
Commit 8d54648e authored by Kirill Smelkov's avatar Kirill Smelkov
Browse files
Options

.

parent 548f1493
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 42 deletions
software/ors-amarisoft/config/enb.cfg
View file @ 8d54648e
......@@ -23,17 +23,18 @@
com_addr: "127.0.1.2:9001",
mme_list: [
{
mme_addr: "127.0.1.100",
},
],
gtp_addr: "127.0.1.1",
enb_id: 0x1A2D0,
gnb_id: 0x12345,
gnb_id_bits: 28,
en_dc_support: true,
// LTE cells
cell_list: [
......@@ -54,24 +55,24 @@
ncell_list: [
// Intra-ENB HO
{
rat: eutra,
rat: "eutra",
cell_id: 0x1A2D00x02, // -> CELL1_b
n_id_cell: 2,
dl_earfcn: 38100,
cell_id: 0x1A2D00x02, // -> CELL1_b
tac: 0x0001,
},
{
rat: eutra,
rat: "eutra",
cell_id: 0x1A2D00x21, // -> CELL2_a
n_id_cell: 21,
dl_earfcn: 3350,
cell_id: 0x1A2D00x21, // -> CELL2_a
tac: 0x0001,
},
{
rat: eutra,
rat: "eutra",
cell_id: 0x1A2D00x22, // -> CELL2_b
n_id_cell: 22,
dl_earfcn: 3410,
cell_id: 0x1A2D00x22, // -> CELL2_b
tac: 0x0001,
},
......@@ -645,24 +646,24 @@
ncell_list: [
// Intra-ENB HO
{
rat: eutra,
rat: "eutra",
cell_id: 0x1A2D00x01, // -> CELL1_a
n_id_cell: 1,
dl_earfcn: 38050,
cell_id: 0x1A2D00x01, // -> CELL1_a
tac: 0x0001,
},
{
rat: eutra,
rat: "eutra",
cell_id: 0x1A2D00x21, // -> CELL2_a
n_id_cell: 21,
dl_earfcn: 3350,
cell_id: 0x1A2D00x21, // -> CELL2_a
tac: 0x0001,
},
{
rat: eutra,
rat: "eutra",
cell_id: 0x1A2D00x22, // -> CELL2_b
n_id_cell: 22,
dl_earfcn: 3410,
cell_id: 0x1A2D00x22, // -> CELL2_b
tac: 0x0001,
},
......@@ -1236,24 +1237,24 @@
ncell_list: [
// Intra-ENB HO
{
rat: eutra,
rat: "eutra",
cell_id: 0x1A2D00x01, // -> CELL1_a
n_id_cell: 1,
dl_earfcn: 38050,
cell_id: 0x1A2D00x01, // -> CELL1_a
tac: 0x0001,
},
{
rat: eutra,
rat: "eutra",
cell_id: 0x1A2D00x02, // -> CELL1_b
n_id_cell: 2,
dl_earfcn: 38100,
cell_id: 0x1A2D00x02, // -> CELL1_b
tac: 0x0001,
},
{
rat: eutra,
rat: "eutra",
cell_id: 0x1A2D00x22, // -> CELL2_b
n_id_cell: 22,
dl_earfcn: 3410,
cell_id: 0x1A2D00x22, // -> CELL2_b
tac: 0x0001,
},
......@@ -1823,24 +1824,24 @@
ncell_list: [
// Intra-ENB HO
{
rat: eutra,
rat: "eutra",
cell_id: 0x1A2D00x01, // -> CELL1_a
n_id_cell: 1,
dl_earfcn: 38050,
cell_id: 0x1A2D00x01, // -> CELL1_a
tac: 0x0001,
},
{
rat: eutra,
rat: "eutra",
cell_id: 0x1A2D00x02, // -> CELL1_b
n_id_cell: 2,
dl_earfcn: 38100,
cell_id: 0x1A2D00x02, // -> CELL1_b
tac: 0x0001,
},
{
rat: eutra,
rat: "eutra",
cell_id: 0x1A2D00x21, // -> CELL2_a
n_id_cell: 21,
dl_earfcn: 3350,
cell_id: 0x1A2D00x21, // -> CELL2_a
tac: 0x0001,
},
......
software/ors-amarisoft/config/enb.jinja2.cfg
View file @ 8d54648e
......@@ -6,6 +6,9 @@
it should be kept in sync with "default" in json schemas #}
{%- set defaults = {
'enb_id': '0x1A2D0',
'gnb_id': '0x12345',
'gnb_id_bits': 28,
'cell': {
'pci': 1,
'tac': "0x0001",
......@@ -134,6 +137,8 @@
{#- do print('\n>>> iru_dict:'), pprint(iru_dict) #}
{#- do print('\n>>> icell_dict:'), pprint(icell_dict) #}
{#- XXX verify cell_type = lte|nr #}
{#- verify that there is no dangling cell->ru references #}
{#- XXX also verify that there is no dangling cell -> cell refs in ruincell_ref #}
{%- for _, icell in icell_dict|dictsort %}
......@@ -242,21 +247,11 @@
{%- endif %}
mme_list: [
{% if slapparameter_dict.get('mme_list', '') %}
{%- for i, k in enumerate(slapparameter_dict['mme_list']) %}
{%- if i == 0 %}
{
{%- else -%}
, {
{%- endif %}
mme_addr: "{{ slapparameter_dict['mme_list'][k]['mme_addr'] }}",
}
{%- endfor -%}
{% else %}
{%- for _, mme in slapparameter_dict.get('mme_list', {'1':{'mme_addr': '127.0.1.100'}}) | dictsort %}
{
mme_addr: "127.0.1.100",
mme_addr: "{{ mme['mme_addr'] }}",
},
{% endif %}
{%- endfor %}
],
{% if slapparameter_dict.get('mme_list', '') %}
{% if slapparameter_dict.get('use_ipv4', False) %}
......@@ -269,6 +264,9 @@
{% endif %}
enb_id: {{ cfg('enb_id') }},
gnb_id: {{ cfg('gnb_id') }},
gnb_id_bits: {{ cfg('gnb_id_bits') }},
en_dc_support: true,
// LTE cells
cell_list: [
......@@ -299,17 +297,37 @@
{%- set cell2 = icell2['_'] %}
{%- if cell2_ref != cell_ref %} {#- NOTE: HO to both LTE and NR #}
{
rat: {{ {'lte':'eutra', 'nr':'nr'}.get(cell2['cell_type']) }},
{%- if cell2['cell_type'] == 'lte' %}
rat: "eutra",
cell_id: {{ cfg('enb_id')}}{{ cell2['cell_id'] }}, // -> {{ J(jref_of_shared(icell2)) }}
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) #}
{%- elif cell2['cell_type'] == 'nr' %}
rat: "nr",
nr_cell_id: {{ cfg('gnb_id')}}{{ cell2['cell_id'] }}, // -> {{ J(jref_of_shared(icell2)) }}
n_id_cell: {{ cell2['pci'] }},
gnb_id_bits
dl_nr_arfcn
ssb_nr_arfcn
ul_nr_arfcn
tac
band
ssb_subcarrier_spacing: 30,
ssb_period: 20,
ssb_offset: 0,
ssb_duration: 1,
{%- else %}
{%- do bug('unreachable') %}
{%- endif %}
},
{%- endif %}
{%- endfor %}
// Inter-ENB HO
{#- TODO: add info about neighbours as shared instances - one instance per neigh *ENB*.
then query SlapOS Master about cells configured on that neigh ENB and
put them as neighbours here #}
],
......
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