Configuration: move cell-angle from tower to O-RU

- schema changed

Issue-ID: OAM-365
Change-Id: I87e4ce792f0f8247533645762bc7c2e21c4cd1ef
Signed-off-by: Martin Skorupski <martin.skorupski@highstreet-technologies.com>

diff --git a/code/network-generator/model/jsonSchema/configuration.schema.json b/code/network-generator/model/jsonSchema/configuration.schema.json
index d1eae1d..4fbe9b1 100644 (file)
--- a/code/network-generator/model/jsonSchema/configuration.schema.json
+++ b/code/network-generator/model/jsonSchema/configuration.schema.json
@@ -101,8 +101,7 @@
           "title": "tower",
           "type": "object",
           "required": [
-            "representation",
-            "cellAngle"
+            "representation"
           ],
           "properties": {
             "representation": {
@@ -111,13 +110,6 @@
               "enum": [
                 "hexagon"
               ]
-            },
-            "cellAngle": {
-              "description": "The area covered by an NRCellDU around the tower in grad.",
-              "type": "integer",
-              "minimum": 0,
-              "maximum": 360,
-              "exclusiveMinimum": true
             }
           }
         },
@@ -164,7 +156,7 @@
           ],
           "properties": {
             "o-ran-cu-spiral-radius": {
-              "description": "The spiral radius of hexagons within an hexagon grid defines the number of O-RAN CUs and the geographical coverage of the SMO.",
+              "description": "The spiral radius of hexagons within a hexagon grid defines the number of O-RAN CUs and the geographical coverage of the SMO.",
               "type": "integer",
               "minimum": 0,
               "maximum": 3
@@ -172,15 +164,15 @@
           }
         },
         "o-ran-cu": {
-          "description": "Definition of the relation to O-RAN-RU children.",
+          "description": "Definition of the relation to O-RAN-CU children.",
           "title": "o-ran-cu",
           "type": "object",
           "required": [
-            "tower-spiral-radius"
+            "o-ran-du-spiral-radius"
           ],
           "properties": {
-            "tower-spiral-radius": {
-              "description": "The spiral radius of hexagons within an hexagon grid defines the number of towers and the geographical coverage of the SMO.",
+            "o-ran-du-spiral-radius": {
+              "description": "The spiral radius of hexagons within a hexagon grid defines the number of O-RAN DUs and the geographical coverage of the SMO.",
               "type": "integer",
               "minimum": 0,
               "maximum": 3
@@ -192,10 +184,17 @@
           "title": "o-ran-du",
           "type": "object",
           "required": [
+            "tower-spiral-radius",
             "fronthaul-gateway-count",
             "o-ran-ru-count"
           ],
           "properties": {
+            "tower-spiral-radius": {
+              "description": "The spiral radius of hexagons within an hexagon grid defines the number of towers and the geographical coverage of the O-RAN-DU. This means that center tower offers the O-Cloud resource pool for the surrounding towers and its O-RAN-RUs.",
+              "type": "integer",
+              "minimum": 0,
+              "maximum": 3
+            },
             "fronthaul-gateway-count": {
               "description": "Number of fronthaul gateway connected to an O-RAN-DU.",
               "type": "integer",
@@ -219,7 +218,9 @@
           "title": "o-ran-ru",
           "type": "object",
           "required": [
-            "nr-cell-du-count"
+            "nr-cell-du-count",
+            "cell-angle",
+            "max-reach"
           ],
           "properties": {
             "nr-cell-du-count": {
@@ -229,6 +230,19 @@
                 1,
                 3
               ]
+            },
+            "cell-angle": {
+              "description": "The area covered by an NRCellDU around the tower in grad.",
+              "type": "integer",
+              "minimum": 0,
+              "maximum": 360,
+              "exclusiveMinimum": true
+            },
+            "max-reach": {
+              "description": "The maximal distance a UE can reach the cell in meters. The value also defines the radius around a tower where UEs may select a NRCellDU of an O-RAN-RU mounted at this tower.",
+              "type": "integer",
+              "minimum": 15,
+              "maximum": 600
             }
           }
         },