Fixing Results DB Keys

Update keys pushed to testresults DB so they match
the expected values.

JIRA: STORPERF-216

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

diff --git a/ci/start_job.sh b/ci/start_job.sh
index dde3dca..715d40a 100755 (executable)
--- a/ci/start_job.sh
+++ b/ci/start_job.sh
@@ -18,7 +18,7 @@ cat << EOF > body.json
    "metadata": {
         "disk_type": "${DISK_TYPE}",
         "pod_name": "${POD_NAME}",
-        "scenario_name": "${SCENARIO_NAME}",
+        "scenario": "${SCENARIO_NAME}",
         "storage_node_count": ${CINDER_NODES},
         "version": "${VERSION}",
         "build_tag": "${BUILD_TAG}",
@@ -33,4 +33,4 @@ curl -s -X POST --header 'Content-Type: application/json' \
     --header 'Accept: application/json' \
     -d @body.json http://127.0.0.1:5000/api/v1.0/jobs
 
-rm body.json
\ No newline at end of file
+rm body.json

diff --git a/docker/storperf-master/storperf/utilities/data_handler.py b/docker/storperf-master/storperf/utilities/data_handler.py
index 471c295..f5bf387 100644 (file)
--- a/docker/storperf-master/storperf/utilities/data_handler.py
+++ b/docker/storperf-master/storperf/utilities/data_handler.py
@@ -141,11 +141,11 @@ class DataHandler(object):
             criteria = 'FAIL'
         executor.metadata['criteria'] = criteria
 
-        executor.metadata['start_time'] = \
+        executor.metadata['start_date'] = \
             time.strftime('%Y-%m-%d %H:%M:%S',
                           time.gmtime(executor.start_time))
 
-        executor.metadata['end_time'] = \
+        executor.metadata['stop_date'] = \
             time.strftime('%Y-%m-%d %H:%M:%S',
                           time.gmtime(executor.end_time))
 

diff --git a/docker/storperf-master/tests/utilities_tests/data_handler_test.py b/docker/storperf-master/tests/utilities_tests/data_handler_test.py
index f028bd0..d83bf1b 100644 (file)
--- a/docker/storperf-master/tests/utilities_tests/data_handler_test.py
+++ b/docker/storperf-master/tests/utilities_tests/data_handler_test.py
@@ -301,8 +301,8 @@ class DataHandlerTest(unittest.TestCase):
         self.assertEqual('FAIL', self.db_results[1]['criteria'],
                          'Expected FAIL in criteria')
         self.assertEqual('2017-09-04 21:05:00',
-                         self.db_results[1]['start_time'],
+                         self.db_results[1]['start_date'],
                          'Start time')
         self.assertEqual('2017-09-04 21:20:00',
-                         self.db_results[1]['end_time'],
+                         self.db_results[1]['stop_date'],
                          'End time')