From: Fawad Khaliq <fawad@plumgrid.com>
Date: Wed, 12 Mar 2014 00:33:30 +0000 (-0700)
Subject: Fix in admin_state_up check function
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=7360e67d32dbd8c98ef59c46bf0c7fff16f48d0c;p=openstack-build%2Fneutron-build.git

Fix in admin_state_up check function

Change-Id: If221cf5546e6432b31dd11ec322ddd4b69d161b2
Closes-Bug: #1291103
Signed-off-by: Fawad Khaliq <fawad@plumgrid.com>
---

diff --git a/neutron/plugins/plumgrid/plumgrid_plugin/plumgrid_plugin.py b/neutron/plugins/plumgrid/plumgrid_plugin/plumgrid_plugin.py
index 12f8e31fa..a01d833bd 100644
--- a/neutron/plugins/plumgrid/plumgrid_plugin/plumgrid_plugin.py
+++ b/neutron/plugins/plumgrid/plumgrid_plugin/plumgrid_plugin.py
@@ -553,16 +553,9 @@ class NeutronPluginPLUMgridV2(db_base_plugin_v2.NeutronDbPluginV2,
         return port
 
     def _network_admin_state(self, network):
-        try:
-            if network["network"].get("admin_state_up"):
-                network_name = network["network"]["name"]
-                if network["network"]["admin_state_up"] is False:
-                    LOG.warning(_("Network with admin_state_up=False are not "
-                                  "supported yet by this plugin. Ignoring "
-                                  "setting for network %s"), network_name)
-        except Exception:
-            err_message = _("Network Admin State Validation Failed: ")
-            raise plum_excep.PLUMgridException(err_msg=err_message)
+        if network["network"].get("admin_state_up") is False:
+            LOG.warning("Networks with admin_state_up=False are not "
+                        "supported by PLUMgrid plugin yet.")
         return network
 
     def _allocate_pools_for_subnet(self, context, subnet):