Merge "Remove obsolete exceptions module"

sahara/exceptions.py

@@ -320,3 +320,12 @@ class ImageNotRegistered(SaharaException):
     def __init__(self, image):
         self.message = self.message % image
         super(ImageNotRegistered, self).__init__()
+
+
+class MalformedRequestBody(SaharaException):
+    code = "MALFORMED_REQUEST_BODY"
+    message = _("Malformed message body: %(reason)s")
+
+    def __init__(self, reason):
+        self.message = self.message % reason
+        super(MalformedRequestBody, self).__init__()

sahara/openstack/common/exception.py

@@ -1,139 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2011 OpenStack Foundation.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-"""
-Exceptions common to OpenStack projects
-"""
-
-import logging
-
-from sahara.openstack.common._i18n import _  # noqa
-
-_FATAL_EXCEPTION_FORMAT_ERRORS = False
-
-
-class Error(Exception):
-    def __init__(self, message=None):
-        super(Error, self).__init__(message)
-
-
-class ApiError(Error):
-    def __init__(self, message='Unknown', code='Unknown'):
-        self.api_message = message
-        self.code = code
-        super(ApiError, self).__init__('%s: %s' % (code, message))
-
-
-class NotFound(Error):
-    pass
-
-
-class UnknownScheme(Error):
-
-    msg_fmt = "Unknown scheme '%s' found in URI"
-
-    def __init__(self, scheme):
-        msg = self.msg_fmt % scheme
-        super(UnknownScheme, self).__init__(msg)
-
-
-class BadStoreUri(Error):
-
-    msg_fmt = "The Store URI %s was malformed. Reason: %s"
-
-    def __init__(self, uri, reason):
-        msg = self.msg_fmt % (uri, reason)
-        super(BadStoreUri, self).__init__(msg)
-
-
-class Duplicate(Error):
-    pass
-
-
-class NotAuthorized(Error):
-    pass
-
-
-class NotEmpty(Error):
-    pass
-
-
-class Invalid(Error):
-    pass
-
-
-class BadInputError(Exception):
-    """Error resulting from a client sending bad input to a server"""
-    pass
-
-
-class MissingArgumentError(Error):
-    pass
-
-
-class DatabaseMigrationError(Error):
-    pass
-
-
-class ClientConnectionError(Exception):
-    """Error resulting from a client connecting to a server"""
-    pass
-
-
-def wrap_exception(f):
-    def _wrap(*args, **kw):
-        try:
-            return f(*args, **kw)
-        except Exception as e:
-            if not isinstance(e, Error):
-                logging.exception(_('Uncaught exception'))
-                raise Error(str(e))
-            raise
-    _wrap.func_name = f.func_name
-    return _wrap
-
-
-class OpenstackException(Exception):
-    """Base Exception class.
-
-    To correctly use this class, inherit from it and define
-    a 'msg_fmt' property. That message will get printf'd
-    with the keyword arguments provided to the constructor.
-    """
-    msg_fmt = "An unknown exception occurred"
-
-    def __init__(self, **kwargs):
-        try:
-            self._error_string = self.msg_fmt % kwargs
-
-        except Exception:
-            if _FATAL_EXCEPTION_FORMAT_ERRORS:
-                raise
-            else:
-                # at least get the core message out if something happened
-                self._error_string = self.msg_fmt
-
-    def __str__(self):
-        return self._error_string
-
-
-class MalformedRequestBody(OpenstackException):
-    msg_fmt = "Malformed message body: %(reason)s"
-
-
-class InvalidContentType(OpenstackException):
-    msg_fmt = "Invalid content type %(content_type)s"

sahara/service/validation.py

@@ -19,7 +19,6 @@ import jsonschema
 
 from sahara import exceptions as ex
 from sahara.i18n import _
-import sahara.openstack.common.exception as os_ex
 from sahara.utils import api as u
 from sahara.utils import api_validator
 
@@ -41,9 +40,6 @@ def validate(schema, *validators):
                 return u.bad_request(e)
             except ex.SaharaException as e:
                 return u.bad_request(e)
-            except os_ex.MalformedRequestBody as e:
-                e.code = "MALFORMED_REQUEST_BODY"
-                return u.bad_request(e)
             except Exception as e:
                 return u.internal_error(
                     500, "Error occurred during validation", e)

sahara/utils/wsgi.py

@@ -28,8 +28,9 @@ from oslo_log import log as logging
 from oslo_serialization import jsonutils
 import six
 
+from sahara import exceptions
 from sahara.i18n import _
-from sahara.openstack.common import exception
+
 LOG = logging.getLogger(__name__)
 
 
@@ -239,7 +240,7 @@ class JSONDeserializer(TextDeserializer):
             return jsonutils.loads(datastring)
         except ValueError:
             msg = _("cannot understand JSON")
-            raise exception.MalformedRequestBody(reason=msg)
+            raise exceptions.MalformedRequestBody(msg)
 
     def default(self, datastring):
         return {'body': self._from_json(datastring)}
@@ -263,7 +264,7 @@ class XMLDeserializer(TextDeserializer):
             return {node.nodeName: self._from_xml_node(node, plurals)}
         except expat.ExpatError:
             msg = _("cannot understand XML")
-            raise exception.MalformedRequestBody(reason=msg)
+            raise exceptions.MalformedRequestBody(msg)
 
     def _from_xml_node(self, node, listnames):
         """Convert a minidom node to a simple Python type.