Merge "Add missing exception" into stable/victoria

This commit is contained in:
Zuul 2020-12-19 16:20:40 +00:00 committed by Gerrit Code Review
commit 81ad810ede
2 changed files with 13 additions and 0 deletions

View File

@ -2281,6 +2281,10 @@ class PMEMNamespaceConfigInvalid(NovaException):
"please check your conf file. ")
class GetPMEMNamespacesFailed(NovaException):
msg_fmt = _("Get PMEM namespaces on host failed: %(reason)s.")
class VPMEMCleanupFailed(NovaException):
msg_fmt = _("Failed to clean up the vpmem backend device %(dev)s: "
"%(error)s")

View File

@ -27549,6 +27549,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