osc-lib: utils

Use osc-lib directly for utils.

Leave openstackclient.common.utils for deprecation period.

Change-Id: I5bd9579abc4e07f45219ccd0565626e6667472f7

24 files changed, 41 insertions, 434 deletions

diff --git a/openstackclient/tests/common/test_utils.py b/openstackclient/tests/common/test_utils.py
deleted file mode 100644
index e521530a..00000000
--- a/openstackclient/tests/common/test_utils.py
+++ /dev/null
@@ -1,401 +0,0 @@
-#   Copyright 2012-2013 OpenStack, LLC.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License"); you may
-#   not use this file except in compliance with the License. You may obtain
-#   a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#   License for the specific language governing permissions and limitations
-#   under the License.
-#
-
-import time
-import uuid
-
-import mock
-
-from osc_lib import exceptions
-
-from openstackclient.common import utils
-from openstackclient.tests import fakes
-from openstackclient.tests import utils as test_utils
-
-PASSWORD = "Pa$$w0rd"
-WASSPORD = "Wa$$p0rd"
-DROWSSAP = "dr0w$$aP"
-
-
-class FakeOddballResource(fakes.FakeResource):
-
-    def get(self, attr):
-        """get() is needed for utils.find_resource()"""
-        if attr == 'id':
-            return self.id
-        elif attr == 'name':
-            return self.name
-        else:
-            return None
-
-
-class TestUtils(test_utils.TestCase):
-
-    def test_get_password_good(self):
-        with mock.patch("getpass.getpass", return_value=PASSWORD):
-            mock_stdin = mock.Mock()
-            mock_stdin.isatty = mock.Mock()
-            mock_stdin.isatty.return_value = True
-            self.assertEqual(PASSWORD, utils.get_password(mock_stdin))
-
-    def test_get_password_bad_once(self):
-        answers = [PASSWORD, WASSPORD, DROWSSAP, DROWSSAP]
-        with mock.patch("getpass.getpass", side_effect=answers):
-            mock_stdin = mock.Mock()
-            mock_stdin.isatty = mock.Mock()
-            mock_stdin.isatty.return_value = True
-            self.assertEqual(DROWSSAP, utils.get_password(mock_stdin))
-
-    def test_get_password_no_tty(self):
-        mock_stdin = mock.Mock()
-        mock_stdin.isatty = mock.Mock()
-        mock_stdin.isatty.return_value = False
-        self.assertRaises(exceptions.CommandError,
-                          utils.get_password,
-                          mock_stdin)
-
-    def test_get_password_cntrl_d(self):
-        with mock.patch("getpass.getpass", side_effect=EOFError()):
-            mock_stdin = mock.Mock()
-            mock_stdin.isatty = mock.Mock()
-            mock_stdin.isatty.return_value = True
-            self.assertRaises(exceptions.CommandError,
-                              utils.get_password,
-                              mock_stdin)
-
-    def get_test_items(self):
-        item1 = {'a': 1, 'b': 2}
-        item2 = {'a': 1, 'b': 3}
-        item3 = {'a': 2, 'b': 2}
-        item4 = {'a': 2, 'b': 1}
-        return [item1, item2, item3, item4]
-
-    def test_sort_items_with_one_key(self):
-        items = self.get_test_items()
-        sort_str = 'b'
-        expect_items = [items[3], items[0], items[2], items[1]]
-        self.assertEqual(expect_items, utils.sort_items(items, sort_str))
-
-    def test_sort_items_with_multiple_keys(self):
-        items = self.get_test_items()
-        sort_str = 'a,b'
-        expect_items = [items[0], items[1], items[3], items[2]]
-        self.assertEqual(expect_items, utils.sort_items(items, sort_str))
-
-    def test_sort_items_all_with_direction(self):
-        items = self.get_test_items()
-        sort_str = 'a:desc,b:desc'
-        expect_items = [items[2], items[3], items[1], items[0]]
-        self.assertEqual(expect_items, utils.sort_items(items, sort_str))
-
-    def test_sort_items_some_with_direction(self):
-        items = self.get_test_items()
-        sort_str = 'a,b:desc'
-        expect_items = [items[1], items[0], items[2], items[3]]
-        self.assertEqual(expect_items, utils.sort_items(items, sort_str))
-
-    def test_sort_items_with_object(self):
-        item1 = mock.Mock(a=1, b=2)
-        item2 = mock.Mock(a=1, b=3)
-        item3 = mock.Mock(a=2, b=2)
-        item4 = mock.Mock(a=2, b=1)
-        items = [item1, item2, item3, item4]
-        sort_str = 'b,a'
-        expect_items = [item4, item1, item3, item2]
-        self.assertEqual(expect_items, utils.sort_items(items, sort_str))
-
-    def test_sort_items_with_empty_key(self):
-        items = self.get_test_items()
-        sort_srt = ''
-        self.assertEqual(items, utils.sort_items(items, sort_srt))
-        sort_srt = None
-        self.assertEqual(items, utils.sort_items(items, sort_srt))
-
-    def test_sort_items_with_invalid_key(self):
-        items = self.get_test_items()
-        sort_str = 'c'
-        self.assertRaises(exceptions.CommandError,
-                          utils.sort_items,
-                          items, sort_str)
-
-    def test_sort_items_with_invalid_direction(self):
-        items = self.get_test_items()
-        sort_str = 'a:bad_dir'
-        self.assertRaises(exceptions.CommandError,
-                          utils.sort_items,
-                          items, sort_str)
-
-    @mock.patch.object(time, 'sleep')
-    def test_wait_for_status_ok(self, mock_sleep):
-        # Tests the normal flow that the resource is status=active
-        resource = mock.MagicMock(status='ACTIVE')
-        status_f = mock.Mock(return_value=resource)
-        res_id = str(uuid.uuid4())
-        self.assertTrue(utils.wait_for_status(status_f, res_id,))
-        mock_sleep.assert_not_called()
-
-    @mock.patch.object(time, 'sleep')
-    def test_wait_for_status_ok__with_overrides(self, mock_sleep):
-        # Tests the normal flow that the resource is status=complete
-        resource = mock.MagicMock(my_status='COMPLETE')
-        status_f = mock.Mock(return_value=resource)
-        res_id = str(uuid.uuid4())
-        self.assertTrue(utils.wait_for_status(status_f, res_id,
-                                              status_field='my_status',
-                                              success_status=['complete']))
-        mock_sleep.assert_not_called()
-
-    @mock.patch.object(time, 'sleep')
-    def test_wait_for_status_error(self, mock_sleep):
-        # Tests that we fail if the resource is status=error
-        resource = mock.MagicMock(status='ERROR')
-        status_f = mock.Mock(return_value=resource)
-        res_id = str(uuid.uuid4())
-        self.assertFalse(utils.wait_for_status(status_f, res_id))
-        mock_sleep.assert_not_called()
-
-    @mock.patch.object(time, 'sleep')
-    def test_wait_for_status_error_with_overrides(self, mock_sleep):
-        # Tests that we fail if the resource is my_status=failed
-        resource = mock.MagicMock(my_status='FAILED')
-        status_f = mock.Mock(return_value=resource)
-        res_id = str(uuid.uuid4())
-        self.assertFalse(utils.wait_for_status(status_f, res_id,
-                                               status_field='my_status',
-                                               error_status=['failed']))
-        mock_sleep.assert_not_called()
-
-    @mock.patch.object(time, 'sleep')
-    def test_wait_for_delete_ok(self, mock_sleep):
-        # Tests the normal flow that the resource is deleted with a 404 coming
-        # back on the 2nd iteration of the wait loop.
-        resource = mock.MagicMock(status='ACTIVE', progress=None)
-        mock_get = mock.Mock(side_effect=[resource,
-                                          exceptions.NotFound(404)])
-        manager = mock.MagicMock(get=mock_get)
-        res_id = str(uuid.uuid4())
-        callback = mock.Mock()
-        self.assertTrue(utils.wait_for_delete(manager, res_id,
-                                              callback=callback))
-        mock_sleep.assert_called_once_with(5)
-        callback.assert_called_once_with(0)
-
-    @mock.patch.object(time, 'sleep')
-    def test_wait_for_delete_timeout(self, mock_sleep):
-        # Tests that we fail if the resource is not deleted before the timeout.
-        resource = mock.MagicMock(status='ACTIVE')
-        mock_get = mock.Mock(return_value=resource)
-        manager = mock.MagicMock(get=mock_get)
-        res_id = str(uuid.uuid4())
-        self.assertFalse(utils.wait_for_delete(manager, res_id, sleep_time=1,
-                                               timeout=1))
-        mock_sleep.assert_called_once_with(1)
-
-    @mock.patch.object(time, 'sleep')
-    def test_wait_for_delete_error(self, mock_sleep):
-        # Tests that we fail if the resource goes to error state while waiting.
-        resource = mock.MagicMock(status='ERROR')
-        mock_get = mock.Mock(return_value=resource)
-        manager = mock.MagicMock(get=mock_get)
-        res_id = str(uuid.uuid4())
-        self.assertFalse(utils.wait_for_delete(manager, res_id))
-        mock_sleep.assert_not_called()
-
-    @mock.patch.object(time, 'sleep')
-    def test_wait_for_delete_error_with_overrides(self, mock_sleep):
-        # Tests that we fail if the resource is my_status=failed
-        resource = mock.MagicMock(my_status='FAILED')
-        mock_get = mock.Mock(return_value=resource)
-        manager = mock.MagicMock(get=mock_get)
-        res_id = str(uuid.uuid4())
-        self.assertFalse(utils.wait_for_delete(manager, res_id,
-                                               status_field='my_status',
-                                               error_status=['failed']))
-        mock_sleep.assert_not_called()
-
-    @mock.patch.object(time, 'sleep')
-    def test_wait_for_delete_error_with_overrides_exception(self, mock_sleep):
-        # Tests that we succeed if the resource is specific exception
-        mock_get = mock.Mock(side_effect=Exception)
-        manager = mock.MagicMock(get=mock_get)
-        res_id = str(uuid.uuid4())
-        self.assertTrue(utils.wait_for_delete(manager, res_id,
-                                              exception_name=['Exception']))
-        mock_sleep.assert_not_called()
-
-    def test_build_kwargs_dict_value_set(self):
-        self.assertEqual({'arg_bla': 'bla'},
-                         utils.build_kwargs_dict('arg_bla', 'bla'))
-
-    def test_build_kwargs_dict_value_None(self):
-        self.assertEqual({}, utils.build_kwargs_dict('arg_bla', None))
-
-    def test_build_kwargs_dict_value_empty_str(self):
-        self.assertEqual({}, utils.build_kwargs_dict('arg_bla', ''))
-
-
-class NoUniqueMatch(Exception):
-    pass
-
-
-class TestFindResource(test_utils.TestCase):
-
-    def setUp(self):
-        super(TestFindResource, self).setUp()
-        self.name = 'legos'
-        self.expected = mock.Mock()
-        self.manager = mock.Mock()
-        self.manager.resource_class = mock.Mock()
-        self.manager.resource_class.__name__ = 'lego'
-
-    def test_find_resource_get_int(self):
-        self.manager.get = mock.Mock(return_value=self.expected)
-        result = utils.find_resource(self.manager, 1)
-        self.assertEqual(self.expected, result)
-        self.manager.get.assert_called_with(1)
-
-    def test_find_resource_get_int_string(self):
-        self.manager.get = mock.Mock(return_value=self.expected)
-        result = utils.find_resource(self.manager, "2")
-        self.assertEqual(self.expected, result)
-        self.manager.get.assert_called_with(2)
-
-    def test_find_resource_get_uuid(self):
-        uuid = '9a0dc2a0-ad0d-11e3-a5e2-0800200c9a66'
-        self.manager.get = mock.Mock(return_value=self.expected)
-        result = utils.find_resource(self.manager, uuid)
-        self.assertEqual(self.expected, result)
-        self.manager.get.assert_called_with(uuid)
-
-    def test_find_resource_get_whatever(self):
-        self.manager.get = mock.Mock(return_value=self.expected)
-        result = utils.find_resource(self.manager, 'whatever')
-        self.assertEqual(self.expected, result)
-        self.manager.get.assert_called_with('whatever')
-
-    def test_find_resource_find(self):
-        self.manager.get = mock.Mock(side_effect=Exception('Boom!'))
-        self.manager.find = mock.Mock(return_value=self.expected)
-        result = utils.find_resource(self.manager, self.name)
-        self.assertEqual(self.expected, result)
-        self.manager.get.assert_called_with(self.name)
-        self.manager.find.assert_called_with(name=self.name)
-
-    def test_find_resource_find_not_found(self):
-        self.manager.get = mock.Mock(side_effect=Exception('Boom!'))
-        self.manager.find = mock.Mock(
-            side_effect=exceptions.NotFound(404, "2")
-        )
-        result = self.assertRaises(exceptions.CommandError,
-                                   utils.find_resource,
-                                   self.manager,
-                                   self.name)
-        self.assertEqual("No lego with a name or ID of 'legos' exists.",
-                         str(result))
-        self.manager.get.assert_called_with(self.name)
-        self.manager.find.assert_called_with(name=self.name)
-
-    def test_find_resource_list_forbidden(self):
-        self.manager.get = mock.Mock(side_effect=Exception('Boom!'))
-        self.manager.find = mock.Mock(side_effect=Exception('Boom!'))
-        self.manager.list = mock.Mock(
-            side_effect=exceptions.Forbidden(403)
-        )
-        self.assertRaises(exceptions.Forbidden,
-                          utils.find_resource,
-                          self.manager,
-                          self.name)
-        self.manager.list.assert_called_with()
-
-    def test_find_resource_find_no_unique(self):
-        self.manager.get = mock.Mock(side_effect=Exception('Boom!'))
-        self.manager.find = mock.Mock(side_effect=NoUniqueMatch())
-        result = self.assertRaises(exceptions.CommandError,
-                                   utils.find_resource,
-                                   self.manager,
-                                   self.name)
-        self.assertEqual("More than one lego exists with the name 'legos'.",
-                         str(result))
-        self.manager.get.assert_called_with(self.name)
-        self.manager.find.assert_called_with(name=self.name)
-
-    def test_find_resource_silly_resource(self):
-        # We need a resource with no resource_class for this test, start fresh
-        self.manager = mock.Mock()
-        self.manager.get = mock.Mock(side_effect=Exception('Boom!'))
-        self.manager.find = mock.Mock(
-            side_effect=AttributeError(
-                "'Controller' object has no attribute 'find'",
-            )
-        )
-        silly_resource = FakeOddballResource(
-            None,
-            {'id': '12345', 'name': self.name},
-            loaded=True,
-        )
-        self.manager.list = mock.Mock(
-            return_value=[silly_resource, ],
-        )
-        result = utils.find_resource(self.manager, self.name)
-        self.assertEqual(silly_resource, result)
-        self.manager.get.assert_called_with(self.name)
-        self.manager.find.assert_called_with(name=self.name)
-
-    def test_find_resource_silly_resource_not_found(self):
-        # We need a resource with no resource_class for this test, start fresh
-        self.manager = mock.Mock()
-        self.manager.get = mock.Mock(side_effect=Exception('Boom!'))
-        self.manager.find = mock.Mock(
-            side_effect=AttributeError(
-                "'Controller' object has no attribute 'find'",
-            )
-        )
-        self.manager.list = mock.Mock(return_value=[])
-        result = self.assertRaises(exceptions.CommandError,
-                                   utils.find_resource,
-                                   self.manager,
-                                   self.name)
-        self.assertEqual("Could not find resource legos",
-                         str(result))
-        self.manager.get.assert_called_with(self.name)
-        self.manager.find.assert_called_with(name=self.name)
-
-    def test_format_dict(self):
-        expected = "a='b', c='d', e='f'"
-        self.assertEqual(expected,
-                         utils.format_dict({'a': 'b', 'c': 'd', 'e': 'f'}))
-        self.assertEqual(expected,
-                         utils.format_dict({'e': 'f', 'c': 'd', 'a': 'b'}))
-
-    def test_format_list(self):
-        expected = 'a, b, c'
-        self.assertEqual(expected, utils.format_list(['a', 'b', 'c']))
-        self.assertEqual(expected, utils.format_list(['c', 'b', 'a']))
-
-    def test_format_list_of_dicts(self):
-        expected = "a='b', c='d'\ne='f'"
-        sorted_data = [{'a': 'b', 'c': 'd'}, {'e': 'f'}]
-        unsorted_data = [{'c': 'd', 'a': 'b'}, {'e': 'f'}]
-        self.assertEqual(expected, utils.format_list_of_dicts(sorted_data))
-        self.assertEqual(expected, utils.format_list_of_dicts(unsorted_data))
-        self.assertEqual('', utils.format_list_of_dicts([]))
-        self.assertEqual('', utils.format_list_of_dicts([{}]))
-
-    def test_format_list_separator(self):
-        expected = 'a\nb\nc'
-        actual_pre_sorted = utils.format_list(['a', 'b', 'c'], separator='\n')
-        actual_unsorted = utils.format_list(['c', 'b', 'a'], separator='\n')
-        self.assertEqual(expected, actual_pre_sorted)
-        self.assertEqual(expected, actual_unsorted)
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
diff --git a/openstackclient/tests/identity/v2_0/test_user.py b/openstackclient/tests/identity/v2_0/test_user.py
index 921e215d..caf38a6f 100644
--- a/openstackclient/tests/identity/v2_0/test_user.py
+++ b/openstackclient/tests/identity/v2_0/test_user.py
@@ -152,7 +152,7 @@ class TestUserCreate(TestUser):
         # data to be shown.
         mocker = mock.Mock()
         mocker.return_value = 'abc123'
-        with mock.patch("openstackclient.common.utils.get_password", mocker):
+        with mock.patch("osc_lib.utils.get_password", mocker):
             columns, data = self.cmd.take_action(parsed_args)
 
         # Set expected values
@@ -638,7 +638,7 @@ class TestUserSet(TestUser):
 
         mocker = mock.Mock()
         mocker.return_value = 'abc123'
-        with mock.patch("openstackclient.common.utils.get_password", mocker):
+        with mock.patch("osc_lib.utils.get_password", mocker):
             result = self.cmd.take_action(parsed_args)
 
         # UserManager.update_password(user, password)
diff --git a/openstackclient/tests/identity/v3/test_project.py b/openstackclient/tests/identity/v3/test_project.py
index 5be4e389..8fcada6e 100644
--- a/openstackclient/tests/identity/v3/test_project.py
+++ b/openstackclient/tests/identity/v3/test_project.py
@@ -202,7 +202,7 @@ class TestProjectCreate(TestProject):
         mocker = mock.Mock()
         mocker.return_value = None
 
-        with mock.patch("openstackclient.common.utils.find_resource", mocker):
+        with mock.patch("osc_lib.utils.find_resource", mocker):
             columns, data = self.cmd.take_action(parsed_args)
 
         # Set expected values
@@ -549,7 +549,7 @@ class TestProjectList(TestProject):
         mocker = mock.Mock()
         mocker.return_value = None
 
-        with mock.patch("openstackclient.common.utils.find_resource", mocker):
+        with mock.patch("osc_lib.utils.find_resource", mocker):
             columns, data = self.cmd.take_action(parsed_args)
 
         self.projects_mock.list.assert_called_with(
diff --git a/openstackclient/tests/identity/v3/test_user.py b/openstackclient/tests/identity/v3/test_user.py
index 5dafa772..85522e57 100644
--- a/openstackclient/tests/identity/v3/test_user.py
+++ b/openstackclient/tests/identity/v3/test_user.py
@@ -185,7 +185,7 @@ class TestUserCreate(TestUser):
         # data to be shown.
         mocker = mock.Mock()
         mocker.return_value = 'abc123'
-        with mock.patch("openstackclient.common.utils.get_password", mocker):
+        with mock.patch("osc_lib.utils.get_password", mocker):
             columns, data = self.cmd.take_action(parsed_args)
 
         # Set expected values
@@ -841,7 +841,7 @@ class TestUserSet(TestUser):
 
         mocker = mock.Mock()
         mocker.return_value = 'abc123'
-        with mock.patch("openstackclient.common.utils.get_password", mocker):
+        with mock.patch("osc_lib.utils.get_password", mocker):
             result = self.cmd.take_action(parsed_args)
 
         # Set expected values
@@ -1023,7 +1023,7 @@ class TestUserSetPassword(TestUser):
     @contextlib.contextmanager
     def _mock_get_password(*passwords):
         mocker = mock.Mock(side_effect=passwords)
-        with mock.patch("openstackclient.common.utils.get_password", mocker):
+        with mock.patch("osc_lib.utils.get_password", mocker):
             yield
 
     def test_user_password_change(self):
diff --git a/openstackclient/tests/image/v1/test_image.py b/openstackclient/tests/image/v1/test_image.py
index b0436b9a..99c0b0ee 100644
--- a/openstackclient/tests/image/v1/test_image.py
+++ b/openstackclient/tests/image/v1/test_image.py
@@ -417,7 +417,7 @@ class TestImageList(TestImage):
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.datalist, tuple(data))
 
-    @mock.patch('openstackclient.common.utils.sort_items')
+    @mock.patch('osc_lib.utils.sort_items')
     def test_image_list_sort_option(self, si_mock):
         si_mock.side_effect = [
             [copy.deepcopy(image_fakes.IMAGE)], [],
diff --git a/openstackclient/tests/image/v2/fakes.py b/openstackclient/tests/image/v2/fakes.py
index 24aaec51..8e22fbb2 100644
--- a/openstackclient/tests/image/v2/fakes.py
+++ b/openstackclient/tests/image/v2/fakes.py
@@ -19,13 +19,12 @@ import random
 import uuid
 
 from glanceclient.v2 import schemas
+from osc_lib import utils as common_utils
 import warlock
 
-from openstackclient.common import utils as common_utils
 from openstackclient.tests import fakes
-from openstackclient.tests import utils
-
 from openstackclient.tests.identity.v3 import fakes as identity_fakes
+from openstackclient.tests import utils
 
 image_id = '0f41529e-7c12-4de8-be2d-181abb825b3c'
 image_name = 'graven'
diff --git a/openstackclient/tests/image/v2/test_image.py b/openstackclient/tests/image/v2/test_image.py
index d8693df0..92e0660f 100644
--- a/openstackclient/tests/image/v2/test_image.py
+++ b/openstackclient/tests/image/v2/test_image.py
@@ -20,8 +20,8 @@ import warlock
 
 from glanceclient.v2 import schemas
 from osc_lib import exceptions
+from osc_lib import utils as common_utils
 
-from openstackclient.common import utils as common_utils
 from openstackclient.image.v2 import image
 from openstackclient.tests import fakes
 from openstackclient.tests.identity.v3 import fakes as identity_fakes
@@ -661,7 +661,7 @@ class TestImageList(TestImage):
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.datalist, tuple(data))
 
-    @mock.patch('openstackclient.common.utils.sort_items')
+    @mock.patch('osc_lib.utils.sort_items')
     def test_image_list_sort_option(self, si_mock):
         si_mock.return_value = [copy.deepcopy(self._image)]
 
@@ -698,7 +698,7 @@ class TestImageList(TestImage):
         self.assertEqual(self.columns, columns)
         self.assertEqual(len(self.datalist), len(tuple(data)))
 
-    @mock.patch('openstackclient.common.utils.find_resource')
+    @mock.patch('osc_lib.utils.find_resource')
     def test_image_list_marker_option(self, fr_mock):
         # tangchen: Since image_fakes.IMAGE is a dict, it cannot offer a .id
         #           operation. Will fix this by using FakeImage class instead
diff --git a/openstackclient/tests/network/v2/test_ip_availability.py b/openstackclient/tests/network/v2/test_ip_availability.py
index 04979e77..39e11cd5 100644
--- a/openstackclient/tests/network/v2/test_ip_availability.py
+++ b/openstackclient/tests/network/v2/test_ip_availability.py
@@ -14,7 +14,8 @@
 import copy
 import mock
 
-from openstackclient.common import utils as osc_utils
+from osc_lib import utils as common_utils
+
 from openstackclient.network.v2 import ip_availability
 from openstackclient.tests import fakes
 from openstackclient.tests.identity.v3 import fakes as identity_fakes
@@ -140,7 +141,7 @@ class TestShowIPAvailability(TestIPAvailability):
         _ip_availability.network_id,
         _ip_availability.network_name,
         _ip_availability.tenant_id,
-        osc_utils.format_list(
+        common_utils.format_list(
             _ip_availability.subnet_ip_availability),
         _ip_availability.total_ips,
         _ip_availability.used_ips,
diff --git a/openstackclient/tests/network/v2/test_network.py b/openstackclient/tests/network/v2/test_network.py
index 581e9278..8fc9dadf 100644
--- a/openstackclient/tests/network/v2/test_network.py
+++ b/openstackclient/tests/network/v2/test_network.py
@@ -16,8 +16,8 @@ import mock
 from mock import call
 
 from osc_lib import exceptions
+from osc_lib import utils
 
-from openstackclient.common import utils
 from openstackclient.network.v2 import network
 from openstackclient.tests.compute.v2 import fakes as compute_fakes
 from openstackclient.tests import fakes
diff --git a/openstackclient/tests/network/v2/test_port.py b/openstackclient/tests/network/v2/test_port.py
index 02c7d4a4..779dca05 100644
--- a/openstackclient/tests/network/v2/test_port.py
+++ b/openstackclient/tests/network/v2/test_port.py
@@ -15,8 +15,8 @@ import mock
 
 from mock import call
 from osc_lib import exceptions
+from osc_lib import utils
 
-from openstackclient.common import utils
 from openstackclient.network.v2 import port
 from openstackclient.tests.network.v2 import fakes as network_fakes
 from openstackclient.tests import utils as tests_utils
diff --git a/openstackclient/tests/network/v2/test_router.py b/openstackclient/tests/network/v2/test_router.py
index b25381ef..16296139 100644
--- a/openstackclient/tests/network/v2/test_router.py
+++ b/openstackclient/tests/network/v2/test_router.py
@@ -13,7 +13,8 @@
 
 import mock
 
-from openstackclient.common import utils as osc_utils
+from osc_lib import utils as osc_utils
+
 from openstackclient.network.v2 import router
 from openstackclient.tests.network.v2 import fakes as network_fakes
 from openstackclient.tests import utils as tests_utils
diff --git a/openstackclient/tests/network/v2/test_subnet.py b/openstackclient/tests/network/v2/test_subnet.py
index 25684d63..de7e1821 100644
--- a/openstackclient/tests/network/v2/test_subnet.py
+++ b/openstackclient/tests/network/v2/test_subnet.py
@@ -14,7 +14,8 @@
 import copy
 import mock
 
-from openstackclient.common import utils
+from osc_lib import utils
+
 from openstackclient.network.v2 import subnet as subnet_v2
 from openstackclient.tests import fakes
 from openstackclient.tests.identity.v3 import fakes as identity_fakes_v3
diff --git a/openstackclient/tests/network/v2/test_subnet_pool.py b/openstackclient/tests/network/v2/test_subnet_pool.py
index f7bb5895..10ef76d8 100644
--- a/openstackclient/tests/network/v2/test_subnet_pool.py
+++ b/openstackclient/tests/network/v2/test_subnet_pool.py
@@ -15,7 +15,8 @@ import argparse
 import copy
 import mock
 
-from openstackclient.common import utils
+from osc_lib import utils
+
 from openstackclient.network.v2 import subnet_pool
 from openstackclient.tests import fakes
 from openstackclient.tests.identity.v3 import fakes as identity_fakes_v3
diff --git a/openstackclient/tests/volume/test_find_resource.py b/openstackclient/tests/volume/test_find_resource.py
index d29a955d..227d6ca7 100644
--- a/openstackclient/tests/volume/test_find_resource.py
+++ b/openstackclient/tests/volume/test_find_resource.py
@@ -18,8 +18,8 @@ import mock
 from cinderclient.v1 import volume_snapshots
 from cinderclient.v1 import volumes
 from osc_lib import exceptions
+from osc_lib import utils
 
-from openstackclient.common import utils
 from openstackclient.tests import utils as test_utils
 from openstackclient.volume import client  # noqa
 
diff --git a/openstackclient/tests/volume/v1/test_qos_specs.py b/openstackclient/tests/volume/v1/test_qos_specs.py
index 4943f5df..392017c6 100644
--- a/openstackclient/tests/volume/v1/test_qos_specs.py
+++ b/openstackclient/tests/volume/v1/test_qos_specs.py
@@ -15,7 +15,8 @@
 
 import copy
 
-from openstackclient.common import utils
+from osc_lib import utils
+
 from openstackclient.tests import fakes
 from openstackclient.tests.volume.v1 import fakes as volume_fakes
 from openstackclient.volume.v1 import qos_specs
diff --git a/openstackclient/tests/volume/v2/fakes.py b/openstackclient/tests/volume/v2/fakes.py
index d3ca009e..1cbbf68a 100644
--- a/openstackclient/tests/volume/v2/fakes.py
+++ b/openstackclient/tests/volume/v2/fakes.py
@@ -17,7 +17,8 @@ import mock
 import random
 import uuid
 
-from openstackclient.common import utils as common_utils
+from osc_lib import utils as common_utils
+
 from openstackclient.tests import fakes
 from openstackclient.tests.identity.v3 import fakes as identity_fakes
 from openstackclient.tests.image.v2 import fakes as image_fakes
diff --git a/openstackclient/tests/volume/v2/test_qos_specs.py b/openstackclient/tests/volume/v2/test_qos_specs.py
index 741f4e70..11047535 100644
--- a/openstackclient/tests/volume/v2/test_qos_specs.py
+++ b/openstackclient/tests/volume/v2/test_qos_specs.py
@@ -13,9 +13,9 @@
 #   under the License.
 #
 
-from openstackclient.common import utils
 from openstackclient.tests.volume.v2 import fakes as volume_fakes
 from openstackclient.volume.v2 import qos_specs
+from osc_lib import utils
 
 
 class TestQos(volume_fakes.TestVolume):
diff --git a/openstackclient/tests/volume/v2/test_snapshot.py b/openstackclient/tests/volume/v2/test_snapshot.py
index fe6fbb52..ef199cbc 100644
--- a/openstackclient/tests/volume/v2/test_snapshot.py
+++ b/openstackclient/tests/volume/v2/test_snapshot.py
@@ -12,7 +12,8 @@
 #   under the License.
 #
 
-from openstackclient.common import utils
+from osc_lib import utils
+
 from openstackclient.tests.volume.v2 import fakes as volume_fakes
 from openstackclient.volume.v2 import snapshot
 
diff --git a/openstackclient/tests/volume/v2/test_type.py b/openstackclient/tests/volume/v2/test_type.py
index 10c38612..7eea1c3c 100644
--- a/openstackclient/tests/volume/v2/test_type.py
+++ b/openstackclient/tests/volume/v2/test_type.py
@@ -14,7 +14,8 @@
 
 import copy
 
-from openstackclient.common import utils
+from osc_lib import utils
+
 from openstackclient.tests import fakes
 from openstackclient.tests.identity.v3 import fakes as identity_fakes
 from openstackclient.tests import utils as tests_utils
diff --git a/openstackclient/tests/volume/v2/test_volume.py b/openstackclient/tests/volume/v2/test_volume.py
index fb48d8ac..68158df0 100644
--- a/openstackclient/tests/volume/v2/test_volume.py
+++ b/openstackclient/tests/volume/v2/test_volume.py
@@ -16,7 +16,8 @@ import copy
 
 from mock import call
 
-from openstackclient.common import utils
+from osc_lib import utils
+
 from openstackclient.tests import fakes
 from openstackclient.tests.identity.v3 import fakes as identity_fakes
 from openstackclient.tests.image.v2 import fakes as image_fakes