Merge "Use oslo database code"

1 files changed, 0 insertions, 14 deletions

diff --git a/nova/exception.py b/nova/exception.py
index 6bb8097c3..3b20b7e78 100644
--- a/nova/exception.py
+++ b/nova/exception.py
@@ -164,20 +164,6 @@ class EC2APIError(NovaException):
         super(EC2APIError, self).__init__(outstr)
 
 
-class DBError(NovaException):
-    """Wraps an implementation specific exception."""
-    def __init__(self, inner_exception=None):
-        self.inner_exception = inner_exception
-        super(DBError, self).__init__(str(inner_exception))
-
-
-class DBDuplicateEntry(DBError):
-    """Wraps an implementation specific exception."""
-    def __init__(self, columns=[], inner_exception=None):
-        self.columns = columns
-        super(DBDuplicateEntry, self).__init__(inner_exception)
-
-
 class EncryptionFailure(NovaException):
     message = _("Failed to encrypt text: %(reason)s")