Skip to content

slapos
slapos
Commit 3db7dace authored by Joanne Hugé's avatar Joanne Hugé
Browse files
Options

ors-amarisoft: fix intra gNB handover

parent 79df2021
Show whitespace changes
Inline Side-by-side
Showing with 56 additions and 70 deletions
software/ors-amarisoft/buildout.hash.cfg
View file @ 3db7dace
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
[template] [template]
filename = instance.cfg filename = instance.cfg
md5sum = f1f1167970ae465cdcece47b722caf20 md5sum = 60945a3c51ad6704c1f02b2e43018bba
[amarisoft-stats.jinja2.py] [amarisoft-stats.jinja2.py]
_update_hash_filename_ = amarisoft-stats.jinja2.py _update_hash_filename_ = amarisoft-stats.jinja2.py
...@@ -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 = 2618a2af4eb5b21856e023dcd10c5c24 md5sum = 678ba2f81ca43eca611e4a41c122073d
[ltelogs.jinja2.sh] [ltelogs.jinja2.sh]
filename = ltelogs.jinja2.sh filename = ltelogs.jinja2.sh
......
software/ors-amarisoft/changelog.rst
View file @ 3db7dace
...@@ -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.318 (2023-04-20) Version 1.0.320 (2023-04-26)
------------- -------------
* Add support for inter gNB XnAP and NGAP NR handover * Add support for inter gNB XnAP and NGAP NR handover
software/ors-amarisoft/config/gnb.jinja2.cfg
View file @ 3db7dace
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
dl_nr_arfcn: {{ slapparameter_dict['ncell_list'][k].get('dl_nr_arfcn', '') }}, dl_nr_arfcn: {{ slapparameter_dict['ncell_list'][k].get('dl_nr_arfcn', '') }},
ssb_nr_arfcn: {{ slapparameter_dict['ncell_list'][k].get('ssb_nr_arfcn', '') }}, ssb_nr_arfcn: {{ slapparameter_dict['ncell_list'][k].get('ssb_nr_arfcn', '') }},
ul_nr_arfcn: {{ slapparameter_dict['ncell_list'][k].get('dl_nr_arfcn', '') }}, ul_nr_arfcn: {{ slapparameter_dict['ncell_list'][k].get('dl_nr_arfcn', '') }},
n_id_cell: {{ slapparameter_dict['ncell_list'][k].get('n_id_cell', '') }}, n_id_cell: {{ slapparameter_dict['ncell_list'][k].get('pci', '') }},
gnb_id_bits: {{ slapparameter_dict['ncell_list'][k].get('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) }},
...@@ -1078,6 +1078,27 @@ ...@@ -1078,6 +1078,27 @@
}, },
], ],
/* measurement configuration */
meas_config_desc: {
a1_report_type: "rsrp",
a1_rsrp: -60,
a1_hysteresis: 10,
a1_time_to_trigger: 100,
a2_report_type: "rsrp",
a2_rsrp: -70,
a2_hysteresis: 0,
a2_time_to_trigger: 100,
a3_report_type: "rsrp",
a3_offset: 6,
a3_hysteresis: 0,
a3_time_to_trigger: 100,
ssb_rsrq_filter_coeff: 3,
ssb_sinr_filter_coeff: 5
},
meas_gap_config: {
pattern_id: 0
},
}, },
} }
software/ors-amarisoft/instance-gnb-input-schema.json.jinja2
View file @ 3db7dace
...@@ -88,41 +88,34 @@ ...@@ -88,41 +88,34 @@
"dl_nr_arfcn": { "dl_nr_arfcn": {
"title": "DL NR ARFCN", "title": "DL NR ARFCN",
"description": "Downlink NR Absolute Radio Frequency Channel Number of the neighbour cell", "description": "Downlink NR Absolute Radio Frequency Channel Number of the neighbour cell",
"type": "number", "type": "number"
"default": {{ default_dl_nr_arfcn }}
}, },
"ssb_nr_arfcn": { "ssb_nr_arfcn": {
"title": "SSB NR ARFCN", "title": "SSB NR ARFCN",
"description": "SSB NR Absolute Radio Frequency Channel Number of the neighbour cell", "description": "SSB NR Absolute Radio Frequency Channel Number of the neighbour cell",
"type": "number", "type": "number"
"default": ""
}, },
"pci": { "pci": {
"title": "Physical Cell ID", "title": "Physical Cell ID",
"description": "Physical Cell ID of the neighbour cell", "description": "Physical Cell ID of the neighbour cell",
"type": "number", "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"
}, },
"gnb_id_bits": { "gnb_id_bits": {
"title": "gNB ID bits", "title": "gNB ID bits",
"description": "Number of bits for the gNodeB global identifier. (range 22 to 32)", "description": "Number of bits for the gNodeB global identifier. (range 22 to 32)",
"type": "number", "type": "number"
"default": 28
}, },
"nr_band": { "nr_band": {
"title": "NR band", "title": "NR band",
"description": "NR band number", "description": "NR band number",
"type": "number", "type": "number"
"default": {{ default_nr_band }}
}, },
"tac": { "tac": {
"default": 100,
"title": "Tracking Area Code", "title": "Tracking Area Code",
"description": "Integer (range 0 to 16777215)", "description": "Integer (range 0 to 16777215)",
"type": "number" "type": "number"
......
software/ors-amarisoft/instance-tdd1900-gnb-input-schema.json
View file @ 3db7dace
...@@ -88,41 +88,34 @@ ...@@ -88,41 +88,34 @@
"dl_nr_arfcn": { "dl_nr_arfcn": {
"title": "DL NR ARFCN", "title": "DL NR ARFCN",
"description": "Downlink NR Absolute Radio Frequency Channel Number of the neighbour cell", "description": "Downlink NR Absolute Radio Frequency Channel Number of the neighbour cell",
"type": "number", "type": "number"
"default": 378000
}, },
"ssb_nr_arfcn": { "ssb_nr_arfcn": {
"title": "SSB NR ARFCN", "title": "SSB NR ARFCN",
"description": "SSB NR Absolute Radio Frequency Channel Number of the neighbour cell", "description": "SSB NR Absolute Radio Frequency Channel Number of the neighbour cell",
"type": "number", "type": "number"
"default": ""
}, },
"pci": { "pci": {
"title": "Physical Cell ID", "title": "Physical Cell ID",
"description": "Physical Cell ID of the neighbour cell", "description": "Physical Cell ID of the neighbour cell",
"type": "number", "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"
}, },
"gnb_id_bits": { "gnb_id_bits": {
"title": "gNB ID bits", "title": "gNB ID bits",
"description": "Number of bits for the gNodeB global identifier. (range 22 to 32)", "description": "Number of bits for the gNodeB global identifier. (range 22 to 32)",
"type": "number", "type": "number"
"default": 28
}, },
"nr_band": { "nr_band": {
"title": "NR band", "title": "NR band",
"description": "NR band number", "description": "NR band number",
"type": "number", "type": "number"
"default": 39
}, },
"tac": { "tac": {
"default": 100,
"title": "Tracking Area Code", "title": "Tracking Area Code",
"description": "Integer (range 0 to 16777215)", "description": "Integer (range 0 to 16777215)",
"type": "number" "type": "number"
......
software/ors-amarisoft/instance-tdd2600-gnb-input-schema.json
View file @ 3db7dace
...@@ -88,41 +88,34 @@ ...@@ -88,41 +88,34 @@
"dl_nr_arfcn": { "dl_nr_arfcn": {
"title": "DL NR ARFCN", "title": "DL NR ARFCN",
"description": "Downlink NR Absolute Radio Frequency Channel Number of the neighbour cell", "description": "Downlink NR Absolute Radio Frequency Channel Number of the neighbour cell",
"type": "number", "type": "number"
"default": 520000
}, },
"ssb_nr_arfcn": { "ssb_nr_arfcn": {
"title": "SSB NR ARFCN", "title": "SSB NR ARFCN",
"description": "SSB NR Absolute Radio Frequency Channel Number of the neighbour cell", "description": "SSB NR Absolute Radio Frequency Channel Number of the neighbour cell",
"type": "number", "type": "number"
"default": ""
}, },
"pci": { "pci": {
"title": "Physical Cell ID", "title": "Physical Cell ID",
"description": "Physical Cell ID of the neighbour cell", "description": "Physical Cell ID of the neighbour cell",
"type": "number", "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"
}, },
"gnb_id_bits": { "gnb_id_bits": {
"title": "gNB ID bits", "title": "gNB ID bits",
"description": "Number of bits for the gNodeB global identifier. (range 22 to 32)", "description": "Number of bits for the gNodeB global identifier. (range 22 to 32)",
"type": "number", "type": "number"
"default": 28
}, },
"nr_band": { "nr_band": {
"title": "NR band", "title": "NR band",
"description": "NR band number", "description": "NR band number",
"type": "number", "type": "number"
"default": 38
}, },
"tac": { "tac": {
"default": 100,
"title": "Tracking Area Code", "title": "Tracking Area Code",
"description": "Integer (range 0 to 16777215)", "description": "Integer (range 0 to 16777215)",
"type": "number" "type": "number"
......
software/ors-amarisoft/instance-tdd3500-gnb-input-schema.json
View file @ 3db7dace
...@@ -88,41 +88,34 @@ ...@@ -88,41 +88,34 @@
"dl_nr_arfcn": { "dl_nr_arfcn": {
"title": "DL NR ARFCN", "title": "DL NR ARFCN",
"description": "Downlink NR Absolute Radio Frequency Channel Number of the neighbour cell", "description": "Downlink NR Absolute Radio Frequency Channel Number of the neighbour cell",
"type": "number", "type": "number"
"default": 632628
}, },
"ssb_nr_arfcn": { "ssb_nr_arfcn": {
"title": "SSB NR ARFCN", "title": "SSB NR ARFCN",
"description": "SSB NR Absolute Radio Frequency Channel Number of the neighbour cell", "description": "SSB NR Absolute Radio Frequency Channel Number of the neighbour cell",
"type": "number", "type": "number"
"default": ""
}, },
"pci": { "pci": {
"title": "Physical Cell ID", "title": "Physical Cell ID",
"description": "Physical Cell ID of the neighbour cell", "description": "Physical Cell ID of the neighbour cell",
"type": "number", "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"
}, },
"gnb_id_bits": { "gnb_id_bits": {
"title": "gNB ID bits", "title": "gNB ID bits",
"description": "Number of bits for the gNodeB global identifier. (range 22 to 32)", "description": "Number of bits for the gNodeB global identifier. (range 22 to 32)",
"type": "number", "type": "number"
"default": 28
}, },
"nr_band": { "nr_band": {
"title": "NR band", "title": "NR band",
"description": "NR band number", "description": "NR band number",
"type": "number", "type": "number"
"default": 78
}, },
"tac": { "tac": {
"default": 100,
"title": "Tracking Area Code", "title": "Tracking Area Code",
"description": "Integer (range 0 to 16777215)", "description": "Integer (range 0 to 16777215)",
"type": "number" "type": "number"
......
software/ors-amarisoft/instance-tdd3700-gnb-input-schema.json
View file @ 3db7dace
...@@ -88,41 +88,34 @@ ...@@ -88,41 +88,34 @@
"dl_nr_arfcn": { "dl_nr_arfcn": {
"title": "DL NR ARFCN", "title": "DL NR ARFCN",
"description": "Downlink NR Absolute Radio Frequency Channel Number of the neighbour cell", "description": "Downlink NR Absolute Radio Frequency Channel Number of the neighbour cell",
"type": "number", "type": "number"
"default": 646666
}, },
"ssb_nr_arfcn": { "ssb_nr_arfcn": {
"title": "SSB NR ARFCN", "title": "SSB NR ARFCN",
"description": "SSB NR Absolute Radio Frequency Channel Number of the neighbour cell", "description": "SSB NR Absolute Radio Frequency Channel Number of the neighbour cell",
"type": "number", "type": "number"
"default": ""
}, },
"pci": { "pci": {
"title": "Physical Cell ID", "title": "Physical Cell ID",
"description": "Physical Cell ID of the neighbour cell", "description": "Physical Cell ID of the neighbour cell",
"type": "number", "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"
}, },
"gnb_id_bits": { "gnb_id_bits": {
"title": "gNB ID bits", "title": "gNB ID bits",
"description": "Number of bits for the gNodeB global identifier. (range 22 to 32)", "description": "Number of bits for the gNodeB global identifier. (range 22 to 32)",
"type": "number", "type": "number"
"default": 28
}, },
"nr_band": { "nr_band": {
"title": "NR band", "title": "NR band",
"description": "NR band number", "description": "NR band number",
"type": "number", "type": "number"
"default": 78
}, },
"tac": { "tac": {
"default": 100,
"title": "Tracking Area Code", "title": "Tracking Area Code",
"description": "Integer (range 0 to 16777215)", "description": "Integer (range 0 to 16777215)",
"type": "number" "type": "number"
......
software/ors-amarisoft/instance.cfg
View file @ 3db7dace
...@@ -50,7 +50,7 @@ recipe = slapos.recipe.build ...@@ -50,7 +50,7 @@ recipe = slapos.recipe.build
init = init =
import netifaces import netifaces
for i in netifaces.interfaces(): for i in netifaces.interfaces():
if not (i.startswith("slaptun") or i.startswith("re6stnet") or i == "lo"): if not (i.startswith("slaptun") or i.startswith("slaptap") or i.startswith("re6stnet") or i == "lo"):
a = netifaces.ifaddresses(i) a = netifaces.ifaddresses(i)
if netifaces.AF_INET in a: if netifaces.AF_INET in a:
try: try:
......
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