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/compute/v2 | |
| 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/compute/v2')
| -rw-r--r-- | openstackclient/compute/v2/agent.py | 2 | ||||
| -rw-r--r-- | openstackclient/compute/v2/flavor.py | 2 | ||||
| -rw-r--r-- | openstackclient/compute/v2/keypair.py | 5 | ||||
| -rw-r--r-- | openstackclient/compute/v2/server.py | 6 | ||||
| -rw-r--r-- | openstackclient/compute/v2/server_backup.py | 2 | ||||
| -rw-r--r-- | openstackclient/compute/v2/server_group.py | 3 | ||||
| -rw-r--r-- | openstackclient/compute/v2/service.py | 3 |
7 files changed, 13 insertions, 10 deletions
diff --git a/openstackclient/compute/v2/agent.py b/openstackclient/compute/v2/agent.py index 064fe5a6..7b1a301e 100644 --- a/openstackclient/compute/v2/agent.py +++ b/openstackclient/compute/v2/agent.py @@ -15,10 +15,10 @@ """Agent 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/compute/v2/flavor.py b/openstackclient/compute/v2/flavor.py index 87909a18..7761ab43 100644 --- a/openstackclient/compute/v2/flavor.py +++ b/openstackclient/compute/v2/flavor.py @@ -15,10 +15,10 @@ """Flavor action implementations""" +from osc_lib import exceptions import six from openstackclient.common import command -from openstackclient.common import exceptions from openstackclient.common import parseractions from openstackclient.common import utils from openstackclient.i18n import _ diff --git a/openstackclient/compute/v2/keypair.py b/openstackclient/compute/v2/keypair.py index 8af209fe..3810c1a3 100644 --- a/openstackclient/compute/v2/keypair.py +++ b/openstackclient/compute/v2/keypair.py @@ -17,11 +17,12 @@ import io import os -import six import sys +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/compute/v2/server.py b/openstackclient/compute/v2/server.py index 5688b55f..ee59bb34 100644 --- a/openstackclient/compute/v2/server.py +++ b/openstackclient/compute/v2/server.py @@ -19,17 +19,17 @@ import argparse import getpass import io import os -import six import sys -from openstackclient.common import command +from osc_lib import exceptions +import six try: from novaclient.v2 import servers except ImportError: from novaclient.v1_1 import servers -from openstackclient.common import exceptions +from openstackclient.common import command from openstackclient.common import parseractions from openstackclient.common import utils from openstackclient.i18n import _ diff --git a/openstackclient/compute/v2/server_backup.py b/openstackclient/compute/v2/server_backup.py index 24d71015..f0b3edc5 100644 --- a/openstackclient/compute/v2/server_backup.py +++ b/openstackclient/compute/v2/server_backup.py @@ -17,11 +17,11 @@ import sys +from osc_lib import exceptions from oslo_utils import importutils 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/compute/v2/server_group.py b/openstackclient/compute/v2/server_group.py index 2e275b71..1b817018 100644 --- a/openstackclient/compute/v2/server_group.py +++ b/openstackclient/compute/v2/server_group.py @@ -15,8 +15,9 @@ """Compute v2 Server Group action implementations""" +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/compute/v2/service.py b/openstackclient/compute/v2/service.py index 5660ff55..2a589f6b 100644 --- a/openstackclient/compute/v2/service.py +++ b/openstackclient/compute/v2/service.py @@ -15,8 +15,9 @@ """Service action implementations""" +from osc_lib import exceptions + from openstackclient.common import command -from openstackclient.common import exceptions from openstackclient.common import utils from openstackclient.i18n import _ |