diff --git a/tempest/api/baremetal/admin/base.py b/tempest/api/baremetal/admin/base.py index 0b5d7d959a..d7d2efe5e2 100644 --- a/tempest/api/baremetal/admin/base.py +++ b/tempest/api/baremetal/admin/base.py @@ -12,9 +12,9 @@ import functools -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/baremetal/admin/test_chassis.py b/tempest/api/baremetal/admin/test_chassis.py index 5ad05cc8be..29fc64c93f 100644 --- a/tempest/api/baremetal/admin/test_chassis.py +++ b/tempest/api/baremetal/admin/test_chassis.py @@ -12,10 +12,10 @@ # under the License. import six -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.baremetal.admin import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/baremetal/admin/test_nodes.py b/tempest/api/baremetal/admin/test_nodes.py index 6b963c7db6..4830dcdc5f 100644 --- a/tempest/api/baremetal/admin/test_nodes.py +++ b/tempest/api/baremetal/admin/test_nodes.py @@ -11,10 +11,10 @@ # under the License. import six -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.baremetal.admin import base +from tempest.common.utils import data_utils from tempest.common import waiters from tempest import test diff --git a/tempest/api/baremetal/admin/test_ports.py b/tempest/api/baremetal/admin/test_ports.py index ece4471f0e..5eaf6417af 100644 --- a/tempest/api/baremetal/admin/test_ports.py +++ b/tempest/api/baremetal/admin/test_ports.py @@ -11,11 +11,11 @@ # under the License. import six -from tempest_lib.common.utils import data_utils from tempest_lib import decorators from tempest_lib import exceptions as lib_exc from tempest.api.baremetal.admin import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/baremetal/admin/test_ports_negative.py b/tempest/api/baremetal/admin/test_ports_negative.py index 3d80ee4ab6..610758ae26 100644 --- a/tempest/api/baremetal/admin/test_ports_negative.py +++ b/tempest/api/baremetal/admin/test_ports_negative.py @@ -10,10 +10,10 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.baremetal.admin import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/compute/admin/test_agents.py b/tempest/api/compute/admin/test_agents.py index c9a73c7c29..1aa1615ed8 100644 --- a/tempest/api/compute/admin/test_agents.py +++ b/tempest/api/compute/admin/test_agents.py @@ -13,10 +13,10 @@ # under the License. from oslo_log import log -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.compute import base +from tempest.common.utils import data_utils from tempest import test LOG = log.getLogger(__name__) diff --git a/tempest/api/compute/admin/test_aggregates.py b/tempest/api/compute/admin/test_aggregates.py index 35a6479577..9e6bae2c69 100644 --- a/tempest/api/compute/admin/test_aggregates.py +++ b/tempest/api/compute/admin/test_aggregates.py @@ -13,11 +13,11 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.compute import base from tempest.common import tempest_fixtures as fixtures +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/compute/admin/test_aggregates_negative.py b/tempest/api/compute/admin/test_aggregates_negative.py index 6942fdb0c8..74a85475bc 100644 --- a/tempest/api/compute/admin/test_aggregates_negative.py +++ b/tempest/api/compute/admin/test_aggregates_negative.py @@ -13,11 +13,11 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.compute import base from tempest.common import tempest_fixtures as fixtures +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/compute/admin/test_flavors.py b/tempest/api/compute/admin/test_flavors.py index d4b8311225..364d080220 100644 --- a/tempest/api/compute/admin/test_flavors.py +++ b/tempest/api/compute/admin/test_flavors.py @@ -15,10 +15,10 @@ import uuid -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.compute import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/compute/admin/test_flavors_access.py b/tempest/api/compute/admin/test_flavors_access.py index 4c743dc27b..2baa53ec08 100644 --- a/tempest/api/compute/admin/test_flavors_access.py +++ b/tempest/api/compute/admin/test_flavors_access.py @@ -13,9 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.compute import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/compute/admin/test_flavors_access_negative.py b/tempest/api/compute/admin/test_flavors_access_negative.py index be5e6cca30..e5ae23bf00 100644 --- a/tempest/api/compute/admin/test_flavors_access_negative.py +++ b/tempest/api/compute/admin/test_flavors_access_negative.py @@ -15,10 +15,10 @@ import uuid -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.compute import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/compute/admin/test_flavors_extra_specs.py b/tempest/api/compute/admin/test_flavors_extra_specs.py index a14a61fc62..6866c1a2f1 100644 --- a/tempest/api/compute/admin/test_flavors_extra_specs.py +++ b/tempest/api/compute/admin/test_flavors_extra_specs.py @@ -13,9 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.compute import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/compute/admin/test_flavors_extra_specs_negative.py b/tempest/api/compute/admin/test_flavors_extra_specs_negative.py index ba05c7ff0f..8c5a1032e2 100644 --- a/tempest/api/compute/admin/test_flavors_extra_specs_negative.py +++ b/tempest/api/compute/admin/test_flavors_extra_specs_negative.py @@ -14,10 +14,10 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.compute import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/compute/admin/test_hosts_negative.py b/tempest/api/compute/admin/test_hosts_negative.py index 930d686f72..b2d2a04ef9 100644 --- a/tempest/api/compute/admin/test_hosts_negative.py +++ b/tempest/api/compute/admin/test_hosts_negative.py @@ -12,10 +12,10 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.compute import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/compute/admin/test_hypervisor_negative.py b/tempest/api/compute/admin/test_hypervisor_negative.py index a5c2f0d92e..701b4bb8c1 100644 --- a/tempest/api/compute/admin/test_hypervisor_negative.py +++ b/tempest/api/compute/admin/test_hypervisor_negative.py @@ -15,10 +15,10 @@ import uuid -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.compute import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/compute/admin/test_quotas.py b/tempest/api/compute/admin/test_quotas.py index 029e578b7f..47bdfa68fc 100644 --- a/tempest/api/compute/admin/test_quotas.py +++ b/tempest/api/compute/admin/test_quotas.py @@ -15,11 +15,11 @@ from oslo_log import log as logging import six -from tempest_lib.common.utils import data_utils from testtools import matchers from tempest.api.compute import base from tempest.common import tempest_fixtures as fixtures +from tempest.common.utils import data_utils from tempest import test LOG = logging.getLogger(__name__) diff --git a/tempest/api/compute/admin/test_quotas_negative.py b/tempest/api/compute/admin/test_quotas_negative.py index c450a1d222..20aa440c67 100644 --- a/tempest/api/compute/admin/test_quotas_negative.py +++ b/tempest/api/compute/admin/test_quotas_negative.py @@ -12,11 +12,11 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from tempest_lib import decorators from tempest_lib import exceptions as lib_exc from tempest.api.compute import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/compute/admin/test_security_groups.py b/tempest/api/compute/admin/test_security_groups.py index d8679e0e14..2c3c629a11 100644 --- a/tempest/api/compute/admin/test_security_groups.py +++ b/tempest/api/compute/admin/test_security_groups.py @@ -13,10 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils import testtools from tempest.api.compute import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/compute/admin/test_servers.py b/tempest/api/compute/admin/test_servers.py index 9c53e71b33..0bbacab5ce 100644 --- a/tempest/api/compute/admin/test_servers.py +++ b/tempest/api/compute/admin/test_servers.py @@ -12,11 +12,11 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from tempest_lib import decorators from tempest.api.compute import base from tempest.common import fixed_network +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/compute/admin/test_servers_negative.py b/tempest/api/compute/admin/test_servers_negative.py index cda4bc429c..6d3c4a31fd 100644 --- a/tempest/api/compute/admin/test_servers_negative.py +++ b/tempest/api/compute/admin/test_servers_negative.py @@ -14,12 +14,12 @@ import uuid -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc import testtools from tempest.api.compute import base from tempest.common import tempest_fixtures as fixtures +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/compute/base.py b/tempest/api/compute/base.py index a1f6f99bdb..04b909acc5 100644 --- a/tempest/api/compute/base.py +++ b/tempest/api/compute/base.py @@ -16,10 +16,10 @@ import time from oslo_log import log as logging -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.common import compute +from tempest.common.utils import data_utils from tempest import config from tempest import exceptions import tempest.test diff --git a/tempest/api/compute/floating_ips/test_floating_ips_actions.py b/tempest/api/compute/floating_ips/test_floating_ips_actions.py index 093f16b181..2cc1b59374 100644 --- a/tempest/api/compute/floating_ips/test_floating_ips_actions.py +++ b/tempest/api/compute/floating_ips/test_floating_ips_actions.py @@ -13,10 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.compute.floating_ips import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/compute/floating_ips/test_floating_ips_actions_negative.py b/tempest/api/compute/floating_ips/test_floating_ips_actions_negative.py index d22d3341bc..c07af729d4 100644 --- a/tempest/api/compute/floating_ips/test_floating_ips_actions_negative.py +++ b/tempest/api/compute/floating_ips/test_floating_ips_actions_negative.py @@ -15,10 +15,10 @@ import uuid -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.compute.floating_ips import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/compute/floating_ips/test_list_floating_ips_negative.py b/tempest/api/compute/floating_ips/test_list_floating_ips_negative.py index 05d3d05400..75b6b552ac 100644 --- a/tempest/api/compute/floating_ips/test_list_floating_ips_negative.py +++ b/tempest/api/compute/floating_ips/test_list_floating_ips_negative.py @@ -15,10 +15,10 @@ import uuid -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.compute import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/compute/images/test_image_metadata.py b/tempest/api/compute/images/test_image_metadata.py index 4e0ed97545..b307b592e8 100644 --- a/tempest/api/compute/images/test_image_metadata.py +++ b/tempest/api/compute/images/test_image_metadata.py @@ -15,9 +15,8 @@ import six -from tempest_lib.common.utils import data_utils - from tempest.api.compute import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/compute/images/test_image_metadata_negative.py b/tempest/api/compute/images/test_image_metadata_negative.py index 0c1971ab5f..0f02166afc 100644 --- a/tempest/api/compute/images/test_image_metadata_negative.py +++ b/tempest/api/compute/images/test_image_metadata_negative.py @@ -13,10 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.compute import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/compute/images/test_images.py b/tempest/api/compute/images/test_images.py index 2896f14e65..0324df2ca5 100644 --- a/tempest/api/compute/images/test_images.py +++ b/tempest/api/compute/images/test_images.py @@ -12,9 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.compute import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/compute/images/test_images_negative.py b/tempest/api/compute/images/test_images_negative.py index 54a82e9061..07eca9e629 100644 --- a/tempest/api/compute/images/test_images_negative.py +++ b/tempest/api/compute/images/test_images_negative.py @@ -12,10 +12,10 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.compute import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/compute/images/test_images_oneserver.py b/tempest/api/compute/images/test_images_oneserver.py index 1fd165b44c..38fed259e4 100644 --- a/tempest/api/compute/images/test_images_oneserver.py +++ b/tempest/api/compute/images/test_images_oneserver.py @@ -14,9 +14,9 @@ # under the License. from oslo_log import log as logging -from tempest_lib.common.utils import data_utils from tempest.api.compute import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/compute/images/test_images_oneserver_negative.py b/tempest/api/compute/images/test_images_oneserver_negative.py index 8a39d90013..1cd1ab7c45 100644 --- a/tempest/api/compute/images/test_images_oneserver_negative.py +++ b/tempest/api/compute/images/test_images_oneserver_negative.py @@ -15,10 +15,10 @@ # under the License. from oslo_log import log as logging -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.compute import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/compute/images/test_list_image_filters.py b/tempest/api/compute/images/test_list_image_filters.py index 111398b6fc..cc5908437d 100644 --- a/tempest/api/compute/images/test_list_image_filters.py +++ b/tempest/api/compute/images/test_list_image_filters.py @@ -17,10 +17,10 @@ import time from oslo_log import log as logging import six -from tempest_lib.common.utils import data_utils import testtools from tempest.api.compute import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/compute/images/test_list_image_filters_negative.py b/tempest/api/compute/images/test_list_image_filters_negative.py index 41106192e2..82062bdc9c 100644 --- a/tempest/api/compute/images/test_list_image_filters_negative.py +++ b/tempest/api/compute/images/test_list_image_filters_negative.py @@ -12,10 +12,10 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.compute import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/compute/keypairs/test_keypairs.py b/tempest/api/compute/keypairs/test_keypairs.py index 50ebdebdc0..45eaa97476 100644 --- a/tempest/api/compute/keypairs/test_keypairs.py +++ b/tempest/api/compute/keypairs/test_keypairs.py @@ -13,9 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.compute import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/compute/keypairs/test_keypairs_negative.py b/tempest/api/compute/keypairs/test_keypairs_negative.py index 78db74eea4..54b07f00e2 100644 --- a/tempest/api/compute/keypairs/test_keypairs_negative.py +++ b/tempest/api/compute/keypairs/test_keypairs_negative.py @@ -14,10 +14,10 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.compute import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/compute/security_groups/test_security_group_rules_negative.py b/tempest/api/compute/security_groups/test_security_group_rules_negative.py index c6541728dd..15e79ac15a 100644 --- a/tempest/api/compute/security_groups/test_security_group_rules_negative.py +++ b/tempest/api/compute/security_groups/test_security_group_rules_negative.py @@ -13,10 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.compute.security_groups import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/compute/security_groups/test_security_groups.py b/tempest/api/compute/security_groups/test_security_groups.py index 0ce26a3c3d..fd1d053160 100644 --- a/tempest/api/compute/security_groups/test_security_groups.py +++ b/tempest/api/compute/security_groups/test_security_groups.py @@ -13,10 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.compute.security_groups import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/compute/security_groups/test_security_groups_negative.py b/tempest/api/compute/security_groups/test_security_groups_negative.py index 06e073d008..465eb590cb 100644 --- a/tempest/api/compute/security_groups/test_security_groups_negative.py +++ b/tempest/api/compute/security_groups/test_security_groups_negative.py @@ -13,12 +13,12 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from tempest_lib import decorators from tempest_lib import exceptions as lib_exc import testtools from tempest.api.compute.security_groups import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/compute/servers/test_create_server.py b/tempest/api/compute/servers/test_create_server.py index 408d4ee13f..b18275c339 100644 --- a/tempest/api/compute/servers/test_create_server.py +++ b/tempest/api/compute/servers/test_create_server.py @@ -16,10 +16,10 @@ import base64 import netaddr -from tempest_lib.common.utils import data_utils import testtools from tempest.api.compute import base +from tempest.common.utils import data_utils from tempest.common.utils.linux import remote_client from tempest import config from tempest import test diff --git a/tempest/api/compute/servers/test_instance_actions_negative.py b/tempest/api/compute/servers/test_instance_actions_negative.py index afd3b7a314..6567da179c 100644 --- a/tempest/api/compute/servers/test_instance_actions_negative.py +++ b/tempest/api/compute/servers/test_instance_actions_negative.py @@ -13,10 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.compute import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/compute/servers/test_list_server_filters.py b/tempest/api/compute/servers/test_list_server_filters.py index 7a91cab1d0..0fda1556ea 100644 --- a/tempest/api/compute/servers/test_list_server_filters.py +++ b/tempest/api/compute/servers/test_list_server_filters.py @@ -13,12 +13,12 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.compute import base from tempest.api import utils from tempest.common import fixed_network +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/compute/servers/test_multiple_create.py b/tempest/api/compute/servers/test_multiple_create.py index 11b457bdd0..a9454110e1 100644 --- a/tempest/api/compute/servers/test_multiple_create.py +++ b/tempest/api/compute/servers/test_multiple_create.py @@ -13,9 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.compute import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/compute/servers/test_multiple_create_negative.py b/tempest/api/compute/servers/test_multiple_create_negative.py index bfc98ff7db..8135768889 100644 --- a/tempest/api/compute/servers/test_multiple_create_negative.py +++ b/tempest/api/compute/servers/test_multiple_create_negative.py @@ -13,10 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.compute import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/compute/servers/test_server_actions.py b/tempest/api/compute/servers/test_server_actions.py index 6fcd38a9e6..814f86d3e0 100644 --- a/tempest/api/compute/servers/test_server_actions.py +++ b/tempest/api/compute/servers/test_server_actions.py @@ -17,12 +17,12 @@ import base64 import logging from six.moves.urllib import parse as urlparse -from tempest_lib.common.utils import data_utils from tempest_lib import decorators from tempest_lib import exceptions as lib_exc import testtools from tempest.api.compute import base +from tempest.common.utils import data_utils from tempest.common.utils.linux import remote_client from tempest import config from tempest import test diff --git a/tempest/api/compute/servers/test_server_group.py b/tempest/api/compute/servers/test_server_group.py index ca808dd12f..f6dd5e3e48 100644 --- a/tempest/api/compute/servers/test_server_group.py +++ b/tempest/api/compute/servers/test_server_group.py @@ -13,10 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from tempest_lib import decorators from tempest.api.compute import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/compute/servers/test_server_metadata_negative.py b/tempest/api/compute/servers/test_server_metadata_negative.py index a8f7597c80..c42ec3d396 100644 --- a/tempest/api/compute/servers/test_server_metadata_negative.py +++ b/tempest/api/compute/servers/test_server_metadata_negative.py @@ -13,10 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.compute import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/compute/servers/test_server_rescue.py b/tempest/api/compute/servers/test_server_rescue.py index 4e3ce47d89..20bc77f682 100644 --- a/tempest/api/compute/servers/test_server_rescue.py +++ b/tempest/api/compute/servers/test_server_rescue.py @@ -13,9 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.compute import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/compute/servers/test_server_rescue_negative.py b/tempest/api/compute/servers/test_server_rescue_negative.py index 7798005566..9cc9e9bf15 100644 --- a/tempest/api/compute/servers/test_server_rescue_negative.py +++ b/tempest/api/compute/servers/test_server_rescue_negative.py @@ -13,11 +13,11 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc import testtools from tempest.api.compute import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/compute/servers/test_servers.py b/tempest/api/compute/servers/test_servers.py index 31078e3cca..8f5da204dc 100644 --- a/tempest/api/compute/servers/test_servers.py +++ b/tempest/api/compute/servers/test_servers.py @@ -13,9 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.compute import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/compute/servers/test_servers_negative.py b/tempest/api/compute/servers/test_servers_negative.py index 08bebc0fb9..e13c5aee88 100644 --- a/tempest/api/compute/servers/test_servers_negative.py +++ b/tempest/api/compute/servers/test_servers_negative.py @@ -15,11 +15,11 @@ import sys -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc import testtools from tempest.api.compute import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/compute/test_authorization.py b/tempest/api/compute/test_authorization.py index af29425c33..8f696f83ab 100644 --- a/tempest/api/compute/test_authorization.py +++ b/tempest/api/compute/test_authorization.py @@ -16,10 +16,10 @@ import six from oslo_log import log as logging -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.compute import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/compute/test_live_block_migration_negative.py b/tempest/api/compute/test_live_block_migration_negative.py index 5ee76ca890..47251b2ee9 100644 --- a/tempest/api/compute/test_live_block_migration_negative.py +++ b/tempest/api/compute/test_live_block_migration_negative.py @@ -13,10 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.compute import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/compute/volumes/test_volumes_get.py b/tempest/api/compute/volumes/test_volumes_get.py index d96dcc2154..92272e280d 100644 --- a/tempest/api/compute/volumes/test_volumes_get.py +++ b/tempest/api/compute/volumes/test_volumes_get.py @@ -13,10 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from testtools import matchers from tempest.api.compute import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/compute/volumes/test_volumes_list.py b/tempest/api/compute/volumes/test_volumes_list.py index fdece0ca53..c7631f3e05 100644 --- a/tempest/api/compute/volumes/test_volumes_list.py +++ b/tempest/api/compute/volumes/test_volumes_list.py @@ -13,9 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.compute import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/compute/volumes/test_volumes_negative.py b/tempest/api/compute/volumes/test_volumes_negative.py index 65d9def9cf..f9af76717f 100644 --- a/tempest/api/compute/volumes/test_volumes_negative.py +++ b/tempest/api/compute/volumes/test_volumes_negative.py @@ -15,10 +15,10 @@ import uuid -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.compute import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/data_processing/test_cluster_templates.py b/tempest/api/data_processing/test_cluster_templates.py index cebf493fbf..e357a85df9 100644 --- a/tempest/api/data_processing/test_cluster_templates.py +++ b/tempest/api/data_processing/test_cluster_templates.py @@ -12,9 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.data_processing import base as dp_base +from tempest.common.utils import data_utils from tempest import exceptions from tempest import test diff --git a/tempest/api/data_processing/test_data_sources.py b/tempest/api/data_processing/test_data_sources.py index 5d2ed2d57d..dd16b2fa23 100644 --- a/tempest/api/data_processing/test_data_sources.py +++ b/tempest/api/data_processing/test_data_sources.py @@ -12,9 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.data_processing import base as dp_base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/data_processing/test_job_binaries.py b/tempest/api/data_processing/test_job_binaries.py index 694cf25331..fb21270de2 100644 --- a/tempest/api/data_processing/test_job_binaries.py +++ b/tempest/api/data_processing/test_job_binaries.py @@ -12,9 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.data_processing import base as dp_base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/data_processing/test_job_binary_internals.py b/tempest/api/data_processing/test_job_binary_internals.py index ee4e68ad72..3d76ebe414 100644 --- a/tempest/api/data_processing/test_job_binary_internals.py +++ b/tempest/api/data_processing/test_job_binary_internals.py @@ -12,9 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.data_processing import base as dp_base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/data_processing/test_jobs.py b/tempest/api/data_processing/test_jobs.py index b15561588a..83eb54d235 100644 --- a/tempest/api/data_processing/test_jobs.py +++ b/tempest/api/data_processing/test_jobs.py @@ -12,9 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.data_processing import base as dp_base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/data_processing/test_node_group_templates.py b/tempest/api/data_processing/test_node_group_templates.py index 4068027e9f..102799d744 100644 --- a/tempest/api/data_processing/test_node_group_templates.py +++ b/tempest/api/data_processing/test_node_group_templates.py @@ -12,9 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.data_processing import base as dp_base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/identity/admin/v2/test_roles.py b/tempest/api/identity/admin/v2/test_roles.py index 4e89bfea8f..1babc4522d 100644 --- a/tempest/api/identity/admin/v2/test_roles.py +++ b/tempest/api/identity/admin/v2/test_roles.py @@ -14,9 +14,9 @@ # under the License. from six import moves -from tempest_lib.common.utils import data_utils from tempest.api.identity import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/identity/admin/v2/test_roles_negative.py b/tempest/api/identity/admin/v2/test_roles_negative.py index 3654f9cb38..b38b7ddee0 100644 --- a/tempest/api/identity/admin/v2/test_roles_negative.py +++ b/tempest/api/identity/admin/v2/test_roles_negative.py @@ -15,10 +15,10 @@ import uuid -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.identity import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/identity/admin/v2/test_services.py b/tempest/api/identity/admin/v2/test_services.py index de1d09196f..ef93981c61 100644 --- a/tempest/api/identity/admin/v2/test_services.py +++ b/tempest/api/identity/admin/v2/test_services.py @@ -14,10 +14,10 @@ # under the License. from six import moves -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.identity import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/identity/admin/v2/test_tenant_negative.py b/tempest/api/identity/admin/v2/test_tenant_negative.py index 367b69950b..bccb5ca31d 100644 --- a/tempest/api/identity/admin/v2/test_tenant_negative.py +++ b/tempest/api/identity/admin/v2/test_tenant_negative.py @@ -15,10 +15,10 @@ import uuid -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.identity import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/identity/admin/v2/test_tenants.py b/tempest/api/identity/admin/v2/test_tenants.py index cfd3d7fd89..f828f66f60 100644 --- a/tempest/api/identity/admin/v2/test_tenants.py +++ b/tempest/api/identity/admin/v2/test_tenants.py @@ -14,9 +14,9 @@ # under the License. from six import moves -from tempest_lib.common.utils import data_utils from tempest.api.identity import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/identity/admin/v2/test_tokens.py b/tempest/api/identity/admin/v2/test_tokens.py index ee2530b02f..66d00d17a6 100644 --- a/tempest/api/identity/admin/v2/test_tokens.py +++ b/tempest/api/identity/admin/v2/test_tokens.py @@ -13,9 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.identity import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/identity/admin/v2/test_users.py b/tempest/api/identity/admin/v2/test_users.py index 8eac80c3e5..bfbcfe7678 100644 --- a/tempest/api/identity/admin/v2/test_users.py +++ b/tempest/api/identity/admin/v2/test_users.py @@ -13,10 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from testtools import matchers from tempest.api.identity import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/identity/admin/v2/test_users_negative.py b/tempest/api/identity/admin/v2/test_users_negative.py index 3c1500694b..85f7411aa4 100644 --- a/tempest/api/identity/admin/v2/test_users_negative.py +++ b/tempest/api/identity/admin/v2/test_users_negative.py @@ -15,10 +15,10 @@ import uuid -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.identity import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/identity/admin/v3/test_credentials.py b/tempest/api/identity/admin/v3/test_credentials.py index 98ab093677..662d06ca05 100644 --- a/tempest/api/identity/admin/v3/test_credentials.py +++ b/tempest/api/identity/admin/v3/test_credentials.py @@ -13,9 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.identity import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/identity/admin/v3/test_default_project_id.py b/tempest/api/identity/admin/v3/test_default_project_id.py index 0b9d60e5c8..98fff09e75 100644 --- a/tempest/api/identity/admin/v3/test_default_project_id.py +++ b/tempest/api/identity/admin/v3/test_default_project_id.py @@ -11,10 +11,10 @@ # under the License. from tempest_lib import auth -from tempest_lib.common.utils import data_utils from tempest.api.identity import base from tempest import clients +from tempest.common.utils import data_utils from tempest import config from tempest import manager from tempest import test diff --git a/tempest/api/identity/admin/v3/test_domains.py b/tempest/api/identity/admin/v3/test_domains.py index 94aab5bff9..5bfb98126e 100644 --- a/tempest/api/identity/admin/v3/test_domains.py +++ b/tempest/api/identity/admin/v3/test_domains.py @@ -14,11 +14,10 @@ # under the License. from tempest.api.identity import base +from tempest.common.utils import data_utils from tempest import config from tempest import test -from tempest_lib.common.utils import data_utils - CONF = config.CONF diff --git a/tempest/api/identity/admin/v3/test_endpoints.py b/tempest/api/identity/admin/v3/test_endpoints.py index 9ca10a47e0..9a8104fa98 100644 --- a/tempest/api/identity/admin/v3/test_endpoints.py +++ b/tempest/api/identity/admin/v3/test_endpoints.py @@ -13,9 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.identity import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/identity/admin/v3/test_endpoints_negative.py b/tempest/api/identity/admin/v3/test_endpoints_negative.py index 7972dbb3a2..b0434151df 100644 --- a/tempest/api/identity/admin/v3/test_endpoints_negative.py +++ b/tempest/api/identity/admin/v3/test_endpoints_negative.py @@ -14,10 +14,10 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.identity import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/identity/admin/v3/test_groups.py b/tempest/api/identity/admin/v3/test_groups.py index fed4dc2603..88e29599c0 100644 --- a/tempest/api/identity/admin/v3/test_groups.py +++ b/tempest/api/identity/admin/v3/test_groups.py @@ -13,9 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.identity import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/identity/admin/v3/test_list_projects.py b/tempest/api/identity/admin/v3/test_list_projects.py index d88b00dcf1..12d80bbd3f 100644 --- a/tempest/api/identity/admin/v3/test_list_projects.py +++ b/tempest/api/identity/admin/v3/test_list_projects.py @@ -13,9 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.identity import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/identity/admin/v3/test_list_users.py b/tempest/api/identity/admin/v3/test_list_users.py index eeee3bb993..d3d51b448a 100644 --- a/tempest/api/identity/admin/v3/test_list_users.py +++ b/tempest/api/identity/admin/v3/test_list_users.py @@ -13,9 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.identity import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/identity/admin/v3/test_policies.py b/tempest/api/identity/admin/v3/test_policies.py index 6c5599abcb..8b679455eb 100644 --- a/tempest/api/identity/admin/v3/test_policies.py +++ b/tempest/api/identity/admin/v3/test_policies.py @@ -13,9 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.identity import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/identity/admin/v3/test_projects.py b/tempest/api/identity/admin/v3/test_projects.py index 41cf840a6c..17712f33d3 100644 --- a/tempest/api/identity/admin/v3/test_projects.py +++ b/tempest/api/identity/admin/v3/test_projects.py @@ -13,9 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.identity import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/identity/admin/v3/test_projects_negative.py b/tempest/api/identity/admin/v3/test_projects_negative.py index 37ec071498..d5ee5a7c9f 100644 --- a/tempest/api/identity/admin/v3/test_projects_negative.py +++ b/tempest/api/identity/admin/v3/test_projects_negative.py @@ -13,10 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.identity import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/identity/admin/v3/test_regions.py b/tempest/api/identity/admin/v3/test_regions.py index 986007afe0..7eb92bc38d 100644 --- a/tempest/api/identity/admin/v3/test_regions.py +++ b/tempest/api/identity/admin/v3/test_regions.py @@ -13,10 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.identity import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/identity/admin/v3/test_roles.py b/tempest/api/identity/admin/v3/test_roles.py index 7857e116ee..f58a5c59a4 100644 --- a/tempest/api/identity/admin/v3/test_roles.py +++ b/tempest/api/identity/admin/v3/test_roles.py @@ -13,9 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.identity import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/identity/admin/v3/test_services.py b/tempest/api/identity/admin/v3/test_services.py index b2a75aa9bc..95a7dcc204 100644 --- a/tempest/api/identity/admin/v3/test_services.py +++ b/tempest/api/identity/admin/v3/test_services.py @@ -13,10 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.identity import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/identity/admin/v3/test_tokens.py b/tempest/api/identity/admin/v3/test_tokens.py index 41d67c7bb3..951bc78dd9 100644 --- a/tempest/api/identity/admin/v3/test_tokens.py +++ b/tempest/api/identity/admin/v3/test_tokens.py @@ -13,10 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.identity import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/identity/admin/v3/test_trusts.py b/tempest/api/identity/admin/v3/test_trusts.py index 8a2d797c73..1ac34eb5c6 100644 --- a/tempest/api/identity/admin/v3/test_trusts.py +++ b/tempest/api/identity/admin/v3/test_trusts.py @@ -14,12 +14,12 @@ import datetime import re from oslo_utils import timeutils -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.identity import base from tempest import clients from tempest.common import cred_provider +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/identity/admin/v3/test_users.py b/tempest/api/identity/admin/v3/test_users.py index c2456c4e47..19cb24e09a 100644 --- a/tempest/api/identity/admin/v3/test_users.py +++ b/tempest/api/identity/admin/v3/test_users.py @@ -13,9 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.identity import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/identity/base.py b/tempest/api/identity/base.py index 913e807b42..0654f373f5 100644 --- a/tempest/api/identity/base.py +++ b/tempest/api/identity/base.py @@ -14,10 +14,10 @@ # under the License. from oslo_log import log as logging -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.common import cred_provider +from tempest.common.utils import data_utils from tempest import config import tempest.test diff --git a/tempest/api/image/base.py b/tempest/api/image/base.py index dc38cabea7..87013dbaad 100644 --- a/tempest/api/image/base.py +++ b/tempest/api/image/base.py @@ -14,9 +14,9 @@ from oslo_log import log as logging from six import moves -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc +from tempest.common.utils import data_utils from tempest import config 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 df0e88aad0..50f5048b2a 100644 --- a/tempest/api/image/v1/test_image_members_negative.py +++ b/tempest/api/image/v1/test_image_members_negative.py @@ -12,10 +12,10 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.image import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/image/v1/test_images.py b/tempest/api/image/v1/test_images.py index 3f71fcb796..8beed3224e 100644 --- a/tempest/api/image/v1/test_images.py +++ b/tempest/api/image/v1/test_images.py @@ -14,9 +14,9 @@ # under the License. from six import moves -from tempest_lib.common.utils import data_utils from tempest.api.image import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/image/v2/test_images.py b/tempest/api/image/v2/test_images.py index 2859cfe254..20e9bca065 100644 --- a/tempest/api/image/v2/test_images.py +++ b/tempest/api/image/v2/test_images.py @@ -17,9 +17,9 @@ import random from six import moves -from tempest_lib.common.utils import data_utils from tempest.api.image import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/image/v2/test_images_tags.py b/tempest/api/image/v2/test_images_tags.py index e38136e87e..42a4b871b9 100644 --- a/tempest/api/image/v2/test_images_tags.py +++ b/tempest/api/image/v2/test_images_tags.py @@ -12,9 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.image import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/image/v2/test_images_tags_negative.py b/tempest/api/image/v2/test_images_tags_negative.py index 571b1f7ff3..a3f4ca8fc9 100644 --- a/tempest/api/image/v2/test_images_tags_negative.py +++ b/tempest/api/image/v2/test_images_tags_negative.py @@ -14,10 +14,10 @@ import uuid -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.image import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/messaging/base.py b/tempest/api/messaging/base.py index 34ac860dc8..64a7fd5222 100644 --- a/tempest/api/messaging/base.py +++ b/tempest/api/messaging/base.py @@ -14,8 +14,8 @@ # limitations under the License. from oslo_log import log as logging -from tempest_lib.common.utils import data_utils +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/messaging/test_claims.py b/tempest/api/messaging/test_claims.py index 34e1fe85b1..e54bed112c 100644 --- a/tempest/api/messaging/test_claims.py +++ b/tempest/api/messaging/test_claims.py @@ -16,10 +16,10 @@ import logging from six.moves.urllib import parse as urlparse -from tempest_lib.common.utils import data_utils from tempest_lib import decorators from tempest.api.messaging import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/messaging/test_messages.py b/tempest/api/messaging/test_messages.py index c8640b3f1d..efbbf56f7a 100644 --- a/tempest/api/messaging/test_messages.py +++ b/tempest/api/messaging/test_messages.py @@ -15,9 +15,8 @@ import logging -from tempest_lib.common.utils import data_utils - from tempest.api.messaging import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/messaging/test_queues.py b/tempest/api/messaging/test_queues.py index a3541b3795..df496636c7 100644 --- a/tempest/api/messaging/test_queues.py +++ b/tempest/api/messaging/test_queues.py @@ -16,11 +16,11 @@ import logging from six import moves -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from testtools import matchers from tempest.api.messaging import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/network/admin/test_external_network_extension.py b/tempest/api/network/admin/test_external_network_extension.py index 75f27195f8..d942641872 100644 --- a/tempest/api/network/admin/test_external_network_extension.py +++ b/tempest/api/network/admin/test_external_network_extension.py @@ -10,9 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.network import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/network/admin/test_floating_ips_admin_actions.py b/tempest/api/network/admin/test_floating_ips_admin_actions.py index d4e94ca53e..dfe7307b98 100644 --- a/tempest/api/network/admin/test_floating_ips_admin_actions.py +++ b/tempest/api/network/admin/test_floating_ips_admin_actions.py @@ -13,9 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.network import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/network/admin/test_l3_agent_scheduler.py b/tempest/api/network/admin/test_l3_agent_scheduler.py index 38d68c2714..d5556b8c41 100644 --- a/tempest/api/network/admin/test_l3_agent_scheduler.py +++ b/tempest/api/network/admin/test_l3_agent_scheduler.py @@ -12,9 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.network import base +from tempest.common.utils import data_utils from tempest import exceptions from tempest import test diff --git a/tempest/api/network/admin/test_quotas.py b/tempest/api/network/admin/test_quotas.py index f6046d3b3b..cb113a7483 100644 --- a/tempest/api/network/admin/test_quotas.py +++ b/tempest/api/network/admin/test_quotas.py @@ -14,9 +14,9 @@ # under the License. import six -from tempest_lib.common.utils import data_utils from tempest.api.network import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/network/admin/test_routers_dvr.py b/tempest/api/network/admin/test_routers_dvr.py index e59be0287a..7a651e893f 100644 --- a/tempest/api/network/admin/test_routers_dvr.py +++ b/tempest/api/network/admin/test_routers_dvr.py @@ -13,9 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.network import base_routers as base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/network/base.py b/tempest/api/network/base.py index bbefc259ad..fda8fc3f7d 100644 --- a/tempest/api/network/base.py +++ b/tempest/api/network/base.py @@ -15,9 +15,9 @@ import netaddr from oslo_log import log as logging -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc +from tempest.common.utils import data_utils from tempest import config from tempest import exceptions import tempest.test diff --git a/tempest/api/network/base_security_groups.py b/tempest/api/network/base_security_groups.py index 6699bf7a61..1cef2cc012 100644 --- a/tempest/api/network/base_security_groups.py +++ b/tempest/api/network/base_security_groups.py @@ -13,9 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.network import base +from tempest.common.utils import data_utils class BaseSecGroupTest(base.BaseNetworkTest): diff --git a/tempest/api/network/test_dhcp_ipv6.py b/tempest/api/network/test_dhcp_ipv6.py index 5d798e35d7..f362f85965 100644 --- a/tempest/api/network/test_dhcp_ipv6.py +++ b/tempest/api/network/test_dhcp_ipv6.py @@ -17,10 +17,10 @@ import netaddr import random import six -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.network import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/network/test_extra_dhcp_options.py b/tempest/api/network/test_extra_dhcp_options.py index 72ac821c27..87e3413af9 100644 --- a/tempest/api/network/test_extra_dhcp_options.py +++ b/tempest/api/network/test_extra_dhcp_options.py @@ -13,9 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.network import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/network/test_floating_ips.py b/tempest/api/network/test_floating_ips.py index 57dab5f682..f0923d2b4d 100644 --- a/tempest/api/network/test_floating_ips.py +++ b/tempest/api/network/test_floating_ips.py @@ -14,9 +14,9 @@ # under the License. import netaddr -from tempest_lib.common.utils import data_utils from tempest.api.network import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/network/test_floating_ips_negative.py b/tempest/api/network/test_floating_ips_negative.py index 87901020ae..e8624d8d70 100644 --- a/tempest/api/network/test_floating_ips_negative.py +++ b/tempest/api/network/test_floating_ips_negative.py @@ -14,10 +14,10 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.network import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/network/test_metering_extensions.py b/tempest/api/network/test_metering_extensions.py index 68bc3cd2ed..ee0dcb083f 100644 --- a/tempest/api/network/test_metering_extensions.py +++ b/tempest/api/network/test_metering_extensions.py @@ -13,9 +13,9 @@ # under the License. from oslo_log import log as logging -from tempest_lib.common.utils import data_utils from tempest.api.network import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/network/test_networks.py b/tempest/api/network/test_networks.py index 7a96f3431f..842a56d492 100644 --- a/tempest/api/network/test_networks.py +++ b/tempest/api/network/test_networks.py @@ -16,11 +16,11 @@ import itertools import netaddr import six -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.network import base from tempest.common import custom_matchers +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/network/test_networks_negative.py b/tempest/api/network/test_networks_negative.py index ae530c2ffe..520342eac1 100644 --- a/tempest/api/network/test_networks_negative.py +++ b/tempest/api/network/test_networks_negative.py @@ -14,10 +14,10 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.network import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/network/test_ports.py b/tempest/api/network/test_ports.py index 29600c541c..04bfdf336e 100644 --- a/tempest/api/network/test_ports.py +++ b/tempest/api/network/test_ports.py @@ -16,11 +16,11 @@ import socket import netaddr -from tempest_lib.common.utils import data_utils from tempest.api.network import base from tempest.api.network import base_security_groups as sec_base from tempest.common import custom_matchers +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/network/test_routers.py b/tempest/api/network/test_routers.py index 35072b44a6..50671d010a 100644 --- a/tempest/api/network/test_routers.py +++ b/tempest/api/network/test_routers.py @@ -15,9 +15,9 @@ import netaddr import six -from tempest_lib.common.utils import data_utils from tempest.api.network import base_routers as base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/network/test_routers_negative.py b/tempest/api/network/test_routers_negative.py index d2afcba20d..90da6fd2b8 100644 --- a/tempest/api/network/test_routers_negative.py +++ b/tempest/api/network/test_routers_negative.py @@ -14,10 +14,10 @@ # under the License. import netaddr -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.network import base_routers as base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/network/test_security_groups.py b/tempest/api/network/test_security_groups.py index 05f0de4e3d..ccc52321ab 100644 --- a/tempest/api/network/test_security_groups.py +++ b/tempest/api/network/test_security_groups.py @@ -14,9 +14,9 @@ # under the License. import six -from tempest_lib.common.utils import data_utils from tempest.api.network import base_security_groups as base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/object_storage/test_account_quotas.py b/tempest/api/object_storage/test_account_quotas.py index bbdf367ac8..78707d8964 100644 --- a/tempest/api/object_storage/test_account_quotas.py +++ b/tempest/api/object_storage/test_account_quotas.py @@ -12,9 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.object_storage import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/object_storage/test_account_quotas_negative.py b/tempest/api/object_storage/test_account_quotas_negative.py index e945e1ec69..2bf331a26e 100644 --- a/tempest/api/object_storage/test_account_quotas_negative.py +++ b/tempest/api/object_storage/test_account_quotas_negative.py @@ -12,11 +12,11 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from tempest_lib import decorators from tempest_lib import exceptions as lib_exc from tempest.api.object_storage import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/object_storage/test_account_services.py b/tempest/api/object_storage/test_account_services.py index ac41148f10..6bab9b30e3 100644 --- a/tempest/api/object_storage/test_account_services.py +++ b/tempest/api/object_storage/test_account_services.py @@ -16,11 +16,11 @@ import random from six import moves -from tempest_lib.common.utils import data_utils import testtools from tempest.api.object_storage import base from tempest.common import custom_matchers +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/object_storage/test_container_acl.py b/tempest/api/object_storage/test_container_acl.py index 4df813d542..c1b6711bf0 100644 --- a/tempest/api/object_storage/test_container_acl.py +++ b/tempest/api/object_storage/test_container_acl.py @@ -13,9 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.object_storage import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/object_storage/test_container_acl_negative.py b/tempest/api/object_storage/test_container_acl_negative.py index 1c42e97ca5..3bb47f0773 100644 --- a/tempest/api/object_storage/test_container_acl_negative.py +++ b/tempest/api/object_storage/test_container_acl_negative.py @@ -12,10 +12,10 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.object_storage import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/object_storage/test_container_quotas.py b/tempest/api/object_storage/test_container_quotas.py index 2217d181db..c78b4c3f05 100644 --- a/tempest/api/object_storage/test_container_quotas.py +++ b/tempest/api/object_storage/test_container_quotas.py @@ -13,10 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.object_storage import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/object_storage/test_container_staticweb.py b/tempest/api/object_storage/test_container_staticweb.py index 20452aba30..4b4b499f95 100644 --- a/tempest/api/object_storage/test_container_staticweb.py +++ b/tempest/api/object_storage/test_container_staticweb.py @@ -12,11 +12,11 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.object_storage import base from tempest.common import custom_matchers +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/object_storage/test_container_sync.py b/tempest/api/object_storage/test_container_sync.py index 06e700bba2..0e39b7e615 100644 --- a/tempest/api/object_storage/test_container_sync.py +++ b/tempest/api/object_storage/test_container_sync.py @@ -16,12 +16,12 @@ import time from six.moves.urllib import parse as urlparse -from tempest_lib.common.utils import data_utils from tempest_lib import decorators import testtools from tempest.api.object_storage import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/object_storage/test_object_expiry.py b/tempest/api/object_storage/test_object_expiry.py index b263050eff..1c9d5829d5 100644 --- a/tempest/api/object_storage/test_object_expiry.py +++ b/tempest/api/object_storage/test_object_expiry.py @@ -13,11 +13,11 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc import time from tempest.api.object_storage import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/object_storage/test_object_formpost.py b/tempest/api/object_storage/test_object_formpost.py index ce587d74ec..356f560c45 100644 --- a/tempest/api/object_storage/test_object_formpost.py +++ b/tempest/api/object_storage/test_object_formpost.py @@ -17,9 +17,9 @@ import hmac import time from six.moves.urllib import parse as urlparse -from tempest_lib.common.utils import data_utils from tempest.api.object_storage import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/object_storage/test_object_formpost_negative.py b/tempest/api/object_storage/test_object_formpost_negative.py index 89deca2af9..7d9e115bfa 100644 --- a/tempest/api/object_storage/test_object_formpost_negative.py +++ b/tempest/api/object_storage/test_object_formpost_negative.py @@ -17,10 +17,10 @@ import hmac import time from six.moves.urllib import parse as urlparse -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.object_storage import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/object_storage/test_object_services.py b/tempest/api/object_storage/test_object_services.py index 3396d8fa20..2198753987 100644 --- a/tempest/api/object_storage/test_object_services.py +++ b/tempest/api/object_storage/test_object_services.py @@ -21,10 +21,10 @@ import zlib import six from six import moves -from tempest_lib.common.utils import data_utils from tempest.api.object_storage import base from tempest.common import custom_matchers +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/object_storage/test_object_slo.py b/tempest/api/object_storage/test_object_slo.py index 6fc7821d1c..9aa1b828a4 100644 --- a/tempest/api/object_storage/test_object_slo.py +++ b/tempest/api/object_storage/test_object_slo.py @@ -15,11 +15,11 @@ import hashlib import json -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.object_storage import base from tempest.common import custom_matchers +from tempest.common.utils import data_utils from tempest import test # Each segment, except for the final one, must be at least 1 megabyte diff --git a/tempest/api/object_storage/test_object_temp_url.py b/tempest/api/object_storage/test_object_temp_url.py index 874826948a..3d28f6ed95 100644 --- a/tempest/api/object_storage/test_object_temp_url.py +++ b/tempest/api/object_storage/test_object_temp_url.py @@ -17,9 +17,9 @@ import hmac import time from six.moves.urllib import parse as urlparse -from tempest_lib.common.utils import data_utils from tempest.api.object_storage import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/object_storage/test_object_temp_url_negative.py b/tempest/api/object_storage/test_object_temp_url_negative.py index 233cced1d5..6d06143d3b 100644 --- a/tempest/api/object_storage/test_object_temp_url_negative.py +++ b/tempest/api/object_storage/test_object_temp_url_negative.py @@ -17,10 +17,10 @@ import hmac import time from six.moves.urllib import parse as urlparse -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.object_storage import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/object_storage/test_object_version.py b/tempest/api/object_storage/test_object_version.py index 923166a944..24ec3f5046 100644 --- a/tempest/api/object_storage/test_object_version.py +++ b/tempest/api/object_storage/test_object_version.py @@ -15,9 +15,8 @@ import testtools -from tempest_lib.common.utils import data_utils - from tempest.api.object_storage import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/orchestration/base.py b/tempest/api/orchestration/base.py index af97794f5d..266f726d90 100644 --- a/tempest/api/orchestration/base.py +++ b/tempest/api/orchestration/base.py @@ -13,10 +13,10 @@ import os.path from oslo_log import log as logging -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc import yaml +from tempest.common.utils import data_utils from tempest import config import tempest.test diff --git a/tempest/api/orchestration/stacks/test_environment.py b/tempest/api/orchestration/stacks/test_environment.py index ecb824b157..0416bc7c17 100644 --- a/tempest/api/orchestration/stacks/test_environment.py +++ b/tempest/api/orchestration/stacks/test_environment.py @@ -12,9 +12,8 @@ import logging -from tempest_lib.common.utils import data_utils - from tempest.api.orchestration import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/orchestration/stacks/test_limits.py b/tempest/api/orchestration/stacks/test_limits.py index 4291d76dac..bb5b89da93 100644 --- a/tempest/api/orchestration/stacks/test_limits.py +++ b/tempest/api/orchestration/stacks/test_limits.py @@ -12,10 +12,10 @@ import logging -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.orchestration import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/orchestration/stacks/test_neutron_resources.py b/tempest/api/orchestration/stacks/test_neutron_resources.py index a0706ff9f9..b0fc5fb58a 100644 --- a/tempest/api/orchestration/stacks/test_neutron_resources.py +++ b/tempest/api/orchestration/stacks/test_neutron_resources.py @@ -14,10 +14,10 @@ import logging import netaddr -from tempest_lib.common.utils import data_utils from tempest.api.orchestration import base from tempest import clients +from tempest.common.utils import data_utils from tempest import config from tempest import exceptions from tempest import test diff --git a/tempest/api/orchestration/stacks/test_non_empty_stack.py b/tempest/api/orchestration/stacks/test_non_empty_stack.py index bffc3066a0..494b6fd528 100644 --- a/tempest/api/orchestration/stacks/test_non_empty_stack.py +++ b/tempest/api/orchestration/stacks/test_non_empty_stack.py @@ -12,9 +12,8 @@ import logging -from tempest_lib.common.utils import data_utils - from tempest.api.orchestration import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/orchestration/stacks/test_nova_keypair_resources.py b/tempest/api/orchestration/stacks/test_nova_keypair_resources.py index c79c3c3cfe..6a04dbdf5a 100644 --- a/tempest/api/orchestration/stacks/test_nova_keypair_resources.py +++ b/tempest/api/orchestration/stacks/test_nova_keypair_resources.py @@ -13,9 +13,8 @@ import logging -from tempest_lib.common.utils import data_utils - from tempest.api.orchestration import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/orchestration/stacks/test_soft_conf.py b/tempest/api/orchestration/stacks/test_soft_conf.py index 13f0a6cdb5..34d93e4d80 100644 --- a/tempest/api/orchestration/stacks/test_soft_conf.py +++ b/tempest/api/orchestration/stacks/test_soft_conf.py @@ -11,10 +11,10 @@ # under the License. from oslo_log import log as logging -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.orchestration import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/orchestration/stacks/test_stacks.py b/tempest/api/orchestration/stacks/test_stacks.py index 9ce8ebeb48..abec906d50 100644 --- a/tempest/api/orchestration/stacks/test_stacks.py +++ b/tempest/api/orchestration/stacks/test_stacks.py @@ -11,9 +11,9 @@ # under the License. from oslo_log import log as logging -from tempest_lib.common.utils import data_utils from tempest.api.orchestration import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/orchestration/stacks/test_swift_resources.py b/tempest/api/orchestration/stacks/test_swift_resources.py index dadabfac1d..30166df962 100644 --- a/tempest/api/orchestration/stacks/test_swift_resources.py +++ b/tempest/api/orchestration/stacks/test_swift_resources.py @@ -13,9 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.orchestration import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/orchestration/stacks/test_templates.py b/tempest/api/orchestration/stacks/test_templates.py index 5ccfdfb76a..9154175046 100644 --- a/tempest/api/orchestration/stacks/test_templates.py +++ b/tempest/api/orchestration/stacks/test_templates.py @@ -10,9 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.orchestration import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/orchestration/stacks/test_volumes.py b/tempest/api/orchestration/stacks/test_volumes.py index f40ca0244a..d8f117e938 100644 --- a/tempest/api/orchestration/stacks/test_volumes.py +++ b/tempest/api/orchestration/stacks/test_volumes.py @@ -12,10 +12,10 @@ import logging -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.orchestration import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/telemetry/base.py b/tempest/api/telemetry/base.py index cce8e2ab04..3be807b593 100644 --- a/tempest/api/telemetry/base.py +++ b/tempest/api/telemetry/base.py @@ -13,9 +13,9 @@ import time from oslo_utils import timeutils -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc +from tempest.common.utils import data_utils from tempest import config from tempest import exceptions import tempest.test diff --git a/tempest/api/telemetry/test_telemetry_alarming_api.py b/tempest/api/telemetry/test_telemetry_alarming_api.py index 99b5c37cb0..13da9cb343 100644 --- a/tempest/api/telemetry/test_telemetry_alarming_api.py +++ b/tempest/api/telemetry/test_telemetry_alarming_api.py @@ -10,10 +10,10 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.telemetry import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/volume/admin/test_multi_backend.py b/tempest/api/volume/admin/test_multi_backend.py index b8047b2164..c7e989d2fa 100644 --- a/tempest/api/volume/admin/test_multi_backend.py +++ b/tempest/api/volume/admin/test_multi_backend.py @@ -11,9 +11,9 @@ # under the License. from oslo_log import log as logging -from tempest_lib.common.utils import data_utils from tempest.api.volume import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/volume/admin/test_snapshots_actions.py b/tempest/api/volume/admin/test_snapshots_actions.py index b885f7dc1a..c860b4b570 100644 --- a/tempest/api/volume/admin/test_snapshots_actions.py +++ b/tempest/api/volume/admin/test_snapshots_actions.py @@ -13,9 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.volume import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/volume/admin/test_volume_quotas.py b/tempest/api/volume/admin/test_volume_quotas.py index ec8e040ff8..1a48204c18 100644 --- a/tempest/api/volume/admin/test_volume_quotas.py +++ b/tempest/api/volume/admin/test_volume_quotas.py @@ -13,9 +13,9 @@ # under the License. import six -from tempest_lib.common.utils import data_utils from tempest.api.volume import base +from tempest.common.utils import data_utils from tempest import test QUOTA_KEYS = ['gigabytes', 'snapshots', 'volumes'] diff --git a/tempest/api/volume/admin/test_volume_types.py b/tempest/api/volume/admin/test_volume_types.py index ea9864e021..b79c185afa 100644 --- a/tempest/api/volume/admin/test_volume_types.py +++ b/tempest/api/volume/admin/test_volume_types.py @@ -13,9 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.volume import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/volume/admin/test_volume_types_extra_specs.py b/tempest/api/volume/admin/test_volume_types_extra_specs.py index 2feb0627c9..c840697add 100644 --- a/tempest/api/volume/admin/test_volume_types_extra_specs.py +++ b/tempest/api/volume/admin/test_volume_types_extra_specs.py @@ -13,9 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.volume import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/volume/admin/test_volume_types_extra_specs_negative.py b/tempest/api/volume/admin/test_volume_types_extra_specs_negative.py index a70a94096c..e49e8b21db 100644 --- a/tempest/api/volume/admin/test_volume_types_extra_specs_negative.py +++ b/tempest/api/volume/admin/test_volume_types_extra_specs_negative.py @@ -15,10 +15,10 @@ import uuid -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.volume import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/volume/admin/test_volumes_actions.py b/tempest/api/volume/admin/test_volumes_actions.py index 8a30a1080a..4288d58a79 100644 --- a/tempest/api/volume/admin/test_volumes_actions.py +++ b/tempest/api/volume/admin/test_volumes_actions.py @@ -13,9 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils as utils - from tempest.api.volume import base +from tempest.common.utils import data_utils as utils from tempest import test diff --git a/tempest/api/volume/admin/test_volumes_backup.py b/tempest/api/volume/admin/test_volumes_backup.py index 8b85da346d..2c545a7e5b 100644 --- a/tempest/api/volume/admin/test_volumes_backup.py +++ b/tempest/api/volume/admin/test_volumes_backup.py @@ -14,9 +14,9 @@ # under the License. from oslo_log import log as logging -from tempest_lib.common.utils import data_utils from tempest.api.volume import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/volume/base.py b/tempest/api/volume/base.py index 7f56b18701..f8ae5ebdc3 100644 --- a/tempest/api/volume/base.py +++ b/tempest/api/volume/base.py @@ -14,10 +14,10 @@ # under the License. from oslo_log import log as logging -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.common import fixed_network +from tempest.common.utils import data_utils from tempest import config from tempest import exceptions import tempest.test diff --git a/tempest/api/volume/test_qos.py b/tempest/api/volume/test_qos.py index 863a698f89..84fd7f60ff 100644 --- a/tempest/api/volume/test_qos.py +++ b/tempest/api/volume/test_qos.py @@ -12,9 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils as utils - from tempest.api.volume import base +from tempest.common.utils import data_utils as utils from tempest import test diff --git a/tempest/api/volume/test_volumes_actions.py b/tempest/api/volume/test_volumes_actions.py index 375d34a37c..0ebcf3a6e6 100644 --- a/tempest/api/volume/test_volumes_actions.py +++ b/tempest/api/volume/test_volumes_actions.py @@ -13,9 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - from tempest.api.volume import base +from tempest.common.utils import data_utils from tempest import config from tempest import test import testtools diff --git a/tempest/api/volume/test_volumes_get.py b/tempest/api/volume/test_volumes_get.py index 8337f8df95..29c21edb9f 100644 --- a/tempest/api/volume/test_volumes_get.py +++ b/tempest/api/volume/test_volumes_get.py @@ -13,10 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils from testtools import matchers from tempest.api.volume import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/volume/test_volumes_list.py b/tempest/api/volume/test_volumes_list.py index da0d5aaaa0..38478776a7 100644 --- a/tempest/api/volume/test_volumes_list.py +++ b/tempest/api/volume/test_volumes_list.py @@ -16,10 +16,10 @@ import operator from oslo_log import log as logging -from tempest_lib.common.utils import data_utils from testtools import matchers from tempest.api.volume import base +from tempest.common.utils import data_utils from tempest import test LOG = logging.getLogger(__name__) diff --git a/tempest/api/volume/test_volumes_negative.py b/tempest/api/volume/test_volumes_negative.py index b591a1ad50..da8f52ae35 100644 --- a/tempest/api/volume/test_volumes_negative.py +++ b/tempest/api/volume/test_volumes_negative.py @@ -15,10 +15,10 @@ import uuid -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.volume import base +from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/volume/test_volumes_snapshots.py b/tempest/api/volume/test_volumes_snapshots.py index 550c3b6c60..340f019f38 100644 --- a/tempest/api/volume/test_volumes_snapshots.py +++ b/tempest/api/volume/test_volumes_snapshots.py @@ -11,9 +11,9 @@ # under the License. from oslo_log import log as logging -from tempest_lib.common.utils import data_utils from tempest.api.volume import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/api/volume/test_volumes_snapshots_negative.py b/tempest/api/volume/test_volumes_snapshots_negative.py index 77f8552bb8..b604360d02 100644 --- a/tempest/api/volume/test_volumes_snapshots_negative.py +++ b/tempest/api/volume/test_volumes_snapshots_negative.py @@ -12,10 +12,10 @@ import uuid -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.volume import base +from tempest.common.utils import data_utils from tempest import config from tempest import test diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py index fff8a5c762..02b55251ce 100644 --- a/tempest/scenario/manager.py +++ b/tempest/scenario/manager.py @@ -19,11 +19,11 @@ import subprocess import netaddr from oslo_log import log import six -from tempest_lib.common.utils import data_utils from tempest_lib.common.utils import misc as misc_utils from tempest_lib import exceptions as lib_exc from tempest.common import fixed_network +from tempest.common.utils import data_utils from tempest.common.utils.linux import remote_client from tempest import config from tempest import exceptions diff --git a/tempest/scenario/test_aggregates_basic_ops.py b/tempest/scenario/test_aggregates_basic_ops.py index 0e158ed533..02d1171a51 100644 --- a/tempest/scenario/test_aggregates_basic_ops.py +++ b/tempest/scenario/test_aggregates_basic_ops.py @@ -14,9 +14,9 @@ # under the License. from oslo_log import log as logging -from tempest_lib.common.utils import data_utils from tempest.common import tempest_fixtures as fixtures +from tempest.common.utils import data_utils from tempest.scenario import manager from tempest import test diff --git a/tempest/scenario/test_large_ops.py b/tempest/scenario/test_large_ops.py index 56d4c7d4c2..ffb35fb4df 100644 --- a/tempest/scenario/test_large_ops.py +++ b/tempest/scenario/test_large_ops.py @@ -14,10 +14,10 @@ # under the License. from oslo_log import log as logging -from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.common import fixed_network +from tempest.common.utils import data_utils from tempest import config from tempest.scenario import manager from tempest import test diff --git a/tempest/scenario/test_network_advanced_server_ops.py b/tempest/scenario/test_network_advanced_server_ops.py index 3d6abff12c..c86437968b 100644 --- a/tempest/scenario/test_network_advanced_server_ops.py +++ b/tempest/scenario/test_network_advanced_server_ops.py @@ -14,9 +14,9 @@ # under the License. from oslo_log import log as logging -from tempest_lib.common.utils import data_utils import testtools +from tempest.common.utils import data_utils from tempest import config from tempest.scenario import manager from tempest import test diff --git a/tempest/scenario/test_network_basic_ops.py b/tempest/scenario/test_network_basic_ops.py index 3274ce8fef..646188632a 100644 --- a/tempest/scenario/test_network_basic_ops.py +++ b/tempest/scenario/test_network_basic_ops.py @@ -17,9 +17,9 @@ import collections import re from oslo_log import log as logging -from tempest_lib.common.utils import data_utils import testtools +from tempest.common.utils import data_utils from tempest import config from tempest import exceptions from tempest.scenario import manager diff --git a/tempest/scenario/test_security_groups_basic_ops.py b/tempest/scenario/test_security_groups_basic_ops.py index 8ec10c70c7..18fd09d122 100644 --- a/tempest/scenario/test_security_groups_basic_ops.py +++ b/tempest/scenario/test_security_groups_basic_ops.py @@ -14,9 +14,9 @@ # under the License. from oslo_log import log as logging -from tempest_lib.common.utils import data_utils from tempest import clients +from tempest.common.utils import data_utils from tempest import config from tempest.scenario import manager from tempest import test diff --git a/tempest/scenario/test_stamp_pattern.py b/tempest/scenario/test_stamp_pattern.py index 51c4c5984e..c1d9a1b1c5 100644 --- a/tempest/scenario/test_stamp_pattern.py +++ b/tempest/scenario/test_stamp_pattern.py @@ -16,11 +16,11 @@ import time from oslo_log import log as logging -from tempest_lib.common.utils import data_utils from tempest_lib import decorators from tempest_lib import exceptions as lib_exc import testtools +from tempest.common.utils import data_utils from tempest import config from tempest import exceptions from tempest.scenario import manager diff --git a/tempest/scenario/test_volume_boot_pattern.py b/tempest/scenario/test_volume_boot_pattern.py index 1731c48752..6c2d3b4488 100644 --- a/tempest/scenario/test_volume_boot_pattern.py +++ b/tempest/scenario/test_volume_boot_pattern.py @@ -11,8 +11,8 @@ # under the License. from oslo_log import log -from tempest_lib.common.utils import data_utils +from tempest.common.utils import data_utils from tempest import config from tempest.scenario import manager from tempest import test diff --git a/tempest/stress/actions/server_create_destroy.py b/tempest/stress/actions/server_create_destroy.py index c0a317814d..d0e4eeadd3 100644 --- a/tempest/stress/actions/server_create_destroy.py +++ b/tempest/stress/actions/server_create_destroy.py @@ -12,8 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from tempest_lib.common.utils import data_utils - +from tempest.common.utils import data_utils from tempest import config import tempest.stress.stressaction as stressaction diff --git a/tempest/stress/actions/ssh_floating.py b/tempest/stress/actions/ssh_floating.py index b2a30e9985..9e540faef6 100644 --- a/tempest/stress/actions/ssh_floating.py +++ b/tempest/stress/actions/ssh_floating.py @@ -13,8 +13,7 @@ import socket import subprocess -from tempest_lib.common.utils import data_utils - +from tempest.common.utils import data_utils from tempest import config import tempest.stress.stressaction as stressaction import tempest.test diff --git a/tempest/stress/actions/volume_attach_delete.py b/tempest/stress/actions/volume_attach_delete.py index 93400c4f9f..a5e393fad7 100644 --- a/tempest/stress/actions/volume_attach_delete.py +++ b/tempest/stress/actions/volume_attach_delete.py @@ -11,8 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from tempest_lib.common.utils import data_utils - +from tempest.common.utils import data_utils from tempest import config import tempest.stress.stressaction as stressaction diff --git a/tempest/stress/actions/volume_attach_verify.py b/tempest/stress/actions/volume_attach_verify.py index ea53481252..1cd96eda19 100644 --- a/tempest/stress/actions/volume_attach_verify.py +++ b/tempest/stress/actions/volume_attach_verify.py @@ -12,8 +12,7 @@ import re -from tempest_lib.common.utils import data_utils - +from tempest.common.utils import data_utils from tempest.common.utils.linux import remote_client from tempest import config import tempest.stress.stressaction as stressaction diff --git a/tempest/stress/actions/volume_create_delete.py b/tempest/stress/actions/volume_create_delete.py index b1899a0677..487005537c 100644 --- a/tempest/stress/actions/volume_create_delete.py +++ b/tempest/stress/actions/volume_create_delete.py @@ -10,8 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from tempest_lib.common.utils import data_utils - +from tempest.common.utils import data_utils import tempest.stress.stressaction as stressaction diff --git a/tempest/stress/driver.py b/tempest/stress/driver.py index 3f8e537f5f..bdb39d80c1 100644 --- a/tempest/stress/driver.py +++ b/tempest/stress/driver.py @@ -22,10 +22,11 @@ from oslo_utils import importutils import six from six import moves from tempest_lib.common import ssh -from tempest_lib.common.utils import data_utils + from tempest import clients from tempest.common import isolated_creds +from tempest.common.utils import data_utils from tempest import config from tempest import exceptions from tempest.stress import cleanup diff --git a/tempest/thirdparty/boto/test_ec2_instance_run.py b/tempest/thirdparty/boto/test_ec2_instance_run.py index b7f0e812b0..920f602047 100644 --- a/tempest/thirdparty/boto/test_ec2_instance_run.py +++ b/tempest/thirdparty/boto/test_ec2_instance_run.py @@ -14,8 +14,8 @@ # under the License. from oslo_log import log as logging -from tempest_lib.common.utils import data_utils +from tempest.common.utils import data_utils from tempest.common.utils.linux import remote_client from tempest import config from tempest import exceptions diff --git a/tempest/thirdparty/boto/test_ec2_keys.py b/tempest/thirdparty/boto/test_ec2_keys.py index 58a577639b..1b58cb435d 100644 --- a/tempest/thirdparty/boto/test_ec2_keys.py +++ b/tempest/thirdparty/boto/test_ec2_keys.py @@ -13,8 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - +from tempest.common.utils import data_utils from tempest import test from tempest.thirdparty.boto import test as boto_test diff --git a/tempest/thirdparty/boto/test_ec2_security_groups.py b/tempest/thirdparty/boto/test_ec2_security_groups.py index 94fab09955..88ff154f6c 100644 --- a/tempest/thirdparty/boto/test_ec2_security_groups.py +++ b/tempest/thirdparty/boto/test_ec2_security_groups.py @@ -13,8 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - +from tempest.common.utils import data_utils from tempest import test from tempest.thirdparty.boto import test as boto_test diff --git a/tempest/thirdparty/boto/test_s3_buckets.py b/tempest/thirdparty/boto/test_s3_buckets.py index 45401fd065..f008973f93 100644 --- a/tempest/thirdparty/boto/test_s3_buckets.py +++ b/tempest/thirdparty/boto/test_s3_buckets.py @@ -13,8 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils - +from tempest.common.utils import data_utils from tempest import test from tempest.thirdparty.boto import test as boto_test diff --git a/tempest/thirdparty/boto/test_s3_ec2_images.py b/tempest/thirdparty/boto/test_s3_ec2_images.py index 15212492bb..c41c7ac695 100644 --- a/tempest/thirdparty/boto/test_s3_ec2_images.py +++ b/tempest/thirdparty/boto/test_s3_ec2_images.py @@ -15,8 +15,7 @@ import os -from tempest_lib.common.utils import data_utils - +from tempest.common.utils import data_utils from tempest import config from tempest import test from tempest.thirdparty.boto import test as boto_test diff --git a/tempest/thirdparty/boto/test_s3_objects.py b/tempest/thirdparty/boto/test_s3_objects.py index dba231c884..c42d85c4a4 100644 --- a/tempest/thirdparty/boto/test_s3_objects.py +++ b/tempest/thirdparty/boto/test_s3_objects.py @@ -16,8 +16,8 @@ import contextlib import boto.s3.key -from tempest_lib.common.utils import data_utils +from tempest.common.utils import data_utils from tempest import test from tempest.thirdparty.boto import test as boto_test