diff --git a/requirements.txt b/requirements.txt index 4690329aad..b14af9dffd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -24,4 +24,4 @@ six>=1.9.0 iso8601>=0.1.9 fixtures>=0.3.14 testscenarios>=0.4 -tempest-lib>=0.2.0 +tempest-lib>=0.3.0 diff --git a/tempest/api/baremetal/admin/base.py b/tempest/api/baremetal/admin/base.py index c93dfb8bce..2834b2bb54 100644 --- a/tempest/api/baremetal/admin/base.py +++ b/tempest/api/baremetal/admin/base.py @@ -11,10 +11,11 @@ # under the License. import functools + +from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest import clients -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 da32f71051..ef2113ce21 100644 --- a/tempest/api/baremetal/admin/test_chassis.py +++ b/tempest/api/baremetal/admin/test_chassis.py @@ -11,10 +11,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/baremetal/admin/test_nodes.py b/tempest/api/baremetal/admin/test_nodes.py index f031614f6c..fb5590e590 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 bbd280142e..f6615fe9d4 100644 --- a/tempest/api/baremetal/admin/test_ports.py +++ b/tempest/api/baremetal/admin/test_ports.py @@ -10,11 +10,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.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 2e79883b53..9db77db078 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 2bd15acc13..5f879a3ae4 100644 --- a/tempest/api/compute/admin/test_agents.py +++ b/tempest/api/compute/admin/test_agents.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.openstack.common import log from tempest import test diff --git a/tempest/api/compute/admin/test_aggregates.py b/tempest/api/compute/admin/test_aggregates.py index e3b01517a4..1753c17690 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 25a2f7acc5..0ecc5939e8 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 cd3a4f1bb3..2c907f7bb6 100644 --- a/tempest/api/compute/admin/test_flavors.py +++ b/tempest/api/compute/admin/test_flavors.py @@ -13,11 +13,12 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib import exceptions as lib_exc 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 aaa96ac80e..e5a0ed9440 100644 --- a/tempest/api/compute/admin/test_flavors_access.py +++ b/tempest/api/compute/admin/test_flavors_access.py @@ -13,8 +13,9 @@ # 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 9c551433f6..44b7fd1bc3 100644 --- a/tempest/api/compute/admin/test_flavors_access_negative.py +++ b/tempest/api/compute/admin/test_flavors_access_negative.py @@ -13,11 +13,12 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib import exceptions as lib_exc 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 5847a64667..2af483dc9b 100644 --- a/tempest/api/compute/admin/test_flavors_extra_specs.py +++ b/tempest/api/compute/admin/test_flavors_extra_specs.py @@ -13,8 +13,9 @@ # 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 a8027362c8..70e894563f 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_flavors_negative.py b/tempest/api/compute/admin/test_flavors_negative.py index 0104ee6505..bb56cb20fc 100644 --- a/tempest/api/compute/admin/test_flavors_negative.py +++ b/tempest/api/compute/admin/test_flavors_negative.py @@ -15,11 +15,11 @@ 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.api_schema.request.compute.v2 import flavors -from tempest.common.utils import data_utils from tempest import config 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 1ecd14f59f..e26ea5a7c4 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 8c967de939..0bf171149a 100644 --- a/tempest/api/compute/admin/test_hypervisor_negative.py +++ b/tempest/api/compute/admin/test_hypervisor_negative.py @@ -13,11 +13,12 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib import exceptions as lib_exc 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 35e682e522..ba0ea1e6b2 100644 --- a/tempest/api/compute/admin/test_quotas.py +++ b/tempest/api/compute/admin/test_quotas.py @@ -14,11 +14,11 @@ # under the License. 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.openstack.common import log as logging from tempest import test diff --git a/tempest/api/compute/admin/test_quotas_negative.py b/tempest/api/compute/admin/test_quotas_negative.py index 323b0cb81f..6140a0b094 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 19f5b8c906..388f249449 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 adeb64b72a..229b816200 100644 --- a/tempest/api/compute/admin/test_servers.py +++ b/tempest/api/compute/admin/test_servers.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 decorators 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_servers_negative.py b/tempest/api/compute/admin/test_servers_negative.py index 46de5f7e0d..47373a3555 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 89818b11c6..18401f01d8 100644 --- a/tempest/api/compute/base.py +++ b/tempest/api/compute/base.py @@ -13,12 +13,13 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib import exceptions as lib_exc import time +from tempest_lib.common.utils import data_utils +from tempest_lib import exceptions as lib_exc + from tempest import clients from tempest.common import credentials -from tempest.common.utils import data_utils from tempest import config from tempest import exceptions from tempest.openstack.common import excutils 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 f65223ed8e..097c37fd50 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 2c08ae70f2..584b202979 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 13d071945f..f0ce6ded0f 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 8193a55f21..f1b82038fe 100644 --- a/tempest/api/compute/images/test_image_metadata.py +++ b/tempest/api/compute/images/test_image_metadata.py @@ -15,8 +15,9 @@ import StringIO +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 d181ed9d89..e31d04e934 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 396d629c69..7ec51ef2fc 100644 --- a/tempest/api/compute/images/test_images.py +++ b/tempest/api/compute/images/test_images.py @@ -12,8 +12,9 @@ # 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 ee52f37a68..451890e03f 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 abdeb18b98..f6041ce9a5 100644 --- a/tempest/api/compute/images/test_images_oneserver.py +++ b/tempest/api/compute/images/test_images_oneserver.py @@ -13,9 +13,9 @@ # 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.openstack.common import log as logging 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 f6a4aecfee..1554f867f1 100644 --- a/tempest/api/compute/images/test_images_oneserver_negative.py +++ b/tempest/api/compute/images/test_images_oneserver_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 config from tempest.openstack.common import log as logging 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 6176d850ce..c91d0ffe67 100644 --- a/tempest/api/compute/images/test_list_image_filters.py +++ b/tempest/api/compute/images/test_list_image_filters.py @@ -16,10 +16,10 @@ import StringIO import time +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.openstack.common import log as logging 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 e5418ad4ee..c246186a85 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 972f0de714..d11de7bcc7 100644 --- a/tempest/api/compute/keypairs/test_keypairs.py +++ b/tempest/api/compute/keypairs/test_keypairs.py @@ -13,8 +13,9 @@ # 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 e63f3c7868..02cd3f8f39 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 f6a50ee43f..9bf7ccbbcc 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 5a11854d9c..71ee16a32b 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 0127dc7559..11ea30b270 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 14eb536c18..8137d9540e 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 a0064b29a0..fc747172d6 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 bfba105e3f..a694fb5376 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 decorators from tempest_lib import exceptions as lib_exc from tempest.api.compute import base from tempest.api import utils -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 69c056e562..3be2b79363 100644 --- a/tempest/api/compute/servers/test_multiple_create.py +++ b/tempest/api/compute/servers/test_multiple_create.py @@ -13,8 +13,9 @@ # 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 caf1ae59f5..ef47ad70c9 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 ce3772fd08..fa19fdc5b2 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 import 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 ac04febfbd..bf6eaab84d 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 19913d9549..9f78dc42f9 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 a1a99a19ae..31d4cb3256 100644 --- a/tempest/api/compute/servers/test_server_rescue.py +++ b/tempest/api/compute/servers/test_server_rescue.py @@ -13,8 +13,9 @@ # 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 7564758864..12b7c0a854 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 624d9c25ee..35f78806a6 100644 --- a/tempest/api/compute/servers/test_servers.py +++ b/tempest/api/compute/servers/test_servers.py @@ -13,8 +13,9 @@ # 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 dd828935d2..5d0d93d5a6 100644 --- a/tempest/api/compute/servers/test_servers_negative.py +++ b/tempest/api/compute/servers/test_servers_negative.py @@ -15,12 +15,12 @@ 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 import clients -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 2dbe1234f1..6502e70674 100644 --- a/tempest/api/compute/test_authorization.py +++ b/tempest/api/compute/test_authorization.py @@ -15,11 +15,11 @@ import StringIO +from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest.api.compute import base from tempest import clients -from tempest.common.utils import data_utils from tempest import config from tempest.openstack.common import log as logging 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 bed53d6976..bced359808 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 5f84c73d4b..1c11128fdd 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 bd126d86cc..cfdf1fc3af 100644 --- a/tempest/api/compute/volumes/test_volumes_list.py +++ b/tempest/api/compute/volumes/test_volumes_list.py @@ -13,8 +13,9 @@ # 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 89f6817571..50ce19815b 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 af7cbafe76..8a63c3f687 100644 --- a/tempest/api/data_processing/test_cluster_templates.py +++ b/tempest/api/data_processing/test_cluster_templates.py @@ -12,8 +12,9 @@ # 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_data_sources.py b/tempest/api/data_processing/test_data_sources.py index dd16b2fa23..5d2ed2d57d 100644 --- a/tempest/api/data_processing/test_data_sources.py +++ b/tempest/api/data_processing/test_data_sources.py @@ -12,8 +12,9 @@ # 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 fb21270de2..694cf25331 100644 --- a/tempest/api/data_processing/test_job_binaries.py +++ b/tempest/api/data_processing/test_job_binaries.py @@ -12,8 +12,9 @@ # 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 3d76ebe414..ee4e68ad72 100644 --- a/tempest/api/data_processing/test_job_binary_internals.py +++ b/tempest/api/data_processing/test_job_binary_internals.py @@ -12,8 +12,9 @@ # 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 83eb54d235..b15561588a 100644 --- a/tempest/api/data_processing/test_jobs.py +++ b/tempest/api/data_processing/test_jobs.py @@ -12,8 +12,9 @@ # 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 9d8421832b..d7381f4d0e 100644 --- a/tempest/api/data_processing/test_node_group_templates.py +++ b/tempest/api/data_processing/test_node_group_templates.py @@ -12,8 +12,9 @@ # 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 3eb6c080a4..dd5164d4d5 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 0885eabe93..662d1eae4e 100644 --- a/tempest/api/identity/admin/v2/test_roles_negative.py +++ b/tempest/api/identity/admin/v2/test_roles_negative.py @@ -13,11 +13,12 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib import exceptions as lib_exc 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 035f5f8e55..0759ec53f7 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 952b62564b..8fd1f5acf7 100644 --- a/tempest/api/identity/admin/v2/test_tenant_negative.py +++ b/tempest/api/identity/admin/v2/test_tenant_negative.py @@ -13,11 +13,12 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib import exceptions as lib_exc 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 3f1c3cdff5..0be25a9ca2 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 751f5fd44d..29ba1de265 100644 --- a/tempest/api/identity/admin/v2/test_tokens.py +++ b/tempest/api/identity/admin/v2/test_tokens.py @@ -13,8 +13,9 @@ # 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 fc64f67418..2ca5595659 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 0336ef1615..387b7142ae 100644 --- a/tempest/api/identity/admin/v2/test_users_negative.py +++ b/tempest/api/identity/admin/v2/test_users_negative.py @@ -13,11 +13,12 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib import exceptions as lib_exc 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 6fbd5440c9..c427615994 100644 --- a/tempest/api/identity/admin/v3/test_credentials.py +++ b/tempest/api/identity/admin/v3/test_credentials.py @@ -13,8 +13,9 @@ # 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 f74b30dfea..f1cc53063b 100644 --- a/tempest/api/identity/admin/v3/test_default_project_id.py +++ b/tempest/api/identity/admin/v3/test_default_project_id.py @@ -10,10 +10,11 @@ # 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 import auth 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 0441f6d7d7..1f6e6513a6 100644 --- a/tempest/api/identity/admin/v3/test_domains.py +++ b/tempest/api/identity/admin/v3/test_domains.py @@ -13,9 +13,9 @@ # 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.py b/tempest/api/identity/admin/v3/test_endpoints.py index 4a11c955de..c683f59d34 100644 --- a/tempest/api/identity/admin/v3/test_endpoints.py +++ b/tempest/api/identity/admin/v3/test_endpoints.py @@ -13,8 +13,9 @@ # 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 06c8e77c20..e2b7edcb82 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 2c70a7cf2a..98d1846fa5 100644 --- a/tempest/api/identity/admin/v3/test_groups.py +++ b/tempest/api/identity/admin/v3/test_groups.py @@ -13,8 +13,9 @@ # 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 ca30b6e431..7b092fd804 100644 --- a/tempest/api/identity/admin/v3/test_list_projects.py +++ b/tempest/api/identity/admin/v3/test_list_projects.py @@ -13,8 +13,9 @@ # 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 1407f38a73..6a073ced8b 100644 --- a/tempest/api/identity/admin/v3/test_list_users.py +++ b/tempest/api/identity/admin/v3/test_list_users.py @@ -13,8 +13,9 @@ # 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 900c26e7ca..63d2b0db17 100644 --- a/tempest/api/identity/admin/v3/test_policies.py +++ b/tempest/api/identity/admin/v3/test_policies.py @@ -13,8 +13,9 @@ # 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 052cf0e4da..69b1fb4d11 100644 --- a/tempest/api/identity/admin/v3/test_projects.py +++ b/tempest/api/identity/admin/v3/test_projects.py @@ -13,8 +13,9 @@ # 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 897eecce3d..739bb350ca 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 bf3c12eefb..b5c337d959 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 24da22a23e..0611393e23 100644 --- a/tempest/api/identity/admin/v3/test_roles.py +++ b/tempest/api/identity/admin/v3/test_roles.py @@ -13,8 +13,9 @@ # 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 bf5cc3e178..886eacf4af 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 47f9dbd720..5cc498fbe8 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 db64a5b88c..d9346e9139 100644 --- a/tempest/api/identity/admin/v3/test_trusts.py +++ b/tempest/api/identity/admin/v3/test_trusts.py @@ -13,12 +13,12 @@ import datetime import re +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.openstack.common import timeutils 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 8120fa74ef..f29e72ac18 100644 --- a/tempest/api/identity/admin/v3/test_users.py +++ b/tempest/api/identity/admin/v3/test_users.py @@ -13,8 +13,9 @@ # 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 ce54baa389..72a4cbd787 100644 --- a/tempest/api/identity/base.py +++ b/tempest/api/identity/base.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 import clients from tempest.common import cred_provider -from tempest.common.utils import data_utils from tempest import config from tempest.openstack.common import log as logging import tempest.test diff --git a/tempest/api/image/base.py b/tempest/api/image/base.py index ffc30712f2..58d0003d9e 100644 --- a/tempest/api/image/base.py +++ b/tempest/api/image/base.py @@ -13,11 +13,12 @@ # under the License. import cStringIO as StringIO + +from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest import clients from tempest.common import credentials -from tempest.common.utils import data_utils from tempest import config from tempest.openstack.common import log as logging 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 c276d257e0..ad3e13196e 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 a268128280..bd672c9771 100644 --- a/tempest/api/image/v1/test_images.py +++ b/tempest/api/image/v1/test_images.py @@ -15,8 +15,9 @@ import cStringIO as StringIO +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 a4f5ae362c..0997c9f1ed 100644 --- a/tempest/api/image/v2/test_images.py +++ b/tempest/api/image/v2/test_images.py @@ -17,8 +17,9 @@ import cStringIO as StringIO import random +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 350ede3074..bdb1679a66 100644 --- a/tempest/api/image/v2/test_images_tags.py +++ b/tempest/api/image/v2/test_images_tags.py @@ -12,8 +12,9 @@ # 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 bbe04319a7..13ef27d97d 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 eae0707266..f193e32834 100644 --- a/tempest/api/messaging/base.py +++ b/tempest/api/messaging/base.py @@ -13,7 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -from tempest.common.utils import data_utils +from tempest_lib.common.utils import data_utils + from tempest import config from tempest.openstack.common import log as logging from tempest import test diff --git a/tempest/api/messaging/test_claims.py b/tempest/api/messaging/test_claims.py index ebaa283456..896de81d28 100644 --- a/tempest/api/messaging/test_claims.py +++ b/tempest/api/messaging/test_claims.py @@ -16,10 +16,10 @@ import logging import 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 12a3df5226..f982f597a4 100644 --- a/tempest/api/messaging/test_messages.py +++ b/tempest/api/messaging/test_messages.py @@ -15,8 +15,9 @@ 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 5d9a7c76fe..c444e0b67c 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 d942641872..75f27195f8 100644 --- a/tempest/api/network/admin/test_external_network_extension.py +++ b/tempest/api/network/admin/test_external_network_extension.py @@ -10,8 +10,9 @@ # 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 a3a9977f42..ccf398002d 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,10 @@ # 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 import clients -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 e6fa0a62b5..257289fb83 100644 --- a/tempest/api/network/admin/test_l3_agent_scheduler.py +++ b/tempest/api/network/admin/test_l3_agent_scheduler.py @@ -12,8 +12,9 @@ # 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_lbaas_agent_scheduler.py b/tempest/api/network/admin/test_lbaas_agent_scheduler.py index c178fc07c2..29b69c3c46 100644 --- a/tempest/api/network/admin/test_lbaas_agent_scheduler.py +++ b/tempest/api/network/admin/test_lbaas_agent_scheduler.py @@ -12,8 +12,9 @@ # 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_load_balancer_admin_actions.py b/tempest/api/network/admin/test_load_balancer_admin_actions.py index 931f079320..b49b57c293 100644 --- a/tempest/api/network/admin/test_load_balancer_admin_actions.py +++ b/tempest/api/network/admin/test_load_balancer_admin_actions.py @@ -13,8 +13,9 @@ # 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_quotas.py b/tempest/api/network/admin/test_quotas.py index 1ea24feeab..60552b9daa 100644 --- a/tempest/api/network/admin/test_quotas.py +++ b/tempest/api/network/admin/test_quotas.py @@ -13,9 +13,9 @@ # 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_routers_dvr.py b/tempest/api/network/admin/test_routers_dvr.py index d1833dd718..48cd02bb5d 100644 --- a/tempest/api/network/admin/test_routers_dvr.py +++ b/tempest/api/network/admin/test_routers_dvr.py @@ -13,8 +13,9 @@ # 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 e8c8de3f71..270f5dd9e8 100644 --- a/tempest/api/network/base.py +++ b/tempest/api/network/base.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 import clients -from tempest.common.utils import data_utils from tempest import config from tempest import exceptions from tempest.openstack.common import log as logging diff --git a/tempest/api/network/base_security_groups.py b/tempest/api/network/base_security_groups.py index 623e2d0617..c704049ea6 100644 --- a/tempest/api/network/base_security_groups.py +++ b/tempest/api/network/base_security_groups.py @@ -13,8 +13,9 @@ # 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 5168219a81..a10f749b23 100644 --- a/tempest/api/network/test_dhcp_ipv6.py +++ b/tempest/api/network/test_dhcp_ipv6.py @@ -16,10 +16,10 @@ import netaddr import random +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 612c20af24..5060a480b9 100644 --- a/tempest/api/network/test_extra_dhcp_options.py +++ b/tempest/api/network/test_extra_dhcp_options.py @@ -13,8 +13,9 @@ # 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 cc88852703..212013a56c 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 c4c547cdbe..a7f806cf24 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_fwaas_extensions.py b/tempest/api/network/test_fwaas_extensions.py index d97a60cc49..e2b6ff1c95 100644 --- a/tempest/api/network/test_fwaas_extensions.py +++ b/tempest/api/network/test_fwaas_extensions.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.network import base -from tempest.common.utils import data_utils from tempest import config from tempest import exceptions from tempest import test diff --git a/tempest/api/network/test_load_balancer.py b/tempest/api/network/test_load_balancer.py index 6872dfacd1..583f91ac59 100644 --- a/tempest/api/network/test_load_balancer.py +++ b/tempest/api/network/test_load_balancer.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.network import base -from tempest.common.utils import data_utils from tempest import test diff --git a/tempest/api/network/test_metering_extensions.py b/tempest/api/network/test_metering_extensions.py index 8e4ee87ec2..68aed27282 100644 --- a/tempest/api/network/test_metering_extensions.py +++ b/tempest/api/network/test_metering_extensions.py @@ -12,8 +12,9 @@ # 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.openstack.common import log as logging from tempest import test diff --git a/tempest/api/network/test_networks.py b/tempest/api/network/test_networks.py index 0801045d11..2e01a85f7f 100644 --- a/tempest/api/network/test_networks.py +++ b/tempest/api/network/test_networks.py @@ -15,11 +15,11 @@ import itertools import netaddr +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 1002295b5e..d246d38fe6 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 33211fc076..6fe955e5e9 100644 --- a/tempest/api/network/test_ports.py +++ b/tempest/api/network/test_ports.py @@ -13,13 +13,14 @@ # License for the specific language governing permissions and limitations # under the License. -import netaddr 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 1388b3bc96..e9c9484425 100644 --- a/tempest/api/network/test_routers.py +++ b/tempest/api/network/test_routers.py @@ -14,10 +14,10 @@ # under the License. import netaddr +from tempest_lib.common.utils import data_utils from tempest.api.network import base_routers as base from tempest import clients -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 9f76dd2e83..9e7d574d4e 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 79d20461d7..46dbeee2f3 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/network/test_vpnaas_extensions.py b/tempest/api/network/test_vpnaas_extensions.py index ebf31d3193..ba3032643b 100644 --- a/tempest/api/network/test_vpnaas_extensions.py +++ b/tempest/api/network/test_vpnaas_extensions.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.network 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.py b/tempest/api/object_storage/test_account_quotas.py index 0c7e991417..c1c766f43f 100644 --- a/tempest/api/object_storage/test_account_quotas.py +++ b/tempest/api/object_storage/test_account_quotas.py @@ -12,9 +12,10 @@ # 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 import clients -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 d1e8f7702c..5e44c53730 100644 --- a/tempest/api/object_storage/test_account_quotas_negative.py +++ b/tempest/api/object_storage/test_account_quotas_negative.py @@ -12,12 +12,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 from tempest.api.object_storage import base from tempest import clients -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 14ccc12b77..77defd641a 100644 --- a/tempest/api/object_storage/test_account_services.py +++ b/tempest/api/object_storage/test_account_services.py @@ -14,13 +14,14 @@ # under the License. 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 import clients 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 2c00022b50..73a976d849 100644 --- a/tempest/api/object_storage/test_container_acl.py +++ b/tempest/api/object_storage/test_container_acl.py @@ -13,9 +13,10 @@ # 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 import clients -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 18939f0128..bbb44f4c66 100644 --- a/tempest/api/object_storage/test_container_acl_negative.py +++ b/tempest/api/object_storage/test_container_acl_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 exceptions as lib_exc from tempest.api.object_storage import base from tempest import clients -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 c78b4c3f05..2217d181db 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_services.py b/tempest/api/object_storage/test_container_services.py index 54da0d15e0..9f2adfe631 100644 --- a/tempest/api/object_storage/test_container_services.py +++ b/tempest/api/object_storage/test_container_services.py @@ -13,8 +13,9 @@ # 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 test diff --git a/tempest/api/object_storage/test_container_staticweb.py b/tempest/api/object_storage/test_container_staticweb.py index 45ecfec8d4..b579a45bce 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 ae42da6c87..ff99c156e0 100644 --- a/tempest/api/object_storage/test_container_sync.py +++ b/tempest/api/object_storage/test_container_sync.py @@ -13,14 +13,16 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib import decorators -import testtools import time import 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 import clients -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 ac6f49a787..89856b730b 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 3e0fc7b67c..c2d767a048 100644 --- a/tempest/api/object_storage/test_object_formpost.py +++ b/tempest/api/object_storage/test_object_formpost.py @@ -17,8 +17,9 @@ import hmac import time import 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 d92a2e5038..8d758b1d7b 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 import 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 f9220cf7b5..2091eb5e2f 100644 --- a/tempest/api/object_storage/test_object_services.py +++ b/tempest/api/object_storage/test_object_services.py @@ -21,11 +21,11 @@ import time import zlib import six +from tempest_lib.common.utils import data_utils from tempest.api.object_storage import base from tempest import clients 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 b013752ae8..96a78b9dd7 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 e6b0b05d56..b404597c41 100644 --- a/tempest/api/object_storage/test_object_temp_url.py +++ b/tempest/api/object_storage/test_object_temp_url.py @@ -17,8 +17,9 @@ import hmac import time import 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 343749e2b0..67b129c7a0 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 import 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 225159f6a6..cd2d3c350a 100644 --- a/tempest/api/object_storage/test_object_version.py +++ b/tempest/api/object_storage/test_object_version.py @@ -15,8 +15,9 @@ 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 b8b056289e..08fddb5f86 100644 --- a/tempest/api/orchestration/base.py +++ b/tempest/api/orchestration/base.py @@ -12,11 +12,11 @@ import os.path +from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc import yaml from tempest import clients -from tempest.common.utils import data_utils from tempest import config from tempest.openstack.common import log as logging import tempest.test diff --git a/tempest/api/orchestration/stacks/test_environment.py b/tempest/api/orchestration/stacks/test_environment.py index 29897093f0..df67ef2eb0 100644 --- a/tempest/api/orchestration/stacks/test_environment.py +++ b/tempest/api/orchestration/stacks/test_environment.py @@ -12,8 +12,9 @@ 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 833fb28ba3..c49b040d4e 100644 --- a/tempest/api/orchestration/stacks/test_limits.py +++ b/tempest/api/orchestration/stacks/test_limits.py @@ -11,10 +11,11 @@ # under the License. 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 253d197997..9f8de0dd48 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 e8f3522221..01b1ef17ae 100644 --- a/tempest/api/orchestration/stacks/test_non_empty_stack.py +++ b/tempest/api/orchestration/stacks/test_non_empty_stack.py @@ -12,8 +12,9 @@ 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 6d2dcc7f6c..28ef5a536a 100644 --- a/tempest/api/orchestration/stacks/test_nova_keypair_resources.py +++ b/tempest/api/orchestration/stacks/test_nova_keypair_resources.py @@ -13,8 +13,9 @@ 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 7387c62ab3..697c6ee86c 100644 --- a/tempest/api/orchestration/stacks/test_soft_conf.py +++ b/tempest/api/orchestration/stacks/test_soft_conf.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.orchestration import base -from tempest.common.utils import data_utils from tempest import config from tempest.openstack.common import log as logging from tempest import test diff --git a/tempest/api/orchestration/stacks/test_stacks.py b/tempest/api/orchestration/stacks/test_stacks.py index a9b3a6b140..3e61de4a6f 100644 --- a/tempest/api/orchestration/stacks/test_stacks.py +++ b/tempest/api/orchestration/stacks/test_stacks.py @@ -10,8 +10,9 @@ # 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.openstack.common import log as logging 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 1290dfe044..6884c6b180 100644 --- a/tempest/api/orchestration/stacks/test_swift_resources.py +++ b/tempest/api/orchestration/stacks/test_swift_resources.py @@ -12,9 +12,11 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # 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 import clients -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 d0fc1cf4ea..8c07adeb04 100644 --- a/tempest/api/orchestration/stacks/test_templates.py +++ b/tempest/api/orchestration/stacks/test_templates.py @@ -10,8 +10,9 @@ # 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 5a1a6d7878..5f03e16eba 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 c521b37ed7..fff04fb7e0 100644 --- a/tempest/api/telemetry/base.py +++ b/tempest/api/telemetry/base.py @@ -12,9 +12,9 @@ import time +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 from tempest.openstack.common import timeutils diff --git a/tempest/api/telemetry/test_telemetry_alarming_api.py b/tempest/api/telemetry/test_telemetry_alarming_api.py index 768b6ea32e..8bc97e8da4 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 2e4b614acc..09ec075c2b 100644 --- a/tempest/api/volume/admin/test_multi_backend.py +++ b/tempest/api/volume/admin/test_multi_backend.py @@ -10,8 +10,9 @@ # 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.openstack.common import log as logging 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 4834be13a4..cb55869d40 100644 --- a/tempest/api/volume/admin/test_snapshots_actions.py +++ b/tempest/api/volume/admin/test_snapshots_actions.py @@ -13,8 +13,9 @@ # 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 cd9155224e..7a64de3cfb 100644 --- a/tempest/api/volume/admin/test_volume_quotas.py +++ b/tempest/api/volume/admin/test_volume_quotas.py @@ -12,8 +12,9 @@ # 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 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 01242f982d..4669e0ef01 100644 --- a/tempest/api/volume/admin/test_volume_types.py +++ b/tempest/api/volume/admin/test_volume_types.py @@ -13,8 +13,9 @@ # 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 5ca838ef77..a1b80ce8de 100644 --- a/tempest/api/volume/admin/test_volume_types_extra_specs.py +++ b/tempest/api/volume/admin/test_volume_types_extra_specs.py @@ -13,8 +13,9 @@ # 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 6d2c4fbe66..1eed8008d6 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 dc96839b2f..29de04d18f 100644 --- a/tempest/api/volume/admin/test_volumes_actions.py +++ b/tempest/api/volume/admin/test_volumes_actions.py @@ -13,8 +13,9 @@ # 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 6b0580fb8c..986e9862ed 100644 --- a/tempest/api/volume/admin/test_volumes_backup.py +++ b/tempest/api/volume/admin/test_volumes_backup.py @@ -13,8 +13,9 @@ # 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.openstack.common import log as logging from tempest import test diff --git a/tempest/api/volume/base.py b/tempest/api/volume/base.py index 4f94f34c39..e5cff23e0e 100644 --- a/tempest/api/volume/base.py +++ b/tempest/api/volume/base.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 import clients -from tempest.common.utils import data_utils from tempest import config from tempest import exceptions from tempest.openstack.common import log as logging diff --git a/tempest/api/volume/test_qos.py b/tempest/api/volume/test_qos.py index b08a01947d..f806790006 100644 --- a/tempest/api/volume/test_qos.py +++ b/tempest/api/volume/test_qos.py @@ -12,8 +12,9 @@ # 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 5cad6b4437..7771300d30 100644 --- a/tempest/api/volume/test_volumes_actions.py +++ b/tempest/api/volume/test_volumes_actions.py @@ -13,8 +13,9 @@ # 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/test_volumes_get.py b/tempest/api/volume/test_volumes_get.py index d03bd8d744..1fa1d5fd5e 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 ef7cebbaf6..b5bf362b5f 100644 --- a/tempest/api/volume/test_volumes_list.py +++ b/tempest/api/volume/test_volumes_list.py @@ -15,10 +15,10 @@ # under the License. import operator +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.openstack.common import log as logging from tempest import test diff --git a/tempest/api/volume/test_volumes_negative.py b/tempest/api/volume/test_volumes_negative.py index 27fd4955ea..b59a3130b6 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 b6cdd6bf39..9a72e9011e 100644 --- a/tempest/api/volume/test_volumes_snapshots.py +++ b/tempest/api/volume/test_volumes_snapshots.py @@ -10,8 +10,9 @@ # 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.openstack.common import log as logging 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 fbbc6239d5..6307b621ee 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/common/isolated_creds.py b/tempest/common/isolated_creds.py index b36dd46ca3..2ccf031f4c 100644 --- a/tempest/common/isolated_creds.py +++ b/tempest/common/isolated_creds.py @@ -13,11 +13,11 @@ # under the License. import netaddr +from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest import clients from tempest.common import cred_provider -from tempest.common.utils import data_utils from tempest import config from tempest import exceptions from tempest.openstack.common import log as logging diff --git a/tempest/common/utils/data_utils.py b/tempest/common/utils/data_utils.py deleted file mode 100644 index d441778452..0000000000 --- a/tempest/common/utils/data_utils.py +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 2012 OpenStack Foundation -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -import itertools -import netaddr -import random -import uuid - - -def rand_uuid(): - return str(uuid.uuid4()) - - -def rand_uuid_hex(): - return uuid.uuid4().hex - - -def rand_name(name=''): - randbits = str(random.randint(1, 0x7fffffff)) - if name: - return name + '-' + randbits - else: - return randbits - - -def rand_url(): - randbits = str(random.randint(1, 0x7fffffff)) - return 'https://url-' + randbits + '.com' - - -def rand_int_id(start=0, end=0x7fffffff): - return random.randint(start, end) - - -def rand_mac_address(): - """Generate an Ethernet MAC address.""" - # NOTE(vish): We would prefer to use 0xfe here to ensure that linux - # bridge mac addresses don't change, but it appears to - # conflict with libvirt, so we use the next highest octet - # that has the unicast and locally administered bits set - # properly: 0xfa. - # Discussion: https://bugs.launchpad.net/nova/+bug/921838 - mac = [0xfa, 0x16, 0x3e, - random.randint(0x00, 0xff), - random.randint(0x00, 0xff), - random.randint(0x00, 0xff)] - return ':'.join(["%02x" % x for x in mac]) - - -def parse_image_id(image_ref): - """Return the image id from a given image ref.""" - return image_ref.rsplit('/')[-1] - - -def arbitrary_string(size=4, base_text=None): - """ - Return size characters from base_text, repeating the base_text infinitely - if needed. - """ - if not base_text: - base_text = 'test' - return ''.join(itertools.islice(itertools.cycle(base_text), size)) - - -def random_bytes(size=1024): - """ - Return size randomly selected bytes as a string. - """ - return ''.join([chr(random.randint(0, 255)) - for i in range(size)]) - - -def get_ipv6_addr_by_EUI64(cidr, mac): - # Check if the prefix is IPv4 address - is_ipv4 = netaddr.valid_ipv4(cidr) - if is_ipv4: - msg = "Unable to generate IP address by EUI64 for IPv4 prefix" - raise TypeError(msg) - try: - eui64 = int(netaddr.EUI(mac).eui64()) - prefix = netaddr.IPNetwork(cidr) - return netaddr.IPAddress(prefix.first + eui64 ^ (1 << 57)) - except (ValueError, netaddr.AddrFormatError): - raise TypeError('Bad prefix or mac format for generating IPv6 ' - 'address by EUI-64: %(prefix)s, %(mac)s:' - % {'prefix': cidr, 'mac': mac}) - except TypeError: - raise TypeError('Bad prefix type for generate IPv6 address by ' - 'EUI-64: %s' % cidr) diff --git a/tempest/common/utils/misc.py b/tempest/common/utils/misc.py deleted file mode 100644 index 0d78273832..0000000000 --- a/tempest/common/utils/misc.py +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 2012 OpenStack Foundation -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -import inspect -import re - -from tempest.openstack.common import log as logging - -LOG = logging.getLogger(__name__) - - -def singleton(cls): - """Simple wrapper for classes that should only have a single instance.""" - instances = {} - - def getinstance(): - if cls not in instances: - instances[cls] = cls() - return instances[cls] - return getinstance - - -def find_test_caller(): - """Find the caller class and test name. - - Because we know that the interesting things that call us are - test_* methods, and various kinds of setUp / tearDown, we - can look through the call stack to find appropriate methods, - and the class we were in when those were called. - """ - caller_name = None - names = [] - frame = inspect.currentframe() - is_cleanup = False - # Start climbing the ladder until we hit a good method - while True: - try: - frame = frame.f_back - name = frame.f_code.co_name - names.append(name) - if re.search("^(test_|setUp|tearDown)", name): - cname = "" - if 'self' in frame.f_locals: - cname = frame.f_locals['self'].__class__.__name__ - if 'cls' in frame.f_locals: - cname = frame.f_locals['cls'].__name__ - caller_name = cname + ":" + name - break - elif re.search("^_run_cleanup", name): - is_cleanup = True - elif name == 'main': - caller_name = 'main' - break - else: - cname = "" - if 'self' in frame.f_locals: - cname = frame.f_locals['self'].__class__.__name__ - if 'cls' in frame.f_locals: - cname = frame.f_locals['cls'].__name__ - - # the fact that we are running cleanups is indicated pretty - # deep in the stack, so if we see that we want to just - # start looking for a real class name, and declare victory - # once we do. - if is_cleanup and cname: - if not re.search("^RunTest", cname): - caller_name = cname + ":_run_cleanups" - break - except Exception: - break - # prevents frame leaks - del frame - if caller_name is None: - LOG.debug("Sane call name not found in %s" % names) - return caller_name diff --git a/tempest/common/waiters.py b/tempest/common/waiters.py index 9b11676be0..6d50b67a0d 100644 --- a/tempest/common/waiters.py +++ b/tempest/common/waiters.py @@ -13,7 +13,8 @@ import time -from tempest.common.utils import misc as misc_utils +from tempest_lib.common.utils import misc as misc_utils + from tempest import config from tempest import exceptions from tempest.openstack.common import log as logging diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py index 7f0582a345..61fb088fb0 100644 --- a/tempest/scenario/manager.py +++ b/tempest/scenario/manager.py @@ -19,12 +19,12 @@ import subprocess import netaddr import six +from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest import clients from tempest.common import cred_provider from tempest.common import credentials -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 ff450ded63..568ad436fb 100644 --- a/tempest/scenario/test_aggregates_basic_ops.py +++ b/tempest/scenario/test_aggregates_basic_ops.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +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.openstack.common import log as logging 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 af2b4cbd7c..d5e901e825 100644 --- a/tempest/scenario/test_large_ops.py +++ b/tempest/scenario/test_large_ops.py @@ -12,9 +12,10 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # 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.common.utils import data_utils from tempest import config from tempest.openstack.common import log as logging from tempest.scenario import manager diff --git a/tempest/scenario/test_network_advanced_server_ops.py b/tempest/scenario/test_network_advanced_server_ops.py index 19a871600f..5b0fa94d9f 100644 --- a/tempest/scenario/test_network_advanced_server_ops.py +++ b/tempest/scenario/test_network_advanced_server_ops.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 import testtools -from tempest.common.utils import data_utils from tempest import config from tempest.openstack.common import log as logging from tempest.scenario import manager diff --git a/tempest/scenario/test_network_basic_ops.py b/tempest/scenario/test_network_basic_ops.py index 81bec51df3..23f6529027 100644 --- a/tempest/scenario/test_network_basic_ops.py +++ b/tempest/scenario/test_network_basic_ops.py @@ -16,9 +16,9 @@ import collections import re +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.openstack.common import log as logging diff --git a/tempest/scenario/test_security_groups_basic_ops.py b/tempest/scenario/test_security_groups_basic_ops.py index 4fbadb0489..5798c798f9 100644 --- a/tempest/scenario/test_security_groups_basic_ops.py +++ b/tempest/scenario/test_security_groups_basic_ops.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +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.openstack.common import log as logging from tempest.scenario import manager diff --git a/tempest/scenario/test_stamp_pattern.py b/tempest/scenario/test_stamp_pattern.py index bd3cefa227..0e5240a621 100644 --- a/tempest/scenario/test_stamp_pattern.py +++ b/tempest/scenario/test_stamp_pattern.py @@ -15,11 +15,11 @@ import time +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.openstack.common import log as logging diff --git a/tempest/scenario/test_volume_boot_pattern.py b/tempest/scenario/test_volume_boot_pattern.py index d1ea270888..ac285320bf 100644 --- a/tempest/scenario/test_volume_boot_pattern.py +++ b/tempest/scenario/test_volume_boot_pattern.py @@ -10,9 +10,9 @@ # 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.common.utils import data_utils from tempest import config from tempest.openstack.common import log from tempest.scenario import manager diff --git a/tempest/scenario/utils.py b/tempest/scenario/utils.py index 68ec6e708b..6c00d09bee 100644 --- a/tempest/scenario/utils.py +++ b/tempest/scenario/utils.py @@ -18,12 +18,12 @@ import re import string import unicodedata +from tempest_lib.common.utils import misc import testscenarios import testtools from tempest import clients from tempest.common import cred_provider -from tempest.common.utils import misc from tempest import config from tempest import exceptions diff --git a/tempest/services/image/v1/json/image_client.py b/tempest/services/image/v1/json/image_client.py index 50f75b3b72..01a9c54ecb 100644 --- a/tempest/services/image/v1/json/image_client.py +++ b/tempest/services/image/v1/json/image_client.py @@ -20,11 +20,11 @@ import os import time import urllib +from tempest_lib.common.utils import misc as misc_utils from tempest_lib import exceptions as lib_exc from tempest.common import glance_http from tempest.common import service_client -from tempest.common.utils import misc as misc_utils from tempest import exceptions from tempest.openstack.common import log as logging diff --git a/tempest/services/network/json/network_client.py b/tempest/services/network/json/network_client.py index 87f133252c..53645a5e33 100644 --- a/tempest/services/network/json/network_client.py +++ b/tempest/services/network/json/network_client.py @@ -14,10 +14,10 @@ import json import time import urllib +from tempest_lib.common.utils import misc from tempest_lib import exceptions as lib_exc from tempest.common import service_client -from tempest.common.utils import misc from tempest import exceptions diff --git a/tempest/stress/actions/server_create_destroy.py b/tempest/stress/actions/server_create_destroy.py index d0e4eeadd3..c0a317814d 100644 --- a/tempest/stress/actions/server_create_destroy.py +++ b/tempest/stress/actions/server_create_destroy.py @@ -12,7 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -from tempest.common.utils import data_utils +from tempest_lib.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 b2c612e521..0df2eb1f0e 100644 --- a/tempest/stress/actions/ssh_floating.py +++ b/tempest/stress/actions/ssh_floating.py @@ -13,7 +13,8 @@ import socket import subprocess -from tempest.common.utils import data_utils +from tempest_lib.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 a5e393fad7..93400c4f9f 100644 --- a/tempest/stress/actions/volume_attach_delete.py +++ b/tempest/stress/actions/volume_attach_delete.py @@ -11,7 +11,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -from tempest.common.utils import data_utils +from tempest_lib.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 a6abd822db..0baf2de689 100644 --- a/tempest/stress/actions/volume_attach_verify.py +++ b/tempest/stress/actions/volume_attach_verify.py @@ -10,13 +10,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -from tempest.common.utils import data_utils +import re + +from tempest_lib.common.utils import data_utils + from tempest.common.utils.linux import remote_client from tempest import config import tempest.stress.stressaction as stressaction import tempest.test -import re CONF = config.CONF diff --git a/tempest/stress/actions/volume_create_delete.py b/tempest/stress/actions/volume_create_delete.py index 487005537c..b1899a0677 100644 --- a/tempest/stress/actions/volume_create_delete.py +++ b/tempest/stress/actions/volume_create_delete.py @@ -10,7 +10,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -from tempest.common.utils import data_utils +from tempest_lib.common.utils import data_utils + import tempest.stress.stressaction as stressaction diff --git a/tempest/stress/driver.py b/tempest/stress/driver.py index 1c27815159..e007a49612 100644 --- a/tempest/stress/driver.py +++ b/tempest/stress/driver.py @@ -18,11 +18,11 @@ import signal import time from six import moves +from tempest_lib.common.utils import data_utils from tempest import clients from tempest.common import cred_provider from tempest.common import ssh -from tempest.common.utils import data_utils from tempest import config from tempest import exceptions from tempest.openstack.common import importutils diff --git a/tempest/tests/common/utils/test_data_utils.py b/tempest/tests/common/utils/test_data_utils.py deleted file mode 100644 index 7aafdb2f3b..0000000000 --- a/tempest/tests/common/utils/test_data_utils.py +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 2014 NEC Corporation. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - - -from tempest.common.utils import data_utils -from tempest.tests import base - - -class TestDataUtils(base.TestCase): - - def test_rand_uuid(self): - actual = data_utils.rand_uuid() - self.assertIsInstance(actual, str) - self.assertRegexpMatches(actual, "^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]" - "{4}-[0-9a-f]{4}-[0-9a-f]{12}$") - actual2 = data_utils.rand_uuid() - self.assertNotEqual(actual, actual2) - - def test_rand_uuid_hex(self): - actual = data_utils.rand_uuid_hex() - self.assertIsInstance(actual, str) - self.assertRegexpMatches(actual, "^[0-9a-f]{32}$") - - actual2 = data_utils.rand_uuid_hex() - self.assertNotEqual(actual, actual2) - - def test_rand_name(self): - actual = data_utils.rand_name() - self.assertIsInstance(actual, str) - actual2 = data_utils.rand_name() - self.assertNotEqual(actual, actual2) - - actual = data_utils.rand_name('foo') - self.assertTrue(actual.startswith('foo')) - actual2 = data_utils.rand_name('foo') - self.assertTrue(actual.startswith('foo')) - self.assertNotEqual(actual, actual2) - - def test_rand_int(self): - actual = data_utils.rand_int_id() - self.assertIsInstance(actual, int) - - actual2 = data_utils.rand_int_id() - self.assertNotEqual(actual, actual2) - - def test_rand_mac_address(self): - actual = data_utils.rand_mac_address() - self.assertIsInstance(actual, str) - self.assertRegexpMatches(actual, "^([0-9a-f][0-9a-f]:){5}" - "[0-9a-f][0-9a-f]$") - - actual2 = data_utils.rand_mac_address() - self.assertNotEqual(actual, actual2) - - def test_parse_image_id(self): - actual = data_utils.parse_image_id("/foo/bar/deadbeaf") - self.assertEqual("deadbeaf", actual) - - def test_arbitrary_string(self): - actual = data_utils.arbitrary_string() - self.assertEqual(actual, "test") - actual = data_utils.arbitrary_string(size=30, base_text="abc") - self.assertEqual(actual, "abc" * (30 / len("abc"))) - actual = data_utils.arbitrary_string(size=5, base_text="deadbeaf") - self.assertEqual(actual, "deadb") diff --git a/tempest/tests/common/utils/test_misc.py b/tempest/tests/common/utils/test_misc.py deleted file mode 100644 index 554027f3ca..0000000000 --- a/tempest/tests/common/utils/test_misc.py +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 2014 NEC Corporation. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - - -from tempest.common.utils import misc -from tempest.tests import base - - -@misc.singleton -class TestFoo(object): - - count = 0 - - def increment(self): - self.count += 1 - return self.count - - -@misc.singleton -class TestBar(object): - - count = 0 - - def increment(self): - self.count += 1 - return self.count - - -class TestMisc(base.TestCase): - - def test_singleton(self): - test = TestFoo() - self.assertEqual(0, test.count) - self.assertEqual(1, test.increment()) - test2 = TestFoo() - self.assertEqual(1, test.count) - self.assertEqual(1, test2.count) - self.assertEqual(test, test2) - test3 = TestBar() - self.assertNotEqual(test, test3) - - def test_find_test_caller_test_case(self): - # Calling it from here should give us the method we're in. - self.assertEqual('TestMisc:test_find_test_caller_test_case', - misc.find_test_caller()) - - def test_find_test_caller_setup_self(self): - def setUp(self): - return misc.find_test_caller() - self.assertEqual('TestMisc:setUp', setUp(self)) - - def test_find_test_caller_setup_no_self(self): - def setUp(): - return misc.find_test_caller() - self.assertEqual(':setUp', setUp()) - - def test_find_test_caller_setupclass_cls(self): - def setUpClass(cls): # noqa - return misc.find_test_caller() - self.assertEqual('TestMisc:setUpClass', setUpClass(self.__class__)) - - def test_find_test_caller_teardown_self(self): - def tearDown(self): - return misc.find_test_caller() - self.assertEqual('TestMisc:tearDown', tearDown(self)) - - def test_find_test_caller_teardown_no_self(self): - def tearDown(): - return misc.find_test_caller() - self.assertEqual(':tearDown', tearDown()) - - def test_find_test_caller_teardown_class(self): - def tearDownClass(cls): # noqa - return misc.find_test_caller() - self.assertEqual('TestMisc:tearDownClass', - tearDownClass(self.__class__)) diff --git a/tempest/thirdparty/boto/test_ec2_instance_run.py b/tempest/thirdparty/boto/test_ec2_instance_run.py index 4a2bd2356d..19be559fdb 100644 --- a/tempest/thirdparty/boto/test_ec2_instance_run.py +++ b/tempest/thirdparty/boto/test_ec2_instance_run.py @@ -13,7 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest.common.utils import data_utils +from tempest_lib.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 acf797a208..2272a5ca4e 100644 --- a/tempest/thirdparty/boto/test_ec2_keys.py +++ b/tempest/thirdparty/boto/test_ec2_keys.py @@ -13,7 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest.common.utils import data_utils +from tempest_lib.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 7f9568b722..ef1ef52946 100644 --- a/tempest/thirdparty/boto/test_ec2_security_groups.py +++ b/tempest/thirdparty/boto/test_ec2_security_groups.py @@ -13,7 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest.common.utils import data_utils +from tempest_lib.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 bf048036b0..451ae59bab 100644 --- a/tempest/thirdparty/boto/test_s3_buckets.py +++ b/tempest/thirdparty/boto/test_s3_buckets.py @@ -13,7 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest.common.utils import data_utils +from tempest_lib.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 21ea984104..49749bcc4d 100644 --- a/tempest/thirdparty/boto/test_s3_ec2_images.py +++ b/tempest/thirdparty/boto/test_s3_ec2_images.py @@ -15,7 +15,8 @@ import os -from tempest.common.utils import data_utils +from tempest_lib.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 2d8152d4a5..dee6a7c2af 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