Skip to content

S
slapos
Commit e5ecb6c4 authored by Joanne Hugé's avatar Joanne Hugé
Browse files
Options

ors-amarisoft: add support for inter gNB Xn handover

parent cde4559a
Show whitespace changes
Inline Side-by-side
Showing with 265 additions and 21 deletions
software/ors-amarisoft/buildout.hash.cfg
View file @ e5ecb6c4
...@@ -72,7 +72,7 @@ md5sum = b377dac7f1fcf94fb9ce9ebed617f36a ...@@ -72,7 +72,7 @@ md5sum = b377dac7f1fcf94fb9ce9ebed617f36a
[gnb.jinja2.cfg] [gnb.jinja2.cfg]
filename = config/gnb.jinja2.cfg filename = config/gnb.jinja2.cfg
md5sum = a49375a59ddda6b8e6eab30e7af30dc6 md5sum = 2618a2af4eb5b21856e023dcd10c5c24
[ltelogs.jinja2.sh] [ltelogs.jinja2.sh]
filename = ltelogs.jinja2.sh filename = ltelogs.jinja2.sh
......
software/ors-amarisoft/changelog.rst
View file @ e5ecb6c4
...@@ -20,7 +20,7 @@ Version 1.0.316 (2023-04-14) ...@@ -20,7 +20,7 @@ Version 1.0.316 (2023-04-14)
- gnb - gnb
- core-network (replaces epc software type) - core-network (replaces epc software type)
Version 1.0.317 (2023-04-18) Version 1.0.318 (2023-04-20)
------------- -------------
* Add support for inter gNB NR handover * Add support for inter gNB XnAP and NGAP NR handover
software/ors-amarisoft/config/gnb.jinja2.cfg
View file @ e5ecb6c4
{% set dl_nr_arfcn = slapparameter_dict.get('dl_nr_arfcn', slap_configuration['configuration.default_dl_nr_arfcn']) %}
{% set band = slapparameter_dict.get('nr_band', slap_configuration['configuration.default_nr_band']) %}
{% set gnb_id_bits = slapparameter_dict.get('gnb_id_bits', 28) %}
#define FR2 0 // Values: 0 (FR1), 1 (FR2) #define FR2 0 // Values: 0 (FR1), 1 (FR2)
#define NR_TDD_CONFIG 2 // Values: FR1: 1, 2, 3, 4 (compatible with LTE TDD config 2) FR2: 10 #define NR_TDD_CONFIG 2 // Values: FR1: 1, 2, 3, 4 (compatible with LTE TDD config 2) FR2: 10
#define N_ANTENNA_DL {{ slapparameter_dict.get('n_antenna_dl', slap_configuration['configuration.default_n_antenna_dl']) }} // Values: 1 (SISO), 2 (MIMO 2x2), 4 (MIMO 4x4) #define N_ANTENNA_DL {{ slapparameter_dict.get('n_antenna_dl', slap_configuration['configuration.default_n_antenna_dl']) }} // Values: 1 (SISO), 2 (MIMO 2x2), 4 (MIMO 4x4)
...@@ -62,6 +58,14 @@ ...@@ -62,6 +58,14 @@
{% endif %} {% endif %}
], ],
{% if slapparameter_dict.get('xn_peers', '') %}
xn_peers: [
{%- for k in slapparameter_dict['xn_peers'] -%}
"{{ slapparameter_dict['xn_peers'][k]['xn_addr'] }}",
{%- endfor -%}
],
{% endif %}
{% if slapparameter_dict.get('amf_list', '') %} {% if slapparameter_dict.get('amf_list', '') %}
{% if slapparameter_dict.get('use_ipv4', False) %} {% if slapparameter_dict.get('use_ipv4', False) %}
gtp_addr: "{{ gtp_addr_v4 }}", gtp_addr: "{{ gtp_addr_v4 }}",
...@@ -72,7 +76,7 @@ ...@@ -72,7 +76,7 @@
gtp_addr: "127.0.1.1", gtp_addr: "127.0.1.1",
{% endif %} {% endif %}
gnb_id_bits: {{ gnb_id_bits }}, gnb_id_bits: {{ slapparameter_dict.get('gnb_id_bits', 28) }},
gnb_id: {{ slapparameter_dict.get('gnb_id', '0x12345') }}, gnb_id: {{ slapparameter_dict.get('gnb_id', '0x12345') }},
nr_support: true, nr_support: true,
...@@ -97,8 +101,8 @@ ...@@ -97,8 +101,8 @@
{ {
rf_port: 0, rf_port: 0,
cell_id: {{ slapparameter_dict.get('cell_id', '0x01') }}, cell_id: {{ slapparameter_dict.get('cell_id', '0x01') }},
band: {{ band }}, band: {{ slapparameter_dict.get('nr_band', slap_configuration['configuration.default_nr_band']) }},
dl_nr_arfcn: {{ dl_nr_arfcn }}, dl_nr_arfcn: {{ slapparameter_dict.get('dl_nr_arfcn', slap_configuration['configuration.default_dl_nr_arfcn']) }},
subcarrier_spacing: 30, subcarrier_spacing: 30,
ssb_pos_bitmap: "{{ slapparameter_dict.get('ssb_pos_bitmap', slap_configuration['configuration.default_nr_ssb_pos_bitmap']) }}", ssb_pos_bitmap: "{{ slapparameter_dict.get('ssb_pos_bitmap', slap_configuration['configuration.default_nr_ssb_pos_bitmap']) }}",
...@@ -111,14 +115,14 @@ ...@@ -111,14 +115,14 @@
, { , {
{%- endif %} {%- endif %}
rat: "nr", rat: "nr",
ssb_nr_arfcn: {{ dl_nr_arfcn }}, dl_nr_arfcn: {{ slapparameter_dict['ncell_list'][k].get('dl_nr_arfcn', '') }},
dl_nr_arfcn: {{ dl_nr_arfcn }}, ssb_nr_arfcn: {{ slapparameter_dict['ncell_list'][k].get('ssb_nr_arfcn', '') }},
ul_nr_arfcn: {{ dl_nr_arfcn }}, ul_nr_arfcn: {{ slapparameter_dict['ncell_list'][k].get('dl_nr_arfcn', '') }},
n_id_cell: 500, n_id_cell: {{ slapparameter_dict['ncell_list'][k].get('n_id_cell', '') }},
gnb_id_bits: {{ gnb_id_bits }}, gnb_id_bits: {{ slapparameter_dict['ncell_list'][k].get('gnb_id_bits', '') }},
nr_cell_id: {{ slapparameter_dict['ncell_list'][k].get('nr_cell_id', '') }}, nr_cell_id: {{ slapparameter_dict['ncell_list'][k].get('nr_cell_id', '') }},
tac: {{ slapparameter_dict['ncell_list'][k].get('tac', 1) }}, tac: {{ slapparameter_dict['ncell_list'][k].get('tac', 1) }},
band: {{ band }}, band: {{ slapparameter_dict['ncell_list'][k].get('nr_band', '') }},
ssb_subcarrier_spacing: 30, ssb_subcarrier_spacing: 30,
ssb_period: 20, ssb_period: 20,
ssb_offset: 0, ssb_offset: 0,
......
software/ors-amarisoft/instance-gnb-input-schema.json.jinja2
View file @ e5ecb6c4
...@@ -85,12 +85,42 @@ ...@@ -85,12 +85,42 @@
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"dl_nr_arfcn": {
"title": "DL NR ARFCN",
"description": "Downlink NR Absolute Radio Frequency Channel Number of the neighbour cell",
"type": "number",
"default": {{ default_dl_nr_arfcn }}
},
"ssb_nr_arfcn": {
"title": "SSB NR ARFCN",
"description": "SSB NR Absolute Radio Frequency Channel Number of the neighbour cell",
"type": "number",
"default": ""
},
"pci": {
"title": "Physical Cell ID",
"description": "Physical Cell ID of the neighbour cell",
"type": "number",
"default": 500
},
"nr_cell_id": { "nr_cell_id": {
"title": "NR Cell ID", "title": "NR Cell ID",
"description": "Concatenation of gnb_id and cell_id of the neighbour cell", "description": "Concatenation of gnb_id and cell_id of the neighbour cell",
"type": "string", "type": "string",
"default": "0x1234501" "default": "0x1234501"
}, },
"gnb_id_bits": {
"title": "gNB ID bits",
"description": "Number of bits for the gNodeB global identifier. (range 22 to 32)",
"type": "number",
"default": 28
},
"nr_band": {
"title": "NR band",
"description": "NR band number",
"type": "number",
"default": {{ default_nr_band }}
},
"tac": { "tac": {
"default": 100, "default": 100,
"title": "Tracking Area Code", "title": "Tracking Area Code",
...@@ -104,6 +134,24 @@ ...@@ -104,6 +134,24 @@
"type": "object", "type": "object",
"default": {} "default": {}
}, },
"xn_peers": {
"title": "XN Peers",
"description": "XN Peers",
"patternProperties": {
".*": {
"properties": {
"xn_addr": {
"title": "XN Address",
"description": "XN Address of the neighbour cell (gNB Address)",
"type": "string"
}
},
"type": "object"
}
},
"type": "object",
"default": {}
},
"gnb_id": { "gnb_id": {
"title": "gNB ID", "title": "gNB ID",
"description": "gNB ID", "description": "gNB ID",
...@@ -126,7 +174,7 @@ ...@@ -126,7 +174,7 @@
"title": "Physical Cell ID", "title": "Physical Cell ID",
"description": "Physical Cell ID", "description": "Physical Cell ID",
"type": "number", "type": "number",
"default": 1 "default": 500
}, },
"ssb_pos_bitmap": { "ssb_pos_bitmap": {
"title": "SSB Position Bitmap", "title": "SSB Position Bitmap",
......
software/ors-amarisoft/instance-tdd1900-gnb-input-schema.json
View file @ e5ecb6c4
...@@ -85,12 +85,42 @@ ...@@ -85,12 +85,42 @@
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"dl_nr_arfcn": {
"title": "DL NR ARFCN",
"description": "Downlink NR Absolute Radio Frequency Channel Number of the neighbour cell",
"type": "number",
"default": 378000
},
"ssb_nr_arfcn": {
"title": "SSB NR ARFCN",
"description": "SSB NR Absolute Radio Frequency Channel Number of the neighbour cell",
"type": "number",
"default": ""
},
"pci": {
"title": "Physical Cell ID",
"description": "Physical Cell ID of the neighbour cell",
"type": "number",
"default": 500
},
"nr_cell_id": { "nr_cell_id": {
"title": "NR Cell ID", "title": "NR Cell ID",
"description": "Concatenation of gnb_id and cell_id of the neighbour cell", "description": "Concatenation of gnb_id and cell_id of the neighbour cell",
"type": "string", "type": "string",
"default": "0x1234501" "default": "0x1234501"
}, },
"gnb_id_bits": {
"title": "gNB ID bits",
"description": "Number of bits for the gNodeB global identifier. (range 22 to 32)",
"type": "number",
"default": 28
},
"nr_band": {
"title": "NR band",
"description": "NR band number",
"type": "number",
"default": 39
},
"tac": { "tac": {
"default": 100, "default": 100,
"title": "Tracking Area Code", "title": "Tracking Area Code",
...@@ -104,6 +134,24 @@ ...@@ -104,6 +134,24 @@
"type": "object", "type": "object",
"default": {} "default": {}
}, },
"xn_peers": {
"title": "XN Peers",
"description": "XN Peers",
"patternProperties": {
".*": {
"properties": {
"xn_addr": {
"title": "XN Address",
"description": "XN Address of the neighbour cell (gNB Address)",
"type": "string"
}
},
"type": "object"
}
},
"type": "object",
"default": {}
},
"gnb_id": { "gnb_id": {
"title": "gNB ID", "title": "gNB ID",
"description": "gNB ID", "description": "gNB ID",
...@@ -126,7 +174,7 @@ ...@@ -126,7 +174,7 @@
"title": "Physical Cell ID", "title": "Physical Cell ID",
"description": "Physical Cell ID", "description": "Physical Cell ID",
"type": "number", "type": "number",
"default": 1 "default": 500
}, },
"ssb_pos_bitmap": { "ssb_pos_bitmap": {
"title": "SSB Position Bitmap", "title": "SSB Position Bitmap",
......
software/ors-amarisoft/instance-tdd2600-gnb-input-schema.json
View file @ e5ecb6c4
...@@ -85,12 +85,42 @@ ...@@ -85,12 +85,42 @@
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"dl_nr_arfcn": {
"title": "DL NR ARFCN",
"description": "Downlink NR Absolute Radio Frequency Channel Number of the neighbour cell",
"type": "number",
"default": 520000
},
"ssb_nr_arfcn": {
"title": "SSB NR ARFCN",
"description": "SSB NR Absolute Radio Frequency Channel Number of the neighbour cell",
"type": "number",
"default": ""
},
"pci": {
"title": "Physical Cell ID",
"description": "Physical Cell ID of the neighbour cell",
"type": "number",
"default": 500
},
"nr_cell_id": { "nr_cell_id": {
"title": "NR Cell ID", "title": "NR Cell ID",
"description": "Concatenation of gnb_id and cell_id of the neighbour cell", "description": "Concatenation of gnb_id and cell_id of the neighbour cell",
"type": "string", "type": "string",
"default": "0x1234501" "default": "0x1234501"
}, },
"gnb_id_bits": {
"title": "gNB ID bits",
"description": "Number of bits for the gNodeB global identifier. (range 22 to 32)",
"type": "number",
"default": 28
},
"nr_band": {
"title": "NR band",
"description": "NR band number",
"type": "number",
"default": 38
},
"tac": { "tac": {
"default": 100, "default": 100,
"title": "Tracking Area Code", "title": "Tracking Area Code",
...@@ -104,6 +134,24 @@ ...@@ -104,6 +134,24 @@
"type": "object", "type": "object",
"default": {} "default": {}
}, },
"xn_peers": {
"title": "XN Peers",
"description": "XN Peers",
"patternProperties": {
".*": {
"properties": {
"xn_addr": {
"title": "XN Address",
"description": "XN Address of the neighbour cell (gNB Address)",
"type": "string"
}
},
"type": "object"
}
},
"type": "object",
"default": {}
},
"gnb_id": { "gnb_id": {
"title": "gNB ID", "title": "gNB ID",
"description": "gNB ID", "description": "gNB ID",
...@@ -126,7 +174,7 @@ ...@@ -126,7 +174,7 @@
"title": "Physical Cell ID", "title": "Physical Cell ID",
"description": "Physical Cell ID", "description": "Physical Cell ID",
"type": "number", "type": "number",
"default": 1 "default": 500
}, },
"ssb_pos_bitmap": { "ssb_pos_bitmap": {
"title": "SSB Position Bitmap", "title": "SSB Position Bitmap",
......
software/ors-amarisoft/instance-tdd3500-gnb-input-schema.json
View file @ e5ecb6c4
...@@ -85,12 +85,42 @@ ...@@ -85,12 +85,42 @@
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"dl_nr_arfcn": {
"title": "DL NR ARFCN",
"description": "Downlink NR Absolute Radio Frequency Channel Number of the neighbour cell",
"type": "number",
"default": 632628
},
"ssb_nr_arfcn": {
"title": "SSB NR ARFCN",
"description": "SSB NR Absolute Radio Frequency Channel Number of the neighbour cell",
"type": "number",
"default": ""
},
"pci": {
"title": "Physical Cell ID",
"description": "Physical Cell ID of the neighbour cell",
"type": "number",
"default": 500
},
"nr_cell_id": { "nr_cell_id": {
"title": "NR Cell ID", "title": "NR Cell ID",
"description": "Concatenation of gnb_id and cell_id of the neighbour cell", "description": "Concatenation of gnb_id and cell_id of the neighbour cell",
"type": "string", "type": "string",
"default": "0x1234501" "default": "0x1234501"
}, },
"gnb_id_bits": {
"title": "gNB ID bits",
"description": "Number of bits for the gNodeB global identifier. (range 22 to 32)",
"type": "number",
"default": 28
},
"nr_band": {
"title": "NR band",
"description": "NR band number",
"type": "number",
"default": 78
},
"tac": { "tac": {
"default": 100, "default": 100,
"title": "Tracking Area Code", "title": "Tracking Area Code",
...@@ -104,6 +134,24 @@ ...@@ -104,6 +134,24 @@
"type": "object", "type": "object",
"default": {} "default": {}
}, },
"xn_peers": {
"title": "XN Peers",
"description": "XN Peers",
"patternProperties": {
".*": {
"properties": {
"xn_addr": {
"title": "XN Address",
"description": "XN Address of the neighbour cell (gNB Address)",
"type": "string"
}
},
"type": "object"
}
},
"type": "object",
"default": {}
},
"gnb_id": { "gnb_id": {
"title": "gNB ID", "title": "gNB ID",
"description": "gNB ID", "description": "gNB ID",
...@@ -126,7 +174,7 @@ ...@@ -126,7 +174,7 @@
"title": "Physical Cell ID", "title": "Physical Cell ID",
"description": "Physical Cell ID", "description": "Physical Cell ID",
"type": "number", "type": "number",
"default": 1 "default": 500
}, },
"ssb_pos_bitmap": { "ssb_pos_bitmap": {
"title": "SSB Position Bitmap", "title": "SSB Position Bitmap",
......
software/ors-amarisoft/instance-tdd3700-gnb-input-schema.json
View file @ e5ecb6c4
...@@ -85,12 +85,42 @@ ...@@ -85,12 +85,42 @@
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"dl_nr_arfcn": {
"title": "DL NR ARFCN",
"description": "Downlink NR Absolute Radio Frequency Channel Number of the neighbour cell",
"type": "number",
"default": 646666
},
"ssb_nr_arfcn": {
"title": "SSB NR ARFCN",
"description": "SSB NR Absolute Radio Frequency Channel Number of the neighbour cell",
"type": "number",
"default": ""
},
"pci": {
"title": "Physical Cell ID",
"description": "Physical Cell ID of the neighbour cell",
"type": "number",
"default": 500
},
"nr_cell_id": { "nr_cell_id": {
"title": "NR Cell ID", "title": "NR Cell ID",
"description": "Concatenation of gnb_id and cell_id of the neighbour cell", "description": "Concatenation of gnb_id and cell_id of the neighbour cell",
"type": "string", "type": "string",
"default": "0x1234501" "default": "0x1234501"
}, },
"gnb_id_bits": {
"title": "gNB ID bits",
"description": "Number of bits for the gNodeB global identifier. (range 22 to 32)",
"type": "number",
"default": 28
},
"nr_band": {
"title": "NR band",
"description": "NR band number",
"type": "number",
"default": 78
},
"tac": { "tac": {
"default": 100, "default": 100,
"title": "Tracking Area Code", "title": "Tracking Area Code",
...@@ -104,6 +134,24 @@ ...@@ -104,6 +134,24 @@
"type": "object", "type": "object",
"default": {} "default": {}
}, },
"xn_peers": {
"title": "XN Peers",
"description": "XN Peers",
"patternProperties": {
".*": {
"properties": {
"xn_addr": {
"title": "XN Address",
"description": "XN Address of the neighbour cell (gNB Address)",
"type": "string"
}
},
"type": "object"
}
},
"type": "object",
"default": {}
},
"gnb_id": { "gnb_id": {
"title": "gNB ID", "title": "gNB ID",
"description": "gNB ID", "description": "gNB ID",
...@@ -126,7 +174,7 @@ ...@@ -126,7 +174,7 @@
"title": "Physical Cell ID", "title": "Physical Cell ID",
"description": "Physical Cell ID", "description": "Physical Cell ID",
"type": "number", "type": "number",
"default": 1 "default": 500
}, },
"ssb_pos_bitmap": { "ssb_pos_bitmap": {
"title": "SSB Position Bitmap", "title": "SSB Position Bitmap",
......
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