diff options
Diffstat (limited to 'yardstick')
| -rw-r--r-- | yardstick/benchmark/scenarios/compute/qemu_migrate.py | 4 | ||||
| -rw-r--r-- | yardstick/benchmark/scenarios/compute/qemu_migrate_benchmark.bash | 20 |
2 files changed, 11 insertions, 13 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 diff --git a/yardstick/benchmark/scenarios/compute/qemu_migrate_benchmark.bash b/yardstick/benchmark/scenarios/compute/qemu_migrate_benchmark.bash index 757553e8b..d95e91425 100644 --- a/yardstick/benchmark/scenarios/compute/qemu_migrate_benchmark.bash +++ b/yardstick/benchmark/scenarios/compute/qemu_migrate_benchmark.bash @@ -21,13 +21,6 @@ max_down_time=$6 OUTPUT_FILE=/tmp/output-qemu.log -echo "To check the parameters:" -echo "SRC: $src" -echo "DST: $dst" -echo "DST_IP: $dst_ip" -echo "MIGRATE_PORT: $migrate_to_port" -echo "DOWN_TIME: $max_down_time" - do_migrate() { echo "Execution of Live Migration" @@ -49,7 +42,8 @@ do_migrate() done echo "End of Live Migration" -} + +} > /dev/null output_qemu() { @@ -74,14 +68,18 @@ echo -e "{ \ \"setuptime\":\"$setuptime\" \ }" } + # main entry main() { - echo "Perform LiveMigration" + # Perform LiveMigration do_migrate - echo "LiveMigration Status" + + # LiveMigration Status output_qemu - echo "LiveMigration JSON output " + + # LiveMigration JSON output output_json } + main |