Merge "Add traffic duration support in test case"

[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 8093cd2..e4c72dc 100644 (file)
--- a/yardstick/benchmark/scenarios/storage/storperf.py
+++ b/yardstick/benchmark/scenarios/storage/storperf.py
@@ -87,7 +87,9 @@ class StorPerf(base.Scenario):
         env_args = {}
         env_args_payload_list = ["agent_count", "agent_flavor",
                                  "public_network", "agent_image",
-                                 "volume_size"]
+                                 "volume_size", "volume_type",
+                                 "volume_count", "availability_zone",
+                                 "stack_name", "subnet_CIDR"]
 
         for env_argument in env_args_payload_list:
             try:
@@ -213,11 +215,20 @@ class StorPerf(base.Scenario):
         #       else:
         #           time.sleep(int(esti_time)/2)
 
-            result_res = requests.get('http://%s:5000/api/v1.0/jobs?id=%s' %
-                                      (self.target, job_id))
+            result_res = requests.get('http://%s:5000/api/v1.0/jobs?type='
+                                      'metadata&id=%s' % (self.target, job_id))
+            result_res_content = jsonutils.loads(result_res.content)
+            if 'report' in result_res_content and \
+                    'steady_state' in result_res_content['report']['details']:
+                res = result_res_content['report']['details']['steady_state']
+                steady_state = res.values()[0]
+                LOG.info("Job %s completed with steady state %s",
+                         job_id, steady_state)
+
+            result_res = requests.get('http://%s:5000/api/v1.0/jobs?'
+                                      'type=status&id=%s' % (self.target, job_id))
             result_res_content = jsonutils.loads(
                 result_res.content)
-
             result.update(result_res_content)
 
     def initialize_disks(self):