Browse Source

Merge "Add missing keyword raise to get_profile_binding function"

changes/82/94882/5
Jenkins 8 years ago
committed by Gerrit Code Review
parent
commit
16eb987558
  1. 2
      neutron/plugins/cisco/db/n1kv_db_v2.py
  2. 11
      neutron/tests/unit/cisco/n1kv/test_n1kv_db.py

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

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

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

Loading…
Cancel
Save