x/python-ganttclient
Code Issues Proposed changes

Fix use of libvirt_disk_prefix

Browse Source 
The code supporting libvirt_disk_prefix was dropped during the
refactoring work in commit 7be531fe.  This patch re-enables
support for this option, along with a test case to verify it.

Change-Id: I84f059e2b35d9237b799236032de5c272a03a451
This commit is contained in:
Jim Fehlig
2013-03-15 15:13:31 -06:00
parent 3361164b35
commit d82528f0ca
1 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
nova/tests/test_libvirt.py
View File

@@ -980,6 +980,10 @@ class LibvirtConnTestCase(test.TestCase):
instance_data = dict(self.test_instance) instance_data = dict(self.test_instance)
self._check_xml_and_disk_prefix(instance_data) self._check_xml_and_disk_prefix(instance_data)
def test_xml_user_specified_disk_prefix(self):
instance_data = dict(self.test_instance)
self._check_xml_and_disk_prefix(instance_data, 'sd')
def test_xml_disk_driver(self): def test_xml_disk_driver(self):
instance_data = dict(self.test_instance) instance_data = dict(self.test_instance)
self._check_xml_and_disk_driver(instance_data) self._check_xml_and_disk_driver(instance_data)
@@ -1711,28 +1715,39 @@ class LibvirtConnTestCase(test.TestCase):
target = tree.find('./devices/filesystem/source').get('dir') target = tree.find('./devices/filesystem/source').get('dir')
self.assertTrue(len(target) > 0) self.assertTrue(len(target) > 0)
def _check_xml_and_disk_prefix(self, instance): def _check_xml_and_disk_prefix(self, instance, prefix=None):
user_context = context.RequestContext(self.user_id, user_context = context.RequestContext(self.user_id,
self.project_id) self.project_id)
instance_ref = db.instance_create(user_context, instance) instance_ref = db.instance_create(user_context, instance)
def _get_prefix(p, default):
if p:
return p + 'a'
return default
type_disk_map = { type_disk_map = {
'qemu': [ 'qemu': [
(lambda t: t.find('.').get('type'), 'qemu'), (lambda t: t.find('.').get('type'), 'qemu'),
(lambda t: t.find('./devices/disk/target').get('dev'), 'vda')], (lambda t: t.find('./devices/disk/target').get('dev'),
_get_prefix(prefix, 'vda'))],
'xen': [ 'xen': [
(lambda t: t.find('.').get('type'), 'xen'), (lambda t: t.find('.').get('type'), 'xen'),
(lambda t: t.find('./devices/disk/target').get('dev'), 'sda')], (lambda t: t.find('./devices/disk/target').get('dev'),
_get_prefix(prefix, 'sda'))],
'kvm': [ 'kvm': [
(lambda t: t.find('.').get('type'), 'kvm'), (lambda t: t.find('.').get('type'), 'kvm'),
(lambda t: t.find('./devices/disk/target').get('dev'), 'vda')], (lambda t: t.find('./devices/disk/target').get('dev'),
_get_prefix(prefix, 'vda'))],
'uml': [ 'uml': [
(lambda t: t.find('.').get('type'), 'uml'), (lambda t: t.find('.').get('type'), 'uml'),
(lambda t: t.find('./devices/disk/target').get('dev'), 'ubda')] (lambda t: t.find('./devices/disk/target').get('dev'),
_get_prefix(prefix, 'ubda'))]
} }
for (libvirt_type, checks) in type_disk_map.iteritems(): for (libvirt_type, checks) in type_disk_map.iteritems():
self.flags(libvirt_type=libvirt_type) self.flags(libvirt_type=libvirt_type)
if prefix:
self.flags(libvirt_disk_prefix=prefix)
conn = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True) conn = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True)
network_info = _fake_network_info(self.stubs, 1) network_info = _fake_network_info(self.stubs, 1)