Add to_directory method to relevant object classes

[oam.git] / code / network-generator / network_generation / cli.py

diff --git a/code/network-generator/network_generation/cli.py b/code/network-generator/network_generation/cli.py
index ad4188a..e156fcd 100644 (file)
--- a/code/network-generator/network_generation/cli.py
+++ b/code/network-generator/network_generation/cli.py
@@ -44,28 +44,41 @@ def main() -> None:  # pragma: no cover
         network: ORanNetwork = generator.generate()
         viewer: NetworkViewer = NetworkViewer(network)
 
-        output_folder: str = configuration["output-folder"]
+        output_folder: str = configuration["outputFolder"]
         # If folder doesn't exist, then create it.
         if not os.path.isdir(output_folder):
             os.makedirs(output_folder)
 
-        name: str = configuration["network"]["name"]
-        filename: str = ""
+        name: str = str(configuration["network"]["name"]).lower()
+        filename: str = "/".join([output_folder, name])
 
         # topology json
-        if configuration["generation-tasks"]["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["generation-tasks"]["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["generation-tasks"]["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())