osc-lib: utils

Use osc-lib directly for utils.

Leave openstackclient.common.utils for deprecation period.

Change-Id: I5bd9579abc4e07f45219ccd0565626e6667472f7

7 files changed, 12 insertions, 7 deletions

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