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.

software/ors-amarisoft/cell/nr/input-schema.json

@@ -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.",
       "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

@@ -84,24 +84,16 @@
         ".*": {
           "properties": {
             "dl_earfcn": {
-              "title": "DL EARFCN",
-              "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the neighbour cell",
-              "type": "number"
+              "$ref": "peer/cell/lte/input-schema.json#/properties/dl_earfcn"
             },
             "pci": {
-              "title": "Physical Cell ID",
-              "description": "Physical Cell ID of the neighbour cell",
-              "type": "number"
+              "$ref": "peer/cell/lte/input-schema.json#/properties/pci"
             },
             "cell_id": {
-              "title": "Cell ID",
-              "description": "Concatenation of enb_id and cell_id of the neighbour cell",
-              "type": "string"
+              "$ref": "peer/cell/lte/input-schema.json#/properties/e_cell_id"
             },
             "tac": {
-              "title": "Tracking Area Code",
-              "description": "Integer (range 0 to 16777215)",
-              "type": "number"
+              "$ref": "peer/cell/lte/input-schema.json#/properties/tac"
             }
           },
           "type": "object"

software/ors-amarisoft/instance-gnb-input-schema.json

@@ -60,9 +60,7 @@
               "type": "string"
             },
             "tac": {
-              "title": "Tracking Area Code",
-              "description": "Integer (range 0 to 16777215)",
-              "type": "number"
+              "$ref": "cell/nr/input-schema.json#/$defs/tac"
             },
             "ranac": {
               "title": "Optional integer (range 0 to 255)",
@@ -111,44 +109,7 @@
       "description": "Neighbour Cell Info",
       "patternProperties": {
         ".*": {
-          "properties": {
-            "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"
+          "$ref": "peer/cell/nr/input-schema.json"
         }
       },
       "type": "object",

software/ors-amarisoft/instance-ors-enb-input-schema.json

@@ -127,24 +127,16 @@
         ".*": {
           "properties": {
             "dl_earfcn": {
-              "title": "DL EARFCN",
-              "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the neighbour cell",
-              "type": "number"
+              "$ref": "peer/cell/lte/input-schema.json#/properties/dl_earfcn"
             },
             "pci": {
-              "title": "Physical Cell ID",
-              "description": "Physical Cell ID of the neighbour cell",
-              "type": "number"
+              "$ref": "peer/cell/lte/input-schema.json#/properties/pci"
             },
             "cell_id": {
-              "title": "Cell ID",
-              "description": "Concatenation of enb_id and cell_id of the neighbour cell",
-              "type": "string"
+              "$ref": "peer/cell/lte/input-schema.json#/properties/e_cell_id"
             },
             "tac": {
-              "title": "Tracking Area Code",
-              "description": "Integer (range 0 to 16777215)",
-              "type": "number"
+              "$ref": "peer/cell/lte/input-schema.json#/properties/tac"
             }
           },
           "type": "object"

software/ors-amarisoft/instance-ors-gnb-input-schema.json

@@ -108,39 +108,25 @@
         ".*": {
           "properties": {
             "dl_nr_arfcn": {
-              "title": "DL NR ARFCN",
-              "description": "Downlink NR Absolute Radio Frequency Channel Number of the neighbour cell",
-              "type": "number"
+              "$ref": "peer/cell/nr/input-schema.json#/properties/dl_nr_arfcn"
             },
             "ssb_nr_arfcn": {
-              "title": "SSB NR ARFCN",
-              "description": "SSB NR Absolute Radio Frequency Channel Number of the neighbour cell",
-              "type": "number"
+              "$ref": "peer/cell/nr/input-schema.json#/properties/ssb_nr_arfcn"
             },
             "pci": {
-              "title": "Physical Cell ID",
-              "description": "Physical Cell ID of the neighbour cell",
-              "type": "number"
+              "$ref": "peer/cell/nr/input-schema.json#/properties/pci"
             },
             "nr_cell_id": {
-              "title": "NR Cell ID",
-              "description": "Concatenation of gnb_id and cell_id of the neighbour cell",
-              "type": "string"
+              "$ref": "peer/cell/nr/input-schema.json#/properties/nr_cell_id"
             },
             "gnb_id_bits": {
-              "title": "gNB ID bits",
-              "description": "Number of bits for the gNodeB global identifier. (range 22 to 32)",
-              "type": "number"
+              "$ref": "peer/cell/nr/input-schema.json#/properties/gnb_id_bits"
             },
             "nr_band": {
-              "title": "NR band",
-              "description": "NR band number",
-              "type": "number"
+              "$ref": "peer/cell/nr/input-schema.json#/properties/nr_band"
             },
             "tac": {
-              "title": "Tracking Area Code",
-              "description": "Integer (range 0 to 16777215)",
-              "type": "number"
+              "$ref": "peer/cell/nr/input-schema.json#/properties/tac"
             }
           },
           "type": "object"

software/ors-amarisoft/peer/cell/lte/input-schema.json

+{
+  "$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

+{
+  "$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" }
+  }
+}