x/gantt
Code Issues Proposed changes

Merge "Fixes KeyError: 'sr_uuid' when booting from volume on xenapi"

Browse Source
This commit is contained in:
Jenkins
2012-12-14 18:34:00 +00:00
committed by Gerrit Code Review
parent 8d1551e355 4ef69baf6b
commit eb6dc8bb60
1 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
nova/tests/xenapi/test_vm_utils.py
View File

@@ -10,6 +10,29 @@ from nova.virt.xenapi import vm_utils
from nova.virt.xenapi import volume_utils from nova.virt.xenapi import volume_utils
XENSM_TYPE = 'xensm'
ISCSI_TYPE = 'iscsi'
def get_fake_dev_params(sr_type):
fakes = {XENSM_TYPE: {'sr_uuid': 'falseSR',
'name_label': 'fake_storage',
'name_description': 'test purposes',
'server': 'myserver',
'serverpath': '/local/scratch/myname',
'sr_type': 'nfs',
'introduce_sr_keys': ['server',
'serverpath',
'sr_type'],
'vdi_uuid': 'falseVDI'},
ISCSI_TYPE: {'volume_id': 'fake_volume_id',
'target_lun': 1,
'target_iqn': 'fake_iqn:volume-fake_volume_id',
'target_portal': u'localhost:3260',
'target_discovered': False}, }
return fakes[sr_type]
class GetInstanceForVdisForSrTestCase(stubs.XenAPITestBase): class GetInstanceForVdisForSrTestCase(stubs.XenAPITestBase):
def setUp(self): def setUp(self):
super(GetInstanceForVdisForSrTestCase, self).setUp() super(GetInstanceForVdisForSrTestCase, self).setUp()
@@ -50,15 +73,8 @@ class GetInstanceForVdisForSrTestCase(stubs.XenAPITestBase):
self.assertEquals([], result) self.assertEquals([], result)
def test_get_vdis_for_boot_from_vol(self): def test_get_vdis_for_boot_from_vol_with_sr_uuid(self):
dev_params = {'sr_uuid': 'falseSR', dev_params = get_fake_dev_params(XENSM_TYPE)
'name_label': 'fake_storage',
'name_description': 'test purposes',
'server': 'myserver',
'serverpath': '/local/scratch/myname',
'sr_type': 'nfs',
'introduce_sr_keys': ['server', 'serverpath', 'sr_type'],
'vdi_uuid': 'falseVDI'}
stubs.stubout_session(self.stubs, fake.SessionBase) stubs.stubout_session(self.stubs, fake.SessionBase)
driver = xenapi_conn.XenAPIDriver(False) driver = xenapi_conn.XenAPIDriver(False)
@@ -74,18 +90,20 @@ class GetInstanceForVdisForSrTestCase(stubs.XenAPITestBase):
return None return None
self.stubs.Set(volume_utils, 'introduce_sr', bad_introduce_sr) self.stubs.Set(volume_utils, 'introduce_sr', bad_introduce_sr)
dev_params = {'sr_uuid': 'falseSR', dev_params = get_fake_dev_params(XENSM_TYPE)
'name_label': 'fake_storage',
'name_description': 'test purposes',
'server': 'myserver',
'serverpath': '/local/scratch/myname',
'sr_type': 'nfs',
'introduce_sr_keys': ['server', 'serverpath', 'sr_type'],
'vdi_uuid': 'falseVDI'}
self.assertRaises(exception.NovaException, self.assertRaises(exception.NovaException,
vm_utils.get_vdis_for_boot_from_vol, vm_utils.get_vdis_for_boot_from_vol,
driver._session, dev_params) driver._session, dev_params)
def test_get_vdis_for_boot_from_iscsi_vol_missing_sr_uuid(self):
dev_params = get_fake_dev_params(ISCSI_TYPE)
stubs.stubout_session(self.stubs, fake.SessionBase)
driver = xenapi_conn.XenAPIDriver(False)
result = vm_utils.get_vdis_for_boot_from_vol(driver._session,
dev_params)
self.assertNotEquals(result['root']['uuid'], None)
class VMRefOrRaiseVMFoundTestCase(test.TestCase): class VMRefOrRaiseVMFoundTestCase(test.TestCase):