openstack
/
nova
Code Issues Proposed changes

Merge "libvirt:Remove duplicated check code for config option sysinfo_serial"

This commit is contained in:
Jenkins 2015-09-19 05:03:38 +00:00 committed by Gerrit Code Review
parent 424aaf3bb3 ae3d970db3
commit 806dc025db
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nova/tests/unit/virt/libvirt/test_driver.py
View File

@ -3914,14 +3914,6 @@ class LibvirtConnTestCase(test.NoDBTestCase):
self._test_get_guest_config_sysinfo_serial(theuuid)
def test_get_guest_config_sysinfo_serial_invalid(self):
self.flags(sysinfo_serial="invalid", group="libvirt")
self.assertRaises(exception.NovaException,
libvirt_driver.LibvirtDriver,
fake.FakeVirtAPI(),
True)
def _create_fake_service_compute(self):
service_info = {
'id': 1729,

7
nova/virt/libvirt/driver.py
View File

@ -495,13 +495,6 @@ class LibvirtDriver(driver.ComputeDriver):
self._sysinfo_serial_func = sysinfo_serial_funcs.get(
CONF.libvirt.sysinfo_serial)
if not self._sysinfo_serial_func:
raise exception.NovaException(
_("Unexpected sysinfo_serial setting '%(actual)s'. "
"Permitted values are %(expect)s'") %
{'actual': CONF.libvirt.sysinfo_serial,
'expect': ', '.join("'%s'" % k for k in
sysinfo_serial_funcs.keys())})
self.job_tracker = instancejobtracker.InstanceJobTracker()
self._remotefs = remotefs.RemoteFilesystem()