openstack
/
openstacksdk
Code Issues Proposed changes

Bump black to 23.3.0 

I was using the distro-provided version of black, 22.8.0, during the
blackify series. There's a newer version out however, 23.3.0. Bump this,
applying the various changes it introduces in the process.

Change-Id: I3442a7ddaf0cb35f37b84bdbe06625a28e982dba
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
This commit is contained in:
Stephen Finucane 2023-05-05 12:44:02 +01:00
parent c946294bdd
commit c7010a2f92
166 changed files with 17 additions and 248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.pre-commit-config.yaml
View File

@ -22,7 +22,7 @@ repos:
hooks:
- id: doc8
- repo: https://github.com/psf/black
rev: 22.8.0
rev: 23.3.0
hooks:
- id: black
args: ['-S', '-l', '79']

1
examples/image/download.py
View File

@ -38,7 +38,6 @@ def download_image_stream(conn):
# Read only 1024 bytes of memory at a time until
# all of the image data has been consumed.
for chunk in response.iter_content(chunk_size=1024):
# With each chunk, add it to the hash to be computed.
md5.update(chunk)

1
openstack/_services_mixin.py
View File

@ -26,7 +26,6 @@ from openstack.workflow import workflow_service
class ServicesMixin:
identity = identity_service.IdentityService(service_type='identity')
compute = compute_service.ComputeService(service_type='compute')

1
openstack/baremetal/v1/_proxy.py
View File

@ -27,7 +27,6 @@ from openstack import utils
class Proxy(proxy.Proxy):
retriable_status_codes = _common.RETRIABLE_STATUS_CODES
_resource_registry = {

1
openstack/baremetal/v1/allocation.py
View File

@ -17,7 +17,6 @@ from openstack import utils
class Allocation(_common.ListMixin, resource.Resource):
resources_key = 'allocations'
base_path = '/allocations'

1
openstack/baremetal/v1/chassis.py
View File

@ -15,7 +15,6 @@ from openstack import resource
class Chassis(_common.ListMixin, resource.Resource):
resources_key = 'chassis'
base_path = '/chassis'

1
openstack/baremetal/v1/conductor.py
View File

@ -15,7 +15,6 @@ from openstack import resource
class Conductor(_common.ListMixin, resource.Resource):
resources_key = 'conductors'
base_path = '/conductors'

1
openstack/baremetal/v1/deploy_templates.py
View File

@ -15,7 +15,6 @@ from openstack import resource
class DeployTemplate(_common.ListMixin, resource.Resource):
resources_key = 'deploy_templates'
base_path = '/deploy_templates'

1
openstack/baremetal/v1/driver.py
View File

@ -17,7 +17,6 @@ from openstack import utils
class Driver(resource.Resource):
resources_key = 'drivers'
base_path = '/drivers'

2
openstack/baremetal/v1/node.py
View File

@ -71,7 +71,6 @@ class WaitResult(
class Node(_common.ListMixin, resource.Resource):
resources_key = 'nodes'
base_path = '/nodes'
@ -1323,7 +1322,6 @@ class Node(_common.ListMixin, resource.Resource):
base_path=None,
reset_interfaces=None,
):
if reset_interfaces is not None:
# The id cannot be dirty for an commit
self._body._dirty.discard("id")

1
openstack/baremetal/v1/port.py
View File

@ -15,7 +15,6 @@ from openstack import resource
class Port(_common.ListMixin, resource.Resource):
resources_key = 'ports'
base_path = '/ports'

1
openstack/baremetal/v1/port_group.py
View File

@ -15,7 +15,6 @@ from openstack import resource
class PortGroup(_common.ListMixin, resource.Resource):
resources_key = 'portgroups'
base_path = '/portgroups'

1
openstack/baremetal/v1/volume_connector.py
View File

@ -15,7 +15,6 @@ from openstack import resource
class VolumeConnector(_common.ListMixin, resource.Resource):
resources_key = 'connectors'
base_path = '/volume/connectors'

1
openstack/baremetal/v1/volume_target.py
View File

@ -15,7 +15,6 @@ from openstack import resource
class VolumeTarget(_common.ListMixin, resource.Resource):
resources_key = 'targets'
base_path = '/volume/targets'

1
openstack/baremetal_introspection/v1/introspection.py
View File

@ -21,7 +21,6 @@ _logger = _log.setup_logging('openstack')
class Introspection(resource.Resource):
resources_key = 'introspection'
base_path = '/introspection'

1
openstack/block_storage/v2/_proxy.py
View File

@ -22,7 +22,6 @@ from openstack import resource
class Proxy(_base_proxy.BaseBlockStorageProxy):
# ====== SNAPSHOTS ======
def get_snapshot(self, snapshot):
"""Get a single snapshot

1
openstack/block_storage/v2/quota_set.py
View File

@ -14,7 +14,6 @@ from openstack import resource
class QuotaSet(quota_set.QuotaSet):
#: Properties
#: The size (GB) of backups that are allowed for each project.
backup_gigabytes = resource.Body('backup_gigabytes', type=int)

1
openstack/block_storage/v3/quota_set.py
View File

@ -14,7 +14,6 @@ from openstack import resource
class QuotaSet(quota_set.QuotaSet):
#: Properties
#: The size (GB) of backups that are allowed for each project.
backup_gigabytes = resource.Body('backup_gigabytes', type=int)

1
openstack/cloud/_block_storage.py
View File

@ -294,7 +294,6 @@ class BlockStorageCloudMixin:
project_id = None
error_msg = "Failed to get limits"
if name_or_id:
proj = self.get_project(name_or_id)
if not proj:
raise exc.OpenStackCloudException("project does not exist")

4
openstack/cloud/_compute.py
View File

@ -432,7 +432,6 @@ class ComputeCloudMixin:
params = {}
project_id = None
if name_or_id:
proj = self.get_project(name_or_id)
if not proj:
raise exc.OpenStackCloudException("project does not exist")
@ -874,7 +873,7 @@ class ComputeCloudMixin:
user_data = kwargs.pop('userdata')
if user_data:
kwargs['user_data'] = self._encode_server_userdata(user_data)
for (desired, given) in (
for desired, given in (
('OS-DCF:diskConfig', 'disk_config'),
('config_drive', 'config_drive'),
('key_name', 'key_name'),
@ -1092,7 +1091,6 @@ class ComputeCloudMixin:
kwargs['block_device_mapping_v2'].append(block_mapping)
kwargs['imageRef'] = ''
elif boot_from_volume:
if isinstance(image, dict):
image_obj = image
else:

3
openstack/cloud/_floating_ip.py
View File

@ -495,7 +495,6 @@ class FloatingIPCloudMixin:
timeout=60,
network_id=None,
):
if not network_id:
if network_name_or_id:
try:
@ -796,7 +795,6 @@ class FloatingIPCloudMixin:
def _neutron_attach_ip_to_server(
self, server, floating_ip, fixed_address=None, nat_destination=None
):
# Find an available port
(port, fixed_address) = self._nat_destination_port(
server,
@ -884,7 +882,6 @@ class FloatingIPCloudMixin:
return True
def _nova_detach_ip_from_server(self, server_id, floating_ip_id):
f_ip = self.get_floating_ip(id=floating_ip_id)
if f_ip is None:
raise exc.OpenStackCloudException(

1
openstack/cloud/_identity.py
View File

@ -454,7 +454,6 @@ class IdentityCloudMixin:
'name', 'enabled', 'type', 'service_type', 'description'
)
def update_service(self, name_or_id, **kwargs):
# NOTE(SamYaple): Keystone v3 only accepts 'type' but shade accepts
# both 'type' and 'service_type' with a preference
# towards 'type'

1
openstack/cloud/_network_common.py
View File

@ -90,7 +90,6 @@ class NetworkCommonCloudMixin:
return
for network in all_networks:
# External IPv4 networks
if (
network['name'] in self._external_ipv4_names

2
openstack/cloud/_security_group.py
View File

@ -465,7 +465,6 @@ class SecurityGroupCloudMixin:
# TODO(stephenfin): Remove this once we get rid of support for nova
# secgroups
def _normalize_secgroup(self, group):
ret = utils.Munch()
# Copy incoming group because of shared dicts in unittests
group = group.copy()
@ -518,7 +517,6 @@ class SecurityGroupCloudMixin:
# TODO(stephenfin): Remove this once we get rid of support for nova
# secgroups
def _normalize_secgroup_rule(self, rule):
ret = utils.Munch()
# Copy incoming rule because of shared dicts in unittests
rule = rule.copy()

1
openstack/cloud/inventory.py
View File

@ -23,7 +23,6 @@ __all__ = ['OpenStackInventory']
class OpenStackInventory:
# Put this here so the capability can be detected with hasattr on the class
extra_config = None

2
openstack/cloud/meta.py
View File

@ -27,7 +27,7 @@ def find_nova_interfaces(
addresses, ext_tag=None, key_name=None, version=4, mac_addr=None
):
ret = []
for (k, v) in iter(addresses.items()):
for k, v in iter(addresses.items()):
if key_name is not None and k != key_name:
# key_name is specified and it doesn't match the current network.
# Continue with the next one

1
openstack/cloud/openstackcloud.py
View File

@ -75,7 +75,6 @@ class _OpenStackCloudMixin:
_SHADE_OBJECT_AUTOCREATE_KEY = 'x-object-meta-x-shade-autocreated'
def __init__(self):
super(_OpenStackCloudMixin, self).__init__()
self.log = _log.setup_logging('openstack')

1
openstack/common/metadata.py
View File

@ -15,7 +15,6 @@ from openstack import utils
class MetadataMixin:
#: *Type: list of tag strings*
metadata = resource.Body('metadata', type=dict)

1
openstack/common/tag.py
View File

@ -15,7 +15,6 @@ from openstack import utils
class TagMixin:
_tag_query_parameters = {
'tags': 'tags',
'any_tags': 'tags-any',

2
openstack/compute/v2/limits.py
View File

@ -14,7 +14,6 @@ from openstack import resource
class AbsoluteLimits(resource.Resource):
_max_microversion = '2.57'
#: The number of key-value pairs that can be set as image metadata.
@ -74,7 +73,6 @@ class AbsoluteLimits(resource.Resource):
class RateLimit(resource.Resource):
# TODO(mordred) Make a resource type for the contents of limit and add
# it to list_type here.
#: A list of the specific limits that apply to the ``regex`` and ``uri``.

1
openstack/compute/v2/server_action.py
View File

@ -14,7 +14,6 @@ from openstack import resource
class ServerActionEvent(resource.Resource):
# Added the 'details' field in 2.84
_max_microversion = '2.84'

1
openstack/compute/v2/server_ip.py
View File

@ -41,7 +41,6 @@ class ServerIP(resource.Resource):
base_path=None,
**params
):
if base_path is None:
base_path = cls.base_path

2
openstack/config/_util.py
View File

@ -36,7 +36,7 @@ def normalize_keys(config):
def merge_clouds(old_dict, new_dict):
"""Like dict.update, except handling nested dicts."""
ret = old_dict.copy()
for (k, v) in new_dict.items():
for k, v in new_dict.items():
if isinstance(v, dict):
if k in ret:
ret[k] = merge_clouds(ret[k], v)

15
openstack/config/loader.py
View File

@ -101,7 +101,7 @@ def get_boolean(value):
def _auth_update(old_dict, new_dict_source):
"""Like dict.update, except handling the nested dict called auth."""
new_dict = copy.deepcopy(new_dict_source)
for (k, v) in new_dict.items():
for k, v in new_dict.items():
if k == 'auth':
if k in old_dict:
old_dict[k].update(v)
@ -143,7 +143,6 @@ def _fix_argv(argv):
class OpenStackConfig:
# These two attribute are to allow os-client-config to plumb in its
# local versions for backwards compat.
# They should not be used by anyone else.
@ -949,7 +948,6 @@ class OpenStackConfig:
return new_cloud
def get_all(self):
clouds = []
for cloud in self.get_cloud_names():
@ -985,7 +983,7 @@ class OpenStackConfig:
os_args = dict()
new_args = dict()
for (key, val) in iter(args.items()):
for key, val in iter(args.items()):
if type(args[key]) == dict:
# dive into the auth dict
new_args[key] = self._fix_args(args[key])
@ -1136,7 +1134,6 @@ class OpenStackConfig:
return config
def _clean_up_after_ourselves(self, config, p_opt, winning_value):
# Clean up after ourselves
for opt in [p_opt.name] + [o.name for o in p_opt.deprecated]:
opt = opt.replace('-', '_')
@ -1245,7 +1242,7 @@ class OpenStackConfig:
# Can't just do update, because None values take over
for arg_list in region_args, args:
for (key, val) in iter(arg_list.items()):
for key, val in iter(arg_list.items()):
if val is not None:
if key == 'auth' and config[key] is not None:
config[key] = _auth_update(config[key], val)
@ -1268,7 +1265,7 @@ class OpenStackConfig:
auth_plugin = None
# If any of the defaults reference other values, we need to expand
for (key, value) in config.items():
for key, value in config.items():
if hasattr(value, 'format') and key not in FORMAT_EXCLUSIONS:
config[key] = value.format(**config)
@ -1367,7 +1364,7 @@ class OpenStackConfig:
# Can't just do update, because None values take over
for arg_list in region_args, args:
for (key, val) in iter(arg_list.items()):
for key, val in iter(arg_list.items()):
if val is not None:
if key == 'auth' and config[key] is not None:
config[key] = _auth_update(config[key], val)
@ -1389,7 +1386,7 @@ class OpenStackConfig:
auth_plugin = None
# If any of the defaults reference other values, we need to expand
for (key, value) in config.items():
for key, value in config.items():
if hasattr(value, 'format') and key not in FORMAT_EXCLUSIONS:
config[key] = value.format(**config)

1
openstack/container_infrastructure_management/v1/_proxy.py
View File

@ -26,7 +26,6 @@ from openstack import proxy
class Proxy(proxy.Proxy):
_resource_registry = {
"cluster": _cluster.Cluster,
"cluster_template": _cluster_template.ClusterTemplate,

1
openstack/container_infrastructure_management/v1/cluster.py
View File

@ -16,7 +16,6 @@ from openstack import utils
class Cluster(resource.Resource):
resources_key = 'clusters'
base_path = '/clusters'

1
openstack/container_infrastructure_management/v1/cluster_certificate.py
View File

@ -14,7 +14,6 @@ from openstack import resource
class ClusterCertificate(resource.Resource):
base_path = '/certificates'
# capabilities

1
openstack/container_infrastructure_management/v1/cluster_template.py
View File

@ -14,7 +14,6 @@ from openstack import resource
class ClusterTemplate(resource.Resource):
resources_key = 'clustertemplates'
base_path = '/clustertemplates'

1
openstack/container_infrastructure_management/v1/service.py
View File

@ -14,7 +14,6 @@ from openstack import resource
class Service(resource.Resource):
resources_key = 'mservices'
base_path = '/mservices'

1
openstack/fixture/connection.py
View File

@ -34,7 +34,6 @@ _ENDPOINT_TEMPLATES = {
class ConnectionFixture(fixtures.Fixture):
_suffixes = {
'baremetal': '/',
'block-storage': '/{project_id}',

1
openstack/identity/v2/extension.py
View File

@ -44,7 +44,6 @@ class Extension(resource.Resource):
@classmethod
def list(cls, session, paginated=False, base_path=None, **params):
if base_path is None:
base_path = cls.base_path

1
openstack/identity/version.py
View File

@ -28,7 +28,6 @@ class Version(resource.Resource):
@classmethod
def list(cls, session, paginated=False, base_path=None, **params):
if base_path is None:
base_path = cls.base_path

1
openstack/image/v2/_proxy.py
View File

@ -49,7 +49,6 @@ def _get_name_and_filename(name, image_format):
class Proxy(proxy.Proxy):
_resource_registry = {
"cache": _cache.Cache,
"image": _image.Image,

1
openstack/object_store/v1/_base.py
View File

@ -16,7 +16,6 @@ from openstack import resource
class BaseResource(resource.Resource):
commit_method = 'POST'
create_method = 'PUT'

3
openstack/object_store/v1/_proxy.py
View File

@ -447,7 +447,6 @@ class Proxy(proxy.Proxy):
file_size = os.path.getsize(filename)
if self.is_object_stale(container_name, name, filename, md5, sha256):
self._connection.log.debug(
"swift uploading %(filename)s to %(endpoint)s",
{'filename': filename, 'endpoint': endpoint},
@ -744,7 +743,7 @@ class Proxy(proxy.Proxy):
def _get_file_segments(self, endpoint, filename, file_size, segment_size):
# Use an ordered dict here so that testing can replicate things
segments = collections.OrderedDict()
for (index, offset) in enumerate(range(0, file_size, segment_size)):
for index, offset in enumerate(range(0, file_size, segment_size)):
remaining = file_size - (index * segment_size)
segment = _utils.FileSegment(
filename,

1
openstack/object_store/v1/info.py
View File

@ -18,7 +18,6 @@ from openstack import resource
class Info(resource.Resource):
base_path = "/info"
allow_fetch = True

2
openstack/orchestration/util/template_utils.py
View File

@ -31,7 +31,6 @@ def get_template_contents(
files=None,
existing=False,
):
is_object = False
tpl = None
@ -123,7 +122,6 @@ def get_file_contents(
is_object=False,
object_request=None,
):
if recurse_if and recurse_if(from_data):
if isinstance(from_data, dict):
recurse_data = from_data.values()

1
openstack/orchestration/v1/stack.py
View File

@ -187,7 +187,6 @@ class Stack(resource.Resource):
skip_cache=False,
resolve_outputs=True,
):
if not self.allow_fetch:
raise exceptions.MethodNotSupported(self, "fetch")

1
openstack/orchestration/v1/stack_environment.py
View File

@ -14,7 +14,6 @@ from openstack import resource
class StackEnvironment(resource.Resource):
base_path = "/stacks/%(stack_name)s/%(stack_id)s/environment"
# capabilities

1
openstack/orchestration/v1/stack_files.py
View File

@ -14,7 +14,6 @@ from openstack import resource
class StackFiles(resource.Resource):
base_path = "/stacks/%(stack_name)s/%(stack_id)s/files"
# capabilities

1
openstack/orchestration/v1/stack_template.py
View File

@ -14,7 +14,6 @@ from openstack import resource
class StackTemplate(resource.Resource):
base_path = "/stacks/%(stack_name)s/%(stack_id)s/template"
# capabilities

1
openstack/orchestration/v1/template.py
View File

@ -16,7 +16,6 @@ from openstack import resource
class Template(resource.Resource):
# capabilities
allow_create = False
allow_list = False

3
openstack/resource.py
View File

@ -87,7 +87,6 @@ def _convert_type(value, data_type, list_type=None):
class _BaseComponent:
# The name this component is being tracked as in the Resource
key = None
# The class to be used for mappings
@ -2031,7 +2030,7 @@ class Resource(dict):
)
client_filters = dict()
# Gather query parameters which are not supported by the server
for (k, v) in params.items():
for k, v in params.items():
if (
# Known attr
hasattr(cls, k)

2
openstack/service_description.py
View File

@ -42,7 +42,6 @@ class _ServiceDisabledProxyShim:
class ServiceDescription:
#: Dictionary of supported versions and proxy classes for that version
supported_versions = None
#: main service_type to use to find this service in the catalog
@ -216,7 +215,6 @@ class ServiceDescription:
)
if proxy_obj:
if getattr(proxy_obj, 'skip_discovery', False):
# Some services, like swift, don't have discovery. While
# keystoneauth will behave correctly and handle such

1
openstack/shared_file_system/v2/storage_pool.py
View File

@ -14,7 +14,6 @@ from openstack import resource
class StoragePool(resource.Resource):
resources_key = "pools"
base_path = "/scheduler-stats/pools"

1
openstack/tests/functional/baremetal/base.py
View File

@ -14,7 +14,6 @@ from openstack.tests.functional import base
class BaseBaremetalTest(base.BaseFunctionalTest):
min_microversion = None
node_id = None

2
openstack/tests/functional/baremetal/test_baremetal_allocation.py
View File

@ -39,7 +39,6 @@ class Base(base.BaseBaremetalTest):
class TestBareMetalAllocation(Base):
min_microversion = '1.52'
def test_allocation_create_get_delete(self):
@ -135,7 +134,6 @@ class TestBareMetalAllocation(Base):
class TestBareMetalAllocationUpdate(Base):
min_microversion = '1.57'
def test_allocation_update(self):

1
openstack/tests/functional/baremetal/test_baremetal_chassis.py
View File

@ -72,7 +72,6 @@ class TestBareMetalChassis(base.BaseBaremetalTest):
class TestBareMetalChassisFields(base.BaseBaremetalTest):
min_microversion = '1.8'
def test_chassis_fields(self):

1
openstack/tests/functional/baremetal/test_baremetal_conductor.py
View File

@ -15,7 +15,6 @@ from openstack.tests.functional.baremetal import base
class TestBareMetalConductor(base.BaseBaremetalTest):
min_microversion = '1.49'
def test_list_get_conductor(self):

1
openstack/tests/functional/baremetal/test_baremetal_deploy_templates.py
View File

@ -15,7 +15,6 @@ from openstack.tests.functional.baremetal import base
class TestBareMetalDeployTemplate(base.BaseBaremetalTest):
min_microversion = '1.55'
def setUp(self):

1
openstack/tests/functional/baremetal/test_baremetal_driver.py
View File

@ -34,7 +34,6 @@ class TestBareMetalDriver(base.BaseBaremetalTest):
class TestBareMetalDriverDetails(base.BaseBaremetalTest):
min_microversion = '1.30'
def test_fake_hardware_get(self):

4
openstack/tests/functional/baremetal/test_baremetal_node.py
View File

@ -327,7 +327,6 @@ class TestBareMetalNode(base.BaseBaremetalTest):
class TestNodeRetired(base.BaseBaremetalTest):
min_microversion = '1.61'
def test_retired(self):
@ -390,7 +389,6 @@ class TestNodeRetired(base.BaseBaremetalTest):
class TestBareMetalNodeFields(base.BaseBaremetalTest):
min_microversion = '1.8'
def test_node_fields(self):
@ -404,7 +402,6 @@ class TestBareMetalNodeFields(base.BaseBaremetalTest):
class TestBareMetalVif(base.BaseBaremetalTest):
min_microversion = '1.28'
def setUp(self):
@ -445,7 +442,6 @@ class TestBareMetalVif(base.BaseBaremetalTest):
class TestTraits(base.BaseBaremetalTest):
min_microversion = '1.37'
def setUp(self):

1
openstack/tests/functional/baremetal/test_baremetal_port.py
View File

@ -132,7 +132,6 @@ class TestBareMetalPort(base.BaseBaremetalTest):
class TestBareMetalPortFields(base.BaseBaremetalTest):
min_microversion = '1.8'
def test_port_fields(self):

1
openstack/tests/functional/baremetal/test_baremetal_port_group.py
View File

@ -16,7 +16,6 @@ from openstack.tests.functional.baremetal import base
class TestBareMetalPortGroup(base.BaseBaremetalTest):
min_microversion = '1.23'
def setUp(self):

1
openstack/tests/functional/baremetal/test_baremetal_volume_connector.py
View File

@ -16,7 +16,6 @@ from openstack.tests.functional.baremetal import base
class TestBareMetalVolumeconnector(base.BaseBaremetalTest):
min_microversion = '1.32'
def setUp(self):

1
openstack/tests/functional/baremetal/test_baremetal_volume_target.py
View File

@ -16,7 +16,6 @@ from openstack.tests.functional.baremetal import base
class TestBareMetalVolumetarget(base.BaseBaremetalTest):
min_microversion = '1.32'
def setUp(self):

1
openstack/tests/functional/base.py
View File

@ -41,7 +41,6 @@ def _disable_keep_alive(conn):
class BaseFunctionalTest(base.TestCase):
_wait_for_timeout_key = ''
def setUp(self):

1
openstack/tests/functional/block_storage/v2/base.py
View File

@ -14,7 +14,6 @@ from openstack.tests.functional import base
class BaseBlockStorageTest(base.BaseFunctionalTest):
_wait_for_timeout_key = 'OPENSTACKSDK_FUNC_TEST_TIMEOUT_BLOCK_STORAGE'
def setUp(self):

1
openstack/tests/functional/block_storage/v3/base.py
View File

@ -14,7 +14,6 @@ from openstack.tests.functional import base
class BaseBlockStorageTest(base.BaseFunctionalTest):
_wait_for_timeout_key = 'OPENSTACKSDK_FUNC_TEST_TIMEOUT_BLOCK_STORAGE'
def setUp(self):

1
openstack/tests/functional/cloud/test_devstack.py
View File

@ -26,7 +26,6 @@ from openstack.tests.functional import base
class TestDevstack(base.BaseFunctionalTest):
scenarios = [
('designate', dict(env='DESIGNATE', service='dns')),
('heat', dict(env='HEAT', service='orchestration')),

1
openstack/tests/functional/cloud/test_endpoints.py
View File

@ -28,7 +28,6 @@ from openstack.tests.functional import base
class TestEndpoints(base.KeystoneBaseFunctionalTest):
endpoint_attributes = [
'id',
'region',

1
openstack/tests/functional/cloud/test_floating_ip.py
View File

@ -119,7 +119,6 @@ class TestFloatingIP(base.BaseFunctionalTest):
raise OpenStackCloudException('\n'.join(exception_list))
def _cleanup_ips(self, server):
exception_list = list()
fixed_ip = meta.get_server_private_ip(server)

1
openstack/tests/functional/cloud/test_project_cleanup.py
View File

@ -22,7 +22,6 @@ from openstack.tests.functional import base
class TestProjectCleanup(base.BaseFunctionalTest):
_wait_for_timeout_key = 'OPENSTACKSDK_FUNC_TEST_TIMEOUT_CLEANUP'
def setUp(self):

1
openstack/tests/functional/cloud/test_services.py
View File

@ -28,7 +28,6 @@ from openstack.tests.functional import base
class TestServices(base.KeystoneBaseFunctionalTest):
service_attributes = ['id', 'name', 'type', 'description']
def setUp(self):

1
openstack/tests/functional/cloud/test_stack.py
View File

@ -145,7 +145,6 @@ class TestStack(base.BaseFunctionalTest):
self.assertEqual(12, len(new_rand))
def test_stack_nested(self):
test_template = tempfile.NamedTemporaryFile(
suffix='.yaml', delete=False
)

1
openstack/tests/functional/cloud/test_volume.py
View File

@ -26,7 +26,6 @@ from openstack import utils
class TestVolume(base.BaseFunctionalTest):
# Creating and deleting volumes is slow
TIMEOUT_SCALING_FACTOR = 1.5

1
openstack/tests/functional/clustering/test_cluster.py
View File

@ -18,7 +18,6 @@ from openstack.tests.functional.network.v2 import test_network
class TestCluster(base.BaseFunctionalTest):
_wait_for_timeout_key = 'OPENSTACKSDK_FUNC_TEST_TIMEOUT_CLUSTER'
def setUp(self):

1
openstack/tests/functional/compute/base.py
View File

@ -14,5 +14,4 @@ from openstack.tests.functional import base
class BaseComputeTest(base.BaseFunctionalTest):
_wait_for_timeout_key = 'OPENSTACKSDK_FUNC_TEST_TIMEOUT_COMPUTE'

1
openstack/tests/functional/image/v2/base.py
View File

@ -14,7 +14,6 @@ from openstack.tests.functional import base
class BaseImageTest(base.BaseFunctionalTest):
_wait_for_timeout_key = 'OPENSTACKSDK_FUNC_TEST_TIMEOUT_IMAGE'
def setUp(self):

1
openstack/tests/functional/image/v2/test_metadef_namespace.py
View File

@ -15,7 +15,6 @@ from openstack.tests.functional.image.v2 import base
class TestMetadefNamespace(base.BaseImageTest):
# TODO(stephenfin): We should use setUpClass here for MOAR SPEED!!!
def setUp(self):
super().setUp()

1
openstack/tests/functional/load_balancer/v2/test_load_balancer.py
View File

@ -26,7 +26,6 @@ from openstack.tests.functional import base
class TestLoadBalancer(base.BaseFunctionalTest):
HM_ID = None
L7POLICY_ID = None
LB_ID = None

1
openstack/tests/functional/network/v2/test_address_group.py
View File

@ -16,7 +16,6 @@ from openstack.tests.functional import base
class TestAddressGroup(base.BaseFunctionalTest):
ADDRESS_GROUP_ID = None
ADDRESSES = ["10.0.0.1/32", "2001:db8::/32"]

1
openstack/tests/functional/network/v2/test_address_scope.py
View File

@ -16,7 +16,6 @@ from openstack.tests.functional import base
class TestAddressScope(base.BaseFunctionalTest):
ADDRESS_SCOPE_ID = None
IS_SHARED = False
IP_VERSION = 4

1
openstack/tests/functional/network/v2/test_agent.py
View File

@ -17,7 +17,6 @@ from openstack.tests.functional import base
class TestAgent(base.BaseFunctionalTest):
AGENT = None
DESC = "test description"

1
openstack/tests/functional/network/v2/test_agent_add_remove_network.py
View File

@ -16,7 +16,6 @@ from openstack.tests.functional import base
class TestAgentNetworks(base.BaseFunctionalTest):
NETWORK_ID = None
AGENT = None
AGENT_ID = None

1
openstack/tests/functional/network/v2/test_agent_add_remove_router.py
View File

@ -16,7 +16,6 @@ from openstack.tests.functional import base
class TestAgentRouters(base.BaseFunctionalTest):
ROUTER = None
AGENT = None

1
openstack/tests/functional/network/v2/test_auto_allocated_topology.py
View File

@ -14,7 +14,6 @@ from openstack.tests.functional import base
class TestAutoAllocatedTopology(base.BaseFunctionalTest):
NETWORK_NAME = "auto_allocated_network"
NETWORK_ID = None
PROJECT_ID = None

1
openstack/tests/functional/network/v2/test_availability_zone.py
View File

@ -18,7 +18,6 @@ class TestAvailabilityZone(base.BaseFunctionalTest):
def test_list(self):
availability_zones = list(self.user_cloud.network.availability_zones())
if len(availability_zones) > 0:
for az in availability_zones:
self.assertIsInstance(az.name, str)
self.assertIsInstance(az.resource, str)

1
openstack/tests/functional/network/v2/test_dvr_router.py
View File

@ -16,7 +16,6 @@ from openstack.tests.functional import base
class TestDVRRouter(base.BaseFunctionalTest):
ID = None
def setUp(self):

1
openstack/tests/functional/network/v2/test_firewall_group.py
View File

@ -19,7 +19,6 @@ from openstack.tests.functional import base
class TestFirewallGroup(base.BaseFunctionalTest):
ID = None
def setUp(self):

1
openstack/tests/functional/network/v2/test_firewall_policy.py
View File

@ -19,7 +19,6 @@ from openstack.tests.functional import base
class TestFirewallPolicy(base.BaseFunctionalTest):
ID = None
def setUp(self):

1
openstack/tests/functional/network/v2/test_firewall_rule.py
View File

@ -19,7 +19,6 @@ from openstack.tests.functional import base
class TestFirewallRule(base.BaseFunctionalTest):
ACTION = "allow"
DEST_IP = "10.0.0.0/24"
DEST_PORT = "80"

1
openstack/tests/functional/network/v2/test_firewall_rule_insert_remove_policy.py
View File

@ -21,7 +21,6 @@ from openstack.tests.functional import base
class TestFirewallPolicyRuleAssociations(base.BaseFunctionalTest):
POLICY_NAME = uuid.uuid4().hex
RULE1_NAME = uuid.uuid4().hex
RULE2_NAME = uuid.uuid4().hex

1
openstack/tests/functional/network/v2/test_flavor.py
View File

@ -15,7 +15,6 @@ from openstack.tests.functional import base
class TestFlavor(base.BaseFunctionalTest):
UPDATE_NAME = "UPDATED-NAME"
SERVICE_TYPE = "FLAVORS"
ID = None

1
openstack/tests/functional/network/v2/test_floating_ip.py
View File

@ -20,7 +20,6 @@ from openstack.tests.functional import base
class TestFloatingIP(base.BaseFunctionalTest):
IPV4 = 4
EXT_CIDR = "10.100.0.0/24"
INT_CIDR = "10.101.0.0/24"

1
openstack/tests/functional/network/v2/test_l3_conntrack_helper.py
View File

@ -17,7 +17,6 @@ from openstack.tests.functional import base
class TestL3ConntrackHelper(base.BaseFunctionalTest):
PROTOCOL = "udp"
HELPER = "tftp"
PORT = 69

1
openstack/tests/functional/network/v2/test_local_ip.py
View File

@ -18,7 +18,6 @@ from openstack.tests.functional import base
class TestLocalIP(base.BaseFunctionalTest):
LOCAL_IP_ID = None
def setUp(self):

1
openstack/tests/functional/network/v2/test_ndp_proxy.py
View File

@ -19,7 +19,6 @@ from openstack.tests.functional import base
class TestNDPProxy(base.BaseFunctionalTest):
IPV6 = 6
EXT_CIDR = "2002::1:0/112"
INT_CIDR = "2002::2:0/112"

1
openstack/tests/functional/network/v2/test_network.py
View File

@ -36,7 +36,6 @@ def delete_network(conn, network, subnet):
class TestNetwork(base.BaseFunctionalTest):
ID = None
def setUp(self):

1
openstack/tests/functional/network/v2/test_network_ip_availability.py
View File

@ -18,7 +18,6 @@ from openstack.tests.functional import base
class TestNetworkIPAvailability(base.BaseFunctionalTest):
IPV4 = 4
CIDR = "10.100.0.0/24"
NET_ID = None

Some files were not shown because too many files have changed in this diff Show More