summaryrefslogtreecommitdiff
path: root/openstackclient/tests/compute/v2
diff options
context:
space:
mode:
authorDean Troyer <dtroyer@gmail.com>2016-06-08 14:17:14 -0500
committerDean Troyer <dtroyer@gmail.com>2016-06-13 10:50:01 -0500
commitd20c863ebc11cecaaefe043e615b2fb4f5f26063 (patch)
tree7f4b63a9e21982d6244e5a24fd93dab697470ce0 /openstackclient/tests/compute/v2
parent17627c55956bca21ddb601fb2604579d0fbb9c9b (diff)
downloadpython-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/tests/compute/v2')
-rw-r--r--openstackclient/tests/compute/v2/test_agent.py3
-rw-r--r--openstackclient/tests/compute/v2/test_flavor.py3
-rw-r--r--openstackclient/tests/compute/v2/test_hypervisor.py3
-rw-r--r--openstackclient/tests/compute/v2/test_server.py5
-rw-r--r--openstackclient/tests/compute/v2/test_server_backup.py3
-rw-r--r--openstackclient/tests/compute/v2/test_server_group.py3
-rw-r--r--openstackclient/tests/compute/v2/test_service.py3
7 files changed, 15 insertions, 8 deletions
diff --git a/openstackclient/tests/compute/v2/test_agent.py b/openstackclient/tests/compute/v2/test_agent.py
index d3d1ff29..b9040ba9 100644
--- a/openstackclient/tests/compute/v2/test_agent.py
+++ b/openstackclient/tests/compute/v2/test_agent.py
@@ -16,7 +16,8 @@
import mock
from mock import call
-from openstackclient.common import exceptions
+from osc_lib import exceptions
+
from openstackclient.compute.v2 import agent
from openstackclient.tests.compute.v2 import fakes as compute_fakes
diff --git a/openstackclient/tests/compute/v2/test_flavor.py b/openstackclient/tests/compute/v2/test_flavor.py
index 434d5f92..139585c2 100644
--- a/openstackclient/tests/compute/v2/test_flavor.py
+++ b/openstackclient/tests/compute/v2/test_flavor.py
@@ -15,7 +15,8 @@
import copy
-from openstackclient.common import exceptions
+from osc_lib import exceptions
+
from openstackclient.common import utils
from openstackclient.compute.v2 import flavor
from openstackclient.tests.compute.v2 import fakes as compute_fakes
diff --git a/openstackclient/tests/compute/v2/test_hypervisor.py b/openstackclient/tests/compute/v2/test_hypervisor.py
index 8d717ba7..ee0f40ed 100644
--- a/openstackclient/tests/compute/v2/test_hypervisor.py
+++ b/openstackclient/tests/compute/v2/test_hypervisor.py
@@ -15,7 +15,8 @@
import copy
-from openstackclient.common import exceptions
+from osc_lib import exceptions
+
from openstackclient.compute.v2 import hypervisor
from openstackclient.tests.compute.v2 import fakes as compute_fakes
from openstackclient.tests import fakes
diff --git a/openstackclient/tests/compute/v2/test_server.py b/openstackclient/tests/compute/v2/test_server.py
index d642e6dd..bd736248 100644
--- a/openstackclient/tests/compute/v2/test_server.py
+++ b/openstackclient/tests/compute/v2/test_server.py
@@ -14,9 +14,10 @@
#
import getpass
import mock
-
from mock import call
-from openstackclient.common import exceptions
+
+from osc_lib import exceptions
+
from openstackclient.common import utils as common_utils
from openstackclient.compute.v2 import server
from openstackclient.tests.compute.v2 import fakes as compute_fakes
diff --git a/openstackclient/tests/compute/v2/test_server_backup.py b/openstackclient/tests/compute/v2/test_server_backup.py
index b35f9f52..3495d1b8 100644
--- a/openstackclient/tests/compute/v2/test_server_backup.py
+++ b/openstackclient/tests/compute/v2/test_server_backup.py
@@ -13,7 +13,8 @@
import mock
-from openstackclient.common import exceptions
+from osc_lib import exceptions
+
from openstackclient.common import utils as common_utils
from openstackclient.compute.v2 import server_backup
from openstackclient.tests.compute.v2 import fakes as compute_fakes
diff --git a/openstackclient/tests/compute/v2/test_server_group.py b/openstackclient/tests/compute/v2/test_server_group.py
index 70ff23f9..4e0dbe45 100644
--- a/openstackclient/tests/compute/v2/test_server_group.py
+++ b/openstackclient/tests/compute/v2/test_server_group.py
@@ -15,7 +15,8 @@
import mock
-from openstackclient.common import exceptions
+from osc_lib import exceptions
+
from openstackclient.common import utils
from openstackclient.compute.v2 import server_group
from openstackclient.tests.compute.v2 import fakes as compute_fakes
diff --git a/openstackclient/tests/compute/v2/test_service.py b/openstackclient/tests/compute/v2/test_service.py
index cf534978..3f741340 100644
--- a/openstackclient/tests/compute/v2/test_service.py
+++ b/openstackclient/tests/compute/v2/test_service.py
@@ -13,7 +13,8 @@
# under the License.
#
-from openstackclient.common import exceptions
+from osc_lib import exceptions
+
from openstackclient.compute.v2 import service
from openstackclient.tests.compute.v2 import fakes as compute_fakes