From: Martin Skorupski <martin.skorupski@highstreet-technologies.com>
Date: Mon, 7 Mar 2022 14:32:32 +0000 (+0000)
Subject: Merge "Ues json file names as expected by o-ran-sc-topology service"
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=0bc1150dcd82b45ff90cd618c0f066e6b26854ba;hp=5430f4d172ebe343d9496264c58e172439ded219;p=oam.git

Merge "Ues json file names as expected by o-ran-sc-topology service"
---

diff --git a/code/network-topology-instance-generator/tapi_topology_generator.py b/code/network-topology-instance-generator/tapi_topology_generator.py
index 8c632c1..2bd27b1 100644
--- a/code/network-topology-instance-generator/tapi_topology_generator.py
+++ b/code/network-topology-instance-generator/tapi_topology_generator.py
@@ -30,14 +30,23 @@ if validator.is_valid():
     network = generator.generate()
     viewer = NetworkViewer(network)
 
-    filename: str = "output/network.json"
-    if configuration['network']['name']:
-        filename = "output/" + configuration['network']['name'] + ".json"
-    viewer.json().save(filename)
+    # operational json
+    filename: str = "output/tapi-common-operational.json"
+    if "name" in configuration['network']:
+        filename = "output/" + configuration['network']['name'] + "-operational.json"
+    viewer.json().save(filename, False)
+
+    # running json
+    filename: str = "output/tapi-common-running.json"
+    if "name" in configuration['network']:
+        filename = "output/" + configuration['network']['name'] + "-running.json"
+    viewer.json().save(filename, True)
+
     # viewer.json().showAsJson()
 
-    filename: str = "output/network.svg"
-    if configuration['network']['name']:
+    # svg
+    filename: str = "output/o-ran-sc-topology-view.svg"
+    if "name" in configuration['network']:
         filename = "output/" + configuration['network']['name'] + ".svg"
     viewer.svg(filename)