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, 9 insertions, 29 deletions

diff --git a/docker/storperf-master/storperf/db/test_results_db.py b/docker/storperf-master/storperf/db/test_results_db.py
index a2f7038..d6aabee 100644
--- a/docker/storperf-master/storperf/db/test_results_db.py
+++ b/docker/storperf-master/storperf/db/test_results_db.py
@@ -8,38 +8,19 @@
 ##############################################################################
 
 import json
-import os
 import requests
 
 
-def get_installer_type(logger=None):
-    """
-    Get installer type (fuel, apex, joid, compass)
-    """
-    try:
-        installer = os.environ['INSTALLER_TYPE']
-    except KeyError:
-        if logger:
-            logger.error("Impossible to retrieve the installer type")
-        installer = "Unknown_installer"
-
-    return installer
-
-
-def push_results_to_db(db_url, project, case_name,
-                       test_start, test_stop, logger, pod_name,
-                       version, scenario, criteria, build_tag, details):
+def push_results_to_db(db_url, details, logger):
     """
     POST results to the Result target DB
     """
     url = db_url + "/results"
-    installer = get_installer_type(logger)
 
-    params = {"project_name": project, "case_name": case_name,
-              "pod_name": pod_name, "installer": installer,
-              "version": version, "scenario": scenario, "criteria": criteria,
-              "build_tag": build_tag, "start_date": test_start,
-              "stop_date": test_stop, "details": details}
+    params = details.copy()
+    params.pop('details')
+
+    logger.info("popped params= %s" % params)
 
     headers = {'Content-Type': 'application/json'}
     try:
@@ -53,9 +34,8 @@ def push_results_to_db(db_url, project, case_name,
             logger.debug(r.status_code)
             logger.debug(r.content)
         return json.loads(r.content)
-    except Exception, e:
-        logger.error("Error [push_results_to_db('%s', '%s', '%s', " +
-                     "'%s', '%s', '%s', '%s', '%s', '%s')]:" %
-                     (db_url, project, case_name, pod_name, version,
-                      scenario, criteria, build_tag, details), e)
+    except Exception:
+        if logger:
+            logger.exception("Error [push_results_to_db('%s', '%s', '%s')]:" %
+                             (db_url, params, details['details']))
         return None