x/gantt
Code Issues Proposed changes

Merge "Refactor Dom0 Glance plugin."

Browse Source
This commit is contained in:
Jenkins
2012-06-28 17:51:55 +00:00
committed by Gerrit Code Review
parent 371b2d1c1e 7dcd6df29b
commit b23d70f3b9
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nova/tests/test_xenapi.py
View File

@@ -561,7 +561,7 @@ class XenAPIVMTestCase(test.TestCase):
""" """
vdi_recs_start = self._list_vdis() vdi_recs_start = self._list_vdis()
stubs.stubout_fetch_image_glance_disk(self.stubs, raise_failure=True) stubs.stubout_fetch_disk_image(self.stubs, raise_failure=True)
self.assertRaises(xenapi_fake.Failure, self.assertRaises(xenapi_fake.Failure,
self._test_spawn, 1, 2, 3) self._test_spawn, 1, 2, 3)
# No additional VDI should be found. # No additional VDI should be found.
@@ -627,7 +627,7 @@ class XenAPIVMTestCase(test.TestCase):
self.check_vm_params_for_windows() self.check_vm_params_for_windows()
def test_spawn_glance(self): def test_spawn_glance(self):
stubs.stubout_fetch_image_glance_disk(self.stubs) stubs.stubout_fetch_disk_image(self.stubs)
self._test_spawn(IMAGE_MACHINE, self._test_spawn(IMAGE_MACHINE,
IMAGE_KERNEL, IMAGE_KERNEL,
IMAGE_RAMDISK) IMAGE_RAMDISK)

7
nova/tests/xenapi/stubs.py
View File

@@ -118,10 +118,10 @@ def stubout_lookup_image(stubs):
stubs.Set(vm_utils, 'lookup_image', f) stubs.Set(vm_utils, 'lookup_image', f)
def stubout_fetch_image_glance_disk(stubs, raise_failure=False): def stubout_fetch_disk_image(stubs, raise_failure=False):
"""Simulates a failure in fetch image_glance_disk.""" """Simulates a failure in fetch image_glance_disk."""
def _fake_fetch_image_glance_disk(context, session, instance, image, def _fake_fetch_disk_image(context, session, instance, image,
image_type): image_type):
if raise_failure: if raise_failure:
raise fake.Failure("Test Exception raised by " raise fake.Failure("Test Exception raised by "
@@ -136,8 +136,7 @@ def stubout_fetch_image_glance_disk(stubs, raise_failure=False):
vdi_type = vm_utils.ImageType.to_string(image_type) vdi_type = vm_utils.ImageType.to_string(image_type)
return {vdi_type: dict(uuid=None, file=filename)} return {vdi_type: dict(uuid=None, file=filename)}
stubs.Set(vm_utils, '_fetch_image_glance_disk', stubs.Set(vm_utils, '_fetch_disk_image', _fake_fetch_disk_image)
_fake_fetch_image_glance_disk)
def stubout_create_vm(stubs): def stubout_create_vm(stubs):