Fix incorrect NotImplementedError

neutron.common.exceptions doesn't define NotImplementedError, but
some codes still use it. We should use builtin
exceptions.NotImplementedError instead.

Note: this patch also fixes a never run code in nvp.

Closes-Bug: #1221500
Change-Id: I5f367ab5edc1e7fbbc2e4eba5fe36d148d4d062d

diff --git a/neutron/extensions/l3.py b/neutron/extensions/l3.py
index 62e1aee6ca3a095e8bf5259ffad56384e2b056c5..8e95d3fdfd87bc22cf9d14f10443c30c16447f90 100644 (file)
--- a/neutron/extensions/l3.py
+++ b/neutron/extensions/l3.py
@@ -285,7 +285,7 @@ class RouterPluginBase(object):
         pass
 
     def get_routers_count(self, context, filters=None):
-        raise qexception.NotImplementedError()
+        raise NotImplementedError()
 
     def get_floatingips_count(self, context, filters=None):
-        raise qexception.NotImplementedError()
+        raise NotImplementedError()

diff --git a/neutron/plugins/nicira/NeutronPlugin.py b/neutron/plugins/nicira/NeutronPlugin.py
index af4a6ff4f7af676aab5d6e9571321f0d76757d4f..58341289861ed3a5a73b6d8a773861a02e590162 100644 (file)
--- a/neutron/plugins/nicira/NeutronPlugin.py
+++ b/neutron/plugins/nicira/NeutronPlugin.py
@@ -1086,11 +1086,9 @@ class NvpPluginV2(addr_pair_db.AllowedAddressPairsMixin,
 
     def update_network(self, context, id, network):
         pnet._raise_if_updates_provider_attributes(network['network'])
-        if network["network"].get("admin_state_up"):
-            if network['network']["admin_state_up"] is False:
-                raise q_exc.NotImplementedError(_("admin_state_up=False "
-                                                  "networks are not "
-                                                  "supported."))
+        if network["network"].get("admin_state_up") is False:
+            raise NotImplementedError(_("admin_state_up=False networks "
+                                        "are not supported."))
         with context.session.begin(subtransactions=True):
             net = super(NvpPluginV2, self).update_network(context, id, network)
             if psec.PORTSECURITY in network['network']:

diff --git a/neutron/tests/unit/nicira/test_nicira_plugin.py b/neutron/tests/unit/nicira/test_nicira_plugin.py
index 2be1b37f785988e52de754f5a2de1067b623e1a9..444eaf0fb437d35c5eb66153a20e1f82eb87829f 100644 (file)
--- a/neutron/tests/unit/nicira/test_nicira_plugin.py
+++ b/neutron/tests/unit/nicira/test_nicira_plugin.py
@@ -324,6 +324,15 @@ class TestNiciraNetworksV2(test_plugin.TestNetworksV2,
             self.assertEqual(webob.exc.HTTPServiceUnavailable.code,
                              res.status_int)
 
+    def test_update_network_with_admin_false(self):
+        data = {'network': {'admin_state_up': False}}
+        with self.network() as net:
+            plugin = manager.NeutronManager.get_plugin()
+            self.assertRaises(NotImplementedError,
+                              plugin.update_network,
+                              context.get_admin_context(),
+                              net['network']['id'], data)
+
 
 class NiciraPortSecurityTestCase(psec.PortSecurityDBTestCase):