ors-json-schema: Update cell json schema

software/ors-amarisoft/cell/common.json

@@ -14,17 +14,6 @@
   ],
 
   "properties": {
-    "cell_type": {
-      "type": "string",
-      "options":  { "hidden": true }
-    },
-    "cell_kind": {
-      "type": "string",
-      "const":    "enb",
-      "template": "enb",
-      "options":  { "hidden": true }
-    },
-
     "rf_mode": {
       "title": "RF mode",
       "description": "Mode for TX/RX radio multiplexing: Frequency- or Time- Domain Division",

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

 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-
   "title": "Cell",
   "type": "object",
   "oneOf": [
-    { "$ref": "../cell/lte/input-schema.json" },
-    { "$ref": "../cell/nr/input-schema.json" }
+    {
+      "$ref": "../cell/lte/input-schema.json"
+    },
+    {
+      "$ref": "../cell/nr/input-schema.json"
+    }
   ]
 }

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

@@ -4,8 +4,14 @@
   "title": "LTE Cell",
   "type": "object",
 
+  "properties": {
+    "lte": {
+      "title": "LTE Cell",
+      "type": "object",
+      "properties" : {
+        "enb": {
+          "type": "object",
           "required": [
-    "cell_type",
             "rf_mode",
             "pci",
             "cell_id",
@@ -17,13 +23,6 @@
           ],
           "properties": {
             "$ref": "../../cell/common.json#/properties",
-
-    "cell_type": {
-      "$ref": "#/properties/cell_type",
-      "const":    "lte",
-      "template": "lte"
-    },
-
             "tdd_ul_dl_config": {
               "title": "TDD Configuration",
               "type": "string",
@@ -38,7 +37,6 @@
                 }
               }
             },
-
             "bandwidth": {
               "$ref": "#/properties/bandwidth",
               "enum": [
@@ -50,7 +48,6 @@
                 20
               ]
             },
-
             "dl_earfcn": {
               "title": "DL EARFCN",
               "description": "Downlink E-UTRA Absolute Radio Frequency Channel Number of the cell",
@@ -67,9 +64,13 @@
               "type": "string"
             },
             "root_sequence_index": {
-      "$ref": "#/properties/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.",
               "default": 204
             }
           }
+	}
+      }
+    }
+  }
 }