Skip to content

Commit 81ad810

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "Add missing exception" into stable/victoria
2 parents d3e1412 + 82d415d commit 81ad810

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

nova/exception.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2281,6 +2281,10 @@ class PMEMNamespaceConfigInvalid(NovaException):
22812281
"please check your conf file. ")
22822282

22832283

2284+
class GetPMEMNamespacesFailed(NovaException):
2285+
msg_fmt = _("Get PMEM namespaces on host failed: %(reason)s.")
2286+
2287+
22842288
class VPMEMCleanupFailed(NovaException):
22852289
msg_fmt = _("Failed to clean up the vpmem backend device %(dev)s: "
22862290
"%(error)s")

nova/tests/unit/virt/libvirt/test_driver.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27549,6 +27549,15 @@ def test_vpmems_duplicated_config(self, mock_get):
2754927549
self.assertRaises(exception.PMEMNamespaceConfigInvalid,
2755027550
drvr._discover_vpmems, vpmem_conf)
2755127551

27552+
@mock.patch('nova.privsep.libvirt.get_pmem_namespaces')
27553+
def test_get_vpmems_on_host__exception(self, mock_get_ns):
27554+
drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True)
27555+
mock_get_ns.side_effect = Exception('foo')
27556+
27557+
self.assertRaises(
27558+
exception.GetPMEMNamespacesFailed,
27559+
drvr._get_vpmems_on_host)
27560+
2755227561
@mock.patch('nova.virt.hardware.get_vpmems')
2755327562
def test_get_ordered_vpmems(self, mock_labels):
2755427563
# get orgered vpmems based on flavor extra_specs

0 commit comments

Comments
 (0)