Revert "."

This reverts commit 5a45624b.

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

@@ -63,6 +63,36 @@
       },
       "type": "object",
       "default": {}
+    },
+    "nr_handover_a3_offset": {
+      "title": "A3 offset for NR handover",
+      "description": "RSRP gain offset between gNBs which will trigger handover",
+      "type": "number",
+      "default": 6
+    },
+    "nr_handover_time_to_trigger": {
+      "title": "Time to Trigger for NR handover",
+      "description": "Time to trigger after which NR handover will be triggered if A3 offset is reached",
+      "type": "number",
+      "enum": [
+        0,
+        40,
+        64,
+        80,
+        100,
+        128,
+        160,
+        256,
+        320,
+        480,
+        512,
+        640,
+        1024,
+        1280,
+        2560,
+        5120
+      ],
+      "default": 100
     }
   }
 }

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

@@ -94,7 +94,7 @@
     },
     "lte_handover_a3_offset": {
       "title": "A3 offset for LTE handover",
-      "description": "RSRP gain offset between eNBs which will trigger handover",
+      "description": "RSRP gain offset between gNBs which will trigger handover",
       "type": "number",
       "default": 6
     },
@@ -122,36 +122,6 @@
       ],
       "default": 480
     },
-    "nr_handover_a3_offset": {
-      "title": "A3 offset for NR handover",
-      "description": "RSRP gain offset between gNBs which will trigger handover",
-      "type": "number",
-      "default": 6
-    },
-    "nr_handover_time_to_trigger": {
-      "title": "Time to Trigger for NR handover",
-      "description": "Time to trigger after which NR handover will be triggered if A3 offset is reached",
-      "type": "number",
-      "enum": [
-        0,
-        40,
-        64,
-        80,
-        100,
-        128,
-        160,
-        256,
-        320,
-        480,
-        512,
-        640,
-        1024,
-        1280,
-        2560,
-        5120
-      ],
-      "default": 100
-    },
     "websocket_password": {
       "title": "Websocket password",
       "description": "Activates websocket for remote control and sets password",

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

@@ -80,10 +80,34 @@
       "$ref": "instance-enb-input-schema.json#/properties/plmn_list"
     },
     "lte_handover_a3_offset": {
-      "$ref": "instance-enb-input-schema.json#/properties/lte_handover_a3_offset"
+      "title": "A3 offset for LTE handover",
+      "description": "RSRP gain offset between gNBs which will trigger handover",
+      "type": "number",
+      "default": 6
     },
     "lte_handover_time_to_trigger": {
-      "$ref": "instance-enb-input-schema.json#/properties/lte_handover_time_to_trigger"
+      "title": "Time to Trigger for LTE handover",
+      "description": "Time to triger after which LTE handover will be triggered if A3 offset is reached",
+      "type": "number",
+      "enum": [
+        0,
+        40,
+        64,
+        80,
+        100,
+        128,
+        160,
+        256,
+        320,
+        480,
+        512,
+        640,
+        1024,
+        1280,
+        2560,
+        5120
+      ],
+      "default": 480
     },
     "ncell_list": {
       "title": "Neighbour Cell Info",

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

@@ -115,10 +115,34 @@
       "default": {}
     },
     "nr_handover_a3_offset": {
-      "$ref": "instance-enb-input-schema.json#/properties/nr_handover_a3_offset"
+      "title": "A3 offset for NR handover",
+      "description": "RSRP gain offset between gNBs which will trigger handover",
+      "type": "number",
+      "default": 6
     },
     "nr_handover_time_to_trigger": {
-      "$ref": "instance-enb-input-schema.json#/properties/nr_handover_time_to_trigger"
+      "title": "Time to Trigger for NR handover",
+      "description": "Time to triger after which NR handover will be triggerd if A3 offset is reached",
+      "type": "number",
+      "enum": [
+        0,
+        40,
+        64,
+        80,
+        100,
+        128,
+        160,
+        256,
+        320,
+        480,
+        512,
+        640,
+        1024,
+        1280,
+        2560,
+        5120
+      ],
+      "default": 100
     },
     "ncell_list": {
       "title": "Neighbour Cell Info",