Fixing double JSON encoding of results payload

Change-Id: I5e5a8180d5851630b1200ade84f6beb5dfa18466
Signed-off-by: mbeierl <mark.beierl@dell.com>

diff --git a/storperf/db/test_results_db.py b/storperf/db/test_results_db.py
index bb328db..038525f 100644 (file)
--- a/storperf/db/test_results_db.py
+++ b/storperf/db/test_results_db.py
@@ -44,9 +44,10 @@ def push_results_to_db(db_url, project, case_name,
     headers = {'Content-Type': 'application/json'}
     try:
         if logger:
+            jsonified_params = json.dumps(params)
             logger.info("Pushing results to %s" % (url))
-            logger.debug("Parameters: %s" % params)
-        r = requests.post(url, data=json.dumps(params), headers=headers)
+            logger.debug("Parameters: %s" % jsonified_params[:1024])
+        r = requests.post(url, data=jsonified_params, headers=headers)
         if logger:
             logger.debug(r)
             logger.debug(r.status_code)
@@ -56,5 +57,5 @@ def push_results_to_db(db_url, project, case_name,
         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[:512]), e)
+                      scenario, criteria, build_tag, details), e)
         return False

diff --git a/storperf/utilities/data_handler.py b/storperf/utilities/data_handler.py
index 2f79054..78708b5 100644 (file)
--- a/storperf/utilities/data_handler.py
+++ b/storperf/utilities/data_handler.py
@@ -17,7 +17,6 @@ from storperf.utilities import math as math
 from storperf.utilities import steady_state as SteadyState
 from time import sleep
 import time
-import json
 
 
 class DataHandler(object):
@@ -179,6 +178,6 @@ class DataHandler(object):
                                                    scenario,
                                                    criteria,
                                                    build_tag,
-                                                   json.dumps(payload))
+                                                   payload)
             except:
                 self.logger.exception("Error pushing results into Database")