From: Rohit Agarwalla <rohitagarwalla@gmail.com>
Date: Mon, 5 Dec 2011 17:56:36 +0000 (-0800)
Subject: Fix for bug 900277
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=9f6c2e0ee6eb156f4673af808878f7478ebd62bc;p=openstack-build%2Fneutron-build.git

Fix for bug 900277

Removes duplicate network name checks from cisco db api module

Change-Id: I620b3abefeb2cb80eb98778807fd26c5a084bb0e
---

diff --git a/quantum/plugins/cisco/db/api.py b/quantum/plugins/cisco/db/api.py
index bfbaafa8e..3e647ffc3 100644
--- a/quantum/plugins/cisco/db/api.py
+++ b/quantum/plugins/cisco/db/api.py
@@ -76,24 +76,9 @@ def unregister_models():
     BASE.metadata.drop_all(_ENGINE)
 
 
-def _check_duplicate_net_name(tenant_id, net_name):
-    session = get_session()
-    try:
-        net = session.query(models.Network).\
-          filter_by(tenant_id=tenant_id, name=net_name).\
-          one()
-        raise q_exc.NetworkNameExists(tenant_id=tenant_id,
-                        net_name=net_name, net_id=net.uuid)
-    except exc.NoResultFound:
-        # this is the "normal" path, as API spec specifies
-        # that net-names are unique within a tenant
-        pass
-
-
 def network_create(tenant_id, name):
     session = get_session()
 
-    _check_duplicate_net_name(tenant_id, name)
     with session.begin():
         net = models.Network(tenant_id, name)
         session.add(net)
@@ -124,8 +109,6 @@ def network_update(net_id, tenant_id, **kwargs):
     session = get_session()
     net = network_get(net_id)
     for key in kwargs.keys():
-        if key == "name":
-            _check_duplicate_net_name(tenant_id, kwargs[key])
         net[key] = kwargs[key]
     session.merge(net)
     session.flush()