x/python-ganttclient
Code Issues Proposed changes

Merge "Clean up disk_format mapping in xenapi.vm_utils"

Browse Source
This commit is contained in:
Jenkins
2012-01-13 18:31:37 +00:00
committed by Gerrit Code Review
parent 21ae7d0eb6 e8af80c8f5
commit 521d48d36b
1 changed files with 12 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
nova/tests/test_xenapi.py
View File

@@ -1042,45 +1042,21 @@ class XenAPIDetermineDiskImageTestCase(test.TestCase):
self.fake_instance.os_type = 'linux' self.fake_instance.os_type = 'linux'
self.fake_instance.architecture = 'x86-64' self.fake_instance.architecture = 'x86-64'
def assert_disk_type(self, disk_type): def assert_disk_type(self, image_meta, expected_disk_type):
ctx = context.RequestContext('fake', 'fake') actual = vm_utils.VMHelper.determine_disk_image_type(image_meta)
fake_glance = glance_stubs.FakeGlance('') self.assertEqual(expected_disk_type, actual)
image_meta = fake_glance.get_image_meta(self.fake_instance.image_ref)
dt = vm_utils.VMHelper.determine_disk_image_type(image_meta)
self.assertEqual(disk_type, dt)
def test_instance_disk(self): def test_machine(self):
"""If a kernel is specified, the image type is DISK (aka machine).""" image_meta = {'id': 'a', 'disk_format': 'ami'}
self.fake_instance.image_ref = glance_stubs.FakeGlance.IMAGE_MACHINE self.assert_disk_type(image_meta, vm_utils.ImageType.DISK)
self.fake_instance.kernel_id = glance_stubs.FakeGlance.IMAGE_KERNEL
self.assert_disk_type(vm_utils.ImageType.DISK)
def test_instance_disk_raw(self): def test_raw(self):
""" image_meta = {'id': 'a', 'disk_format': 'raw'}
If the kernel isn't specified, and we're not using Glance, then self.assert_disk_type(image_meta, vm_utils.ImageType.DISK_RAW)
DISK_RAW is assumed.
"""
self.fake_instance.image_ref = glance_stubs.FakeGlance.IMAGE_RAW
self.fake_instance.kernel_id = None
self.assert_disk_type(vm_utils.ImageType.DISK_RAW)
def test_glance_disk_raw(self): def test_vhd(self):
""" image_meta = {'id': 'a', 'disk_format': 'vhd'}
If we're using Glance, then defer to the image_type field, which in self.assert_disk_type(image_meta, vm_utils.ImageType.DISK_VHD)
this case will be 'raw'.
"""
self.fake_instance.image_ref = glance_stubs.FakeGlance.IMAGE_RAW
self.fake_instance.kernel_id = None
self.assert_disk_type(vm_utils.ImageType.DISK_RAW)
def test_glance_disk_vhd(self):
"""
If we're using Glance, then defer to the image_type field, which in
this case will be 'vhd'.
"""
self.fake_instance.image_ref = glance_stubs.FakeGlance.IMAGE_VHD
self.fake_instance.kernel_id = None
self.assert_disk_type(vm_utils.ImageType.DISK_VHD)
class CompareVersionTestCase(test.TestCase): class CompareVersionTestCase(test.TestCase):