x/python-ganttclient
Code Issues Proposed changes

refactor all uses of the qemu-img info command

Browse Source 
* nova/virt/images.py: Define a single function that
calls `qemu-img info` in a robust manner, by avoiding
locale issues etc.
* nova/virt/libvirt/utils.py: Define secondary functions
to parse items returned from images.qemu_img_info().
* nova/virt/libvirt/driver.py: Use the libvirt.utils functions.
* nova/virt/disk/api.py: Likewise.
* nova/tests/test_libvirt.py: Remove no longer needed stub
for utils.execute('qemu-img info'). Adjust to a more restrictive
`qemu-img info` format, and more robust calling signature.
* nova/tests/test_imagebackend.py: Adjust to moved method.

Change-Id: I739dd246410c215f401ebd3a92b8207f46e8fb9a
This commit is contained in:
Pádraig Brady
2012-07-18 00:40:24 +01:00
parent fb0d5bb852
commit adb6b4df33
2 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
nova/tests/test_imagebackend.py
View File

@@ -236,21 +236,21 @@ class LvmTestCase(_ImageTestCase):
def prepare_mocks(self): def prepare_mocks(self):
fn = self.mox.CreateMockAnything() fn = self.mox.CreateMockAnything()
self.mox.StubOutWithMock(self.disk, 'get_image_virtual_size')
self.mox.StubOutWithMock(self.disk, 'resize2fs') self.mox.StubOutWithMock(self.disk, 'resize2fs')
self.mox.StubOutWithMock(self.libvirt_utils, 'create_lvm_image') self.mox.StubOutWithMock(self.libvirt_utils, 'create_lvm_image')
self.mox.StubOutWithMock(self.libvirt_utils, 'get_disk_size')
self.mox.StubOutWithMock(self.utils, 'execute') self.mox.StubOutWithMock(self.utils, 'execute')
return fn return fn
def _create_image(self, sparse): def _create_image(self, sparse):
fn = self.prepare_mocks() fn = self.prepare_mocks()
fn(target=self.TEMPLATE_PATH) fn(target=self.TEMPLATE_PATH)
self.disk.get_image_virtual_size(self.TEMPLATE_PATH
).AndReturn(self.TEMPLATE_SIZE)
self.libvirt_utils.create_lvm_image(self.VG, self.libvirt_utils.create_lvm_image(self.VG,
self.LV, self.LV,
self.TEMPLATE_SIZE, self.TEMPLATE_SIZE,
sparse=sparse) sparse=sparse)
self.libvirt_utils.get_disk_size(self.TEMPLATE_PATH
).AndReturn(self.TEMPLATE_SIZE)
cmd = ('dd', 'if=%s' % self.TEMPLATE_PATH, cmd = ('dd', 'if=%s' % self.TEMPLATE_PATH,
'of=%s' % self.PATH, 'bs=4M') 'of=%s' % self.PATH, 'bs=4M')
self.utils.execute(*cmd, run_as_root=True) self.utils.execute(*cmd, run_as_root=True)
@@ -277,10 +277,10 @@ class LvmTestCase(_ImageTestCase):
def _create_image_resize(self, sparse): def _create_image_resize(self, sparse):
fn = self.prepare_mocks() fn = self.prepare_mocks()
fn(target=self.TEMPLATE_PATH) fn(target=self.TEMPLATE_PATH)
self.disk.get_image_virtual_size(self.TEMPLATE_PATH
).AndReturn(self.TEMPLATE_SIZE)
self.libvirt_utils.create_lvm_image(self.VG, self.LV, self.libvirt_utils.create_lvm_image(self.VG, self.LV,
self.SIZE, sparse=sparse) self.SIZE, sparse=sparse)
self.libvirt_utils.get_disk_size(self.TEMPLATE_PATH
).AndReturn(self.TEMPLATE_SIZE)
cmd = ('dd', 'if=%s' % self.TEMPLATE_PATH, cmd = ('dd', 'if=%s' % self.TEMPLATE_PATH,
'of=%s' % self.PATH, 'bs=4M') 'of=%s' % self.PATH, 'bs=4M')
self.utils.execute(*cmd, run_as_root=True) self.utils.execute(*cmd, run_as_root=True)
@@ -316,13 +316,13 @@ class LvmTestCase(_ImageTestCase):
def test_create_image_negative(self): def test_create_image_negative(self):
fn = self.prepare_mocks() fn = self.prepare_mocks()
fn(target=self.TEMPLATE_PATH) fn(target=self.TEMPLATE_PATH)
self.disk.get_image_virtual_size(self.TEMPLATE_PATH
).AndReturn(self.TEMPLATE_SIZE)
self.libvirt_utils.create_lvm_image(self.VG, self.libvirt_utils.create_lvm_image(self.VG,
self.LV, self.LV,
self.SIZE, self.SIZE,
sparse=False sparse=False
).AndRaise(RuntimeError()) ).AndRaise(RuntimeError())
self.libvirt_utils.get_disk_size(self.TEMPLATE_PATH
).AndReturn(self.TEMPLATE_SIZE)
self.mox.StubOutWithMock(self.libvirt_utils, 'remove_logical_volumes') self.mox.StubOutWithMock(self.libvirt_utils, 'remove_logical_volumes')
self.libvirt_utils.remove_logical_volumes(self.PATH) self.libvirt_utils.remove_logical_volumes(self.PATH)
self.mox.ReplayAll() self.mox.ReplayAll()

18
nova/tests/test_libvirt.py
View File

@@ -1825,11 +1825,6 @@ class LibvirtConnTestCase(test.TestCase):
self.mox.StubOutWithMock(os.path, "getsize") self.mox.StubOutWithMock(os.path, "getsize")
os.path.getsize('/test/disk').AndReturn((10737418240)) os.path.getsize('/test/disk').AndReturn((10737418240))
self.mox.StubOutWithMock(utils, "execute")
utils.execute('qemu-img', 'info',
'/test/disk.local').AndReturn((ret, ''))
os.path.getsize('/test/disk.local').AndReturn((21474836480)) os.path.getsize('/test/disk.local').AndReturn((21474836480))
self.mox.ReplayAll() self.mox.ReplayAll()
@@ -3189,8 +3184,7 @@ class LibvirtUtilsTestCase(test.TestCase):
def test_get_disk_size(self): def test_get_disk_size(self):
self.mox.StubOutWithMock(utils, 'execute') self.mox.StubOutWithMock(utils, 'execute')
utils.execute('qemu-img', utils.execute('env', 'LC_ALL=C', 'LANG=C', 'qemu-img', 'info',
'info',
'/some/path').AndReturn(('''image: 00000001 '/some/path').AndReturn(('''image: 00000001
file format: raw file format: raw
virtual size: 4.4M (4592640 bytes) virtual size: 4.4M (4592640 bytes)
@@ -3346,15 +3340,13 @@ disk size: 4.4M''', ''))
def fake_execute(*args, **kwargs): def fake_execute(*args, **kwargs):
if with_actual_path: if with_actual_path:
return ("some\n" return ("some: output\n"
"output\n"
"backing file: /foo/bar/baz (actual path: /a/b/c)\n" "backing file: /foo/bar/baz (actual path: /a/b/c)\n"
"...\n"), '' "...: ...\n"), ''
else: else:
return ("some\n" return ("some: output\n"
"output\n"
"backing file: /foo/bar/baz\n" "backing file: /foo/bar/baz\n"
"...\n"), '' "...: ...\n"), ''
self.stubs.Set(utils, 'execute', fake_execute) self.stubs.Set(utils, 'execute', fake_execute)