Remove usage of six

Remove six-library Replace the following items with Python 3 style code.
- six.moves

Change-Id: Ied212eb0947c7441cc51193399185b4fb0f87271
changes/38/769238/2
songwenping 2 years ago
parent fec2c93cdc
commit 99d6e00982
  1. 3
      tempest/api/compute/admin/test_instance_usage_audit_log.py
  2. 3
      tempest/api/compute/admin/test_instance_usage_audit_log_negative.py
  3. 2
      tempest/api/compute/servers/test_novnc.py
  4. 3
      tempest/api/compute/servers/test_server_actions.py
  5. 2
      tempest/api/object_storage/test_container_sync.py
  6. 3
      tempest/api/object_storage/test_object_formpost.py
  7. 3
      tempest/api/object_storage/test_object_formpost_negative.py
  8. 3
      tempest/api/object_storage/test_object_temp_url.py
  9. 3
      tempest/api/object_storage/test_object_temp_url_negative.py
  10. 2
      tempest/api/volume/test_volumes_list.py
  11. 3
      tempest/cmd/cleanup_service.py
  12. 4
      tempest/cmd/init.py
  13. 3
      tempest/common/compute.py
  14. 2
      tempest/lib/auth.py
  15. 2
      tempest/lib/cmd/check_uuid.py
  16. 2
      tempest/lib/common/rest_client.py
  17. 3
      tempest/lib/services/compute/agents_client.py
  18. 3
      tempest/lib/services/compute/baremetal_nodes_client.py
  19. 3
      tempest/lib/services/compute/flavors_client.py
  20. 3
      tempest/lib/services/compute/floating_ip_pools_client.py
  21. 3
      tempest/lib/services/compute/floating_ips_client.py
  22. 3
      tempest/lib/services/compute/hosts_client.py
  23. 3
      tempest/lib/services/compute/images_client.py
  24. 3
      tempest/lib/services/compute/keypairs_client.py
  25. 3
      tempest/lib/services/compute/migrations_client.py
  26. 3
      tempest/lib/services/compute/quotas_client.py
  27. 3
      tempest/lib/services/compute/security_groups_client.py
  28. 2
      tempest/lib/services/compute/servers_client.py
  29. 3
      tempest/lib/services/compute/services_client.py
  30. 3
      tempest/lib/services/compute/snapshots_client.py
  31. 3
      tempest/lib/services/compute/tenant_usages_client.py
  32. 3
      tempest/lib/services/compute/volumes_client.py
  33. 3
      tempest/lib/services/identity/v2/identity_client.py
  34. 3
      tempest/lib/services/identity/v2/roles_client.py
  35. 3
      tempest/lib/services/identity/v2/services_client.py
  36. 3
      tempest/lib/services/identity/v2/tenants_client.py
  37. 3
      tempest/lib/services/identity/v2/users_client.py
  38. 3
      tempest/lib/services/identity/v3/access_rules_client.py
  39. 3
      tempest/lib/services/identity/v3/application_credentials_client.py
  40. 3
      tempest/lib/services/identity/v3/credentials_client.py
  41. 3
      tempest/lib/services/identity/v3/domains_client.py
  42. 3
      tempest/lib/services/identity/v3/endpoints_client.py
  43. 3
      tempest/lib/services/identity/v3/groups_client.py
  44. 2
      tempest/lib/services/identity/v3/oauth_token_client.py
  45. 3
      tempest/lib/services/identity/v3/projects_client.py
  46. 3
      tempest/lib/services/identity/v3/regions_client.py
  47. 3
      tempest/lib/services/identity/v3/role_assignments_client.py
  48. 3
      tempest/lib/services/identity/v3/roles_client.py
  49. 3
      tempest/lib/services/identity/v3/services_client.py
  50. 3
      tempest/lib/services/identity/v3/trusts_client.py
  51. 3
      tempest/lib/services/identity/v3/users_client.py
  52. 2
      tempest/lib/services/image/v1/images_client.py
  53. 2
      tempest/lib/services/image/v2/images_client.py
  54. 3
      tempest/lib/services/image/v2/namespace_objects_client.py
  55. 3
      tempest/lib/services/image/v2/namespace_tags_client.py
  56. 3
      tempest/lib/services/network/base.py
  57. 2
      tempest/lib/services/object_storage/account_client.py
  58. 2
      tempest/lib/services/object_storage/container_client.py
  59. 4
      tempest/lib/services/object_storage/object_client.py
  60. 3
      tempest/lib/services/placement/placement_client.py
  61. 3
      tempest/lib/services/placement/resource_providers_client.py
  62. 3
      tempest/lib/services/volume/v1/hosts_client.py
  63. 3
      tempest/lib/services/volume/v1/quotas_client.py
  64. 3
      tempest/lib/services/volume/v1/services_client.py
  65. 3
      tempest/lib/services/volume/v1/snapshots_client.py
  66. 3
      tempest/lib/services/volume/v1/types_client.py
  67. 3
      tempest/lib/services/volume/v1/volumes_client.py
  68. 3
      tempest/lib/services/volume/v3/backups_client.py
  69. 3
      tempest/lib/services/volume/v3/group_snapshots_client.py
  70. 3
      tempest/lib/services/volume/v3/group_types_client.py
  71. 3
      tempest/lib/services/volume/v3/groups_client.py
  72. 3
      tempest/lib/services/volume/v3/hosts_client.py
  73. 3
      tempest/lib/services/volume/v3/quotas_client.py
  74. 3
      tempest/lib/services/volume/v3/services_client.py
  75. 3
      tempest/lib/services/volume/v3/snapshots_client.py
  76. 3
      tempest/lib/services/volume/v3/transfers_client.py
  77. 3
      tempest/lib/services/volume/v3/types_client.py
  78. 2
      tempest/lib/services/volume/v3/versions_client.py
  79. 3
      tempest/lib/services/volume/v3/volumes_client.py
  80. 2
      tempest/services/orchestration/json/orchestration_client.py
  81. 2
      tempest/tests/common/test_compute.py
  82. 2
      tools/check_logs.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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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):

@ -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

@ -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

@ -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'

@ -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

@ -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

@ -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

@ -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 \

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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 \

@ -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

@ -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

@ -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

@ -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 \

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -20,9 +20,9 @@ import gzip
import os
<