From 731b73639c8aeb2ce39d01705c49ad22bcaeda27 Mon Sep 17 00:00:00 2001 From: Boris Filippov Date: Wed, 26 Sep 2012 03:11:55 +0400 Subject: [PATCH] Add util for disk type retrieval blueprint snapshots-for-everyone Add libvirt.utils.get_disk_type that retrieves format for given file. Format can be raw, qcow2, or lvm. Change-Id: I33898983cfa15db6b2654648ce32f72b6dd920cb --- nova/tests/fake_libvirt_utils.py | 5 +++++ nova/tests/test_libvirt.py | 1 + 2 files changed, 6 insertions(+) diff --git a/nova/tests/fake_libvirt_utils.py b/nova/tests/fake_libvirt_utils.py index 378515ac0..1862521c1 100644 --- a/nova/tests/fake_libvirt_utils.py +++ b/nova/tests/fake_libvirt_utils.py @@ -21,6 +21,7 @@ import StringIO files = {} disk_sizes = {} disk_backing_files = {} +disk_type = "qcow2" def get_iscsi_initiator(): @@ -39,6 +40,10 @@ def get_disk_backing_file(path): return disk_backing_files.get(path, None) +def get_disk_type(path): + return disk_type + + def copy_image(src, dest): pass diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py index 91cf8df7c..523761454 100644 --- a/nova/tests/test_libvirt.py +++ b/nova/tests/test_libvirt.py @@ -1162,6 +1162,7 @@ class LibvirtConnTestCase(test.TestCase): libvirt_driver.LibvirtDriver._conn.lookupByName = self.fake_lookup self.mox.StubOutWithMock(libvirt_driver.utils, 'execute') libvirt_driver.utils.execute = self.fake_execute + self.stubs.Set(libvirt_driver.libvirt_utils, 'disk_type', 'raw') self.mox.ReplayAll()