Fix reporters

cloudselect/report/json.py

@@ -8,8 +8,6 @@
 """Module that represents list of selected instances as JSON output."""
 import json
 
-from cloudselect import Container
-
 from . import ReportService
 
 
@@ -18,9 +16,7 @@ class Json(ReportService):  # pylint: disable=too-few-public-methods
 
     def run(self, selected):
         """Represent instances as JSON output."""
-        # get first instance
-        # assume that all instances match the same group/pattern
-        instance = next(iter(selected), None)
-        options = Container.options("option", instance.metadata)
+        options = self.get_option(selected)
         report = {"instances": [i.to_dict() for i in selected], "option": options}
         print(json.dumps(report, sort_keys=True))
+        return report

cloudselect/report/json_pp.py

@@ -8,8 +8,6 @@
 """Module that represents list of selected instances as formatted JSON output."""
 import json
 
-from cloudselect import Container
-
 from . import ReportService
 
 
@@ -18,9 +16,7 @@ class JsonPP(ReportService):  # pylint: disable=too-few-public-methods
 
     def run(self, selected):
         """Represent instances as formatted JSON output."""
-        # get first instance
-        # assume that all instances match the same group/pattern
-        instance = next(iter(selected), None)
-        options = Container.options("option", instance.metadata)
+        options = self.get_option(selected)
         report = {"instances": [i.to_dict() for i in selected], "option": options}
         print(json.dumps(report, indent=2, sort_keys=True))
+        return report

cloudselect/report/report.py

@@ -20,12 +20,20 @@ class ReportService:  # pylint: disable=too-few-public-methods
     def run(selected):
         """Prepare report based on list of selected instances."""
         pp = pprint.PrettyPrinter()
+        options = ReportService.get_option(selected)
+        report = {"instances": [i.to_dict() for i in selected], "option": options}
+        pp.pprint(report)
+        return report
+
+    @staticmethod
+    def get_option(selected):
+        """Get option block for report."""
         # get first instance
         # assume that all instances match the same group/pattern
         instance = next(iter(selected), None)
-        options = Container.options("option", instance.metadata)
-        report = {"instances": [i.to_dict() for i in selected], "option": options}
-        pp.pprint(report)
+        if instance:
+            return Container.options("option", instance.metadata)
+        return Container.options("option")
 
 
 class ReportServiceProvider(providers.Singleton):

cloudselect/report/yaml.py

@@ -8,8 +8,6 @@
 """Module that represents list of selected instances as JSON output."""
 from yaml import safe_dump
 
-from cloudselect import Container
-
 from . import ReportService
 
 
@@ -18,9 +16,7 @@ class Yaml(ReportService):  # pylint: disable=too-few-public-methods
 
     def run(self, selected):
         """Represent instances as YAML output."""
-        # get first instance
-        # assume that all instances match the same group/pattern
-        instance = next(iter(selected), None)
-        options = Container.options("option", instance.metadata)
+        options = self.get_option(selected)
         report = {"instances": [i.to_dict() for i in selected], "option": options}
         print(safe_dump(report, indent=2))
+        return report

test/report/test_stub.py

@@ -26,7 +26,7 @@ def test_stub_report(cfgdir):
     args = cloud.parse_args([])
     cloud.fabric(profile, args)
     assert Container.report().__class__.__name__ == "Stub"
-    assert Container.report().run([]) == []
+    assert Container.report().run([]) == {"instances": [], "option": {}}
     assert Container.report() == Container.report()
 
 

test/test_selector.py

@@ -133,5 +133,5 @@ def test_select_single(cfgdir):
     selector = cloud.fabric(configuration, args)
     assert isinstance(Container.discovery(), Local)
     report = selector.select()
-    assert len(report) == 1
-    assert report[0].host == "my.cloud.instance"
+    assert len(report["instances"]) == 1
+    assert report["instances"][0]["host"] == "my.cloud.instance"