Generate GeoJSON for topology

- adopt config files according to new schema

IssueID: OAM-443
Change-Id: Ifa61d2f35b94b496392dee2621b802516e330459
Signed-off-by: Martin Skorupski <martin.skorupski@highstreet-technologies.com>

diff --git a/code/network-generator/config.json b/code/network-generator/config.json
index e3c86fe..af0fbea 100644 (file)
--- a/code/network-generator/config.json
+++ b/code/network-generator/config.json
@@ -2,6 +2,13 @@
   "network": {
     "name": "O-RAN-Network",
     "operationalState": "enabled",
+    "host": "to-be-replaced-by-host-fqdn",
+    "version":"v0.0.2",
+    "center": {
+      "latitude": 40.535,
+      "longitude": -74.447,
+      "aboveMeanSeaLevel": 50
+    },
     "disabledResourcesProfile": {
       "o-ran-sc-network:smo": 0,
       "o-ran-sc-network:o-cloud": 0,
@@ -12,11 +19,6 @@
       "o-ran-common-identity-refs:o-ru-function": 20,
       "o-ran-sc-network:cell": 0
     },
-    "center": {
-      "latitude": 40.535,
-      "longitude": -74.447,
-      "aboveMeanSeaLevel": 50
-    },
     "pattern": {
       "tower": {
         "representation": "hexagon"
@@ -66,6 +68,10 @@
       "enabled": true,
       "compressed": true
     },
+    "rfc7946": {
+      "enabled": true,
+      "compressed": false
+    },
     "teiv": {
       "enabled": false,
       "compressed": false

diff --git a/code/network-generator/configurations/config00111.json b/code/network-generator/configurations/config00111.json
index c3663fa..f511b54 100644 (file)
--- a/code/network-generator/configurations/config00111.json
+++ b/code/network-generator/configurations/config00111.json
@@ -1,7 +1,14 @@
 {
   "network": {
     "name": "O-RAN-Network-Operator-B",
+    "host": "to-be-replaced-by-host-fqdn",
+    "version":"v0.0.2",
     "operationalState": "enabled",
+    "center": {
+      "latitude": 40.535,
+      "longitude": -74.457,
+      "aboveMeanSeaLevel": 52
+    },
     "disabledResourcesProfile": {
       "o-ran-sc-network:smo": 0,
       "o-ran-sc-network:o-cloud": 0,
@@ -11,11 +18,6 @@
       "o-ran-common-identity-refs:o-du-function": 0,
       "o-ran-common-identity-refs:o-ru-function": 25,
       "o-ran-sc-network:cell": 0
-    },
-     "center": {
-      "latitude": 40.535,
-      "longitude": -74.457,
-      "aboveMeanSeaLevel": 52
     },
     "pattern": {
       "tower": {
@@ -66,6 +68,10 @@
       "enabled": true,
       "compressed": true
     },
+    "rfc7946": {
+      "enabled": true,
+      "compressed": false
+    },
     "teiv": {
       "enabled": false,
       "compressed": false

diff --git a/code/network-generator/configurations/config00211.json b/code/network-generator/configurations/config00211.json
index 9dd58d7..40ce835 100644 (file)
--- a/code/network-generator/configurations/config00211.json
+++ b/code/network-generator/configurations/config00211.json
@@ -1,7 +1,14 @@
 {
   "network": {
     "name": "O-RAN-Network-Operator-A",
+    "host": "to-be-replaced-by-host-fqdn",
+    "version":"v0.0.2",
     "operationalState": "enabled",
+    "center": {
+      "latitude": 40.545,
+      "longitude": -74.447,
+      "aboveMeanSeaLevel": 51
+    },
     "disabledResourcesProfile": {
       "o-ran-sc-network:smo": 0,
       "o-ran-sc-network:o-cloud": 0,
@@ -11,11 +18,6 @@
       "o-ran-common-identity-refs:o-du-function": 0,
       "o-ran-common-identity-refs:o-ru-function": 15,
       "o-ran-sc-network:cell": 0
-    },
-     "center": {
-      "latitude": 40.545,
-      "longitude": -74.447,
-      "aboveMeanSeaLevel": 51
     },
     "pattern": {
       "tower": {
@@ -66,6 +68,10 @@
       "enabled": true,
       "compressed": true
     },
+    "rfc7946": {
+      "enabled": true,
+      "compressed": false
+    },
     "teiv": {
       "enabled": false,
       "compressed": false

diff --git a/code/network-generator/configurations/config11111.json b/code/network-generator/configurations/config11111.json
index fdc1a5b..ab163fe 100644 (file)
--- a/code/network-generator/configurations/config11111.json
+++ b/code/network-generator/configurations/config11111.json
@@ -1,7 +1,14 @@
 {
   "network": {
     "name": "O-RAN-Network-Operator-C",
+    "host": "to-be-replaced-by-host-fqdn",
+    "version":"v0.0.2",
     "operationalState": "enabled",
+    "center": {
+      "latitude": 40.535,
+      "longitude": -74.447,
+      "aboveMeanSeaLevel": 53
+    },
     "disabledResourcesProfile": {
       "o-ran-sc-network:smo": 0,
       "o-ran-sc-network:o-cloud": 0,
@@ -11,11 +18,6 @@
       "o-ran-common-identity-refs:o-du-function": 0,
       "o-ran-common-identity-refs:o-ru-function": 20,
       "o-ran-sc-network:cell": 0
-    },
-     "center": {
-      "latitude": 40.535,
-      "longitude": -74.447,
-      "aboveMeanSeaLevel": 53
     },
     "pattern": {
       "tower": {
@@ -66,6 +68,10 @@
       "enabled": true,
       "compressed": true
     },
+    "rfc7946": {
+      "enabled": true,
+      "compressed": false
+    },
     "teiv": {
       "enabled": false,
       "compressed": false

diff --git a/code/network-generator/test_config.json b/code/network-generator/test_config.json
index 374663c..ee7aca4 100644 (file)
--- a/code/network-generator/test_config.json
+++ b/code/network-generator/test_config.json
@@ -1,6 +1,13 @@
 {
   "network": {
     "name": "O-RAN-TEST-Network",
+    "host": "to-be-replaced-by-host-fqdn",
+    "version":"v0.0.2",
+    "center": {
+      "latitude": 40.535,
+      "longitude": -74.447,
+      "aboveMeanSeaLevel": 50
+    },
     "disabledResourcesProfile": {
       "o-ran-sc-network:smo": 0,
       "o-ran-sc-network:o-cloud": 0,
@@ -11,11 +18,6 @@
       "o-ran-common-identity-refs:o-ru-function": 0,
       "o-ran-sc-network:cell": 0
     },
-    "center": {
-      "latitude": 40.535,
-      "longitude": -74.447,
-      "aboveMeanSeaLevel": 50
-    },
     "pattern": {
       "tower": {
         "representation": "hexagon"