x/python-ganttclient
Code Issues Proposed changes

More accurate rescue mode testing for XenAPI

Browse Source 
Update test_rescue to make sure the swap partition wasn't rescued. Since
this test fails with the current code, I also updated the code so the test
passed.

Fixes bug 997835

Change-Id: I9f09b3bbbee0ddfcbfdb243a7dff0b9bae99925d
This commit is contained in:
Brian Lamar
2012-05-10 16:54:12 -04:00
parent 5d0e08504c
commit a7e379b407
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
nova/tests/test_xenapi.py
View File

@@ -713,13 +713,26 @@ class XenAPIVMTestCase(test.TestCase):
def test_rescue(self): def test_rescue(self):
instance = self._create_instance() instance = self._create_instance()
session = xenapi_conn.XenAPISession('test_url', 'root', 'test_pass') session = xenapi_conn.XenAPISession('test_url', 'root', 'test_pass')
vm = vm_utils.VMHelper.lookup(session, instance.name) vm_ref = vm_utils.VMHelper.lookup(session, instance.name)
vbd = xenapi_fake.create_vbd(vm, None)
xenapi_fake.create_vbd(vm_ref, "swap", userdevice=1)
xenapi_fake.create_vbd(vm_ref, "rootfs", userdevice=0)
conn = xenapi_conn.get_connection(False) conn = xenapi_conn.get_connection(False)
image_meta = {'id': glance_stubs.FakeGlance.IMAGE_VHD, image_meta = {'id': glance_stubs.FakeGlance.IMAGE_VHD,
'disk_format': 'vhd'} 'disk_format': 'vhd'}
conn.rescue(self.context, instance, [], image_meta) conn.rescue(self.context, instance, [], image_meta)
vm = xenapi_fake.get_record('VM', vm_ref)
rescue_name = "%s-rescue" % vm["name_label"]
rescue_ref = vm_utils.VMHelper.lookup(session, rescue_name)
rescue_vm = xenapi_fake.get_record('VM', rescue_ref)
vdi_uuids = []
for vbd_uuid in rescue_vm["VBDs"]:
vdi_uuids.append(xenapi_fake.get_record('VBD', vbd_uuid)["VDI"])
self.assertTrue("swap" not in vdi_uuids)
def test_unrescue(self): def test_unrescue(self):
instance = self._create_instance() instance = self._create_instance()
conn = xenapi_conn.get_connection(False) conn = xenapi_conn.get_connection(False)