summaryrefslogtreecommitdiff
path: root/openstackclient/tests/compute
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-20 15:11:29 +0000
committerGerrit Code Review <review@openstack.org>2016-06-20 15:11:29 +0000
commita0c07ca4506bc917af6416041303efe66dcbe10b (patch)
tree70aa1c5d34023554abb76171af4bde9d8d6a3691 /openstackclient/tests/compute
parent40004b5d80689f9f9cd802b1487f8e78830e6d4f (diff)
parentd67c2e838320f79b4ddc74238bb827026f5275bd (diff)
downloadpython-openstackclient-a0c07ca4506bc917af6416041303efe66dcbe10b.tar.gz
Merge "Use osc_lib in server_image.py"
Diffstat (limited to 'openstackclient/tests/compute')
-rw-r--r--openstackclient/tests/compute/v2/test_server_image.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/openstackclient/tests/compute/v2/test_server_image.py b/openstackclient/tests/compute/v2/test_server_image.py
index 660e9817..8a8bd9bc 100644
--- a/openstackclient/tests/compute/v2/test_server_image.py
+++ b/openstackclient/tests/compute/v2/test_server_image.py
@@ -12,8 +12,9 @@
#
import mock
-from openstackclient.common import exceptions
-from openstackclient.common import utils as common_utils
+from osc_lib import exceptions
+from osc_lib import utils as common_utils
+
from openstackclient.compute.v2 import server_image
from openstackclient.tests.compute.v2 import fakes as compute_fakes
from openstackclient.tests.image.v2 import fakes as image_fakes