diff options
| author | Dean Troyer <dtroyer@gmail.com> | 2016-06-08 14:17:14 -0500 |
|---|---|---|
| committer | Dean Troyer <dtroyer@gmail.com> | 2016-06-13 10:50:01 -0500 |
| commit | d20c863ebc11cecaaefe043e615b2fb4f5f26063 (patch) | |
| tree | 7f4b63a9e21982d6244e5a24fd93dab697470ce0 /openstackclient/identity | |
| parent | 17627c55956bca21ddb601fb2604579d0fbb9c9b (diff) | |
| download | python-openstackclient-d20c863ebc11cecaaefe043e615b2fb4f5f26063.tar.gz | |
osc-lib: exceptions
Use osc-lib directly for exceptions.
Leave openstackclient.common.exceptions for deprecation period.
Change-Id: Iea3e862302372e1b31ccd27f69db59b4953ca828
Diffstat (limited to 'openstackclient/identity')
| -rw-r--r-- | openstackclient/identity/common.py | 2 | ||||
| -rw-r--r-- | openstackclient/identity/v2_0/catalog.py | 2 | ||||
| -rw-r--r-- | openstackclient/identity/v2_0/role.py | 5 | ||||
| -rw-r--r-- | openstackclient/identity/v2_0/service.py | 3 | ||||
| -rw-r--r-- | openstackclient/identity/v3/catalog.py | 2 | ||||
| -rw-r--r-- | openstackclient/identity/v3/mapping.py | 3 | ||||
| -rw-r--r-- | openstackclient/identity/v3/token.py | 3 | ||||
| -rw-r--r-- | openstackclient/identity/v3/unscoped_saml.py | 3 |
8 files changed, 13 insertions, 10 deletions
diff --git a/openstackclient/identity/common.py b/openstackclient/identity/common.py index 2afa41fb..5a65c47c 100644 --- a/openstackclient/identity/common.py +++ b/openstackclient/identity/common.py @@ -20,8 +20,8 @@ from keystoneclient.v3 import domains from keystoneclient.v3 import groups from keystoneclient.v3 import projects from keystoneclient.v3 import users +from osc_lib import exceptions -from openstackclient.common import exceptions from openstackclient.common import utils diff --git a/openstackclient/identity/v2_0/catalog.py b/openstackclient/identity/v2_0/catalog.py index 33692a0d..3210df76 100644 --- a/openstackclient/identity/v2_0/catalog.py +++ b/openstackclient/identity/v2_0/catalog.py @@ -13,10 +13,10 @@ """Identity v2 Service Catalog action implementations""" +from osc_lib import exceptions import six from openstackclient.common import command -from openstackclient.common import exceptions from openstackclient.common import utils from openstackclient.i18n import _ diff --git a/openstackclient/identity/v2_0/role.py b/openstackclient/identity/v2_0/role.py index 0f8da992..8914abfd 100644 --- a/openstackclient/identity/v2_0/role.py +++ b/openstackclient/identity/v2_0/role.py @@ -15,12 +15,11 @@ """Identity v2 Role action implementations""" -import six - from keystoneauth1 import exceptions as ks_exc +from osc_lib import exceptions +import six from openstackclient.common import command -from openstackclient.common import exceptions from openstackclient.common import utils from openstackclient.i18n import _ diff --git a/openstackclient/identity/v2_0/service.py b/openstackclient/identity/v2_0/service.py index 7fe66d91..1293afc7 100644 --- a/openstackclient/identity/v2_0/service.py +++ b/openstackclient/identity/v2_0/service.py @@ -16,10 +16,11 @@ """Service action implementations""" import argparse + +from osc_lib import exceptions import six from openstackclient.common import command -from openstackclient.common import exceptions from openstackclient.common import utils from openstackclient.i18n import _ from openstackclient.identity import common diff --git a/openstackclient/identity/v3/catalog.py b/openstackclient/identity/v3/catalog.py index c2b4359d..202c3a3f 100644 --- a/openstackclient/identity/v3/catalog.py +++ b/openstackclient/identity/v3/catalog.py @@ -13,10 +13,10 @@ """Identity v3 Service Catalog action implementations""" +from osc_lib import exceptions import six from openstackclient.common import command -from openstackclient.common import exceptions from openstackclient.common import utils from openstackclient.i18n import _ diff --git a/openstackclient/identity/v3/mapping.py b/openstackclient/identity/v3/mapping.py index c45796e4..acf3a081 100644 --- a/openstackclient/identity/v3/mapping.py +++ b/openstackclient/identity/v3/mapping.py @@ -19,8 +19,9 @@ import json import six +from osc_lib import exceptions + from openstackclient.common import command -from openstackclient.common import exceptions from openstackclient.common import utils from openstackclient.i18n import _ diff --git a/openstackclient/identity/v3/token.py b/openstackclient/identity/v3/token.py index cc399363..5a47dfdd 100644 --- a/openstackclient/identity/v3/token.py +++ b/openstackclient/identity/v3/token.py @@ -17,8 +17,9 @@ import six +from osc_lib import exceptions + from openstackclient.common import command -from openstackclient.common import exceptions from openstackclient.common import utils from openstackclient.i18n import _ from openstackclient.identity import common diff --git a/openstackclient/identity/v3/unscoped_saml.py b/openstackclient/identity/v3/unscoped_saml.py index 5cb8e486..6eee27d2 100644 --- a/openstackclient/identity/v3/unscoped_saml.py +++ b/openstackclient/identity/v3/unscoped_saml.py @@ -17,8 +17,9 @@ The first step of federated auth is to fetch an unscoped token. From there, the user can list domains and projects they are allowed to access, and request a scoped token.""" +from osc_lib import exceptions + from openstackclient.common import command -from openstackclient.common import exceptions from openstackclient.common import utils from openstackclient.i18n import _ |