Merge "Add missing keyword raise to get_profile_binding function"
This commit is contained in:
commit
16eb987558
|
@ -917,7 +917,7 @@ def get_profile_binding(db_session, tenant_id, profile_id):
|
||||||
return (db_session.query(n1kv_models_v2.ProfileBinding).filter_by(
|
return (db_session.query(n1kv_models_v2.ProfileBinding).filter_by(
|
||||||
tenant_id=tenant_id, profile_id=profile_id).one())
|
tenant_id=tenant_id, profile_id=profile_id).one())
|
||||||
except exc.NoResultFound:
|
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):
|
def delete_profile_binding(db_session, tenant_id, profile_id):
|
||||||
|
|
|
@ -825,6 +825,11 @@ class ProfileBindingTests(base.BaseTestCase,
|
||||||
self.assertEqual(binding.profile_id, test_profile_id)
|
self.assertEqual(binding.profile_id, test_profile_id)
|
||||||
self.assertEqual(binding.profile_type, test_profile_type)
|
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):
|
def test_delete_profile_binding(self):
|
||||||
test_tenant_id = "d434dd90-76ec-11e2-bcfd-0800200c9a66"
|
test_tenant_id = "d434dd90-76ec-11e2-bcfd-0800200c9a66"
|
||||||
test_profile_id = "dd7b9741-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,
|
binding = n1kv_db_v2.get_profile_binding(self.session,
|
||||||
ctx.tenant_id,
|
ctx.tenant_id,
|
||||||
test_profile_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,
|
self.session,
|
||||||
cisco_constants.TENANT_ID_NOT_SET,
|
cisco_constants.TENANT_ID_NOT_SET,
|
||||||
test_profile_id))
|
test_profile_id)
|
||||||
self.assertNotEqual(binding.tenant_id,
|
self.assertNotEqual(binding.tenant_id,
|
||||||
cisco_constants.TENANT_ID_NOT_SET)
|
cisco_constants.TENANT_ID_NOT_SET)
|
||||||
|
|
Loading…
Reference in New Issue