.

software/ors-amarisoft/cell/common.json

+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+
+  "title": "Cell. Common properties",
+  "type": "object",
+
+  "required": [
+    "cell_type",
+    "rf_mode",
+    "pci",
+    "cell_id",
+    "ru"
+  ],
+
+  "properties": {
+    "cell_type": {
+      "type": "string",
+      "options":  { "hidden": true }
+    },
+
+    "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",
+      "default": "0x01"
+    },
+    "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": "integer",
+      "default": 204
+    },
+    "ru": {
+      "$ref": "#/$defs/ru-of-cell",
+      "propertyOrder": 9999
+    }
+  },
+
+  "$defs": {
+    "ru-of-cell": {
+      "title": "Radio Unit",
+      "oneOf": [
+        {
+          "title": "Shared Radio Unit",
+          "description": "Use radio unit defined in separate shared instance",
+          "type": "object",
+          "required": ["ru_type", "ru_ref"],
+          "properties": {
+            "ru_type": {
+                "const":    "ru_ref",
+                "template": "ru_ref",
+                "options":  { "hidden": true }
+            },
+            "ru_ref": {
+              "title": "RU Reference",
+              "description": "Reference of shared radio unit instance",
+              "type": "string"
+            }
+          }
+        },
+        {
+          "title": "Shared Radio Unit of a Cell",
+          "description": "Use the same radio unit as referenced cell instance does",
+          "type": "object",
+          "required": ["ru_type", "ruincell_ref"],
+          "properties": {
+            "ru_type": {
+                "const":    "ruincell_ref",
+                "template": "ruincell_ref",
+                "options":  { "hidden": true }
+            },
+            "ruincell_ref": {
+              "title": "Cell Reference",
+              "description": "Reference of cell instance whose radio unit to share",
+              "type": "string"
+            }
+          }
+        },
+        { "$ref": "../ru/input-schema.json" }
+      ]
+    }
+  }
+}

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

@@ -6,96 +6,5 @@
   "oneOf": [
     { "$ref": "../cell/lte/input-schema.json" },
     { "$ref": "../cell/nr/input-schema.json" }
-  ],
-
-  "$defs": {
-    "cell-common": {
-      "required": [
-        "cell_type",
-        "rf_mode",
-        "pci",
-        "cell_id",
-        "ru"
-      ],
-
-      "properties": {
-        "cell_type": {
-          "type": "string",
-          "options":  { "hidden": true }
-        },
-
-        "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",
-          "default": "0x01"
-        },
-        "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": "integer",
-          "default": 204
-        },
-        "ru": {
-          "$ref": "#/$defs/ru-of-cell",
-          "propertyOrder": 9999
-        }
-      }
-    },
-
-    "ru-of-cell": {
-      "title": "Radio Unit",
-      "oneOf": [
-        {
-          "title": "Shared Radio Unit",
-          "description": "Use radio unit defined in separate shared instance",
-          "type": "object",
-          "required": ["ru_type", "ru_ref"],
-          "properties": {
-            "ru_type": {
-                "const":    "ru_ref",
-                "template": "ru_ref",
-                "options":  { "hidden": true }
-            },
-            "ru_ref": {
-              "title": "RU Reference",
-              "description": "Reference of shared radio unit instance",
-              "type": "string"
-            }
-          }
-        },
-        {
-          "title": "Shared Radio Unit of a Cell",
-          "description": "Use the same radio unit as referenced cell instance does",
-          "type": "object",
-          "required": ["ru_type", "ruincell_ref"],
-          "properties": {
-            "ru_type": {
-                "const":    "ruincell_ref",
-                "template": "ruincell_ref",
-                "options":  { "hidden": true }
-            },
-            "ruincell_ref": {
-              "title": "Cell Reference",
-              "description": "Reference of cell instance whose radio unit to share",
-              "type": "string"
-            }
-          }
-        },
-        { "$ref": "../ru/input-schema.json" }
   ]
-    }
-  }
 }

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

@@ -10,10 +10,10 @@
     "tac"
   ],
   "properties": {
-    "$ref": "../../cell/input-schema.json#/$defs/cell-common/properties",
+    "$ref": "../../cell/common.json#/properties",
 
     "cell_type": {
-      "$ref": "#/$defs/cell-common/properties/cell_type",
+      "$ref": "#/properties/cell_type",
       "const":    "lte",
       "template": "lte"
     },
@@ -57,7 +57,7 @@
       "type": "integer"
     },
     "pci": {
-      "$ref": "#/$defs/cell-common/properties/pci",
+      "$ref": "#/properties/pci",
       "default": 1
     },
     "tac": {

software/ors-amarisoft/cell/peer/common.json

+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+
+  "title": "Peer Cell. Common properties",
+  "type": "object",
+  "required": [
+    "peer_cell_type",
+    "pci",
+    "tac"
+  ],
+
+  "properties": {
+    "peer_cell_type": {
+      "type": "string",
+      "options":  { "hidden": true }
+    }
+  }
+}

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

@@ -6,22 +6,5 @@
   "oneOf": [
     { "$ref": "../../cell/peer/lte/input-schema.json" },
     { "$ref": "../../cell/peer/nr/input-schema.json" }
-  ],
-
-  "$defs": {
-    "peer-cell-common": {
-      "required": [
-        "peer_cell_type",
-        "pci",
-        "tac"
-      ],
-
-      "properties": {
-        "peer_cell_type": {
-          "type": "string",
-          "options":  { "hidden": true }
-        }
-      }
-    }
-  }
+  ]
 }

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

@@ -3,7 +3,6 @@
 
   "title": "LTE Peer Cell",
   "type": "object",
-  "$ref": "../../../cell/peer/input-schema.json#/$defs/peer-cell-common",
 
   "required": [
     "e_cell_id",
@@ -15,6 +14,7 @@
 
   "properties": {
     "peer_cell_type": {
+      "$ref": "../../../cell/peer/common.json#/properties/peer_cell_type",
       "const":    "lte",
       "template": "lte"
     },