diff options
| author | Zuul <zuul@review.opendev.org> | 2021-06-25 03:30:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-06-25 03:30:38 +0000 |
| commit | 7acb9fc562b104c0e2d443e2efd6ab364dfffc8f (patch) | |
| tree | 5fde26b01a3160dab1ac735296c53985b5146261 | |
| parent | b095ed1cf3bc090fe74d98c9660ea6a40e6adab1 (diff) | |
| parent | eaecd1ceb0243b31cde9b3c909e8fb3fbef7e635 (diff) | |
| download | nova-7acb9fc562b104c0e2d443e2efd6ab364dfffc8f.tar.gz | |
Merge "Add missing exception" into stable/train
| -rw-r--r-- | nova/exception.py | 2 | ||||
| -rw-r--r-- | nova/tests/unit/virt/libvirt/test_driver.py | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/nova/exception.py b/nova/exception.py index d1780349a5..d9533fe4c3 100644 --- a/nova/exception.py +++ b/nova/exception.py @@ -2546,7 +2546,7 @@ class PMEMNamespaceConfigInvalid(NovaException): "please check your conf file. ") -class GetPMEMNamespaceFailed(NovaException): +class GetPMEMNamespacesFailed(NovaException): msg_fmt = _("Get PMEM namespaces on host failed: %(reason)s.") diff --git a/nova/tests/unit/virt/libvirt/test_driver.py b/nova/tests/unit/virt/libvirt/test_driver.py index ad315f84df..d6e241c8e6 100644 --- a/nova/tests/unit/virt/libvirt/test_driver.py +++ b/nova/tests/unit/virt/libvirt/test_driver.py @@ -25575,6 +25575,15 @@ class LibvirtPMEMNamespaceTests(test.NoDBTestCase): self.assertRaises(exception.PMEMNamespaceConfigInvalid, drvr._discover_vpmems, vpmem_conf) + @mock.patch('nova.privsep.libvirt.get_pmem_namespaces') + def test_get_vpmems_on_host__exception(self, mock_get_ns): + drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True) + mock_get_ns.side_effect = Exception('foo') + + self.assertRaises( + exception.GetPMEMNamespacesFailed, + drvr._get_vpmems_on_host) + @mock.patch('nova.virt.hardware.get_vpmems') def test_get_ordered_vpmems(self, mock_labels): # get orgered vpmems based on flavor extra_specs |