From cc01c3eb5afec3db048fa4f6b547281465c5cc74 Mon Sep 17 00:00:00 2001 From: Ken'ichi Ohmichi Date: Fri, 10 Mar 2017 10:48:14 -0800 Subject: [PATCH] Use tempest.lib data_utils - image Tempest has duplicated modules of data_utils, one is tempest.lib and the other is tempest.common. The difference is tempest.common module refers to the config option resources_prefix. And the option is marked as deprecated already. So it is nice to replace the calls with tempest.lib one. Change-Id: I2ae4ca7e132a961ffcb072988551c3c9e7cf8266 --- tempest/api/image/admin/v2/test_images.py | 2 +- tempest/api/image/base.py | 2 +- tempest/api/image/v1/test_image_members_negative.py | 2 +- tempest/api/image/v1/test_images.py | 2 +- tempest/api/image/v1/test_images_negative.py | 2 +- tempest/api/image/v2/test_images.py | 2 +- tempest/api/image/v2/test_images_metadefs_namespace_objects.py | 2 +- .../api/image/v2/test_images_metadefs_namespace_properties.py | 2 +- tempest/api/image/v2/test_images_metadefs_namespace_tags.py | 2 +- tempest/api/image/v2/test_images_metadefs_namespaces.py | 2 +- tempest/api/image/v2/test_images_tags.py | 2 +- tempest/api/image/v2/test_images_tags_negative.py | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tempest/api/image/admin/v2/test_images.py b/tempest/api/image/admin/v2/test_images.py index 11b595a248..fc5ed79788 100644 --- a/tempest/api/image/admin/v2/test_images.py +++ b/tempest/api/image/admin/v2/test_images.py @@ -17,8 +17,8 @@ import six import testtools from tempest.api.image import base -from tempest.common.utils import data_utils from tempest import config +from tempest.lib.common.utils import data_utils from tempest.lib import decorators from tempest.lib import exceptions as lib_exc diff --git a/tempest/api/image/base.py b/tempest/api/image/base.py index cd4f820ddc..69294fad28 100644 --- a/tempest/api/image/base.py +++ b/tempest/api/image/base.py @@ -15,8 +15,8 @@ import six from tempest.common import image as common_image -from tempest.common.utils import data_utils from tempest import config +from tempest.lib.common.utils import data_utils from tempest.lib.common.utils import test_utils import tempest.test diff --git a/tempest/api/image/v1/test_image_members_negative.py b/tempest/api/image/v1/test_image_members_negative.py index d1aa801f3f..f075cab5e2 100644 --- a/tempest/api/image/v1/test_image_members_negative.py +++ b/tempest/api/image/v1/test_image_members_negative.py @@ -13,7 +13,7 @@ # under the License. from tempest.api.image import base -from tempest.common.utils import data_utils +from tempest.lib.common.utils import data_utils from tempest.lib import decorators from tempest.lib import exceptions as lib_exc from tempest import test diff --git a/tempest/api/image/v1/test_images.py b/tempest/api/image/v1/test_images.py index 756c78ce8e..b341ab73a2 100644 --- a/tempest/api/image/v1/test_images.py +++ b/tempest/api/image/v1/test_images.py @@ -17,9 +17,9 @@ import six from tempest.api.image import base from tempest.common import image as common_image -from tempest.common.utils import data_utils from tempest.common import waiters from tempest import config +from tempest.lib.common.utils import data_utils from tempest.lib import decorators from tempest.lib import exceptions diff --git a/tempest/api/image/v1/test_images_negative.py b/tempest/api/image/v1/test_images_negative.py index abec82aa6f..42ff02f300 100644 --- a/tempest/api/image/v1/test_images_negative.py +++ b/tempest/api/image/v1/test_images_negative.py @@ -15,7 +15,7 @@ from tempest.api.image import base -from tempest.common.utils import data_utils +from tempest.lib.common.utils import data_utils from tempest.lib import decorators from tempest.lib import exceptions as lib_exc from tempest import test diff --git a/tempest/api/image/v2/test_images.py b/tempest/api/image/v2/test_images.py index 2812c68ea5..30f9ae2fc9 100644 --- a/tempest/api/image/v2/test_images.py +++ b/tempest/api/image/v2/test_images.py @@ -20,8 +20,8 @@ import six from oslo_log import log as logging from tempest.api.image import base -from tempest.common.utils import data_utils from tempest import config +from tempest.lib.common.utils import data_utils from tempest.lib import decorators from tempest import test diff --git a/tempest/api/image/v2/test_images_metadefs_namespace_objects.py b/tempest/api/image/v2/test_images_metadefs_namespace_objects.py index 38e56d49c7..80f8112110 100644 --- a/tempest/api/image/v2/test_images_metadefs_namespace_objects.py +++ b/tempest/api/image/v2/test_images_metadefs_namespace_objects.py @@ -11,7 +11,7 @@ # under the License. from tempest.api.image import base -from tempest.common.utils import data_utils +from tempest.lib.common.utils import data_utils from tempest.lib.common.utils import test_utils from tempest.lib import decorators diff --git a/tempest/api/image/v2/test_images_metadefs_namespace_properties.py b/tempest/api/image/v2/test_images_metadefs_namespace_properties.py index ead70f2a82..ed91726e0b 100644 --- a/tempest/api/image/v2/test_images_metadefs_namespace_properties.py +++ b/tempest/api/image/v2/test_images_metadefs_namespace_properties.py @@ -11,7 +11,7 @@ # under the License. from tempest.api.image import base -from tempest.common.utils import data_utils +from tempest.lib.common.utils import data_utils from tempest.lib import decorators diff --git a/tempest/api/image/v2/test_images_metadefs_namespace_tags.py b/tempest/api/image/v2/test_images_metadefs_namespace_tags.py index 608d9fc831..e2a36176f7 100644 --- a/tempest/api/image/v2/test_images_metadefs_namespace_tags.py +++ b/tempest/api/image/v2/test_images_metadefs_namespace_tags.py @@ -11,7 +11,7 @@ # under the License. from tempest.api.image import base -from tempest.common.utils import data_utils +from tempest.lib.common.utils import data_utils from tempest.lib.common.utils import test_utils from tempest.lib import decorators diff --git a/tempest/api/image/v2/test_images_metadefs_namespaces.py b/tempest/api/image/v2/test_images_metadefs_namespaces.py index 9fda937711..f71b16c4ec 100644 --- a/tempest/api/image/v2/test_images_metadefs_namespaces.py +++ b/tempest/api/image/v2/test_images_metadefs_namespaces.py @@ -14,7 +14,7 @@ # under the License. from tempest.api.image import base -from tempest.common.utils import data_utils +from tempest.lib.common.utils import data_utils from tempest.lib.common.utils import test_utils from tempest.lib import decorators from tempest.lib import exceptions as lib_exc diff --git a/tempest/api/image/v2/test_images_tags.py b/tempest/api/image/v2/test_images_tags.py index fd9591f1dc..601826ee4c 100644 --- a/tempest/api/image/v2/test_images_tags.py +++ b/tempest/api/image/v2/test_images_tags.py @@ -13,7 +13,7 @@ # under the License. from tempest.api.image import base -from tempest.common.utils import data_utils +from tempest.lib.common.utils import data_utils from tempest.lib import decorators diff --git a/tempest/api/image/v2/test_images_tags_negative.py b/tempest/api/image/v2/test_images_tags_negative.py index 2a08f3a415..7032dd4a67 100644 --- a/tempest/api/image/v2/test_images_tags_negative.py +++ b/tempest/api/image/v2/test_images_tags_negative.py @@ -13,7 +13,7 @@ # under the License. from tempest.api.image import base -from tempest.common.utils import data_utils +from tempest.lib.common.utils import data_utils from tempest.lib import decorators from tempest.lib import exceptions as lib_exc from tempest import test