Merge "Update NSB PROX devguide"

[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..5b8b000 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:
@@ -100,13 +102,14 @@ class StorPerf(base.Scenario):
         setup_res = requests.post('http://%s:5000/api/v1.0/configurations'
                                   % self.target, json=env_args)
 
-        setup_res_content = jsonutils.loads(
-            setup_res.content)
 
         if setup_res.status_code != 200:
-            raise RuntimeError("Failed to create a stack, error message:",
-                               setup_res_content["message"])
+            LOG.error("Failed to create stack. %s: %s",
+                      setup_res.status_code, setup_res.content)
+            raise RuntimeError("Failed to create stack. %s: %s" %
+                               (setup_res.status_code, setup_res.content))
         elif setup_res.status_code == 200:
+            setup_res_content = jsonutils.loads(setup_res.content)
             LOG.info("stack_id: %s", setup_res_content["stack_id"])
 
         while not self._query_setup_state():
@@ -120,14 +123,15 @@ class StorPerf(base.Scenario):
     def _query_job_state(self, job_id):
         """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),
+        report_res = requests.get('http://%s:5000/api/v1.0/jobs' % self.target,
                                   params={'id': job_id, 'type': 'status'})
 
         report_res_content = jsonutils.loads(
             report_res.content)
 
         if report_res.status_code != 200:
+            LOG.error("Failed to fetch report, error message: %s",
+                      report_res_content["message"])
             raise RuntimeError("Failed to fetch report, error message:",
                                report_res_content["message"])
         else:
@@ -184,15 +188,15 @@ class StorPerf(base.Scenario):
 
         LOG.info("Starting a job with parameters %s", job_args)
         job_res = requests.post('http://%s:5000/api/%s/jobs' % (self.target,
-                                                                api_version),
-                                json=job_args)
-
-        job_res_content = jsonutils.loads(job_res.content)
+                                                                api_version), json=job_args)
 
         if job_res.status_code != 200:
-            raise RuntimeError("Failed to start a job, error message:",
-                               job_res_content["message"])
+            LOG.error("Failed to start job. %s: %s",
+                               job_res.status_code, job_res.content)
+            raise RuntimeError("Failed to start job. %s: %s" %
+                               (job_res.status_code, job_res.content))
         elif job_res.status_code == 200:
+            job_res_content = jsonutils.loads(job_res.content)
             job_id = job_res_content["job_id"]
             LOG.info("Started job id: %s...", job_id)
 
@@ -213,11 +217,20 @@ class StorPerf(base.Scenario):
         #       else:
         #           time.sleep(int(esti_time)/2)
 
+            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?id=%s' %
                                       (self.target, job_id))
             result_res_content = jsonutils.loads(
                 result_res.content)
-
             result.update(result_res_content)
 
     def initialize_disks(self):
@@ -236,13 +249,14 @@ class StorPerf(base.Scenario):
         job_res = requests.post('http://%s:5000/api/v1.0/initializations' %
                                 self.target, json=job_args)
 
-        job_res_content = jsonutils.loads(job_res.content)
 
         if job_res.status_code != 200:
-            raise RuntimeError(
-                "Failed to start initialization job, error message:",
-                job_res_content["message"])
+            LOG.error("Failed to start initialization job, error message: %s: %s",
+                      job_res.status_code, job_res.content)
+            raise RuntimeError("Failed to start initialization job, error message: %s: %s" %
+                               (job_res.status_code, job_res.content))
         elif job_res.status_code == 200:
+            job_res_content = jsonutils.loads(job_res.content)
             job_id = job_res_content["job_id"]
             LOG.info("Started initialization as job id: %s...", job_id)
 
@@ -260,6 +274,8 @@ class StorPerf(base.Scenario):
         if teardown_res.status_code == 400:
             teardown_res_content = jsonutils.loads(
                 teardown_res.json_data)
+            LOG.error("Failed to reset environment, error message: %s",
+                      teardown_res_content['message'])
             raise RuntimeError("Failed to reset environment, error message:",
                                teardown_res_content['message'])