Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xavier Thompson
slapos
Commits
06c20f8f
Commit
06c20f8f
authored
Apr 17, 2023
by
Joanne Hugé
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ors-amarisoft: add support for NR inter gNB handover
parent
e7becb28
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
274 additions
and
25 deletions
+274
-25
software/ors-amarisoft/buildout.hash.cfg
software/ors-amarisoft/buildout.hash.cfg
+2
-2
software/ors-amarisoft/config/enb.jinja2.cfg
software/ors-amarisoft/config/enb.jinja2.cfg
+3
-0
software/ors-amarisoft/config/gnb.jinja2.cfg
software/ors-amarisoft/config/gnb.jinja2.cfg
+38
-7
software/ors-amarisoft/instance-enb-input-schema.json.jinja2
software/ors-amarisoft/instance-enb-input-schema.json.jinja2
+6
-0
software/ors-amarisoft/instance-gnb-input-schema.json.jinja2
software/ors-amarisoft/instance-gnb-input-schema.json.jinja2
+49
-12
software/ors-amarisoft/instance-tdd1900-enb-input-schema.json
...ware/ors-amarisoft/instance-tdd1900-enb-input-schema.json
+6
-0
software/ors-amarisoft/instance-tdd1900-gnb-input-schema.json
...ware/ors-amarisoft/instance-tdd1900-gnb-input-schema.json
+38
-1
software/ors-amarisoft/instance-tdd2600-enb-input-schema.json
...ware/ors-amarisoft/instance-tdd2600-enb-input-schema.json
+6
-0
software/ors-amarisoft/instance-tdd2600-gnb-input-schema.json
...ware/ors-amarisoft/instance-tdd2600-gnb-input-schema.json
+38
-1
software/ors-amarisoft/instance-tdd3500-enb-input-schema.json
...ware/ors-amarisoft/instance-tdd3500-enb-input-schema.json
+6
-0
software/ors-amarisoft/instance-tdd3500-gnb-input-schema.json
...ware/ors-amarisoft/instance-tdd3500-gnb-input-schema.json
+38
-1
software/ors-amarisoft/instance-tdd3700-enb-input-schema.json
...ware/ors-amarisoft/instance-tdd3700-enb-input-schema.json
+6
-0
software/ors-amarisoft/instance-tdd3700-gnb-input-schema.json
...ware/ors-amarisoft/instance-tdd3700-gnb-input-schema.json
+38
-1
No files found.
software/ors-amarisoft/buildout.hash.cfg
View file @
06c20f8f
...
@@ -64,7 +64,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
...
@@ -64,7 +64,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
[enb.jinja2.cfg]
[enb.jinja2.cfg]
filename = config/enb.jinja2.cfg
filename = config/enb.jinja2.cfg
md5sum =
0b2a37e6902fd5ad3d6b37e11eebec69
md5sum =
1333ef2400f2088221ed879f1b03e777
[sib23.asn]
[sib23.asn]
filename = config/sib23.asn
filename = config/sib23.asn
...
@@ -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 =
cbbbdeda9ddaaf5957d91ef31afe6051
md5sum =
f24666fb64bbfdb5f2e51756b37bb4a4
[ltelogs.jinja2.sh]
[ltelogs.jinja2.sh]
filename = ltelogs.jinja2.sh
filename = ltelogs.jinja2.sh
...
...
software/ors-amarisoft/config/enb.jinja2.cfg
View file @
06c20f8f
...
@@ -23,6 +23,9 @@
...
@@ -23,6 +23,9 @@
rf_driver: {
rf_driver: {
name: "sdr",
name: "sdr",
args: "dev0=/dev/sdr0",
args: "dev0=/dev/sdr0",
{% if slapparameter_dict.get('gps_sync', False) %}
sync: "gps",
{% endif %}
rx_antenna:"tx_rx",
rx_antenna:"tx_rx",
},
},
tx_gain: {{ slapparameter_dict.get('tx_gain', slap_configuration['configuration.default_lte_tx_gain']) }},
tx_gain: {{ slapparameter_dict.get('tx_gain', slap_configuration['configuration.default_lte_tx_gain']) }},
...
...
software/ors-amarisoft/config/gnb.jinja2.cfg
View file @
06c20f8f
{% 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)
...
@@ -29,10 +33,10 @@
...
@@ -29,10 +33,10 @@
{% else %}
{% else %}
rf_driver: {
rf_driver: {
name: "sdr",
name: "sdr",
args: "dev0=/dev/sdr0",
args: "dev0=/dev/sdr0",
{% if slapparameter_dict.get('gps_sync', False) %}
// sync: "gps",
sync: "gps",
{% endif %}
rx_antenna: "tx_rx",
rx_antenna: "tx_rx",
},
},
tx_gain: {{ slapparameter_dict.get('tx_gain', slap_configuration['configuration.default_nr_tx_gain']) }},
tx_gain: {{ slapparameter_dict.get('tx_gain', slap_configuration['configuration.default_nr_tx_gain']) }},
...
@@ -68,7 +72,7 @@
...
@@ -68,7 +72,7 @@
gtp_addr: "127.0.1.1",
gtp_addr: "127.0.1.1",
{% endif %}
{% endif %}
gnb_id_bits: {{
slapparameter_dict.get('gnb_id_bits', 28)
}},
gnb_id_bits: {{
gnb_id_bits
}},
gnb_id: {{ slapparameter_dict.get('gnb_id', '0x12345') }},
gnb_id: {{ slapparameter_dict.get('gnb_id', '0x12345') }},
nr_support: true,
nr_support: true,
...
@@ -92,11 +96,38 @@
...
@@ -92,11 +96,38 @@
nr_cell_list: [
nr_cell_list: [
{
{
rf_port: 0,
rf_port: 0,
cell_id:
0x01
,
cell_id:
{{ slapparameter_dict.get('cell_id', '0x01') }}
,
band: {{
slapparameter_dict.get('nr_band', slap_configuration['configuration.default_nr_band'])
}},
band: {{
band
}},
dl_nr_arfcn: {{
slapparameter_dict.get('dl_nr_arfcn', slap_configuration['configuration.default_dl_nr_arfcn'])
}},
dl_nr_arfcn: {{
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']) }}",
{%- if slapparameter_dict.get('ncell_list', '') %}
ncell_list: [
{%- for i, k in enumerate(slapparameter_dict['ncell_list']) %}
{%- if i == 0 -%}
{
{%- else -%}
, {
{%- endif %}
rat: "nr",
ssb_nr_arfcn: {{ dl_nr_arfcn }},
dl_nr_arfcn: {{ dl_nr_arfcn }},
ul_nr_arfcn: {{ dl_nr_arfcn }},
n_id_cell: 500,
gnb_id_bits: {{ gnb_id_bits }},
nr_cell_id: {{ slapparameter_dict['ncell_list'][k].get('nr_cell_id', '') }},
tac: {{ slapparameter_dict['ncell_list'][k].get('tac', 1) }},
band: {{ band }},
ssb_subcarrier_spacing: 30,
ssb_period: 20,
ssb_offset: 0,
ssb_duration: 1,
}
{%- endfor -%}
],
{% endif %}
},
},
],
],
...
...
software/ors-amarisoft/instance-enb-input-schema.json.jinja2
View file @
06c20f8f
...
@@ -25,6 +25,12 @@
...
@@ -25,6 +25,12 @@
"type": "number",
"type": "number",
"default": {{ default_lte_rx_gain }}
"default": {{ default_lte_rx_gain }}
},
},
"gps_sync": {
"default": false,
"title": "GPS synchronisation",
"description": "True if GPS should be used for synchronisation",
"type": "boolean"
},
"dl_earfcn": {
"dl_earfcn": {
"title": "DL EARFCN",
"title": "DL EARFCN",
"description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
"description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
...
...
software/ors-amarisoft/instance-gnb-input-schema.json.jinja2
View file @
06c20f8f
...
@@ -25,6 +25,24 @@
...
@@ -25,6 +25,24 @@
"type": "number",
"type": "number",
"default": {{ default_nr_rx_gain }}
"default": {{ default_nr_rx_gain }}
},
},
"n_antenna_dl": {
"title": "Number of DL antennas",
"description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
"type": "number",
"default": {{ default_n_antenna_dl }}
},
"n_antenna_ul": {
"title": "Number of UL antennas",
"description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
"type": "number",
"default": {{ default_n_antenna_ul }}
},
"gps_sync": {
"default": false,
"title": "GPS synchronisation",
"description": "True if GPS should be used for synchronisation",
"type": "boolean"
},
"dl_nr_arfcn": {
"dl_nr_arfcn": {
"title": "DL NR ARFCN",
"title": "DL NR ARFCN",
"description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
"description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
...
@@ -61,6 +79,31 @@
...
@@ -61,6 +79,31 @@
"type": "object",
"type": "object",
"default": {}
"default": {}
},
},
"ncell_list": {
"title": "Neighbour Cell Info",
"description": "Neighbour Cell Info",
"patternProperties": {
".*": {
"properties": {
"nr_cell_id": {
"title": "NR Cell ID",
"description": "Concatenation of gnb_id and cell_id of the neighbour cell",
"type": "string",
"default": "0x1234501"
},
"tac": {
"default": 100,
"title": "Tracking Area Code",
"description": "Integer (range 0 to 16777215)",
"type": "number"
}
},
"type": "object"
}
},
"type": "object",
"default": {}
},
"gnb_id": {
"gnb_id": {
"title": "gNB ID",
"title": "gNB ID",
"description": "gNB ID",
"description": "gNB ID",
...
@@ -73,6 +116,12 @@
...
@@ -73,6 +116,12 @@
"type": "number",
"type": "number",
"default": 28
"default": 28
},
},
"cell_id": {
"title": "Cell ID",
"description": "Cell ID",
"type": "string",
"default": "0x01"
},
"pci": {
"pci": {
"title": "Physical Cell ID",
"title": "Physical Cell ID",
"description": "Physical Cell ID",
"description": "Physical Cell ID",
...
@@ -199,18 +248,6 @@
...
@@ -199,18 +248,6 @@
"description": "Duration during which average temperature should not exceed specified threshold",
"description": "Duration during which average temperature should not exceed specified threshold",
"type": "number",
"type": "number",
"default": 600
"default": 600
},
"n_antenna_dl": {
"title": "Number of DL antennas",
"description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
"type": "number",
"default": {{ default_n_antenna_dl }}
},
"n_antenna_ul": {
"title": "Number of UL antennas",
"description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
"type": "number",
"default": {{ default_n_antenna_ul }}
}
}
}
}
}
}
software/ors-amarisoft/instance-tdd1900-enb-input-schema.json
View file @
06c20f8f
...
@@ -25,6 +25,12 @@
...
@@ -25,6 +25,12 @@
"type"
:
"number"
,
"type"
:
"number"
,
"default"
:
45
"default"
:
45
},
},
"gps_sync"
:
{
"default"
:
false
,
"title"
:
"GPS synchronisation"
,
"description"
:
"True if GPS should be used for synchronisation"
,
"type"
:
"boolean"
},
"dl_earfcn"
:
{
"dl_earfcn"
:
{
"title"
:
"DL EARFCN"
,
"title"
:
"DL EARFCN"
,
"description"
:
"Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell"
,
"description"
:
"Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell"
,
...
...
software/ors-amarisoft/instance-tdd1900-gnb-input-schema.json
View file @
06c20f8f
...
@@ -211,6 +211,43 @@
...
@@ -211,6 +211,43 @@
"description"
:
"Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port."
,
"description"
:
"Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port."
,
"type"
:
"number"
,
"type"
:
"number"
,
"default"
:
2
"default"
:
2
}
},
"cell_id"
:
{
"title"
:
"Cell ID"
,
"description"
:
"Cell ID"
,
"type"
:
"string"
,
"default"
:
"0x01"
},
"gps_sync"
:
{
"default"
:
false
,
"title"
:
"GPS synchronisation"
,
"description"
:
"True if GPS should be used for synchronisation"
,
"type"
:
"boolean"
},
"ncell_list"
:
{
"title"
:
"Neighbour Cell Info"
,
"description"
:
"Neighbour Cell Info"
,
"patternProperties"
:
{
".*"
:
{
"properties"
:
{
"nr_cell_id"
:
{
"title"
:
"NR Cell ID"
,
"description"
:
"Concatenation of gnb_id and cell_id of the neighbour cell"
,
"type"
:
"string"
,
"default"
:
"0x1234501"
},
"tac"
:
{
"default"
:
100
,
"title"
:
"Tracking Area Code"
,
"description"
:
"Integer (range 0 to 16777215)"
,
"type"
:
"number"
}
},
"type"
:
"object"
}
},
"type"
:
"object"
,
"default"
:
{}
},
}
}
}
}
software/ors-amarisoft/instance-tdd2600-enb-input-schema.json
View file @
06c20f8f
...
@@ -25,6 +25,12 @@
...
@@ -25,6 +25,12 @@
"type"
:
"number"
,
"type"
:
"number"
,
"default"
:
45
"default"
:
45
},
},
"gps_sync"
:
{
"default"
:
false
,
"title"
:
"GPS synchronisation"
,
"description"
:
"True if GPS should be used for synchronisation"
,
"type"
:
"boolean"
},
"dl_earfcn"
:
{
"dl_earfcn"
:
{
"title"
:
"DL EARFCN"
,
"title"
:
"DL EARFCN"
,
"description"
:
"Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell"
,
"description"
:
"Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell"
,
...
...
software/ors-amarisoft/instance-tdd2600-gnb-input-schema.json
View file @
06c20f8f
...
@@ -211,6 +211,43 @@
...
@@ -211,6 +211,43 @@
"description"
:
"Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port."
,
"description"
:
"Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port."
,
"type"
:
"number"
,
"type"
:
"number"
,
"default"
:
2
"default"
:
2
}
},
"cell_id"
:
{
"title"
:
"Cell ID"
,
"description"
:
"Cell ID"
,
"type"
:
"string"
,
"default"
:
"0x01"
},
"gps_sync"
:
{
"default"
:
false
,
"title"
:
"GPS synchronisation"
,
"description"
:
"True if GPS should be used for synchronisation"
,
"type"
:
"boolean"
},
"ncell_list"
:
{
"title"
:
"Neighbour Cell Info"
,
"description"
:
"Neighbour Cell Info"
,
"patternProperties"
:
{
".*"
:
{
"properties"
:
{
"nr_cell_id"
:
{
"title"
:
"NR Cell ID"
,
"description"
:
"Concatenation of gnb_id and cell_id of the neighbour cell"
,
"type"
:
"string"
,
"default"
:
"0x1234501"
},
"tac"
:
{
"default"
:
100
,
"title"
:
"Tracking Area Code"
,
"description"
:
"Integer (range 0 to 16777215)"
,
"type"
:
"number"
}
},
"type"
:
"object"
}
},
"type"
:
"object"
,
"default"
:
{}
},
}
}
}
}
software/ors-amarisoft/instance-tdd3500-enb-input-schema.json
View file @
06c20f8f
...
@@ -25,6 +25,12 @@
...
@@ -25,6 +25,12 @@
"type"
:
"number"
,
"type"
:
"number"
,
"default"
:
45
"default"
:
45
},
},
"gps_sync"
:
{
"default"
:
false
,
"title"
:
"GPS synchronisation"
,
"description"
:
"True if GPS should be used for synchronisation"
,
"type"
:
"boolean"
},
"dl_earfcn"
:
{
"dl_earfcn"
:
{
"title"
:
"DL EARFCN"
,
"title"
:
"DL EARFCN"
,
"description"
:
"Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell"
,
"description"
:
"Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell"
,
...
...
software/ors-amarisoft/instance-tdd3500-gnb-input-schema.json
View file @
06c20f8f
...
@@ -211,6 +211,43 @@
...
@@ -211,6 +211,43 @@
"description"
:
"Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port."
,
"description"
:
"Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port."
,
"type"
:
"number"
,
"type"
:
"number"
,
"default"
:
2
"default"
:
2
}
},
"cell_id"
:
{
"title"
:
"Cell ID"
,
"description"
:
"Cell ID"
,
"type"
:
"string"
,
"default"
:
"0x01"
},
"gps_sync"
:
{
"default"
:
false
,
"title"
:
"GPS synchronisation"
,
"description"
:
"True if GPS should be used for synchronisation"
,
"type"
:
"boolean"
},
"ncell_list"
:
{
"title"
:
"Neighbour Cell Info"
,
"description"
:
"Neighbour Cell Info"
,
"patternProperties"
:
{
".*"
:
{
"properties"
:
{
"nr_cell_id"
:
{
"title"
:
"NR Cell ID"
,
"description"
:
"Concatenation of gnb_id and cell_id of the neighbour cell"
,
"type"
:
"string"
,
"default"
:
"0x1234501"
},
"tac"
:
{
"default"
:
100
,
"title"
:
"Tracking Area Code"
,
"description"
:
"Integer (range 0 to 16777215)"
,
"type"
:
"number"
}
},
"type"
:
"object"
}
},
"type"
:
"object"
,
"default"
:
{}
},
}
}
}
}
software/ors-amarisoft/instance-tdd3700-enb-input-schema.json
View file @
06c20f8f
...
@@ -25,6 +25,12 @@
...
@@ -25,6 +25,12 @@
"type"
:
"number"
,
"type"
:
"number"
,
"default"
:
45
"default"
:
45
},
},
"gps_sync"
:
{
"default"
:
false
,
"title"
:
"GPS synchronisation"
,
"description"
:
"True if GPS should be used for synchronisation"
,
"type"
:
"boolean"
},
"dl_earfcn"
:
{
"dl_earfcn"
:
{
"title"
:
"DL EARFCN"
,
"title"
:
"DL EARFCN"
,
"description"
:
"Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell"
,
"description"
:
"Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell"
,
...
...
software/ors-amarisoft/instance-tdd3700-gnb-input-schema.json
View file @
06c20f8f
...
@@ -211,6 +211,43 @@
...
@@ -211,6 +211,43 @@
"description"
:
"Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port."
,
"description"
:
"Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port."
,
"type"
:
"number"
,
"type"
:
"number"
,
"default"
:
2
"default"
:
2
}
},
"cell_id"
:
{
"title"
:
"Cell ID"
,
"description"
:
"Cell ID"
,
"type"
:
"string"
,
"default"
:
"0x01"
},
"gps_sync"
:
{
"default"
:
false
,
"title"
:
"GPS synchronisation"
,
"description"
:
"True if GPS should be used for synchronisation"
,
"type"
:
"boolean"
},
"ncell_list"
:
{
"title"
:
"Neighbour Cell Info"
,
"description"
:
"Neighbour Cell Info"
,
"patternProperties"
:
{
".*"
:
{
"properties"
:
{
"nr_cell_id"
:
{
"title"
:
"NR Cell ID"
,
"description"
:
"Concatenation of gnb_id and cell_id of the neighbour cell"
,
"type"
:
"string"
,
"default"
:
"0x1234501"
},
"tac"
:
{
"default"
:
100
,
"title"
:
"Tracking Area Code"
,
"description"
:
"Integer (range 0 to 16777215)"
,
"type"
:
"number"
}
},
"type"
:
"object"
}
},
"type"
:
"object"
,
"default"
:
{}
},
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment