Skip to content

S
slapos
Commit 7abb0b52 authored by Kirill Smelkov's avatar Kirill Smelkov
Browse files
Options

software/ors-amarisoft: enb/*: Deduplicate ncell_list via peer/cell 

Move schema of peer cells into under peer/cell/lte and peer/cell/nr with
keeping in mind that peer/cell will become a separate entity in MultiRU.

NR deduplication is straightforward, but for LTE original ncell_list used
`cell_id` name for full E-UTRAN cell identity. peer/cell/lte uses e_cell_id
name for that and content of that peer/cell/lte cannot be applied directly to
ORS's ncell_list and ncell_list in current enb/generic. To keep things working
we pickup peer/cell/lte field by field with mapping e_cell_id into cell_id. For
the reference for NR both original ncell_list and new peer/cell/nr use
nr_cell_id for full 5G cell identity.

Backward compatibility: nothing practically changes for ORS and generic.
parent edd4de18
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 86 deletions
software/ors-amarisoft/cell/nr/input-schema.json
View file @ 7abb0b52
...@@ -58,5 +58,18 @@ ...@@ -58,5 +58,18 @@
"description": "Range 0 to 837 for PRACH format up to 3, 0 to 137 otherwise. prach-RootSequenceIndex parameter. It must be different for each neighbour cell operating on the same frequency and sharing the same PRACH configuration.", "description": "Range 0 to 837 for PRACH format up to 3, 0 to 137 otherwise. prach-RootSequenceIndex parameter. It must be different for each neighbour cell operating on the same frequency and sharing the same PRACH configuration.",
"default": 1 "default": 1
} }
},
"$defs": {
"ssb_nr_arfcn": {
"title": "SSB NR ARFCN",
"description": "SSB NR Absolute Radio Frequency Channel Number of the cell",
"type": "number"
},
"tac": {
"title": "Tracking Area Code",
"description": "Integer (range 0 to 16777215)",
"type": "number"
}
} }
} }
software/ors-amarisoft/instance-enb-input-schema.json
View file @ 7abb0b52
...@@ -84,24 +84,16 @@ ...@@ -84,24 +84,16 @@
".*": { ".*": {
"properties": { "properties": {
"dl_earfcn": { "dl_earfcn": {
"title": "DL EARFCN", "$ref": "peer/cell/lte/input-schema.json#/properties/dl_earfcn"
"description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the neighbour cell",
"type": "number"
}, },
"pci": { "pci": {
"title": "Physical Cell ID", "$ref": "peer/cell/lte/input-schema.json#/properties/pci"
"description": "Physical Cell ID of the neighbour cell",
"type": "number"
}, },
"cell_id": { "cell_id": {
"title": "Cell ID", "$ref": "peer/cell/lte/input-schema.json#/properties/e_cell_id"
"description": "Concatenation of enb_id and cell_id of the neighbour cell",
"type": "string"
}, },
"tac": { "tac": {
"title": "Tracking Area Code", "$ref": "peer/cell/lte/input-schema.json#/properties/tac"
"description": "Integer (range 0 to 16777215)",
"type": "number"
} }
}, },
"type": "object" "type": "object"
......
software/ors-amarisoft/instance-gnb-input-schema.json
View file @ 7abb0b52
...@@ -60,9 +60,7 @@ ...@@ -60,9 +60,7 @@
"type": "string" "type": "string"
}, },
"tac": { "tac": {
"title": "Tracking Area Code", "$ref": "cell/nr/input-schema.json#/$defs/tac"
"description": "Integer (range 0 to 16777215)",
"type": "number"
}, },
"ranac": { "ranac": {
"title": "Optional integer (range 0 to 255)", "title": "Optional integer (range 0 to 255)",
...@@ -111,44 +109,7 @@ ...@@ -111,44 +109,7 @@
"description": "Neighbour Cell Info", "description": "Neighbour Cell Info",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "$ref": "peer/cell/nr/input-schema.json"
"dl_nr_arfcn": {
"title": "DL NR ARFCN",
"description": "Downlink NR Absolute Radio Frequency Channel Number of the neighbour cell",
"type": "number"
},
"ssb_nr_arfcn": {
"title": "SSB NR ARFCN",
"description": "SSB NR Absolute Radio Frequency Channel Number of the neighbour cell",
"type": "number"
},
"pci": {
"title": "Physical Cell ID",
"description": "Physical Cell ID of the neighbour cell",
"type": "number"
},
"nr_cell_id": {
"title": "NR Cell ID",
"description": "Concatenation of gnb_id and cell_id of the neighbour cell",
"type": "string"
},
"gnb_id_bits": {
"title": "gNB ID bits",
"description": "Number of bits for the gNodeB global identifier. (range 22 to 32)",
"type": "number"
},
"nr_band": {
"title": "NR band",
"description": "NR band number",
"type": "number"
},
"tac": {
"title": "Tracking Area Code",
"description": "Integer (range 0 to 16777215)",
"type": "number"
}
},
"type": "object"
} }
}, },
"type": "object", "type": "object",
......
software/ors-amarisoft/instance-ors-enb-input-schema.json
View file @ 7abb0b52
...@@ -127,24 +127,16 @@ ...@@ -127,24 +127,16 @@
".*": { ".*": {
"properties": { "properties": {
"dl_earfcn": { "dl_earfcn": {
"title": "DL EARFCN", "$ref": "peer/cell/lte/input-schema.json#/properties/dl_earfcn"
"description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the neighbour cell",
"type": "number"
}, },
"pci": { "pci": {
"title": "Physical Cell ID", "$ref": "peer/cell/lte/input-schema.json#/properties/pci"
"description": "Physical Cell ID of the neighbour cell",
"type": "number"
}, },
"cell_id": { "cell_id": {
"title": "Cell ID", "$ref": "peer/cell/lte/input-schema.json#/properties/e_cell_id"
"description": "Concatenation of enb_id and cell_id of the neighbour cell",
"type": "string"
}, },
"tac": { "tac": {
"title": "Tracking Area Code", "$ref": "peer/cell/lte/input-schema.json#/properties/tac"
"description": "Integer (range 0 to 16777215)",
"type": "number"
} }
}, },
"type": "object" "type": "object"
......
software/ors-amarisoft/instance-ors-gnb-input-schema.json
View file @ 7abb0b52
...@@ -108,39 +108,25 @@ ...@@ -108,39 +108,25 @@
".*": { ".*": {
"properties": { "properties": {
"dl_nr_arfcn": { "dl_nr_arfcn": {
"title": "DL NR ARFCN", "$ref": "peer/cell/nr/input-schema.json#/properties/dl_nr_arfcn"
"description": "Downlink NR Absolute Radio Frequency Channel Number of the neighbour cell",
"type": "number"
}, },
"ssb_nr_arfcn": { "ssb_nr_arfcn": {
"title": "SSB NR ARFCN", "$ref": "peer/cell/nr/input-schema.json#/properties/ssb_nr_arfcn"
"description": "SSB NR Absolute Radio Frequency Channel Number of the neighbour cell",
"type": "number"
}, },
"pci": { "pci": {
"title": "Physical Cell ID", "$ref": "peer/cell/nr/input-schema.json#/properties/pci"
"description": "Physical Cell ID of the neighbour cell",
"type": "number"
}, },
"nr_cell_id": { "nr_cell_id": {
"title": "NR Cell ID", "$ref": "peer/cell/nr/input-schema.json#/properties/nr_cell_id"
"description": "Concatenation of gnb_id and cell_id of the neighbour cell",
"type": "string"
}, },
"gnb_id_bits": { "gnb_id_bits": {
"title": "gNB ID bits", "$ref": "peer/cell/nr/input-schema.json#/properties/gnb_id_bits"
"description": "Number of bits for the gNodeB global identifier. (range 22 to 32)",
"type": "number"
}, },
"nr_band": { "nr_band": {
"title": "NR band", "$ref": "peer/cell/nr/input-schema.json#/properties/nr_band"
"description": "NR band number",
"type": "number"
}, },
"tac": { "tac": {
"title": "Tracking Area Code", "$ref": "peer/cell/nr/input-schema.json#/properties/tac"
"description": "Integer (range 0 to 16777215)",
"type": "number"
} }
}, },
"type": "object" "type": "object"
......
software/ors-amarisoft/peer/cell/lte/input-schema.json 0 → 100644
View file @ 7abb0b52
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"title": "LTE Peer Cell",
"type": "object",
"required": [
"pci",
"tac",
"e_cell_id",
"dl_earfcn"
],
"properties": {
"e_cell_id": {
"title": "E-UTRAN Cell ID",
"description": "28 bit E-UTRAN cell identity. Concatenation of enb_id and cell_id of the neighbour cell.",
"type": "string"
},
"dl_earfcn": { "$ref": "../../../cell/lte/input-schema.json#/properties/dl_earfcn" },
"pci": { "$ref": "../../../cell/lte/input-schema.json#/properties/pci" },
"tac": { "$ref": "../../../cell/lte/input-schema.json#/properties/tac" }
}
}
software/ors-amarisoft/peer/cell/nr/input-schema.json 0 → 100644
View file @ 7abb0b52
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"title": "NR Peer Cell",
"type": "object",
"required": [
"pci",
"tac",
"nr_cell_id",
"gnb_id_bits",
"dl_nr_arfcn",
"ssb_nr_arfcn",
"nr_band"
],
"properties": {
"nr_cell_id": {
"title": "NR Cell ID",
"description": "Concatenation of gnb_id and cell_id of the neighbour cell",
"type": "string"
},
"gnb_id_bits": {
"title": "gNB ID bits",
"description": "Number of bits for the gNodeB global identifier. (range 22 to 32)",
"type": "integer"
},
"dl_nr_arfcn": { "$ref": "../../../cell/nr/input-schema.json#/properties/dl_nr_arfcn" },
"nr_band": { "$ref": "../../../cell/nr/input-schema.json#/properties/nr_band" },
"ssb_nr_arfcn": { "$ref": "../../../cell/nr/input-schema.json#/$defs/ssb_nr_arfcn" },
"pci": { "$ref": "../../../cell/nr/input-schema.json#/properties/pci" },
"tac": { "$ref": "../../../cell/nr/input-schema.json#/$defs/tac" }
}
}
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