Merge "Move "read_yaml_file" to common.yaml_loader"

[yardstick.git] / yardstick / benchmark / scenarios / compute / qemu_migrate.py

diff --git a/yardstick/benchmark/scenarios/compute/qemu_migrate.py b/yardstick/benchmark/scenarios/compute/qemu_migrate.py
index 6cfedc1..975c90b 100644 (file)
--- a/yardstick/benchmark/scenarios/compute/qemu_migrate.py
+++ b/yardstick/benchmark/scenarios/compute/qemu_migrate.py
@@ -26,7 +26,7 @@ class QemuMigrate(base.Scenario):
     __scenario_type__ = "QemuMigrate"
 
     TARGET_SCRIPT = "qemu_migrate_benchmark.bash"
-    WORKSPACE = "/root/workspace"
+    WORKSPACE = "/root/workspace/"
     REBOOT_CMD_PATTERN = r";\s*reboot\b"
 
     def __init__(self, scenario_cfg, context_cfg):
@@ -56,7 +56,7 @@ class QemuMigrate(base.Scenario):
 
     def _run_setup_cmd(self, client, cmd):
         LOG.debug("Run cmd: %s", cmd)
-        status, stdout, stderr = client.execute(cmd)
+        status, _, stderr = client.execute(cmd)
         if status:
             if re.search(self.REBOOT_CMD_PATTERN, cmd):
                 LOG.debug("Error on reboot")
@@ -89,7 +89,8 @@ class QemuMigrate(base.Scenario):
         self.target_script = pkg_resources.resource_filename(
             "yardstick.benchmark.scenarios.compute",
             QemuMigrate.TARGET_SCRIPT)
-        self.host.put_file(self.target_script, "~/qemu_migrate_benchmark.sh")
+        self.host._put_file_shell(
+            self.target_script, "~/qemu_migrate_benchmark.sh")
 
         self.setup_done = True
 
@@ -126,7 +127,7 @@ class QemuMigrate(base.Scenario):
                 if timevalue > sla_time:
                     sla_error += "%s timevalue %d > sla:max_%s(%d); " % \
                         (t, timevalue, t, sla_time)
-            assert sla_error == "", sla_error
+            self.verify_SLA(sla_error == "", sla_error)
 
 
 def _test():    # pragma: no cover