Merge "Use exceptions from Keystoneauth"

2 files changed, 3 insertions, 3 deletions

diff --git a/keystoneclient/v3/auth.py b/keystoneclient/v3/auth.py
index 6272dbc..0009a3a 100644
--- a/keystoneclient/v3/auth.py
+++ b/keystoneclient/v3/auth.py
@@ -10,10 +10,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from keystoneauth1 import exceptions
 from keystoneauth1 import plugin
 
 from keystoneclient import base
-from keystoneclient import exceptions
 from keystoneclient.v3 import domains
 from keystoneclient.v3 import projects
 
diff --git a/keystoneclient/v3/contrib/federation/base.py b/keystoneclient/v3/contrib/federation/base.py
index 5e2e9e7..98567a2 100644
--- a/keystoneclient/v3/contrib/federation/base.py
+++ b/keystoneclient/v3/contrib/federation/base.py
@@ -12,11 +12,11 @@
 
 import abc
 
+from keystoneauth1 import exceptions
 from keystoneauth1 import plugin
 import six
 
 from keystoneclient import base
-from keystoneclient import exceptions
 
 
 @six.add_metaclass(abc.ABCMeta)
@@ -33,7 +33,7 @@ class EntityManager(base.Manager):
         url = '/auth/%s' % self.object_type
         try:
             tenant_list = self._list(url, self.object_type)
-        except exceptions.EndpointException:
+        except exceptions.CatalogException:
             endpoint_filter = {'interface': plugin.AUTH_INTERFACE}
             tenant_list = self._list(url, self.object_type,
                                      endpoint_filter=endpoint_filter)