summaryrefslogtreecommitdiff
path: root/keystoneclient/exceptions.py
diff options
context:
space:
mode:
Diffstat (limited to 'keystoneclient/exceptions.py')
-rw-r--r--keystoneclient/exceptions.py20
1 files changed, 12 insertions, 8 deletions
diff --git a/keystoneclient/exceptions.py b/keystoneclient/exceptions.py
index c462074..c688fac 100644
--- a/keystoneclient/exceptions.py
+++ b/keystoneclient/exceptions.py
@@ -17,7 +17,14 @@ Exception definitions.
"""
#flake8: noqa
-from keystoneclient.apiclient.exceptions import *
+from keystoneclient.openstack.common.apiclient.exceptions import *
+
+# NOTE(akurilin): This alias should be left here to support backwards
+# compatibility until we are sure that usage of these exceptions in
+# projects is correct.
+ConnectionError = ConnectionRefused
+HTTPNotImplemented = HttpNotImplemented
+Timeout = RequestTimeout
class CertificateConfigError(Exception):
@@ -29,18 +36,15 @@ class CertificateConfigError(Exception):
super(CertificateConfigError, self).__init__(msg)
-class ConnectionError(ClientException):
- """Something went wrong trying to connect to a server"""
+class EmptyCatalog(EndpointNotFound):
+ """The service catalog is empty."""
+ pass
-class SSLError(ConnectionError):
+class SSLError(ConnectionRefused):
"""An SSL error occurred."""
-class Timeout(ClientException):
- """The request timed out."""
-
-
class DiscoveryFailure(ClientException):
"""Discovery of client versions failed."""