Structure json more nicely

Author: mariuszskon

cve_bin_tool/OutputEngine.py

@@ -30,9 +30,27 @@ def output_cves(self, outfile, output=None):
         else:  # csv, console, or anything else that is unrecognised
             self.output_csv(outfile)
 
+    def formatted_modules(self):
+        """ Returns self.modules converted into form
+        formatted_output[modulesname][version] = {
+            "cve": cve_number,
+            "severity": cve_severity,
+        }
+        """
+        formatted_output = {}
+        for modulename in self.modules:
+            formatted_output[modulename] = {}
+            for version, cves in self.modules[modulename].items():
+                formatted_output[modulename][version] = []
+                for cve_number, cve_severity in cves.items():
+                    formatted_output[modulename][version].append(
+                        {"cve": cve_number, "severity": cve_severity,}
+                    )
+        return formatted_output
+
     def output_json(self, outfile):
         """ Output a JSON of CVEs """
-        json.dump(self.modules, outfile)
+        json.dump(self.formatted_modules(), outfile)
 
     def output_csv(self, outfile):
         """ Output a CSV of CVEs """