openstack
/
neutron
Code Issues Proposed changes

Merge "Add missing keyword raise to get_profile_binding function"

This commit is contained in:
Jenkins 2014-06-17 11:43:16 +00:00 committed by Gerrit Code Review
parent 28ca9dcf7b 13fe102fad
commit 16eb987558
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/plugins/cisco/db/n1kv_db_v2.py
View File

@ -917,7 +917,7 @@ def get_profile_binding(db_session, tenant_id, profile_id):
return (db_session.query(n1kv_models_v2.ProfileBinding).filter_by(
tenant_id=tenant_id, profile_id=profile_id).one())
except exc.NoResultFound:
c_exc.ProfileTenantBindingNotFound(profile_id=profile_id)
raise c_exc.ProfileTenantBindingNotFound(profile_id=profile_id)
def delete_profile_binding(db_session, tenant_id, profile_id):

11
neutron/tests/unit/cisco/n1kv/test_n1kv_db.py
View File

@ -825,6 +825,11 @@ class ProfileBindingTests(base.BaseTestCase,
self.assertEqual(binding.profile_id, test_profile_id)
self.assertEqual(binding.profile_type, test_profile_type)
def test_get_profile_binding_not_found(self):
self.assertRaises(
c_exc.ProfileTenantBindingNotFound,
n1kv_db_v2.get_profile_binding, self.session, "123", "456")
def test_delete_profile_binding(self):
test_tenant_id = "d434dd90-76ec-11e2-bcfd-0800200c9a66"
test_profile_id = "dd7b9741-76ec-11e2-bcfd-0800200c9a66"
@ -855,9 +860,11 @@ class ProfileBindingTests(base.BaseTestCase,
binding = n1kv_db_v2.get_profile_binding(self.session,
ctx.tenant_id,
test_profile_id)
self.assertIsNone(n1kv_db_v2.get_profile_binding(
self.assertRaises(
c_exc.ProfileTenantBindingNotFound,
n1kv_db_v2.get_profile_binding,
self.session,
cisco_constants.TENANT_ID_NOT_SET,
test_profile_id))
test_profile_id)
self.assertNotEqual(binding.tenant_id,
cisco_constants.TENANT_ID_NOT_SET)