summaryrefslogtreecommitdiff
path: root/openstackclient/tests/compute
diff options
context:
space:
mode:
authorDean Troyer <dtroyer@gmail.com>2016-05-13 16:14:09 -0500
committerDean Troyer <dtroyer@gmail.com>2016-06-13 10:50:44 -0500
commite5e29a8fef7ba2396015918545a49e717fe75d15 (patch)
treec42c9581e6358c9327853e7800de0dfecc20a405 /openstackclient/tests/compute
parentd20c863ebc11cecaaefe043e615b2fb4f5f26063 (diff)
downloadpython-openstackclient-e5e29a8fef7ba2396015918545a49e717fe75d15.tar.gz
osc-lib: utils
Use osc-lib directly for utils. Leave openstackclient.common.utils for deprecation period. Change-Id: I5bd9579abc4e07f45219ccd0565626e6667472f7
Diffstat (limited to 'openstackclient/tests/compute')
-rw-r--r--openstackclient/tests/compute/v2/test_flavor.py2
-rw-r--r--openstackclient/tests/compute/v2/test_server.py4
-rw-r--r--openstackclient/tests/compute/v2/test_server_backup.py2
-rw-r--r--openstackclient/tests/compute/v2/test_server_group.py2
4 files changed, 5 insertions, 5 deletions
diff --git a/openstackclient/tests/compute/v2/test_flavor.py b/openstackclient/tests/compute/v2/test_flavor.py
index 139585c2..8ce7bb27 100644
--- a/openstackclient/tests/compute/v2/test_flavor.py
+++ b/openstackclient/tests/compute/v2/test_flavor.py
@@ -16,8 +16,8 @@
import copy
from osc_lib import exceptions
+from osc_lib import utils
-from openstackclient.common import utils
from openstackclient.compute.v2 import flavor
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 bd736248..e10f43a1 100644
--- a/openstackclient/tests/compute/v2/test_server.py
+++ b/openstackclient/tests/compute/v2/test_server.py
@@ -17,8 +17,8 @@ import mock
from mock import call
from osc_lib import exceptions
+from osc_lib import utils as common_utils
-from openstackclient.common import utils as common_utils
from openstackclient.compute.v2 import server
from openstackclient.tests.compute.v2 import fakes as compute_fakes
from openstackclient.tests.image.v2 import fakes as image_fakes
@@ -1692,7 +1692,7 @@ class TestServerGeneral(TestServer):
(data_1, data_2, networks_format))
self.assertIn(networks_format, (data_1, data_2), msg)
- @mock.patch('openstackclient.common.utils.find_resource')
+ @mock.patch('osc_lib.utils.find_resource')
def test_prep_server_detail(self, find_resource):
# Setup mock method return value. utils.find_resource() will be called
# three times in _prep_server_detail():
diff --git a/openstackclient/tests/compute/v2/test_server_backup.py b/openstackclient/tests/compute/v2/test_server_backup.py
index 3495d1b8..b6802ff0 100644
--- a/openstackclient/tests/compute/v2/test_server_backup.py
+++ b/openstackclient/tests/compute/v2/test_server_backup.py
@@ -14,8 +14,8 @@
import mock
from osc_lib import exceptions
+from osc_lib import utils as common_utils
-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
from openstackclient.tests.image.v2 import fakes as image_fakes
diff --git a/openstackclient/tests/compute/v2/test_server_group.py b/openstackclient/tests/compute/v2/test_server_group.py
index 4e0dbe45..bd5f8471 100644
--- a/openstackclient/tests/compute/v2/test_server_group.py
+++ b/openstackclient/tests/compute/v2/test_server_group.py
@@ -16,8 +16,8 @@
import mock
from osc_lib import exceptions
+from osc_lib import utils
-from openstackclient.common import utils
from openstackclient.compute.v2 import server_group
from openstackclient.tests.compute.v2 import fakes as compute_fakes
from openstackclient.tests import utils as tests_utils