Rename qemu image type to qemu image format

pull/370/head
Julien Duponchelle 9 years ago
parent b94a4e2308
commit 5d8c90d138

@ -1253,12 +1253,12 @@ class QemuVM(BaseVM):
:returns: Image name with the extensions
"""
img_type = options.pop("type")
img_format = options.pop("format")
img_size = options.pop("size")
img_name = "{}.{}".format(name, img_type)
img_name = "{}.{}".format(name, img_format)
qemu_img = self._get_qemu_img()
command = [qemu_img, "create", "-f", img_type]
command = [qemu_img, "create", "-f", img_format]
for option in sorted(options.keys()):
command.extend(["-o", "{}={}".format(option, options[option])])
command.append(os.path.join(self.working_dir, img_name))

@ -415,7 +415,7 @@ def test_get_qemu_img(vm, tmpdir):
open(str(tmpdir / "qemu-sytem-x86_64"), "w+").close()
open(str(tmpdir / "qemu-img"), "w+").close()
vm._qemu_path = str(tmpdir / "qemu-sytem-x86_64")
assert vm._get_qemu_img() == str(tmpdir / "qemu-img")
assert vm._get_qemu_img() == str(tmpdir / "qemu-img")
def test_get_qemu_img_not_exist(vm, tmpdir):
@ -428,7 +428,7 @@ def test_get_qemu_img_not_exist(vm, tmpdir):
def test_create_image(vm, loop, fake_qemu_img_binary):
options = {
"type": "qcow2",
"format": "qcow2",
"preallocation": "metadata",
"cluster_size": 64,
"refcount_bits": 12,

Loading…
Cancel
Save