openstack
/
neutron
Code Issues Proposed changes

Fix NeutronPrimaryKeyMissing instantiation 

Change-Id: I6749b97c568bbf49df4a386825f80d61aa34a685
Closes-Bug: 1738023
This commit is contained in:
Thomas Morin 2017-12-13 16:53:02 +01:00
parent 59e2c40f14
commit d198d71ffd
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/objects/base.py
View File

@ -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):

7
neutron/tests/unit/objects/test_base.py
View File

@ -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: