diff options
| author | Jamie Lennox <jamielennox@gmail.com> | 2016-08-24 18:33:54 +1000 |
|---|---|---|
| committer | Jamie Lennox <jamielennox@gmail.com> | 2016-08-24 18:52:36 +1000 |
| commit | 5b91fedd650613f7ba480039fca7df83c1ff6bed (patch) | |
| tree | 08459126ec74a7759b608f22a972d17d2c6089d2 /keystoneclient/v3 | |
| parent | f557170404ec2b7f5c562e55ad212b6e444655c8 (diff) | |
| download | python-keystoneclient-5b91fedd650613f7ba480039fca7df83c1ff6bed.tar.gz | |
Use exceptions from Keystoneauth
As keystoneclient and other services rely more on keystoneauth we should
assume that keystoneauth is our base auth library, not keystoneclient
and start to default to the objects provided from there. This will make
it easier to remove these objects when the time comes.
For the session independant parts of keystoneclient we should use the
exception names as provided by keystoneauth instead of the aliases in
keystoneclient.
Change-Id: Ic513046f8398a76c244e145d6cc3117cdf6bb4cd
Diffstat (limited to 'keystoneclient/v3')
| -rw-r--r-- | keystoneclient/v3/auth.py | 2 | ||||
| -rw-r--r-- | keystoneclient/v3/contrib/federation/base.py | 4 |
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) |