openstack/nova
Code Issues Proposed changes

Merge "libvirt: remove explicit /dev/random rng default"

Browse Source
This commit is contained in:
Jenkins 2014-02-27 06:50:56 +00:00 committed by Gerrit Code Review
commit b91b9bd0c8
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nova/tests/virt/libvirt/test_libvirt.py
View File

@ -1471,6 +1471,10 @@ class LibvirtConnTestCase(test.TestCase):
vconfig.LibvirtConfigGuestVideo)
self.assertIsInstance(cfg.devices[6],
vconfig.LibvirtConfigGuestRng)
self.assertEqual(cfg.devices[6].model, 'random')
self.assertIsNone(cfg.devices[6].backend)
self.assertIsNone(cfg.devices[6].rate_bytes)
self.assertIsNone(cfg.devices[6].rate_period)
def test_get_guest_config_with_rng_not_allowed(self):
self.flags(virt_type='kvm',
@ -1537,6 +1541,8 @@ class LibvirtConnTestCase(test.TestCase):
vconfig.LibvirtConfigGuestVideo)
self.assertIsInstance(cfg.devices[6],
vconfig.LibvirtConfigGuestRng)
self.assertEqual(cfg.devices[6].model, 'random')
self.assertIsNone(cfg.devices[6].backend)
self.assertEqual(cfg.devices[6].rate_bytes, 1024)
self.assertEqual(cfg.devices[6].rate_period, 2)
@ -1579,7 +1585,10 @@ class LibvirtConnTestCase(test.TestCase):
vconfig.LibvirtConfigGuestVideo)
self.assertIsInstance(cfg.devices[6],
vconfig.LibvirtConfigGuestRng)
self.assertEqual(cfg.devices[6].model, 'random')
self.assertEqual(cfg.devices[6].backend, '/dev/hw_rng')
self.assertIsNone(cfg.devices[6].rate_bytes)
self.assertIsNone(cfg.devices[6].rate_period)
def test_get_guest_config_with_rng_dev_not_present(self):
self.flags(virt_type='kvm',

3
nova/tests/virt/libvirt/test_libvirt_config.py
View File

@ -1616,11 +1616,12 @@ class LibvirtConfigGuestRngTest(LibvirtConfigBaseTest):
xml = obj.to_xml()
self.assertXmlEqual(xml, """
<rng model='virtio'>
<backend model='random'>/dev/random</backend>
<backend model='random'/>
</rng>""")
def test_config_rng_driver_with_rate(self):
obj = config.LibvirtConfigGuestRng()
obj.backend = '/dev/random'
obj.rate_period = '12'
obj.rate_bytes = '34'

2
nova/virt/libvirt/config.py
View File

@ -1371,7 +1371,7 @@ class LibvirtConfigGuestRng(LibvirtConfigGuestDevice):
**kwargs)
self.model = 'random'
self.backend = '/dev/random'
self.backend = None
self.rate_period = None
self.rate_bytes = None