diff options
| author |   Rex Lee <limingjiang@huawei.com> | 2017-08-25 06:17:53 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-08-25 06:17:53 +0000 |
| commit | b49d8593d8ebe22aa7f3c9580f6934a92a6fdddd (patch) | |
| tree | 594fffd389f2c9e468674fab1964a36fe5a52da0 | |
| parent | e91ccae7fa21647cd2452cdb7dbec584bad6a476 (diff) | |
| parent | 421ef9bad3d7d47df0344d74536e371736144abc (diff) | |
Merge "Add rpm,image directories and SLA options to Livemigration"
| -rw-r--r-- | yardstick/benchmark/scenarios/compute/qemu_migrate.py | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/yardstick/benchmark/scenarios/compute/qemu_migrate.py b/yardstick/benchmark/scenarios/compute/qemu_migrate.py index cee87a545..6c0446bb7 100644 --- a/yardstick/benchmark/scenarios/compute/qemu_migrate.py +++ b/yardstick/benchmark/scenarios/compute/qemu_migrate.py @@ -41,10 +41,18 @@ class QemuMigrate(base.Scenario): def _put_files(self, client): setup_options = self.scenario_cfg["setup_options"] + rpm_dir = setup_options["rpm_dir"] script_dir = setup_options["script_dir"] + image_dir = setup_options["image_dir"] + LOG.debug("Send RPMs from %s to workspace %s", + rpm_dir, self.WORKSPACE) + client.put(rpm_dir, self.WORKSPACE, recursive=True) LOG.debug("Send scripts from %s to workspace %s", script_dir, self.WORKSPACE) client.put(script_dir, self.WORKSPACE, recursive=True) + LOG.debug("Send guest image from %s to workspace %s", + image_dir, self.WORKSPACE) + client.put(image_dir, self.WORKSPACE, recursive=True) def _run_setup_cmd(self, client, cmd): LOG.debug("Run cmd: %s", cmd) @@ -143,10 +151,17 @@ def _test(): # pragma: no cover "qmp_sock_dst": "/tmp/qmp-sock-dst", "max_down_time": 0.10 } + sla = { + "max_totaltime": 10, + "max_downtime": 0.10, + "max_setuptime": 0.50, + } args = { - "options": options + "options": options, + "sla": sla } result = {} + migrate = QemuMigrate(args, ctx) migrate.run(result) print(result) |