Merge "Fix NeutronPrimaryKeyMissing instantiation"
This commit is contained in:
commit
2daf560480
|
@ -511,7 +511,7 @@ class NeutronDbObject(NeutronObject):
|
|||
all_keys = itertools.chain([cls.primary_keys], cls.unique_keys)
|
||||
if not any(lookup_keys.issuperset(keys) for keys in all_keys):
|
||||
missing_keys = set(cls.primary_keys).difference(lookup_keys)
|
||||
raise o_exc.NeutronPrimaryKeyMissing(object_class=cls.__name__,
|
||||
raise o_exc.NeutronPrimaryKeyMissing(object_class=cls,
|
||||
missing_keys=missing_keys)
|
||||
|
||||
with context.session.begin(subtransactions=True):
|
||||
|
|
|
@ -750,9 +750,10 @@ class BaseObjectIfaceTestCase(_BaseObjectTestCase, test_base.BaseTestCase):
|
|||
self._test_class.unique_keys)))
|
||||
obj_keys = self.generate_object_keys(self._test_class,
|
||||
non_unique_fields)
|
||||
self.assertRaises(o_exc.NeutronPrimaryKeyMissing,
|
||||
self._test_class.get_object,
|
||||
self.context, **obj_keys)
|
||||
exception = self.assertRaises(o_exc.NeutronPrimaryKeyMissing,
|
||||
self._test_class.get_object,
|
||||
self.context, **obj_keys)
|
||||
self.assertIn(self._test_class.__name__, str(exception))
|
||||
|
||||
def test_get_object_unique_key(self):
|
||||
if not self._test_class.unique_keys:
|
||||
|
|
Loading…
Reference in New Issue