From 6d25da03b7f4064db33df50469d01019451eb1fc Mon Sep 17 00:00:00 2001 From: Martin Skorupski Date: Wed, 22 Nov 2023 17:29:33 +0100 Subject: [PATCH] Decide about "list-case" or "camelCase" in schema. - update config files according to schema Issue-ID: OAM-396 Change-Id: Id5b5f3fb41421333955db401708b31957c94a46f Signed-off-by: Martin Skorupski --- code/network-generator/config.json | 38 ++++++++++++++++----------------- code/network-generator/test_config.json | 38 ++++++++++++++++----------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/code/network-generator/config.json b/code/network-generator/config.json index 2661f46..2e13bbc 100644 --- a/code/network-generator/config.json +++ b/code/network-generator/config.json @@ -1,6 +1,6 @@ { "network": { - "name": "o-ran-network", + "name": "O-RAN-Network", "center": { "latitude": 40.535, "longitude": -74.447, @@ -11,34 +11,34 @@ "representation": "hexagon" }, "smo": { - "five-g-core-count": 1, - "near-rt-ric-spiral-radius": 1, - "o-could-resource-pool-count": 1 + "fiveGCoreCount": 1, + "nearRtRicSpiralRadius": 1, + "oCloudResourcePoolCount": 1 }, - "near-rt-ric": { - "o-ran-cu-spiral-radius": 1 + "nearRtRic": { + "oRanCuSpiralRadius": 1 }, - "o-ran-cu": { - "o-ran-du-spiral-radius": 1 + "oRanCu": { + "oRanDuSpiralRadius": 1 }, - "o-ran-du": { - "fronthaul-gateway-count": 0, - "tower-spiral-radius": 1, - "o-ran-ru-count": 1 + "oRanDu": { + "fronthaulGatewayCount": 0, + "towerSpiralRadius": 1, + "oRanRuCount": 1 }, - "o-ran-ru": { - "nr-cell-du-count": 1 + "oRanRu": { + "nrCellDuCount": 1 }, - "nr-cell-du": { - "sector-count": 1, - "cell-angle": 120, + "nrCellDu": { + "sectorCount": 1, + "cellAngle": 120, "cellScaleFactorForHandoverArea": 20, "maxReach": 400 } } }, - "output-folder": "output", - "generation-tasks": { + "outputFolder": "output", + "generationTasks": { "topology": true, "svg": true, "kml": true diff --git a/code/network-generator/test_config.json b/code/network-generator/test_config.json index ac8a56d..914d359 100644 --- a/code/network-generator/test_config.json +++ b/code/network-generator/test_config.json @@ -1,6 +1,6 @@ { "network": { - "name": "o-ran-network", + "name": "O-RAN-TEST-Network", "center": { "latitude": 40.535, "longitude": -74.447, @@ -11,34 +11,34 @@ "representation": "hexagon" }, "smo": { - "five-g-core-count": 1, - "near-rt-ric-spiral-radius": 0, - "o-could-resource-pool-count": 1 + "fiveCCoreCount": 1, + "nearRtRicSpiralRadius": 0, + "oCloudResourcePoolCount": 1 }, - "near-rt-ric": { - "o-ran-cu-spiral-radius": 0 + "nearRtRic": { + "oRanCuSpiralRadius": 0 }, - "o-ran-cu": { - "o-ran-du-spiral-radius": 0 + "oRanCu": { + "oRanDuSpiralRadius": 0 }, - "o-ran-du": { - "fronthaul-gateway-count": 0, - "tower-spiral-radius": 0, - "o-ran-ru-count": 1 + "oRanDu": { + "fronthaulGatewayCount": 0, + "towerSpiralRadius": 0, + "oRanRuCount": 1 }, - "o-ran-ru": { - "nr-cell-du-count": 1 + "oRanRu": { + "nrCellDuCount": 1 }, - "nr-cell-du": { - "sector-count": 1, - "cell-angle": 120, + "nrCellDu": { + "sectorCount": 1, + "cellAngle": 120, "cellScaleFactorForHandoverArea": 20, "maxReach": 400 } } }, - "output-folder": "output", - "generation-tasks": { + "outputFolder": "output", + "generationTasks": { "topology": true, "svg": true, "kml": true -- 2.16.6