Move cell configurations to cell level

- Change schema

IssueID: OAM-375
Change-Id: I28e14fd4088effe42317ea85d333231e1dabf4c8
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 4fbe9b1..ee56992 100644 (file)
--- a/code/network-generator/model/jsonSchema/configuration.schema.json
+++ b/code/network-generator/model/jsonSchema/configuration.schema.json
@@ -218,9 +218,7 @@
           "title": "o-ran-ru",
           "type": "object",
           "required": [
-            "nr-cell-du-count",
-            "cell-angle",
-            "max-reach"
+            "nr-cell-du-count"
           ],
           "properties": {
             "nr-cell-du-count": {
@@ -230,19 +228,6 @@
                 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
             }
           }
         },
@@ -251,7 +236,9 @@
           "title": "nr-cell-du",
           "type": "object",
           "required": [
-            "sector-count"
+            "sector-count",
+            "cell-angle",
+            "max-reach"
           ],
           "properties": {
             "sector-count": {
@@ -261,6 +248,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
             }
           }
         }