Merge "Document for Fraser test case results"

[yardstick.git] / yardstick / benchmark / scenarios / storage / storperf.py

diff --git a/yardstick/benchmark/scenarios/storage/storperf.py b/yardstick/benchmark/scenarios/storage/storperf.py
index 6ea0351..f0b2361 100644 (file)
--- a/yardstick/benchmark/scenarios/storage/storperf.py
+++ b/yardstick/benchmark/scenarios/storage/storperf.py
@@ -8,6 +8,7 @@
 ##############################################################################
 from __future__ import absolute_import
 
+import os
 import logging
 import time
 
@@ -86,8 +87,9 @@ class StorPerf(base.Scenario):
     def setup(self):
         """Set the configuration."""
         env_args = {}
-        env_args_payload_list = ["agent_count", "public_network",
-                                 "agent_image", "volume_size"]
+        env_args_payload_list = ["agent_count", "agent_flavor",
+                                 "public_network", "agent_image",
+                                 "volume_size"]
 
         for env_argument in env_args_payload_list:
             try:
@@ -117,7 +119,8 @@ class StorPerf(base.Scenario):
         """Query the status of the supplied job_id and report on metrics"""
         LOG.info("Fetching report for %s...", job_id)
         report_res = requests.get('http://{}:5000/api/v1.0/jobs'.format
-                                  (self.target), params={'id': job_id})
+                                  (self.target),
+                                  params={'id': job_id, 'type': 'status'})
 
         report_res_content = jsonutils.loads(
             report_res.content)
@@ -126,10 +129,10 @@ class StorPerf(base.Scenario):
             raise RuntimeError("Failed to fetch report, error message:",
                                report_res_content["message"])
         else:
-            job_status = report_res_content["status"]
+            job_status = report_res_content["Status"]
 
         LOG.debug("Job is: %s...", job_status)
-        self.job_completed = job_status == "completed"
+        self.job_completed = job_status == "Completed"
 
         # TODO: Support using StorPerf ReST API to read Job ETA.
 
@@ -146,7 +149,18 @@ class StorPerf(base.Scenario):
         if not self.setup_done:
             self.setup()
 
-        job_args = {}
+        metadata = {"build_tag": "latest", "test_case": "opnfv_yardstick_tc074"}
+        metadata_payload_dict = {"pod_name": "NODE_NAME",
+                                 "scenario_name": "DEPLOY_SCENARIO",
+                                 "version": "YARDSTICK_BRANCH"}
+
+        for key, value in metadata_payload_dict.items():
+            try:
+                metadata[key] = os.environ[value]
+            except KeyError:
+                pass
+
+        job_args = {"metadata": metadata}
         job_args_payload_list = ["block_sizes", "queue_depths", "deadline",
                                  "target", "nossd", "nowarm", "workload"]
 
@@ -193,7 +207,7 @@ class StorPerf(base.Scenario):
         #           terminate_res = requests.delete('http://%s:5000/api/v1.0
         #                                           /jobs' % self.target)
         #       else:
-        #           time.sleep(int(est_time)/2)
+        #           time.sleep(int(esti_time)/2)
 
             result_res = requests.get('http://%s:5000/api/v1.0/jobs?id=%s' %
                                       (self.target, job_id))