X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=code%2Fnetwork-generator%2Fnetwork_generation%2Fcli.py;h=e156fcdfeee72a3d141f19719c0b72c95399a021;hb=refs%2Fheads%2Fmaster;hp=c64243355c2f4b2be2d85a91e211f3fd221d4163;hpb=4b089018e34cea369399ace99c2a81bc77b7ce82;p=oam.git

diff --git a/code/network-generator/network_generation/cli.py b/code/network-generator/network_generation/cli.py
index c642433..e156fcd 100644
--- a/code/network-generator/network_generation/cli.py
+++ b/code/network-generator/network_generation/cli.py
@@ -50,22 +50,35 @@ def main() -> None:  # pragma: no cover
             os.makedirs(output_folder)
 
         name: str = str(configuration["network"]["name"]).lower()
-        filename: str = ""
+        filename: str = "/".join([output_folder, name])
 
         # topology json
-        if configuration["generationTasks"]["topology"] is True:
-            filename = output_folder + "/" + name + "-operational.json"
-            viewer.json().save(filename)
+        if configuration["generationTasks"]["topology"]["enabled"] is True:
+            viewer.json().save(
+                filename,
+                configuration["generationTasks"]["topology"]["compressed"]
+            )
+
+        # dir structure for day0 configuration
+        # Note: compressed option ignored
+        if configuration["generationTasks"]["network_dir"]["enabled"] is True:
+            viewer.to_directory(
+                output_folder
+            )
 
         # svg xml
-        if configuration["generationTasks"]["svg"] is True:
-            filename = output_folder + "/" + name + ".svg"
-            viewer.svg(filename)
+        if configuration["generationTasks"]["svg"]["enabled"] is True:
+            viewer.svg(
+                filename,
+                configuration["generationTasks"]["svg"]["compressed"]
+            )
 
-        # kml xml
-        if configuration["generationTasks"]["kml"] is True:
-            filename = output_folder + "/" + name + ".kml"
-            viewer.kml(filename)
+        # kml/kmz xml
+        if configuration["generationTasks"]["kml"]["enabled"] is True:
+            viewer.kml(
+                filename,
+                configuration["generationTasks"]["kml"]["compressed"]
+            )
 
     else:
         print(validator.error_message())