Improve errors for lab command and speed up topology builder (#136)

0.2.5 branch

Author: ttafsir

src/evengsdk/cli/lab/commands.py

@@ -118,8 +118,15 @@ def _get_all_labs(client: EvengClient) -> List:
 
         # Get the lab information from all other folders (non-root)
         status.update("Retrieving nested folders...")
+
+        # The EVE-NG PRO version shows labs in the root folder and The "Running"
+        # folder if the lab is running. We need to skip the "Running" folder to
+        # avoid duplicates.
         labs_in_nested_folders = chain(
-            *thread_executor(_get_lab_folder, (x["name"] for x in root_folders))
+            *thread_executor(
+                _get_lab_folder,
+                (x["name"] for x in root_folders if x["name"] != "Running"),
+            )
         )
         # flatten the results to single iterable
         # (labs from root folder + labs from nested)
@@ -261,6 +268,10 @@ def topology(ctx, path, output):
     """
     client = get_client(ctx)
     resp = client.api.get_lab_topology(path)
+
+    if not resp.get("data"):
+        cli_print_error("No Topology information available. Is the lab empty?")
+
     table_header = [
         ("type", {}),
         ("source", dict(justify="center", style="cyan", no_wrap=True)),

src/evengsdk/cli/version.py

@@ -1,2 +1,2 @@
 # -*- coding: utf-8 -*-
-__version__ = "0.2.4"
+__version__ = "0.2.5"

src/tests/cli/test_cli_lab.py

@@ -108,15 +108,15 @@ def test_lab_list(self):
         result = self._run_commands(["lab", "list"])
         assert result.exit_code == 0, result.output
 
-    @pytest.mark.skip(reason="TODO: fix empty lab raises error")
-    def test_list_lab_topology(self):
+    def test_list_lab_empty_topology(self, cli_lab_path):
         """
         Arrange/Act: Run the `lab` command with the 'topology' subcommand.
         Assert: The output indicates that lab topology is retrieved
             successfully.
         """
-        result = self._run_commands(["lab", "topology"])
-        assert result.exit_code == 0, result.output
+        result = self._run_commands(["lab", "topology"], cli_lab_path)
+        assert result.exit_code > 0
+        assert "no topology" in result.output.lower()
 
 
 @pytest.mark.usefixtures("setup_cli_lab")