Remove openstack.common.exception usage

This file is deprecated, stop using it.

Change-Id: I5d79b8c0134bb5f4021487542d4d0a964281b8bf
Fixes-Bug: #1208734

neutron/common/exceptions.py

@@ -19,12 +19,10 @@
 Neutron base exception handling.
 """
 
-from neutron.openstack.common.exception import Error
-from neutron.openstack.common.exception import InvalidContentType  # noqa
-from neutron.openstack.common.exception import OpenstackException
+_FATAL_EXCEPTION_FORMAT_ERRORS = False
 
 
-class NeutronException(OpenstackException):
+class NeutronException(Exception):
     """Base Neutron Exception.
 
     To correctly use this class, inherit from it and define
@@ -33,6 +31,16 @@ class NeutronException(OpenstackException):
     """
     message = _("An unknown exception occurred.")
 
+    def __init__(self, **kwargs):
+        try:
+            super(NeutronException, self).__init__(self.message % kwargs)
+        except Exception:
+            if _FATAL_EXCEPTION_FORMAT_ERRORS:
+                raise
+            else:
+                # at least get the core message out if something happened
+                super(NeutronException, self).__init__(self.message)
+
 
 class BadRequest(NeutronException):
     message = _('Bad %(resource)s request: %(msg)s')
@@ -185,8 +193,10 @@ class MalformedRequestBody(BadRequest):
     message = _("Malformed request body: %(reason)s")
 
 
-class Invalid(Error):
-    pass
+class Invalid(NeutronException):
+    def __init__(self, message=None):
+        self.message = message
+        super(Invalid, self).__init__()
 
 
 class InvalidInput(BadRequest):
@@ -207,10 +217,6 @@ class OutOfBoundsAllocationPool(BadRequest):
                 "beyond the subnet cidr %(subnet_cidr)s.")
 
 
-class NotImplementedError(Error):
-    pass
-
-
 class MacAddressGenerationFailure(ServiceUnavailable):
     message = _("Unable to generate unique mac on network %(net_id)s.")
 
@@ -257,6 +263,10 @@ class InvalidExtensionEnv(BadRequest):
     message = _("Invalid extension environment: %(reason)s")
 
 
+class InvalidContentType(NeutronException):
+    message = "Invalid content type %(content_type)s"
+
+
 class ExternalIpAddressExhausted(BadRequest):
     message = _("Unable to find any IP address on external "
                 "network %(net_id)s.")

neutron/neutron_plugin_base_v2.py

@@ -23,8 +23,6 @@
 
 from abc import ABCMeta, abstractmethod
 
-from neutron.common import exceptions
-
 
 class NeutronPluginBaseV2(object):
 
@@ -119,7 +117,7 @@ def get_subnets_count(self, context, filters=None):
         .. note:: this method is optional, as it was not part of the originally
                   defined plugin API.
         """
-        raise exceptions.NotImplementedError()
+        raise NotImplementedError
 
     @abstractmethod
     def delete_subnet(self, context, id):
@@ -220,7 +218,7 @@ def get_networks_count(self, context, filters=None):
         NOTE: this method is optional, as it was not part of the originally
               defined plugin API.
         """
-        raise exceptions.NotImplementedError()
+        raise NotImplementedError
 
     @abstractmethod
     def delete_network(self, context, id):
@@ -316,7 +314,7 @@ def get_ports_count(self, context, filters=None):
         .. note:: this method is optional, as it was not part of the originally
                   defined plugin API.
         """
-        raise exceptions.NotImplementedError()
+        raise NotImplementedError
 
     @abstractmethod
     def delete_port(self, context, id):

neutron/quota.py

@@ -300,7 +300,7 @@ def _count_resource(context, plugin, resources, tenant_id):
     try:
         obj_count_getter = getattr(plugin, count_getter_name)
         return obj_count_getter(context, filters={'tenant_id': [tenant_id]})
-    except (exceptions.NotImplementedError, AttributeError):
+    except (NotImplementedError, AttributeError):
         obj_getter = getattr(plugin, "get_%s" % resources)
         obj_list = obj_getter(context, filters={'tenant_id': [tenant_id]})
         return len(obj_list) if obj_list else 0

neutron/tests/base.py

@@ -25,7 +25,8 @@
 import stubout
 import testtools
 
-from neutron.openstack.common import exception
+from neutron.common import exceptions
+
 
 CONF = cfg.CONF
 TRUE_STRING = ['True', '1']
@@ -62,7 +63,7 @@ def setUp(self):
             stderr = self.useFixture(fixtures.StringStream('stderr')).stream
             self.useFixture(fixtures.MonkeyPatch('sys.stderr', stderr))
         self.stubs = stubout.StubOutForTesting()
-        self.stubs.Set(exception, '_FATAL_EXCEPTION_FORMAT_ERRORS', True)
+        self.stubs.Set(exceptions, '_FATAL_EXCEPTION_FORMAT_ERRORS', True)
 
     def config(self, **kw):
         """Override some configuration values.

neutron/tests/unit/test_api_v2.py

@@ -1325,7 +1325,7 @@ def test_create_network_quota_no_counts(self):
 
         instance = self.plugin.return_value
         instance.get_networks_count.side_effect = (
-            q_exc.NotImplementedError())
+            NotImplementedError())
         instance.get_networks.return_value = ["foo"]
         res = self.api.post_json(
             _get_path('networks'), initial_input, expect_errors=True)

openstack-common.conf

@@ -4,7 +4,6 @@ module=context
 module=db
 module=db.sqlalchemy
 module=eventlet_backdoor
-module=exception
 module=excutils
 module=fileutils
 module=gettextutils