diff --git a/qemu/tests/block_stream.py b/qemu/tests/block_stream.py index cb57ac2b3c842e3f5497f8e8096e5430bc7d349e..233eb8be9b0e5102e29db6a669a5d0335903cd70 100644 --- a/qemu/tests/block_stream.py +++ b/qemu/tests/block_stream.py @@ -31,7 +31,7 @@ def run(test, params, env): 5) Check for backing file in sn1 6) Check for the size of the sn1 should not exceeds image.img """ - tag = params.get("source_images", "image1") + tag = params.get("source_image", "image1") stream_test = BlockStreamTest(test, params, env, tag) try: image_file = stream_test.get_image_file() diff --git a/qemu/tests/block_stream_check_backingfile.py b/qemu/tests/block_stream_check_backingfile.py index ac57ac9982ca82852c36b339381871bb792d0e7b..a7f06ba38f23de073663f46271219c38414fe451 100644 --- a/qemu/tests/block_stream_check_backingfile.py +++ b/qemu/tests/block_stream_check_backingfile.py @@ -65,7 +65,7 @@ def run(test, params, env): :param params: Dictionary with the test parameters :param env: Dictionary with test environment. """ - tag = params.get("source_images", "image1") + tag = params.get("source_image", "image1") backingfile_test = BlockStreamCheckBackingfile(test, params, env, tag) try: backingfile_test.create_snapshots() diff --git a/qemu/tests/block_stream_reboot.py b/qemu/tests/block_stream_reboot.py index 8cef9169d90f1155ab07aefe97fa72f11cff3763..01d3467070b6c08914a3120f9080528c3e7f72f2 100644 --- a/qemu/tests/block_stream_reboot.py +++ b/qemu/tests/block_stream_reboot.py @@ -54,7 +54,7 @@ def run(test, params, env): :param params: Dictionary with the test parameters :param env: Dictionary with test environment. """ - tag = params.get("source_images", "image1") + tag = params.get("source_image", "image1") reboot_test = BlockStreamReboot(test, params, env, tag) try: reboot_test.action_before_start() diff --git a/qemu/tests/block_stream_simple.py b/qemu/tests/block_stream_simple.py index 20cc335f15e9acdcb813c52a10dc6f0a755a604e..ddc08982fde905b940057c95b99e28e48c6baf6b 100644 --- a/qemu/tests/block_stream_simple.py +++ b/qemu/tests/block_stream_simple.py @@ -31,7 +31,7 @@ def run(test, params, env): :param params: Dictionary with the test parameters :param env: Dictionary with test environment. """ - tag = params.get("source_images", "image1") + tag = params.get("source_image", "image1") simple_test = BlockStreamSimple(test, params, env, tag) try: simple_test.create_snapshots() diff --git a/qemu/tests/cfg/drive_mirror.cfg b/qemu/tests/cfg/drive_mirror.cfg index 475325da0b4e8623a6ba37cf287456b0f4dfbd83..d94463c551dde47378ab5d60ce2cf1d82f9afbb4 100644 --- a/qemu/tests/cfg/drive_mirror.cfg +++ b/qemu/tests/cfg/drive_mirror.cfg @@ -19,9 +19,9 @@ #block_reopen_cmd = "__com.redhat_drive-reopen" wait_timeout = 6000 # wait_timeout: wait xx seconds for block mirror job go into steady status, aka offset equal image length - source_images = "image1" + source_image = "image1" target_image_image1 = "target" - # source_images: set which image will be mirroring to target, now only a image at one time; + # source_image: set which image will be mirroring to target, now only a image at one time; full_copy_image1 = "full" #for full image or top most default_speed_image1 = 0 diff --git a/qemu/tests/cfg/drive_mirror_negtive_tests.cfg b/qemu/tests/cfg/drive_mirror_negtive_tests.cfg index 3ea590748a4f5971af7e69417c5932d81bf42cbc..c09199592e7f9bd042bfea7fe423a30497492f45 100644 --- a/qemu/tests/cfg/drive_mirror_negtive_tests.cfg +++ b/qemu/tests/cfg/drive_mirror_negtive_tests.cfg @@ -19,9 +19,9 @@ #block_reopen_cmd = "__com.redhat_drive-reopen" wait_timeout = 6000 # wait_timeout: wait xx seconds for block mirror job go into steady status, aka offset equal image length - source_images = "image1" + source_image = "image1" target_image_image1 = "target" - # source_images: set which image will be mirroring to target, now only a image at one time; + # source_image: set which image will be mirroring to target, now only a image at one time; full_copy_image1 = "full" #for full image or top most default_speed_image1 = 0 diff --git a/qemu/tests/drive_mirror_cancel.py b/qemu/tests/drive_mirror_cancel.py index ea56fa90c61e4ce72515cef62a5045214c08c06d..54716561307b1f6c8172c6b778f5a773b77e4c4f 100644 --- a/qemu/tests/drive_mirror_cancel.py +++ b/qemu/tests/drive_mirror_cancel.py @@ -15,7 +15,7 @@ def run_drive_mirror_cancel(test, params, env): 4). flush iptables chain then check job canceled in 10s """ - tag = params.get("source_images", "image1") + tag = params.get("source_image", "image1") mirror_test = drive_mirror.DriveMirror(test, params, env, tag) try: mirror_test.start() diff --git a/qemu/tests/drive_mirror_complete.py b/qemu/tests/drive_mirror_complete.py index 2695d74e9b115e17451d52f8e3de068cd8b040e6..5ee29d244499e4bc402614d47196e79a471dc379 100644 --- a/qemu/tests/drive_mirror_complete.py +++ b/qemu/tests/drive_mirror_complete.py @@ -24,7 +24,7 @@ def run(test, params, env): "qemu-img compare" is used to verify disk is mirrored successfully. """ - tag = params.get("source_images", "image1") + tag = params.get("source_image", "image1") qemu_img = qemu_storage.QemuImg(params, data_dir.get_data_dir(), tag) mirror_test = drive_mirror.DriveMirror(test, params, env, tag) try: diff --git a/qemu/tests/drive_mirror_powerdown.py b/qemu/tests/drive_mirror_powerdown.py index f2c559dbdcfcd2cc708ff6a29bd9f2b9d440401b..3922a76480d845df735575d1061ba755c7a18d78 100644 --- a/qemu/tests/drive_mirror_powerdown.py +++ b/qemu/tests/drive_mirror_powerdown.py @@ -48,7 +48,7 @@ def run(test, params, env): :param params: Dictionary with the test parameters :param env: Dictionary with test environment. """ - tag = params.get("source_images", "image1") + tag = params.get("source_image", "image1") powerdown_test = DriveMirrorPowerdown(test, params, env, tag) try: powerdown_test.action_before_start() diff --git a/qemu/tests/drive_mirror_reboot.py b/qemu/tests/drive_mirror_reboot.py index 4b6fe7f27d1f8d3876c70126ee92b681e50a90d6..a4c60f0cc856f4d61430a6b352fb9032c476b0b6 100644 --- a/qemu/tests/drive_mirror_reboot.py +++ b/qemu/tests/drive_mirror_reboot.py @@ -13,7 +13,7 @@ def run(test, params, env): :param params: Dictionary with the test parameters :param env: Dictionary with test environment. """ - tag = params.get("source_images", "image1") + tag = params.get("source_image", "image1") reboot_test = drive_mirror.DriveMirror(test, params, env, tag) try: reboot_test.reboot("system_reset", False) diff --git a/qemu/tests/drive_mirror_simple.py b/qemu/tests/drive_mirror_simple.py index 1d591882e735502d68cf7d91156a0b858426df87..2f5cdb524a38a3eaafa72f80a3d351576cfa8bdf 100644 --- a/qemu/tests/drive_mirror_simple.py +++ b/qemu/tests/drive_mirror_simple.py @@ -45,7 +45,7 @@ def run(test, params, env): :param params: Dictionary with the test parameters :param env: Dictionary with test environment. """ - tag = params.get("source_images", "image1") + tag = params.get("source_image", "image1") repeats = int(params.get("repeat_times", 3)) simple_test = DriveMirrorSimple(test, params, env, tag) try: