Commit 253f36e0 authored by Kirill Smelkov's avatar Kirill Smelkov

software/ors-amarisoft: enb/generic: Move LTE and NR cell definitions to...

software/ors-amarisoft: enb/generic: Move LTE and NR cell definitions to schemas under cell/lte/ and cell/nr/

And reuse bits from there for ORS cell-related parameters.

Preparatory step to handle cell as separate object and a bit less code duplication.
parent b0d1a1ea
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"title": "Cell. Common properties",
"type": "object",
"required": [
"rf_mode",
"pci",
"cell_id",
"bandwidth",
"ru"
],
"properties": {
"rf_mode": {
"title": "RF mode",
"description": "Mode for TX/RX radio multiplexing: Frequency- or Time- Domain Division",
"type": "string",
"enum": ["fdd", "tdd"],
"propertyOrder": 101
},
"pci": {
"title": "Physical Cell ID",
"description": "Physical Cell ID",
"type": "integer"
},
"cell_id": {
"title": "Cell ID",
"description": "Cell ID",
"type": "string"
},
"bandwidth": {
"title": "Bandwidth",
"description": "Downlink Bandwidth (in MHz)",
"type": "number"
},
"root_sequence_index": {
"title": "Root Sequence Index",
"type": "integer"
},
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default": 10000
},
"ru": {
"$ref": "../ru/input-schema.json",
"propertyOrder": 9999
}
}
}
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"title": "LTE Cell",
"type": "object",
"required": [
"cell_type",
"rf_mode",
"pci",
"cell_id",
"bandwidth",
"ru",
"dl_earfcn",
"tac"
],
"properties": {
"$ref": "../../cell/common.json#/properties",
"tdd_ul_dl_config": {
"title": "TDD Configuration",
"type": "string",
"enum": [
"[Configuration 2] 5ms 2UL 6DL (default)",
"[Configuration 6] 5ms 5UL 3DL (maximum uplink)"
],
"default": "[Configuration 2] 5ms 2UL 6DL (default)",
"options": {
"dependencies": {
"rf_mode": "tdd"
}
}
},
"bandwidth": {
"$ref": "#/properties/bandwidth",
"enum": [
1.4,
3,
5,
10,
15,
20
]
},
"dl_earfcn": {
"title": "DL EARFCN",
"description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
"type": "integer"
},
"ul_earfcn": {
"title": "UL EARFCN",
"description": "Uplink E-UTRA Absolute Radio Frequency Channel Number of the cell. By default a frequency corresponding to dl_earfcn is chosen.",
"type": "integer"
},
"tac": {
"title": "Tracking Area Code",
"description": "Tracking Area Code in hexadecimal representation (range 0x0000 to 0xffff)",
"type": "string"
},
"root_sequence_index": {
"$ref": "#/properties/root_sequence_index",
"description": "Range: 0 to 837. Set the PRACH root sequence index (SIB2.rootSequenceIndex field). It must be different for each neighbour cell operating on the same frequency and sharing the same PRACH configuration.",
"default": 204
}
}
}
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"title": "NR Cell",
"type": "object",
"required": [
"rf_mode",
"pci",
"cell_id",
"bandwidth",
"ru",
"dl_nr_arfcn",
"nr_band"
],
"properties": {
"$ref": "../../cell/common.json#/properties",
"tdd_ul_dl_config": {
"title": "TDD Configuration",
"type": "string",
"enum": [
"5ms 2UL 7DL 4/6 (default)",
"2.5ms 1UL 3DL 2/10",
"5ms 8UL 1DL 2/10 (maximum uplink)"
],
"default": "5ms 2UL 7DL 4/6 (default)",
"options": {
"dependencies": {
"rf_mode": "tdd"
}
}
},
"bandwidth": {
"$ref": "#/properties/bandwidth"
},
"dl_nr_arfcn": {
"title": "DL NR ARFCN",
"description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
"type": "integer"
},
"nr_band": {
"title": "NR band",
"description": "NR band number",
"type": "integer"
},
"ssb_pos_bitmap": {
"title": "SSB Position Bitmap",
"description": "SSB position bitmap in bits (4, 8 or 64 bits depending on the DL frequency).",
"type": "string",
"default": "10000000"
},
"root_sequence_index": {
"$ref": "#/properties/root_sequence_index",
"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
}
}
}
...@@ -8,81 +8,7 @@ ...@@ -8,81 +8,7 @@
"description": "Cell List", "description": "Cell List",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "$ref": "cell/lte/input-schema.json"
"rf_mode": {
"title": "RF mode",
"description": "Mode for TX/RX radio multiplexing: Frequency- or Time- Domain Division",
"type": "string",
"enum": [
"fdd",
"tdd"
]
},
"tdd_ul_dl_config": {
"title": "TDD",
"description": "TDD",
"type": "string",
"enum": [
"[Configuration 2] 5ms 2UL 6DL (default)",
"[Configuration 6] 5ms 5UL 3DL (maximum uplink)"
],
"default": "[Configuration 2] 5ms 2UL 6DL (default)",
"options": {
"dependencies": {
"rf_mode": "tdd"
}
}
},
"ru": {
"$ref": "ru/input-schema.json"
},
"dl_earfcn": {
"title": "DL EARFCN",
"description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
"type": "number"
},
"bandwidth": {
"title": "Bandwidth",
"description": "Downlink Bandwidth (in MHz)",
"type": "number"
"enum": [
1.4,
3,
5,
10,
15,
20
]
},
"pci": {
"title": "Physical Cell ID",
"description": "Physical Cell IDs",
"type": "number"
},
"cell_id": {
"title": "Cell ID",
"description": "Cell IDs",
"type": "string"
},
"tac": {
"title": "Tracking Area Code",
"description": "Tracking Area Code in hexadecimal representation (range 0x0000 to 0xffff)",
"type": "string"
},
"root_sequence_index": {
"title": "Root Sequence Index",
"description": "Range: 0 to 837. Set the PRACH root sequence index (SIB2.rootSequenceIndex field). It must be different for each neighbour cell operating on the same frequency and sharing the same PRACH configuration.",
"type": "number",
"default": 204
},
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default": 10000
}
},
"type": "object"
} }
}, },
"type": "object", "type": "object",
......
...@@ -35,57 +35,29 @@ ...@@ -35,57 +35,29 @@
"default": {{ default_n_antenna_ul }} "default": {{ default_n_antenna_ul }}
}, },
"rf_mode": { "rf_mode": {
"title": "RF mode", "$ref": "cell/common.json#/properties/rf_mode",
"description": "Mode for TX/RX radio multiplexing: Frequency- or Time- Domain Division",
"type": "string",
"enum": [
"fdd",
"tdd"
],
"default": "tdd" "default": "tdd"
}, },
"tdd_ul_dl_config": { "tdd_ul_dl_config": {
"title": "TDD", "$ref": "cell/lte/input-schema.json#/properties/tdd_ul_dl_config"
"description": "TDD",
"type": "string",
"enum": [
"[Configuration 2] 5ms 2UL 6DL (default)",
"[Configuration 6] 5ms 5UL 3DL (maximum uplink)"
],
"default": "[Configuration 2] 5ms 2UL 6DL (default)",
"options": {
"dependencies": {
"rf_mode": "tdd"
}
}
}, },
"dl_earfcn": { "dl_earfcn": {
"title": "DL EARFCN", "$ref": "cell/lte/input-schema.json#/properties/dl_earfcn"
"description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
"type": "number"
}, },
"pci": { "pci": {
"title": "Physical Cell ID", "$ref": "cell/common.json#/properties/pci",
"description": "Physical Cell ID",
"type": "number",
"default": 1 "default": 1
}, },
"cell_id": { "cell_id": {
"title": "Cell ID", "$ref": "cell/common.json#/properties/cell_id",
"description": "Cell ID",
"type": "string",
"default": "0x01" "default": "0x01"
}, },
"tac": { "tac": {
"title": "Tracking Area Code", "$ref": "cell/lte/input-schema.json#/properties/tac",
"description": "Tracking Area Code in hexadecimal representation (range 0x0000 to 0xffff)", "default": "0x0001"
"default": "0x0001",
"type": "string"
}, },
"root_sequence_index": { "root_sequence_index": {
"title": "Root Sequence Index", "$ref": "cell/common.json#/properties/root_sequence_index",
"description": "Range: 0 to 837. Set the PRACH root sequence index (SIB2.rootSequenceIndex field). It must be different for each neighbour cell operating on the same frequency and sharing the same PRACH configuration.",
"type": "number",
"default": 204 "default": 204
}, },
{%- else %} {%- else %}
...@@ -94,81 +66,7 @@ ...@@ -94,81 +66,7 @@
"description": "Cell List", "description": "Cell List",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "$ref": "cell/lte/input-schema.json"
"rf_mode": {
"title": "RF mode",
"description": "Mode for TX/RX radio multiplexing: Frequency- or Time- Domain Division",
"type": "string",
"enum": [
"fdd",
"tdd"
]
},
"tdd_ul_dl_config": {
"title": "TDD",
"description": "TDD",
"type": "string",
"enum": [
"[Configuration 2] 5ms 2UL 6DL (default)",
"[Configuration 6] 5ms 5UL 3DL (maximum uplink)"
],
"default": "[Configuration 2] 5ms 2UL 6DL (default)",
"options": {
"dependencies": {
"rf_mode": "tdd"
}
}
},
"ru": {
"$ref": "ru/input-schema.json"
},
"dl_earfcn": {
"title": "DL EARFCN",
"description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
"type": "number"
},
"bandwidth": {
"title": "Bandwidth",
"description": "Downlink Bandwidth (in MHz)",
"type": "number"
"enum": [
1.4,
3,
5,
10,
15,
20
]
},
"pci": {
"title": "Physical Cell ID",
"description": "Physical Cell IDs",
"type": "number"
},
"cell_id": {
"title": "Cell ID",
"description": "Cell IDs",
"type": "string"
},
"tac": {
"title": "Tracking Area Code",
"description": "Tracking Area Code in hexadecimal representation (range 0x0000 to 0xffff)",
"type": "string"
},
"root_sequence_index": {
"title": "Root Sequence Index",
"description": "Range: 0 to 837. Set the PRACH root sequence index (SIB2.rootSequenceIndex field). It must be different for each neighbour cell operating on the same frequency and sharing the same PRACH configuration.",
"type": "number",
"default": 204
},
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default": {{ default_lte_inactivity_timer }}
}
},
"type": "object"
} }
}, },
"type": "object", "type": "object",
......
...@@ -8,80 +8,7 @@ ...@@ -8,80 +8,7 @@
"description": "Cell List", "description": "Cell List",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "$ref": "cell/nr/input-schema.json"
"rf_mode": {
"title": "RF mode",
"description": "Mode for TX/RX radio multiplexing: Frequency- or Time- Domain Division",
"type": "string",
"enum": [
"fdd",
"tdd"
]
},
"tdd_ul_dl_config": {
"title": "TDD",
"description": "TDD",
"type": "string",
"enum": [
"5ms 2UL 7DL 4/6 (default)",
"2.5ms 1UL 3DL 2/10",
"5ms 8UL 1DL 2/10 (maximum uplink)"
],
"default": "5ms 2UL 7DL 4/6 (default)",
"options": {
"dependencies": {
"rf_mode": "tdd"
}
}
},
"ru": {
"$ref": "ru/input-schema.json"
},
"dl_nr_arfcn": {
"title": "DL NR ARFCN",
"description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
"type": "number"
},
"nr_band": {
"title": "NR band",
"description": "NR band number",
"type": "number"
},
"bandwidth": {
"title": "Bandwidth",
"description": "Downlink Bandwidth (in MHz)",
"type": "number"
},
"ssb_pos_bitmap": {
"title": "SSB Position Bitmap",
"description": "SSB position bitmap in bits (4, 8 or 64 bits depending on the DL frequency).",
"type": "string",
"default": 10000000
},
"pci": {
"title": "Physical Cell ID",
"description": "Physical Cell ID",
"type": "number"
},
"cell_id": {
"title": "Cell ID",
"description": "Cell ID",
"type": "string"
},
"root_sequence_index": {
"title": "Root Sequence Index",
"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.",
"type": "number",
"default": 1
},
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default": 10000
}
},
"type": "object"
} }
}, },
"type": "object", "type": "object",
......
...@@ -5,9 +5,7 @@ ...@@ -5,9 +5,7 @@
"properties": { "properties": {
{%- if bbu == 'ors' %} {%- if bbu == 'ors' %}
"nr_bandwidth": { "nr_bandwidth": {
"title": "Bandwidth", "$ref": "cell/common.json#/properties/bandwidth",
"description": "Downlink Bandwidth (in MHz)",
"type": "number",
"default": {{ default_nr_bandwidth }} "default": {{ default_nr_bandwidth }}
}, },
"n_antenna_dl": { "n_antenna_dl": {
...@@ -27,57 +25,28 @@ ...@@ -27,57 +25,28 @@
"default": {{ default_n_antenna_ul }} "default": {{ default_n_antenna_ul }}
}, },
"rf_mode": { "rf_mode": {
"title": "RF mode", "$ref": "cell/common.json#/properties/rf_mode",
"description": "Mode for TX/RX radio multiplexing: Frequency- or Time- Domain Division",
"type": "string",
"enum": [
"fdd",
"tdd"
],
"default": "tdd" "default": "tdd"
}, },
"tdd_ul_dl_config": { "tdd_ul_dl_config": {
"title": "TDD", "$ref": "cell/nr/input-schema.json#/properties/tdd_ul_dl_config"
"description": "TDD",
"type": "string",
"enum": [
"5ms 2UL 7DL 4/6 (default)",
"2.5ms 1UL 3DL 2/10",
"5ms 8UL 1DL 2/10 (maximum uplink)"
],
"default": "5ms 2UL 7DL 4/6 (default)",
"options": {
"dependencies": {
"rf_mode": "tdd"
}
}
}, },
"dl_nr_arfcn": { "dl_nr_arfcn": {
"title": "DL NR ARFCN", "$ref": "cell/nr/input-schema.json#/properties/dl_nr_arfcn"
"description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
"type": "number"
}, },
"nr_band": { "nr_band": {
"title": "NR band", "$ref": "cell/nr/input-schema.json#/properties/nr_band"
"description": "NR band number",
"type": "number"
}, },
"ssb_pos_bitmap": { "ssb_pos_bitmap": {
"title": "SSB Position Bitmap", "$ref": "cell/nr/input-schema.json#/properties/ssb_pos_bitmap",
"description": "SSB position bitmap in bits (4, 8 or 64 bits depending on the DL frequency).",
"type": "string",
"default": {{ default_nr_ssb_pos_bitmap }} "default": {{ default_nr_ssb_pos_bitmap }}
}, },
"pci": { "pci": {
"title": "Physical Cell ID", "$ref": "cell/common.json#/properties/pci",
"description": "Physical Cell ID",
"type": "number",
"default": 500 "default": 500
}, },
"cell_id": { "cell_id": {
"title": "Cell ID", "$ref": "cell/common.json#/properties/cell_id",
"description": "Cell ID",
"type": "string",
"default": "0x01" "default": "0x01"
}, },
{%- else %} {%- else %}
...@@ -86,80 +55,7 @@ ...@@ -86,80 +55,7 @@
"description": "Cell List", "description": "Cell List",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "$ref": "cell/nr/input-schema.json"
"rf_mode": {
"title": "RF mode",
"description": "Mode for TX/RX radio multiplexing: Frequency- or Time- Domain Division",
"type": "string",
"enum": [
"fdd",
"tdd"
]
},
"tdd_ul_dl_config": {
"title": "TDD",
"description": "TDD",
"type": "string",
"enum": [
"5ms 2UL 7DL 4/6 (default)",
"2.5ms 1UL 3DL 2/10",
"5ms 8UL 1DL 2/10 (maximum uplink)"
],
"default": "5ms 2UL 7DL 4/6 (default)",
"options": {
"dependencies": {
"rf_mode": "tdd"
}
}
},
"ru": {
"$ref": "ru/input-schema.json"
},
"dl_nr_arfcn": {
"title": "DL NR ARFCN",
"description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
"type": "number"
},
"nr_band": {
"title": "NR band",
"description": "NR band number",
"type": "number"
},
"bandwidth": {
"title": "Bandwidth",
"description": "Downlink Bandwidth (in MHz)",
"type": "number"
},
"ssb_pos_bitmap": {
"title": "SSB Position Bitmap",
"description": "SSB position bitmap in bits (4, 8 or 64 bits depending on the DL frequency).",
"type": "string",
"default": {{ default_nr_ssb_pos_bitmap }}
},
"pci": {
"title": "Physical Cell ID",
"description": "Physical Cell ID",
"type": "number"
},
"cell_id": {
"title": "Cell ID",
"description": "Cell ID",
"type": "string"
},
"root_sequence_index": {
"title": "Root Sequence Index",
"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.",
"type": "number",
"default": 1
},
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default": {{ default_nr_inactivity_timer }}
}
},
"type": "object"
} }
}, },
"type": "object", "type": "object",
......
...@@ -34,57 +34,29 @@ ...@@ -34,57 +34,29 @@
"default": 2 "default": 2
}, },
"rf_mode": { "rf_mode": {
"title": "RF mode", "$ref": "cell/common.json#/properties/rf_mode",
"description": "Mode for TX/RX radio multiplexing: Frequency- or Time- Domain Division",
"type": "string",
"enum": [
"fdd",
"tdd"
],
"default": "tdd" "default": "tdd"
}, },
"tdd_ul_dl_config": { "tdd_ul_dl_config": {
"title": "TDD", "$ref": "cell/lte/input-schema.json#/properties/tdd_ul_dl_config"
"description": "TDD",
"type": "string",
"enum": [
"[Configuration 2] 5ms 2UL 6DL (default)",
"[Configuration 6] 5ms 5UL 3DL (maximum uplink)"
],
"default": "[Configuration 2] 5ms 2UL 6DL (default)",
"options": {
"dependencies": {
"rf_mode": "tdd"
}
}
}, },
"dl_earfcn": { "dl_earfcn": {
"title": "DL EARFCN", "$ref": "cell/lte/input-schema.json#/properties/dl_earfcn"
"description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
"type": "number"
}, },
"pci": { "pci": {
"title": "Physical Cell ID", "$ref": "cell/common.json#/properties/pci",
"description": "Physical Cell ID",
"type": "number",
"default": 1 "default": 1
}, },
"cell_id": { "cell_id": {
"title": "Cell ID", "$ref": "cell/common.json#/properties/cell_id",
"description": "Cell ID",
"type": "string",
"default": "0x01" "default": "0x01"
}, },
"tac": { "tac": {
"title": "Tracking Area Code", "$ref": "cell/lte/input-schema.json#/properties/tac",
"description": "Tracking Area Code in hexadecimal representation (range 0x0000 to 0xffff)", "default": "0x0001"
"default": "0x0001",
"type": "string"
}, },
"root_sequence_index": { "root_sequence_index": {
"title": "Root Sequence Index", "$ref": "cell/common.json#/properties/root_sequence_index",
"description": "Range: 0 to 837. Set the PRACH root sequence index (SIB2.rootSequenceIndex field). It must be different for each neighbour cell operating on the same frequency and sharing the same PRACH configuration.",
"type": "number",
"default": 204 "default": 204
}, },
"tx_gain": { "tx_gain": {
......
...@@ -4,9 +4,7 @@ ...@@ -4,9 +4,7 @@
"title": "Input Parameters", "title": "Input Parameters",
"properties": { "properties": {
"nr_bandwidth": { "nr_bandwidth": {
"title": "Bandwidth", "$ref": "cell/common.json#/properties/bandwidth",
"description": "Downlink Bandwidth (in MHz)",
"type": "number",
"default": 40 "default": 40
}, },
"n_antenna_dl": { "n_antenna_dl": {
...@@ -26,57 +24,28 @@ ...@@ -26,57 +24,28 @@
"default": 2 "default": 2
}, },
"rf_mode": { "rf_mode": {
"title": "RF mode", "$ref": "cell/common.json#/properties/rf_mode",
"description": "Mode for TX/RX radio multiplexing: Frequency- or Time- Domain Division",
"type": "string",
"enum": [
"fdd",
"tdd"
],
"default": "tdd" "default": "tdd"
}, },
"tdd_ul_dl_config": { "tdd_ul_dl_config": {
"title": "TDD", "$ref": "cell/nr/input-schema.json#/properties/tdd_ul_dl_config"
"description": "TDD",
"type": "string",
"enum": [
"5ms 2UL 7DL 4/6 (default)",
"2.5ms 1UL 3DL 2/10",
"5ms 8UL 1DL 2/10 (maximum uplink)"
],
"default": "5ms 2UL 7DL 4/6 (default)",
"options": {
"dependencies": {
"rf_mode": "tdd"
}
}
}, },
"dl_nr_arfcn": { "dl_nr_arfcn": {
"title": "DL NR ARFCN", "$ref": "cell/nr/input-schema.json#/properties/dl_nr_arfcn"
"description": "Downlink NR Absolute Radio Frequency Channel Number of the cell",
"type": "number"
}, },
"nr_band": { "nr_band": {
"title": "NR band", "$ref": "cell/nr/input-schema.json#/properties/nr_band"
"description": "NR band number",
"type": "number"
}, },
"ssb_pos_bitmap": { "ssb_pos_bitmap": {
"title": "SSB Position Bitmap", "$ref": "cell/nr/input-schema.json#/properties/ssb_pos_bitmap",
"description": "SSB position bitmap in bits (4, 8 or 64 bits depending on the DL frequency).",
"type": "string",
"default": 10000000 "default": 10000000
}, },
"pci": { "pci": {
"title": "Physical Cell ID", "$ref": "cell/common.json#/properties/pci",
"description": "Physical Cell ID",
"type": "number",
"default": 500 "default": 500
}, },
"cell_id": { "cell_id": {
"title": "Cell ID", "$ref": "cell/common.json#/properties/cell_id",
"description": "Cell ID",
"type": "string",
"default": "0x01" "default": "0x01"
}, },
"tx_gain": { "tx_gain": {
......
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