diff --git a/nova/tests/virt/libvirt/test_libvirt.py b/nova/tests/virt/libvirt/test_libvirt.py index 1d8b80756c22..3275d1e57571 100644 --- a/nova/tests/virt/libvirt/test_libvirt.py +++ b/nova/tests/virt/libvirt/test_libvirt.py @@ -1387,6 +1387,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', @@ -1453,6 +1457,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) @@ -1495,7 +1501,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', diff --git a/nova/tests/virt/libvirt/test_libvirt_config.py b/nova/tests/virt/libvirt/test_libvirt_config.py index 3bd45e25e3a9..8da799762d03 100644 --- a/nova/tests/virt/libvirt/test_libvirt_config.py +++ b/nova/tests/virt/libvirt/test_libvirt_config.py @@ -1616,11 +1616,12 @@ class LibvirtConfigGuestRngTest(LibvirtConfigBaseTest): xml = obj.to_xml() self.assertXmlEqual(xml, """ - /dev/random + """) def test_config_rng_driver_with_rate(self): obj = config.LibvirtConfigGuestRng() + obj.backend = '/dev/random' obj.rate_period = '12' obj.rate_bytes = '34' diff --git a/nova/virt/libvirt/config.py b/nova/virt/libvirt/config.py index 7fb5c844a6c4..3602da8f5b9b 100644 --- a/nova/virt/libvirt/config.py +++ b/nova/virt/libvirt/config.py @@ -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