diff options
| author |   Jing Lu <lvjing5@huawei.com> | 2017-12-13 06:10:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-12-13 06:10:55 +0000 |
| commit | 4f0b2293ce25d8311d352bc4f10708d6a1e00c79 (patch) | |
| tree | db6fe8bf0fbecbde27650fb3051a3f08bf0b4d89 /yardstick/benchmark/scenarios/compute/qemu_migrate.py | |
| parent | 102e3528ba4d7b8c566c1304192c4036f2a94f8f (diff) | |
| parent | c46f8d22a2307e550fe7d769e043e23d3114428a (diff) | |
Merge "KVMFORNFV: Reverting LiveMigration changes" into stable/euphrates
Diffstat (limited to 'yardstick/benchmark/scenarios/compute/qemu_migrate.py')
| -rw-r--r-- | yardstick/benchmark/scenarios/compute/qemu_migrate.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/yardstick/benchmark/scenarios/compute/qemu_migrate.py b/yardstick/benchmark/scenarios/compute/qemu_migrate.py index 286d8cdaf..2de1270ef 100644 --- a/yardstick/benchmark/scenarios/compute/qemu_migrate.py +++ b/yardstick/benchmark/scenarios/compute/qemu_migrate.py @@ -113,11 +113,11 @@ class QemuMigrate(base.Scenario): if status: raise RuntimeError(stderr) - parsed_data = jsonutils.loads(stdout) + result.update(jsonutils.loads(stdout)) if "sla" in self.scenario_cfg: sla_error = "" - for t, timevalue in parsed_data.items(): + for t, timevalue in result.items(): if 'max_%s' % t not in self.scenario_cfg['sla']: continue |