Now that they were moved to virt_utils.
Signed-off-by: Lucas Meneghel Rodrigues <lmr@xxxxxxxxxx>
---
client/tests/kvm/tests/enospc.py | 2 +-
client/tests/kvm/tests/pci_hotplug.py | 4 ++--
client/tests/kvm/tests/physical_resources_check.py | 4 ++--
client/tests/kvm/tests/qemu_img.py | 4 ++--
client/tests/kvm/tests/qemu_io_blkdebug.py | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/client/tests/kvm/tests/enospc.py b/client/tests/kvm/tests/enospc.py
index b4740a4..a011091 100644
--- a/client/tests/kvm/tests/enospc.py
+++ b/client/tests/kvm/tests/enospc.py
@@ -145,7 +145,7 @@ def run_enospc(test, params, env):
for image_name in vm.params.objects("images"):
image_params = vm.params.object_params(image_name)
try:
- virt_vm.check_image(image_params, test.bindir)
+ virt_utils.check_image(image_params, test.bindir)
except (virt_vm.VMError, error.TestWarn), e:
logging.error(e)
logging.info("Guest paused, extending Logical Volume size")
diff --git a/client/tests/kvm/tests/pci_hotplug.py b/client/tests/kvm/tests/pci_hotplug.py
index 6908134..4316d51 100644
--- a/client/tests/kvm/tests/pci_hotplug.py
+++ b/client/tests/kvm/tests/pci_hotplug.py
@@ -66,7 +66,7 @@ def run_pci_hotplug(test, params, env):
pci_add_cmd = "pci_add pci_addr=auto nic model=%s" % tested_model
elif test_type == "block":
image_params = params.object_params("stg")
- image_filename = virt_vm.get_image_filename(image_params,
+ image_filename = virt_utils.get_image_filename(image_params,
test.bindir)
pci_add_cmd = ("pci_add pci_addr=auto storage file=%s,if=%s" %
(image_filename, tested_model))
@@ -89,7 +89,7 @@ def run_pci_hotplug(test, params, env):
elif test_type == "block":
image_params = params.object_params("stg")
- image_filename = virt_vm.get_image_filename(image_params,
+ image_filename = virt_utils.get_image_filename(image_params,
test.bindir)
controller_model = None
if tested_model == "virtio":
diff --git a/client/tests/kvm/tests/physical_resources_check.py b/client/tests/kvm/tests/physical_resources_check.py
index 4e0bb72..076139c 100644
--- a/client/tests/kvm/tests/physical_resources_check.py
+++ b/client/tests/kvm/tests/physical_resources_check.py
@@ -1,6 +1,6 @@
import re, string, logging
from autotest.client.shared import error
-from autotest.client.virt import kvm_monitor, virt_vm
+from autotest.client.virt import kvm_monitor, virt_utils
def run_physical_resources_check(test, params, env):
@@ -98,7 +98,7 @@ def run_physical_resources_check(test, params, env):
n_fail = []
# We will check HDs with the image name
- image_name = virt_vm.get_image_filename(params, test.bindir)
+ image_name = virt_utils.get_image_filename(params, test.bindir)
# Check cpu count
logging.info("CPU count check")
diff --git a/client/tests/kvm/tests/qemu_img.py b/client/tests/kvm/tests/qemu_img.py
index 47ae20f..bf108bc 100644
--- a/client/tests/kvm/tests/qemu_img.py
+++ b/client/tests/kvm/tests/qemu_img.py
@@ -18,7 +18,7 @@ def run_qemu_img(test, params, env):
raise error.TestError("Binary of 'qemu-img' not found")
image_format = params.get("image_format")
image_size = params.get("image_size", "10G")
- image_name = virt_vm.get_image_filename(params, test.bindir)
+ image_name = virt_utils.get_image_filename(params, test.bindir)
def _check(cmd, img):
@@ -402,7 +402,7 @@ def run_qemu_img(test, params, env):
sn_fmt = params.get("snapshot_format", "qcow2")
sn1 = params.get("image_name_snapshot1")
sn1 = virt_utils.get_path(test.bindir, sn1) + ".%s" % sn_fmt
- base_img = virt_vm.get_image_filename(params, test.bindir)
+ base_img = virt_utils.get_image_filename(params, test.bindir)
_create(cmd, sn1, sn_fmt, base_img=base_img, base_img_fmt=image_format)
# Create snapshot2 based on snapshot1
diff --git a/client/tests/kvm/tests/qemu_io_blkdebug.py b/client/tests/kvm/tests/qemu_io_blkdebug.py
index 01830e3..b838225 100644
--- a/client/tests/kvm/tests/qemu_io_blkdebug.py
+++ b/client/tests/kvm/tests/qemu_io_blkdebug.py
@@ -32,7 +32,7 @@ def run_qemu_io_blkdebug(test, params, env):
blkdebug_default = params.get("blkdebug_default")
error.context("Create image", logging.info)
- image_name = virt_vm.create_image(params.object_params(image), test.bindir)
+ image_name = virt_utils.create_image(params.object_params(image), test.bindir)
template_name = virt_utils.get_path(test.virtdir, blkdebug_default)
template = ConfigParser.ConfigParser()
--
1.7.10
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
