From: Eugene Nikanorov <enikanorov@mirantis.com>
Date: Fri, 13 Jun 2014 06:12:46 +0000 (+0400)
Subject: Add missing keyword raise to get_profile_binding function
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=13fe102fadf8d25b0927ee172b0fb3f681c56bf4;p=openstack-build%2Fneutron-build.git

Add missing keyword raise to get_profile_binding function

Improve corresponding unit tests.

Change-Id: I8f71ee7aa8fcafbf3ef6e3f9d4f0b89c874af73b
Closes-Bug: #1329426
---

diff --git a/neutron/plugins/cisco/db/n1kv_db_v2.py b/neutron/plugins/cisco/db/n1kv_db_v2.py
index 5e256bbef..e3f4445a0 100644
--- a/neutron/plugins/cisco/db/n1kv_db_v2.py
+++ b/neutron/plugins/cisco/db/n1kv_db_v2.py
@@ -893,7 +893,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):
diff --git a/neutron/tests/unit/cisco/n1kv/test_n1kv_db.py b/neutron/tests/unit/cisco/n1kv/test_n1kv_db.py
index 39e27e6e7..e806944e0 100644
--- a/neutron/tests/unit/cisco/n1kv/test_n1kv_db.py
+++ b/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)