Standardize Output

Re-arrange the JSON output so that it matches the format that
gets sent and retrieved from the testresults db.

Change-Id: I9f15e553e94b27b9e5a36f4984789c5e710feac4
JIRA: STORPERF-200
Signed-off-by: mbeierl <mark.beierl@dell.com>

1 files changed, 20 insertions, 3 deletions

diff --git a/docker/storperf-master/storperf/storperf_master.py b/docker/storperf-master/storperf/storperf_master.py
index 3b0af78..4e99e57 100644
--- a/docker/storperf-master/storperf/storperf_master.py
+++ b/docker/storperf-master/storperf/storperf_master.py
@@ -363,7 +363,7 @@ class StorPerfMaster(object):
 
     def fetch_results(self, job_id):
         if self._test_executor.job_db.job_id == job_id:
-            return self._test_executor.metadata['metrics']
+            return self._test_executor.metadata['details']['metrics']
 
         workload_params = self.job_db.fetch_workload_params(job_id)
         if 'report' in workload_params:
@@ -377,8 +377,25 @@ class StorPerfMaster(object):
     def fetch_job_status(self, job_id):
         return self._test_executor.execution_status(job_id)
 
-    def fetch_all_jobs(self):
-        return self.job_db.fetch_jobs()
+    def fetch_all_jobs(self, metrics_type):
+        job_list = self.job_db.fetch_jobs()
+        job_report = {}
+        if metrics_type is None:
+            job_report['job_ids'] = job_list
+        elif metrics_type == "metadata":
+            job_report['results'] = []
+            for job in job_list:
+                if metrics_type == 'metadata':
+                    metadata = self.fetch_metadata(job)
+                    if 'report' in metadata:
+                        metadata['report']['_id'] = job
+                        metadata['report']['start_date'] = \
+                            metadata['report']['start_time']
+                        metadata['report']['end_date'] = \
+                            metadata['report']['end_time']
+                        metadata['report']['_id'] = job
+                        job_report['results'].append(metadata['report'])
+        return job_report
 
     def _setup_slave(self, slave):
         logger = logging.getLogger(__name__ + ":" + slave)