diff --git a/tempest/api/compute/admin/test_instance_usage_audit_log.py b/tempest/api/compute/admin/test_instance_usage_audit_log.py index 4dcbb3b082..c4c054246c 100644 --- a/tempest/api/compute/admin/test_instance_usage_audit_log.py +++ b/tempest/api/compute/admin/test_instance_usage_audit_log.py @@ -14,8 +14,7 @@ # under the License. import datetime - -from six.moves.urllib import parse as urllib +from urllib import parse as urllib from tempest.api.compute import base from tempest.lib import decorators diff --git a/tempest/api/compute/admin/test_instance_usage_audit_log_negative.py b/tempest/api/compute/admin/test_instance_usage_audit_log_negative.py index 84d18c47bf..c1154511fd 100644 --- a/tempest/api/compute/admin/test_instance_usage_audit_log_negative.py +++ b/tempest/api/compute/admin/test_instance_usage_audit_log_negative.py @@ -14,8 +14,7 @@ # under the License. import datetime - -from six.moves.urllib import parse as urllib +from urllib import parse as urllib from tempest.api.compute import base from tempest.lib import decorators diff --git a/tempest/api/compute/servers/test_novnc.py b/tempest/api/compute/servers/test_novnc.py index 6ebdbdb086..34b3146db6 100644 --- a/tempest/api/compute/servers/test_novnc.py +++ b/tempest/api/compute/servers/test_novnc.py @@ -14,9 +14,9 @@ # under the License. import struct +import urllib.parse as urlparse import six -import six.moves.urllib.parse as urlparse import urllib3 from tempest.api.compute import base diff --git a/tempest/api/compute/servers/test_server_actions.py b/tempest/api/compute/servers/test_server_actions.py index 4527aa930b..deb21c7260 100644 --- a/tempest/api/compute/servers/test_server_actions.py +++ b/tempest/api/compute/servers/test_server_actions.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urlparse + from oslo_log import log as logging -from six.moves.urllib import parse as urlparse import testtools from tempest.api.compute import base diff --git a/tempest/api/object_storage/test_container_sync.py b/tempest/api/object_storage/test_container_sync.py index eb2ef7ff42..276b826b52 100644 --- a/tempest/api/object_storage/test_container_sync.py +++ b/tempest/api/object_storage/test_container_sync.py @@ -14,8 +14,8 @@ # under the License. import time +from urllib import parse as urlparse -from six.moves.urllib import parse as urlparse import testtools from tempest.api.object_storage import base diff --git a/tempest/api/object_storage/test_object_formpost.py b/tempest/api/object_storage/test_object_formpost.py index d857d3b12f..39e895ea46 100644 --- a/tempest/api/object_storage/test_object_formpost.py +++ b/tempest/api/object_storage/test_object_formpost.py @@ -15,8 +15,7 @@ import hashlib import hmac import time - -from six.moves.urllib import parse as urlparse +from urllib import parse as urlparse from tempest.api.object_storage import base from tempest.common import utils diff --git a/tempest/api/object_storage/test_object_formpost_negative.py b/tempest/api/object_storage/test_object_formpost_negative.py index 0499eef270..971a223221 100644 --- a/tempest/api/object_storage/test_object_formpost_negative.py +++ b/tempest/api/object_storage/test_object_formpost_negative.py @@ -15,8 +15,7 @@ import hashlib import hmac import time - -from six.moves.urllib import parse as urlparse +from urllib import parse as urlparse from tempest.api.object_storage import base from tempest.common import utils diff --git a/tempest/api/object_storage/test_object_temp_url.py b/tempest/api/object_storage/test_object_temp_url.py index 29354b62c1..e75e22a940 100644 --- a/tempest/api/object_storage/test_object_temp_url.py +++ b/tempest/api/object_storage/test_object_temp_url.py @@ -15,8 +15,7 @@ import hashlib import hmac import time - -from six.moves.urllib import parse as urlparse +from urllib import parse as urlparse from tempest.api.object_storage import base from tempest.common import utils 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 bbb48272b5..4ad8428bad 100644 --- a/tempest/api/object_storage/test_object_temp_url_negative.py +++ b/tempest/api/object_storage/test_object_temp_url_negative.py @@ -15,8 +15,7 @@ import hashlib import hmac import time - -from six.moves.urllib import parse as urlparse +from urllib import parse as urlparse from tempest.api.object_storage import base from tempest.common import utils diff --git a/tempest/api/volume/test_volumes_list.py b/tempest/api/volume/test_volumes_list.py index 60f85a4322..1d1981caf9 100644 --- a/tempest/api/volume/test_volumes_list.py +++ b/tempest/api/volume/test_volumes_list.py @@ -16,8 +16,8 @@ import operator import random +from urllib.parse import urlparse -from six.moves.urllib.parse import urlparse from testtools import matchers from tempest.api.volume import base diff --git a/tempest/cmd/cleanup_service.py b/tempest/cmd/cleanup_service.py index 84d2492e64..f2370f30ad 100644 --- a/tempest/cmd/cleanup_service.py +++ b/tempest/cmd/cleanup_service.py @@ -12,8 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_log import log as logging -from six.moves.urllib import parse as urllib from tempest import clients from tempest.common import credentials_factory as credentials diff --git a/tempest/cmd/init.py b/tempest/cmd/init.py index 6e93d69609..3eae5522d1 100644 --- a/tempest/cmd/init.py +++ b/tempest/cmd/init.py @@ -12,6 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. +import configparser import os import shutil import sys @@ -19,7 +20,6 @@ import sys from cliff import command from oslo_config import generator from oslo_log import log as logging -from six import moves from stestr import commands from tempest.cmd import workspace @@ -92,7 +92,7 @@ class TempestInit(command.Command): stestr_conf_file.write(stestr_conf) def get_configparser(self, conf_path): - config_parse = moves.configparser.ConfigParser() + config_parse = configparser.ConfigParser() config_parse.optionxform = str # get any existing values if a config file already exists if os.path.isfile(conf_path): diff --git a/tempest/common/compute.py b/tempest/common/compute.py index 42f68f1d88..a062f6f0f3 100644 --- a/tempest/common/compute.py +++ b/tempest/common/compute.py @@ -18,8 +18,7 @@ import socket import ssl import struct import textwrap - -from six.moves.urllib import parse as urlparse +from urllib import parse as urlparse from oslo_log import log as logging from oslo_utils import excutils diff --git a/tempest/lib/auth.py b/tempest/lib/auth.py index 7c279ab289..16a71f1ceb 100644 --- a/tempest/lib/auth.py +++ b/tempest/lib/auth.py @@ -18,10 +18,10 @@ import abc import copy import datetime import re +from urllib import parse as urlparse from oslo_log import log as logging import six -from six.moves.urllib import parse as urlparse from tempest.lib import exceptions from tempest.lib.services.identity.v2 import token_client as json_v2id diff --git a/tempest/lib/cmd/check_uuid.py b/tempest/lib/cmd/check_uuid.py index ff09671dc2..0ae11ca9f6 100755 --- a/tempest/lib/cmd/check_uuid.py +++ b/tempest/lib/cmd/check_uuid.py @@ -22,10 +22,10 @@ import inspect import os import sys import unittest +import urllib.parse as urlparse import uuid from oslo_utils import uuidutils -import six.moves.urllib.parse as urlparse DECORATOR_MODULE = 'decorators' DECORATOR_NAME = 'idempotent_id' diff --git a/tempest/lib/common/rest_client.py b/tempest/lib/common/rest_client.py index b47b511f6b..1786e67a9f 100644 --- a/tempest/lib/common/rest_client.py +++ b/tempest/lib/common/rest_client.py @@ -18,13 +18,13 @@ import collections import email.utils import re import time +import urllib import jsonschema from oslo_log import log as logging from oslo_log import versionutils from oslo_serialization import jsonutils as json import six -from six.moves import urllib from tempest.lib.common import http from tempest.lib.common import jsonschema_validator diff --git a/tempest/lib/services/compute/agents_client.py b/tempest/lib/services/compute/agents_client.py index 12b3900fbc..bd973ddbb7 100644 --- a/tempest/lib/services/compute/agents_client.py +++ b/tempest/lib/services/compute/agents_client.py @@ -12,8 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.api_schema.response.compute.v2_1 import agents as schema from tempest.lib.common import rest_client diff --git a/tempest/lib/services/compute/baremetal_nodes_client.py b/tempest/lib/services/compute/baremetal_nodes_client.py index 3efdbcec20..83af451e23 100644 --- a/tempest/lib/services/compute/baremetal_nodes_client.py +++ b/tempest/lib/services/compute/baremetal_nodes_client.py @@ -12,8 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.api_schema.response.compute.v2_1 import baremetal_nodes \ as schema diff --git a/tempest/lib/services/compute/flavors_client.py b/tempest/lib/services/compute/flavors_client.py index e22b5b2a3b..5282405b6f 100644 --- a/tempest/lib/services/compute/flavors_client.py +++ b/tempest/lib/services/compute/flavors_client.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.api_schema.response.compute.v2_1 import flavors as schema from tempest.lib.api_schema.response.compute.v2_1 import flavors_access \ diff --git a/tempest/lib/services/compute/floating_ip_pools_client.py b/tempest/lib/services/compute/floating_ip_pools_client.py index d3af050bed..aa065b8294 100644 --- a/tempest/lib/services/compute/floating_ip_pools_client.py +++ b/tempest/lib/services/compute/floating_ip_pools_client.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.api_schema.response.compute.v2_1 import floating_ips as schema from tempest.lib.common import rest_client diff --git a/tempest/lib/services/compute/floating_ips_client.py b/tempest/lib/services/compute/floating_ips_client.py index d7a1a9b398..e6b6916634 100644 --- a/tempest/lib/services/compute/floating_ips_client.py +++ b/tempest/lib/services/compute/floating_ips_client.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.api_schema.response.compute.v2_1 import floating_ips as schema from tempest.lib.common import rest_client diff --git a/tempest/lib/services/compute/hosts_client.py b/tempest/lib/services/compute/hosts_client.py index 743b4ec2cd..bbecc3ba45 100644 --- a/tempest/lib/services/compute/hosts_client.py +++ b/tempest/lib/services/compute/hosts_client.py @@ -12,8 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.api_schema.response.compute.v2_1 import hosts as schema from tempest.lib.common import rest_client diff --git a/tempest/lib/services/compute/images_client.py b/tempest/lib/services/compute/images_client.py index b252ee9efd..b6d8d30439 100644 --- a/tempest/lib/services/compute/images_client.py +++ b/tempest/lib/services/compute/images_client.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.api_schema.response.compute.v2_1 import images as schema from tempest.lib.api_schema.response.compute.v2_45 import images as schemav245 diff --git a/tempest/lib/services/compute/keypairs_client.py b/tempest/lib/services/compute/keypairs_client.py index 47cf2d09ea..9d7b7fcf00 100644 --- a/tempest/lib/services/compute/keypairs_client.py +++ b/tempest/lib/services/compute/keypairs_client.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.api_schema.response.compute.v2_1 import keypairs as schemav21 from tempest.lib.api_schema.response.compute.v2_2 import keypairs as schemav22 diff --git a/tempest/lib/services/compute/migrations_client.py b/tempest/lib/services/compute/migrations_client.py index 812dc966e7..8a6e62a131 100644 --- a/tempest/lib/services/compute/migrations_client.py +++ b/tempest/lib/services/compute/migrations_client.py @@ -12,8 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.api_schema.response.compute.v2_1 import migrations as schema from tempest.lib.api_schema.response.compute.v2_23 import migrations \ diff --git a/tempest/lib/services/compute/quotas_client.py b/tempest/lib/services/compute/quotas_client.py index 12e865e8e9..dd796aa06f 100644 --- a/tempest/lib/services/compute/quotas_client.py +++ b/tempest/lib/services/compute/quotas_client.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.api_schema.response.compute.v2_1 import quotas as schema from tempest.lib.api_schema.response.compute.v2_36 import quotas as schemav236 diff --git a/tempest/lib/services/compute/security_groups_client.py b/tempest/lib/services/compute/security_groups_client.py index 9493144ce2..0bba990c74 100644 --- a/tempest/lib/services/compute/security_groups_client.py +++ b/tempest/lib/services/compute/security_groups_client.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.api_schema.response.compute.v2_1 import \ security_groups as schema diff --git a/tempest/lib/services/compute/servers_client.py b/tempest/lib/services/compute/servers_client.py index e82b58f2f2..c36f80ab19 100644 --- a/tempest/lib/services/compute/servers_client.py +++ b/tempest/lib/services/compute/servers_client.py @@ -16,9 +16,9 @@ # under the License. import copy +from urllib import parse as urllib from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.api_schema.response.compute.v2_1 import \ security_groups as security_groups_schema diff --git a/tempest/lib/services/compute/services_client.py b/tempest/lib/services/compute/services_client.py index 4e3383fcd0..7d9f3e26f4 100644 --- a/tempest/lib/services/compute/services_client.py +++ b/tempest/lib/services/compute/services_client.py @@ -14,8 +14,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.api_schema.response.compute.v2_1 import services as schema from tempest.lib.api_schema.response.compute.v2_11 import services \ diff --git a/tempest/lib/services/compute/snapshots_client.py b/tempest/lib/services/compute/snapshots_client.py index 225eb8d8d5..2e6f7cff6d 100644 --- a/tempest/lib/services/compute/snapshots_client.py +++ b/tempest/lib/services/compute/snapshots_client.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.api_schema.response.compute.v2_1 import snapshots as schema from tempest.lib.common import rest_client diff --git a/tempest/lib/services/compute/tenant_usages_client.py b/tempest/lib/services/compute/tenant_usages_client.py index a34730c1e8..b47d91750c 100644 --- a/tempest/lib/services/compute/tenant_usages_client.py +++ b/tempest/lib/services/compute/tenant_usages_client.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.api_schema.response.compute.v2_1 import tenant_usages from tempest.lib.common import rest_client diff --git a/tempest/lib/services/compute/volumes_client.py b/tempest/lib/services/compute/volumes_client.py index 11282ee9ed..52172ed5c8 100644 --- a/tempest/lib/services/compute/volumes_client.py +++ b/tempest/lib/services/compute/volumes_client.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.api_schema.response.compute.v2_1 import volumes as schema from tempest.lib.common import rest_client diff --git a/tempest/lib/services/identity/v2/identity_client.py b/tempest/lib/services/identity/v2/identity_client.py index d7526f3f63..6239ba64f0 100644 --- a/tempest/lib/services/identity/v2/identity_client.py +++ b/tempest/lib/services/identity/v2/identity_client.py @@ -10,8 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.common import rest_client diff --git a/tempest/lib/services/identity/v2/roles_client.py b/tempest/lib/services/identity/v2/roles_client.py index a133fc3674..1580c33672 100644 --- a/tempest/lib/services/identity/v2/roles_client.py +++ b/tempest/lib/services/identity/v2/roles_client.py @@ -10,8 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.common import rest_client diff --git a/tempest/lib/services/identity/v2/services_client.py b/tempest/lib/services/identity/v2/services_client.py index fc51cb46e3..2a0e5ca421 100644 --- a/tempest/lib/services/identity/v2/services_client.py +++ b/tempest/lib/services/identity/v2/services_client.py @@ -12,8 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.common import rest_client diff --git a/tempest/lib/services/identity/v2/tenants_client.py b/tempest/lib/services/identity/v2/tenants_client.py index 09618adfdc..3435835f74 100644 --- a/tempest/lib/services/identity/v2/tenants_client.py +++ b/tempest/lib/services/identity/v2/tenants_client.py @@ -12,8 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.common import rest_client diff --git a/tempest/lib/services/identity/v2/users_client.py b/tempest/lib/services/identity/v2/users_client.py index 72f29bed53..c3217c928d 100644 --- a/tempest/lib/services/identity/v2/users_client.py +++ b/tempest/lib/services/identity/v2/users_client.py @@ -10,8 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.common import rest_client diff --git a/tempest/lib/services/identity/v3/access_rules_client.py b/tempest/lib/services/identity/v3/access_rules_client.py index 4f13e479cc..c3be5df7eb 100644 --- a/tempest/lib/services/identity/v3/access_rules_client.py +++ b/tempest/lib/services/identity/v3/access_rules_client.py @@ -18,8 +18,9 @@ https://docs.openstack.org/api-ref/identity/v3/index.html#application-credentials """ +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.common import rest_client diff --git a/tempest/lib/services/identity/v3/application_credentials_client.py b/tempest/lib/services/identity/v3/application_credentials_client.py index be2e17203a..e7f3ac2b13 100644 --- a/tempest/lib/services/identity/v3/application_credentials_client.py +++ b/tempest/lib/services/identity/v3/application_credentials_client.py @@ -18,8 +18,9 @@ https://docs.openstack.org/api-ref/identity/v3/index.html#application-credentials """ +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.common import rest_client diff --git a/tempest/lib/services/identity/v3/credentials_client.py b/tempest/lib/services/identity/v3/credentials_client.py index 3f4b40e7f6..27f61565c9 100644 --- a/tempest/lib/services/identity/v3/credentials_client.py +++ b/tempest/lib/services/identity/v3/credentials_client.py @@ -17,8 +17,9 @@ https://docs.openstack.org/api-ref/identity/v3/index.html#credentials """ +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.common import rest_client diff --git a/tempest/lib/services/identity/v3/domains_client.py b/tempest/lib/services/identity/v3/domains_client.py index bd32cfc8e7..c1d1980183 100644 --- a/tempest/lib/services/identity/v3/domains_client.py +++ b/tempest/lib/services/identity/v3/domains_client.py @@ -12,8 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.common import rest_client diff --git a/tempest/lib/services/identity/v3/endpoints_client.py b/tempest/lib/services/identity/v3/endpoints_client.py index 236b34c7f6..de8538892f 100644 --- a/tempest/lib/services/identity/v3/endpoints_client.py +++ b/tempest/lib/services/identity/v3/endpoints_client.py @@ -17,8 +17,9 @@ https://docs.openstack.org/api-ref/identity/v3/index.html#service-catalog-and-endpoints """ +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.common import rest_client diff --git a/tempest/lib/services/identity/v3/groups_client.py b/tempest/lib/services/identity/v3/groups_client.py index 2cfb24a032..6f82067357 100644 --- a/tempest/lib/services/identity/v3/groups_client.py +++ b/tempest/lib/services/identity/v3/groups_client.py @@ -17,8 +17,9 @@ https://docs.openstack.org/api-ref/identity/v3/index.html#groups """ +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.common import rest_client diff --git a/tempest/lib/services/identity/v3/oauth_token_client.py b/tempest/lib/services/identity/v3/oauth_token_client.py index 722decad86..33360941ad 100644 --- a/tempest/lib/services/identity/v3/oauth_token_client.py +++ b/tempest/lib/services/identity/v3/oauth_token_client.py @@ -18,9 +18,9 @@ import hashlib import hmac import random import time +from urllib import parse as urlparse import six -from six.moves.urllib import parse as urlparse from oslo_serialization import jsonutils as json diff --git a/tempest/lib/services/identity/v3/projects_client.py b/tempest/lib/services/identity/v3/projects_client.py index b186fba322..fffbe7a3fd 100644 --- a/tempest/lib/services/identity/v3/projects_client.py +++ b/tempest/lib/services/identity/v3/projects_client.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.common import rest_client diff --git a/tempest/lib/services/identity/v3/regions_client.py b/tempest/lib/services/identity/v3/regions_client.py index a598c9c295..3aed5b8caa 100644 --- a/tempest/lib/services/identity/v3/regions_client.py +++ b/tempest/lib/services/identity/v3/regions_client.py @@ -17,8 +17,9 @@ https://docs.openstack.org/api-ref/identity/v3/index.html#regions """ +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.common import rest_client diff --git a/tempest/lib/services/identity/v3/role_assignments_client.py b/tempest/lib/services/identity/v3/role_assignments_client.py index 51ee8f6697..f6157097a0 100644 --- a/tempest/lib/services/identity/v3/role_assignments_client.py +++ b/tempest/lib/services/identity/v3/role_assignments_client.py @@ -12,8 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.common import rest_client diff --git a/tempest/lib/services/identity/v3/roles_client.py b/tempest/lib/services/identity/v3/roles_client.py index 0d7593aa75..62120f228a 100644 --- a/tempest/lib/services/identity/v3/roles_client.py +++ b/tempest/lib/services/identity/v3/roles_client.py @@ -12,8 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.common import rest_client diff --git a/tempest/lib/services/identity/v3/services_client.py b/tempest/lib/services/identity/v3/services_client.py index eb961a5c60..994df2f522 100644 --- a/tempest/lib/services/identity/v3/services_client.py +++ b/tempest/lib/services/identity/v3/services_client.py @@ -17,8 +17,9 @@ https://docs.openstack.org/api-ref/identity/v3/index.html#service-catalog-and-endpoints """ +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.common import rest_client diff --git a/tempest/lib/services/identity/v3/trusts_client.py b/tempest/lib/services/identity/v3/trusts_client.py index f1cc806eca..48a7956867 100644 --- a/tempest/lib/services/identity/v3/trusts_client.py +++ b/tempest/lib/services/identity/v3/trusts_client.py @@ -12,8 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.common import rest_client diff --git a/tempest/lib/services/identity/v3/users_client.py b/tempest/lib/services/identity/v3/users_client.py index bba02a494f..771ffea6de 100644 --- a/tempest/lib/services/identity/v3/users_client.py +++ b/tempest/lib/services/identity/v3/users_client.py @@ -12,8 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.common import rest_client diff --git a/tempest/lib/services/image/v1/images_client.py b/tempest/lib/services/image/v1/images_client.py index 0e76a63d43..c9a4a94038 100644 --- a/tempest/lib/services/image/v1/images_client.py +++ b/tempest/lib/services/image/v1/images_client.py @@ -14,9 +14,9 @@ # under the License. import functools +from urllib import parse as urllib from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.common import rest_client from tempest.lib import exceptions as lib_exc diff --git a/tempest/lib/services/image/v2/images_client.py b/tempest/lib/services/image/v2/images_client.py index 4713cce2f7..fa3bb8c5f5 100644 --- a/tempest/lib/services/image/v2/images_client.py +++ b/tempest/lib/services/image/v2/images_client.py @@ -14,9 +14,9 @@ # under the License. import functools +from urllib import parse as urllib from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.common import rest_client from tempest.lib import exceptions as lib_exc diff --git a/tempest/lib/services/image/v2/namespace_objects_client.py b/tempest/lib/services/image/v2/namespace_objects_client.py index 0cae8169b5..32f5a2cef1 100644 --- a/tempest/lib/services/image/v2/namespace_objects_client.py +++ b/tempest/lib/services/image/v2/namespace_objects_client.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.common import rest_client diff --git a/tempest/lib/services/image/v2/namespace_tags_client.py b/tempest/lib/services/image/v2/namespace_tags_client.py index 4315f167a3..5bca229ffc 100644 --- a/tempest/lib/services/image/v2/namespace_tags_client.py +++ b/tempest/lib/services/image/v2/namespace_tags_client.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.common import rest_client diff --git a/tempest/lib/services/network/base.py b/tempest/lib/services/network/base.py index fe8b244eae..ee87dd435f 100644 --- a/tempest/lib/services/network/base.py +++ b/tempest/lib/services/network/base.py @@ -10,8 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.common import rest_client diff --git a/tempest/lib/services/object_storage/account_client.py b/tempest/lib/services/object_storage/account_client.py index 8c15a888c5..52b253423b 100644 --- a/tempest/lib/services/object_storage/account_client.py +++ b/tempest/lib/services/object_storage/account_client.py @@ -13,10 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib from xml.etree import ElementTree as etree from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.common import rest_client diff --git a/tempest/lib/services/object_storage/container_client.py b/tempest/lib/services/object_storage/container_client.py index 027fb1f46a..8472a9771a 100644 --- a/tempest/lib/services/object_storage/container_client.py +++ b/tempest/lib/services/object_storage/container_client.py @@ -13,11 +13,11 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib from xml.etree import ElementTree as etree import debtcollector.moves from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.common import rest_client diff --git a/tempest/lib/services/object_storage/object_client.py b/tempest/lib/services/object_storage/object_client.py index 383aff6a79..b8863117eb 100644 --- a/tempest/lib/services/object_storage/object_client.py +++ b/tempest/lib/services/object_storage/object_client.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from six.moves import http_client as httplib -from six.moves.urllib import parse as urlparse +from http import client as httplib +from urllib import parse as urlparse from tempest.lib.common import rest_client from tempest.lib import exceptions diff --git a/tempest/lib/services/placement/placement_client.py b/tempest/lib/services/placement/placement_client.py index b8e91b8e44..216ac08c25 100644 --- a/tempest/lib/services/placement/placement_client.py +++ b/tempest/lib/services/placement/placement_client.py @@ -12,8 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.common import rest_client from tempest.lib.services.placement import base_placement_client diff --git a/tempest/lib/services/placement/resource_providers_client.py b/tempest/lib/services/placement/resource_providers_client.py index 56f6409002..fcd220f7d2 100644 --- a/tempest/lib/services/placement/resource_providers_client.py +++ b/tempest/lib/services/placement/resource_providers_client.py @@ -10,8 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.common import rest_client from tempest.lib.services.placement import base_placement_client diff --git a/tempest/lib/services/volume/v1/hosts_client.py b/tempest/lib/services/volume/v1/hosts_client.py index f3446780d4..2e94274229 100644 --- a/tempest/lib/services/volume/v1/hosts_client.py +++ b/tempest/lib/services/volume/v1/hosts_client.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.common import rest_client diff --git a/tempest/lib/services/volume/v1/quotas_client.py b/tempest/lib/services/volume/v1/quotas_client.py index 7f191ca765..d7c96987dd 100644 --- a/tempest/lib/services/volume/v1/quotas_client.py +++ b/tempest/lib/services/volume/v1/quotas_client.py @@ -12,8 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils -from six.moves.urllib import parse as urllib from tempest.lib.common import rest_client diff --git a/tempest/lib/services/volume/v1/services_client.py b/tempest/lib/services/volume/v1/services_client.py index d438a34ecb..957a0e6347 100644 --- a/tempest/lib/services/volume/v1/services_client.py +++ b/tempest/lib/services/volume/v1/services_client.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.common import rest_client diff --git a/tempest/lib/services/volume/v1/snapshots_client.py b/tempest/lib/services/volume/v1/snapshots_client.py index 7dfdcf276d..a478686e19 100644 --- a/tempest/lib/services/volume/v1/snapshots_client.py +++ b/tempest/lib/services/volume/v1/snapshots_client.py @@ -10,8 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.common import rest_client from tempest.lib import exceptions as lib_exc diff --git a/tempest/lib/services/volume/v1/types_client.py b/tempest/lib/services/volume/v1/types_client.py index d434e654d0..6237fb45a1 100644 --- a/tempest/lib/services/volume/v1/types_client.py +++ b/tempest/lib/services/volume/v1/types_client.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.common import rest_client from tempest.lib import exceptions as lib_exc diff --git a/tempest/lib/services/volume/v1/volumes_client.py b/tempest/lib/services/volume/v1/volumes_client.py index 2efb0da741..9fca800a50 100644 --- a/tempest/lib/services/volume/v1/volumes_client.py +++ b/tempest/lib/services/volume/v1/volumes_client.py @@ -13,9 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json import six -from six.moves.urllib import parse as urllib from tempest.lib.common import rest_client from tempest.lib import exceptions as lib_exc diff --git a/tempest/lib/services/volume/v3/backups_client.py b/tempest/lib/services/volume/v3/backups_client.py index 1df45fa206..4bf7ffb646 100644 --- a/tempest/lib/services/volume/v3/backups_client.py +++ b/tempest/lib/services/volume/v3/backups_client.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.api_schema.response.volume import backups as schema from tempest.lib.common import rest_client diff --git a/tempest/lib/services/volume/v3/group_snapshots_client.py b/tempest/lib/services/volume/v3/group_snapshots_client.py index 4051c06570..0f36fc9702 100644 --- a/tempest/lib/services/volume/v3/group_snapshots_client.py +++ b/tempest/lib/services/volume/v3/group_snapshots_client.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.api_schema.response.volume import group_snapshots as schema from tempest.lib.common import rest_client diff --git a/tempest/lib/services/volume/v3/group_types_client.py b/tempest/lib/services/volume/v3/group_types_client.py index 1dcd508ee9..9de36f41b1 100644 --- a/tempest/lib/services/volume/v3/group_types_client.py +++ b/tempest/lib/services/volume/v3/group_types_client.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.api_schema.response.volume import group_types as schema from tempest.lib.common import rest_client diff --git a/tempest/lib/services/volume/v3/groups_client.py b/tempest/lib/services/volume/v3/groups_client.py index 3d8523d460..d1500cf511 100644 --- a/tempest/lib/services/volume/v3/groups_client.py +++ b/tempest/lib/services/volume/v3/groups_client.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.api_schema.response.volume import groups as schema from tempest.lib.common import rest_client diff --git a/tempest/lib/services/volume/v3/hosts_client.py b/tempest/lib/services/volume/v3/hosts_client.py index 019a85283a..9c64659775 100644 --- a/tempest/lib/services/volume/v3/hosts_client.py +++ b/tempest/lib/services/volume/v3/hosts_client.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.api_schema.response.volume import hosts as schema from tempest.lib.common import rest_client diff --git a/tempest/lib/services/volume/v3/quotas_client.py b/tempest/lib/services/volume/v3/quotas_client.py index 5b1a52c23e..3f4c4e1c6f 100644 --- a/tempest/lib/services/volume/v3/quotas_client.py +++ b/tempest/lib/services/volume/v3/quotas_client.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils -from six.moves.urllib import parse as urllib from tempest.lib.api_schema.response.volume import quotas as schema from tempest.lib.common import rest_client diff --git a/tempest/lib/services/volume/v3/services_client.py b/tempest/lib/services/volume/v3/services_client.py index 8bc82c9b2c..4672da8c8c 100644 --- a/tempest/lib/services/volume/v3/services_client.py +++ b/tempest/lib/services/volume/v3/services_client.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.api_schema.response.volume import services as schema from tempest.lib.common import rest_client diff --git a/tempest/lib/services/volume/v3/snapshots_client.py b/tempest/lib/services/volume/v3/snapshots_client.py index 8ca2044d20..ae31ee9d7c 100644 --- a/tempest/lib/services/volume/v3/snapshots_client.py +++ b/tempest/lib/services/volume/v3/snapshots_client.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.api_schema.response.volume import snapshots as schema from tempest.lib.common import rest_client diff --git a/tempest/lib/services/volume/v3/transfers_client.py b/tempest/lib/services/volume/v3/transfers_client.py index f572f95c24..36198c30e1 100644 --- a/tempest/lib/services/volume/v3/transfers_client.py +++ b/tempest/lib/services/volume/v3/transfers_client.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.api_schema.response.volume import transfers as schema from tempest.lib.common import rest_client diff --git a/tempest/lib/services/volume/v3/types_client.py b/tempest/lib/services/volume/v3/types_client.py index 1ebd447e47..9858d877da 100644 --- a/tempest/lib/services/volume/v3/types_client.py +++ b/tempest/lib/services/volume/v3/types_client.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest.lib.api_schema.response.volume import volume_types as schema from tempest.lib.common import rest_client diff --git a/tempest/lib/services/volume/v3/versions_client.py b/tempest/lib/services/volume/v3/versions_client.py index 4ac411241d..0bed827356 100644 --- a/tempest/lib/services/volume/v3/versions_client.py +++ b/tempest/lib/services/volume/v3/versions_client.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from six.moves.urllib.parse import urljoin +from urllib.parse import urljoin from oslo_serialization import jsonutils as json diff --git a/tempest/lib/services/volume/v3/volumes_client.py b/tempest/lib/services/volume/v3/volumes_client.py index b8535d8127..147a79b224 100644 --- a/tempest/lib/services/volume/v3/volumes_client.py +++ b/tempest/lib/services/volume/v3/volumes_client.py @@ -13,9 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. +from urllib import parse as urllib + from oslo_serialization import jsonutils as json import six -from six.moves.urllib import parse as urllib from tempest.lib.api_schema.response.volume import volumes as schema from tempest.lib.common import rest_client diff --git a/tempest/services/orchestration/json/orchestration_client.py b/tempest/services/orchestration/json/orchestration_client.py index 9fec5482bc..0d7720edba 100644 --- a/tempest/services/orchestration/json/orchestration_client.py +++ b/tempest/services/orchestration/json/orchestration_client.py @@ -15,9 +15,9 @@ import re import time +from urllib import parse as urllib from oslo_serialization import jsonutils as json -from six.moves.urllib import parse as urllib from tempest import exceptions from tempest.lib.common import rest_client diff --git a/tempest/tests/common/test_compute.py b/tempest/tests/common/test_compute.py index 45a439ce99..142bb081e9 100644 --- a/tempest/tests/common/test_compute.py +++ b/tempest/tests/common/test_compute.py @@ -15,7 +15,7 @@ from unittest import mock -from six.moves.urllib import parse as urlparse +from urllib import parse as urlparse from tempest.common import compute diff --git a/tools/check_logs.py b/tools/check_logs.py index de7e41d958..e2a5e30dd3 100755 --- a/tools/check_logs.py +++ b/tools/check_logs.py @@ -20,9 +20,9 @@ import gzip import os import re import sys +import urllib.request as urlreq import six -import six.moves.urllib.request as urlreq import yaml # DEVSTACK_GATE_GRENADE is either unset if grenade is not running