bottlenecks offiline support

[bottlenecks.git] / testsuites / posca / testcase_script / posca_factor_multistack_storage.py

diff --git a/testsuites/posca/testcase_script/posca_factor_multistack_storage.py b/testsuites/posca/testcase_script/posca_factor_multistack_storage.py
index db4cb73..34ee225 100644 (file)
--- a/testsuites/posca/testcase_script/posca_factor_multistack_storage.py
+++ b/testsuites/posca/testcase_script/posca_factor_multistack_storage.py
@@ -54,11 +54,9 @@ def env_pre(test_config):
         test_yardstick = True
     stack_prepare._prepare_env_daemon(test_yardstick)
     quota_prepare.quota_env_prepare()
-    cmd = ('yardstick env prepare')
     LOG.info("yardstick environment prepare!")
     if(test_config["contexts"]['yardstick_envpre']):
-        yardstick_container = docker_env.yardstick_info['container']
-        stdout = docker_env.docker_exec_cmd(yardstick_container, cmd)
+        stdout = yardstick_task.yardstick_image_prepare()
         LOG.debug(stdout)
 
 
@@ -83,11 +81,11 @@ def do_test(test_config):
         loop_value = loop_value + 1
         with open(out_file) as f:
             data = json.load(f)
-            if data["status"] == 1:
+            if data["result"]["criteria"] == "PASS":
                 LOG.info("yardstick run success")
                 LOG.info("%s" % data["result"]["testcases"])
                 break
-            elif data["status"] == 2:
+            else:
                 LOG.error("yardstick error exit")
                 break
 
@@ -192,6 +190,7 @@ def run(test_config):
     numjobs = scenarios_conf["num_jobs"]
     direct = scenarios_conf["direct"]
     volume_num = scenarios_conf["volume_num"]
+    volume_size = scenarios_conf["volume_size"]
 
     for value in test_num:
         result = []
@@ -211,7 +210,8 @@ def run(test_config):
                            "size": size,
                            "rwmixwrite": rwmixwrite,
                            "numjobs": numjobs,
-                           "direct": direct}
+                           "direct": direct,
+                           "volume_size": int(volume_size)}
             tmp_thread = threading.Thread(target=func_run, args=(case_config,))
             threadings.append(tmp_thread)
             tmp_thread.start()