From bf3d5372b9fc670ecd08339fa989c9b738ad8d69 Mon Sep 17 00:00:00 2001 From: Carlos Goncalves Date: Fri, 21 Aug 2020 15:00:27 +0200 Subject: [PATCH] Fix new pylint errors Pylint 2.6.0 added two new checkers [1] that make pep8 validation to fail: - raise-missing-from (W0707) - super-with-arguments (R1725) [1] http://pylint.pycqa.org/en/latest/technical_reference/features.html Change-Id: I15fd7082646d95414bdd8f0815ee44b5867b3ed0 --- .../agent/api_server/keepalivedlvs.py | 4 +- .../backends/agent/api_server/osutils.py | 16 ++++---- .../backends/agent/api_server/server.py | 9 +++-- .../amphorae/backends/utils/haproxy_query.py | 5 ++- .../amphorae/backends/utils/network_utils.py | 4 +- .../amphorae/driver_exceptions/exceptions.py | 4 +- .../amphorae/drivers/haproxy/exceptions.py | 2 +- .../drivers/haproxy/rest_api_driver.py | 18 ++++----- .../drivers/keepalived/jinja/jinja_cfg.py | 2 +- .../drivers/keepalived/vrrp_rest_driver.py | 2 +- .../amphorae/drivers/noop_driver/driver.py | 4 +- octavia/api/common/pagination.py | 9 +++-- octavia/api/common/types.py | 18 ++++----- .../api/drivers/amphora_driver/v1/driver.py | 2 +- .../api/drivers/amphora_driver/v2/driver.py | 2 +- .../drivers/driver_agent/driver_updater.py | 2 +- octavia/api/drivers/noop_driver/driver.py | 4 +- .../api/healthcheck/healthcheck_plugins.py | 4 +- octavia/api/root_controller.py | 2 +- octavia/api/v2/controllers/__init__.py | 6 +-- octavia/api/v2/controllers/amphora.py | 8 ++-- .../controllers/availability_zone_profiles.py | 18 ++++----- .../api/v2/controllers/availability_zones.py | 16 ++++---- octavia/api/v2/controllers/base.py | 2 +- octavia/api/v2/controllers/flavor_profiles.py | 20 +++++----- octavia/api/v2/controllers/flavors.py | 14 +++---- octavia/api/v2/controllers/health_monitor.py | 14 +++---- octavia/api/v2/controllers/l7policy.py | 10 ++--- octavia/api/v2/controllers/l7rule.py | 10 ++--- octavia/api/v2/controllers/listener.py | 8 ++-- octavia/api/v2/controllers/load_balancer.py | 28 +++++++------- octavia/api/v2/controllers/member.py | 8 ++-- octavia/api/v2/controllers/pool.py | 10 ++--- octavia/api/v2/controllers/provider.py | 6 +-- octavia/api/v2/controllers/quotas.py | 4 +- octavia/api/v2/types/quotas.py | 2 +- octavia/certificates/generator/local.py | 12 +++--- octavia/certificates/manager/barbican.py | 2 +- .../certificates/manager/barbican_legacy.py | 2 +- octavia/certificates/manager/castellan_mgr.py | 2 +- octavia/certificates/manager/local.py | 13 ++++--- octavia/cmd/agent.py | 2 +- octavia/common/base_taskflow.py | 9 ++--- octavia/common/context.py | 2 +- octavia/common/exceptions.py | 6 +-- octavia/common/keystone.py | 2 +- octavia/common/policy.py | 8 ++-- octavia/common/stats.py | 2 +- octavia/common/tls_utils/cert_parser.py | 32 ++++++++-------- octavia/common/validate.py | 32 ++++++++-------- octavia/compute/drivers/noop_driver/driver.py | 4 +- octavia/compute/drivers/nova_driver.py | 22 +++++------ .../healthmanager/health_drivers/update_db.py | 2 +- octavia/controller/queue/v1/consumer.py | 4 +- octavia/controller/queue/v2/consumer.py | 4 +- octavia/controller/worker/task_utils.py | 2 +- .../controller/worker/v1/controller_worker.py | 2 +- .../worker/v1/tasks/amphora_driver_tasks.py | 2 +- .../controller/worker/v1/tasks/cert_task.py | 2 +- .../worker/v1/tasks/compute_tasks.py | 4 +- .../worker/v1/tasks/database_tasks.py | 8 ++-- .../worker/v1/tasks/lifecycle_tasks.py | 6 +-- .../worker/v1/tasks/network_tasks.py | 2 +- .../controller/worker/v1/tasks/retry_tasks.py | 2 +- .../worker/v2/tasks/amphora_driver_tasks.py | 2 +- .../controller/worker/v2/tasks/cert_task.py | 2 +- .../worker/v2/tasks/compute_tasks.py | 4 +- .../worker/v2/tasks/database_tasks.py | 8 ++-- .../worker/v2/tasks/lifecycle_tasks.py | 6 +-- .../worker/v2/tasks/network_tasks.py | 2 +- octavia/db/repositories.py | 22 +++++------ .../distributor/drivers/noop_driver/driver.py | 6 +-- .../drivers/neutron/allowed_address_pairs.py | 38 +++++++++---------- octavia/network/drivers/neutron/base.py | 18 +++++---- octavia/network/drivers/noop_driver/driver.py | 4 +- .../agent/api_server/test_keepalivedlvs.py | 2 +- .../backend/agent/api_server/test_server.py | 2 +- .../drivers/driver_agent/test_driver_agent.py | 2 +- .../tests/functional/api/test_healthcheck.py | 2 +- .../functional/api/test_root_controller.py | 2 +- octavia/tests/functional/api/v2/base.py | 2 +- .../tests/functional/api/v2/test_amphora.py | 2 +- .../api/v2/test_availability_zones.py | 2 +- .../tests/functional/api/v2/test_flavors.py | 2 +- .../functional/api/v2/test_health_monitor.py | 2 +- .../tests/functional/api/v2/test_l7policy.py | 2 +- .../tests/functional/api/v2/test_l7rule.py | 2 +- .../tests/functional/api/v2/test_listener.py | 2 +- .../functional/api/v2/test_load_balancer.py | 4 +- .../tests/functional/api/v2/test_member.py | 2 +- octavia/tests/functional/api/v2/test_pool.py | 2 +- .../tests/functional/api/v2/test_provider.py | 6 +-- .../tests/functional/api/v2/test_quotas.py | 2 +- octavia/tests/functional/db/base.py | 2 +- octavia/tests/functional/db/test_models.py | 26 ++++++------- .../tests/functional/db/test_repositories.py | 30 +++++++-------- .../agent/api_server/test_amphora_info.py | 2 +- .../api_server/test_haproxy_compatibility.py | 2 +- .../agent/api_server/test_keepalived.py | 2 +- .../agent/api_server/test_keepalivedlvs.py | 2 +- .../agent/api_server/test_loadbalancer.py | 2 +- .../backends/agent/api_server/test_osutils.py | 2 +- .../backends/agent/api_server/test_plug.py | 4 +- .../backends/agent/api_server/test_util.py | 2 +- .../backends/agent/test_agent_jinja_cfg.py | 2 +- .../backends/health_daemon/test_envelope.py | 2 +- .../health_daemon/test_health_daemon.py | 2 +- .../health_daemon/test_health_sender.py | 2 +- .../backends/utils/test_haproxy_query.py | 2 +- .../backends/utils/test_ip_advertisement.py | 2 +- .../utils/test_keepalivedlvs_query.py | 2 +- .../backends/utils/test_network_namespace.py | 2 +- .../backends/utils/test_network_utils.py | 2 +- .../drivers/haproxy/test_exceptions.py | 2 +- .../haproxy/test_rest_api_driver_0_5.py | 4 +- .../haproxy/test_rest_api_driver_1_0.py | 4 +- .../haproxy/test_rest_api_driver_common.py | 2 +- .../drivers/health/test_heartbeat_udp.py | 2 +- .../keepalived/jinja/test_jinja_cfg.py | 2 +- .../keepalived/test_vrrp_rest_driver.py | 2 +- .../test_noop_amphoraloadbalancer_driver.py | 4 +- octavia/tests/unit/api/common/test_types.py | 6 +-- .../amphora_driver/v1/test_amphora_driver.py | 2 +- .../amphora_driver/v2/test_amphora_driver.py | 2 +- .../driver_agent/test_driver_listener.py | 2 +- .../driver_agent/test_driver_updater.py | 2 +- .../unit/api/drivers/test_driver_factory.py | 2 +- .../api/drivers/test_provider_noop_agent.py | 2 +- .../api/drivers/test_provider_noop_driver.py | 2 +- octavia/tests/unit/api/drivers/test_utils.py | 2 +- .../unit/api/v2/types/test_l7policies.py | 2 +- octavia/tests/unit/base.py | 6 +-- .../common/auth/test_barbican_acl.py | 2 +- .../unit/certificates/common/test_local.py | 2 +- .../unit/certificates/generator/local_csr.py | 2 +- .../unit/certificates/generator/test_local.py | 2 +- .../certificates/manager/test_barbican.py | 2 +- .../manager/test_barbican_legacy.py | 2 +- .../manager/test_castellan_mgr.py | 2 +- .../unit/certificates/manager/test_local.py | 2 +- octavia/tests/unit/cmd/test_agent.py | 2 +- octavia/tests/unit/cmd/test_driver_agent.py | 2 +- .../tests/unit/cmd/test_haproxy_vrrp_check.py | 2 +- octavia/tests/unit/cmd/test_health_manager.py | 2 +- octavia/tests/unit/cmd/test_house_keeping.py | 2 +- octavia/tests/unit/cmd/test_status.py | 2 +- .../combined_listeners/test_jinja_cfg.py | 2 +- .../haproxy/split_listeners/test_jinja_cfg.py | 2 +- .../jinja/logging/test_logging_jinja_cfg.py | 2 +- .../common/jinja/lvs/test_lvs_jinja_cfg.py | 2 +- .../common/jinja/test_user_data_jinja_cfg.py | 2 +- .../tests/unit/common/test_base_taskflow.py | 4 +- octavia/tests/unit/common/test_clients.py | 8 ++-- octavia/tests/unit/common/test_data_models.py | 2 +- octavia/tests/unit/common/test_policy.py | 8 ++-- octavia/tests/unit/common/test_stats.py | 2 +- octavia/tests/unit/common/test_validations.py | 2 +- .../drivers/test_compute_noop_driver.py | 2 +- .../unit/compute/drivers/test_nova_driver.py | 2 +- .../health_drivers/test_update_base.py | 4 +- .../health_drivers/test_update_db.py | 4 +- .../health_drivers/test_update_logging.py | 4 +- .../healthmanager/test_health_manager.py | 2 +- .../housekeeping/test_house_keeping.py | 6 +-- .../unit/controller/queue/v1/test_consumer.py | 2 +- .../controller/queue/v1/test_endpoints.py | 2 +- .../unit/controller/queue/v2/test_consumer.py | 2 +- .../controller/queue/v2/test_endpoints.py | 2 +- .../worker/test_amphora_rate_limit.py | 2 +- .../unit/controller/worker/test_task_utils.py | 2 +- .../worker/v1/flows/test_amphora_flows.py | 2 +- .../v1/flows/test_health_monitor_flows.py | 2 +- .../worker/v1/flows/test_l7policy_flows.py | 2 +- .../worker/v1/flows/test_l7rule_flows.py | 2 +- .../worker/v1/flows/test_listener_flows.py | 2 +- .../v1/flows/test_load_balancer_flows.py | 2 +- .../worker/v1/flows/test_member_flows.py | 2 +- .../worker/v1/flows/test_pool_flows.py | 2 +- .../v1/tasks/test_amphora_driver_tasks.py | 2 +- .../worker/v1/tasks/test_compute_tasks.py | 2 +- .../worker/v1/tasks/test_database_tasks.py | 2 +- .../v1/tasks/test_database_tasks_quota.py | 2 +- .../worker/v1/tasks/test_lifecycle_tasks.py | 2 +- .../worker/v1/tasks/test_model_tasks.py | 2 +- .../worker/v1/tasks/test_network_tasks.py | 2 +- .../worker/v1/tasks/test_retry_tasks.py | 2 +- .../worker/v1/test_controller_worker.py | 2 +- .../worker/v2/flows/test_amphora_flows.py | 2 +- .../v2/flows/test_health_monitor_flows.py | 2 +- .../worker/v2/flows/test_l7policy_flows.py | 2 +- .../worker/v2/flows/test_l7rule_flows.py | 2 +- .../worker/v2/flows/test_listener_flows.py | 2 +- .../v2/flows/test_load_balancer_flows.py | 2 +- .../worker/v2/flows/test_member_flows.py | 2 +- .../worker/v2/flows/test_pool_flows.py | 2 +- .../v2/tasks/test_amphora_driver_tasks.py | 2 +- .../worker/v2/tasks/test_compute_tasks.py | 2 +- .../worker/v2/tasks/test_database_tasks.py | 2 +- .../v2/tasks/test_database_tasks_quota.py | 2 +- .../worker/v2/tasks/test_lifecycle_tasks.py | 2 +- .../worker/v2/tasks/test_network_tasks.py | 2 +- .../worker/v2/test_controller_worker.py | 2 +- .../neutron/test_allowed_address_pairs.py | 2 +- .../unit/network/drivers/neutron/test_base.py | 2 +- .../network/drivers/neutron/test_utils.py | 2 +- .../drivers/test_network_noop_driver.py | 2 +- octavia/tests/unit/test_opts.py | 2 +- octavia/tests/unit/test_version.py | 2 +- .../unit/volume/drivers/test_cinder_driver.py | 2 +- .../volume/drivers/test_volume_noop_driver.py | 2 +- octavia/volume/drivers/cinder_driver.py | 10 ++--- octavia/volume/drivers/noop_driver/driver.py | 4 +- 212 files changed, 494 insertions(+), 489 deletions(-) diff --git a/octavia/amphorae/backends/agent/api_server/keepalivedlvs.py b/octavia/amphorae/backends/agent/api_server/keepalivedlvs.py index 0ec0855ce1..702c660444 100644 --- a/octavia/amphorae/backends/agent/api_server/keepalivedlvs.py +++ b/octavia/amphorae/backends/agent/api_server/keepalivedlvs.py @@ -64,12 +64,12 @@ class KeepalivedLvs(udp_listener_base.UdpListenerApiServerBase): assert True is os.path.exists(script_dir) assert True is os.path.exists(os.path.join( script_dir, CHECK_SCRIPT_NAME)) - except Exception: + except Exception as e: raise exceptions.Conflict( description='%(file_name)s not Found for ' 'UDP Listener %(listener_id)s' % {'file_name': CHECK_SCRIPT_NAME, - 'listener_id': listener_id}) + 'listener_id': listener_id}) from e os.makedirs(util.keepalived_backend_check_script_dir()) shutil.copy2(os.path.join(script_dir, CHECK_SCRIPT_NAME), util.keepalived_backend_check_script_path()) diff --git a/octavia/amphorae/backends/agent/api_server/osutils.py b/octavia/amphorae/backends/agent/api_server/osutils.py index cf32285cbd..c60a973a19 100644 --- a/octavia/amphorae/backends/agent/api_server/osutils.py +++ b/octavia/amphorae/backends/agent/api_server/osutils.py @@ -284,7 +284,7 @@ class Ubuntu(BaseOS): network_dir = self.get_network_path() if not ignore: ignore = shutil.ignore_patterns('eth0*', 'openssh*') - super(Ubuntu, self).create_netns_dir( + super().create_netns_dir( network_dir, netns_network_dir, ignore) def write_interfaces_file(self): @@ -307,7 +307,7 @@ class Ubuntu(BaseOS): render_host_routes, template_vip=None): if not template_vip: template_vip = j2_env.get_template(self.ETH_X_VIP_CONF) - super(Ubuntu, self).write_vip_interface_file( + super().write_vip_interface_file( interface_file_path, primary_interface, vip, ip, broadcast, netmask, gateway, mtu, vrrp_ip, vrrp_version, render_host_routes, template_vip) @@ -320,7 +320,7 @@ class Ubuntu(BaseOS): netns_interface) if not template_port: template_port = j2_env.get_template(self.ETH_X_PORT_CONF) - super(Ubuntu, self).write_port_interface_file( + super().write_port_interface_file( netns_interface, fixed_ips, mtu, interface_file_path, template_port) @@ -391,7 +391,7 @@ class RH(BaseOS): network_dir = self.get_network_path() if not ignore: ignore = shutil.ignore_patterns('ifcfg-eth0*', 'ifcfg-lo*') - super(RH, self).create_netns_dir( + super().create_netns_dir( network_dir, netns_network_dir, ignore) # Copy /etc/sysconfig/network file @@ -410,7 +410,7 @@ class RH(BaseOS): render_host_routes, template_vip=None): if not template_vip: template_vip = j2_env.get_template(self.ETH_X_VIP_CONF) - super(RH, self).write_vip_interface_file( + super().write_vip_interface_file( interface_file_path, primary_interface, vip, ip, broadcast, netmask, gateway, mtu, vrrp_ip, vrrp_version, render_host_routes, template_vip) @@ -423,7 +423,7 @@ class RH(BaseOS): alias_interface_file_path = self.get_alias_network_interface_file( primary_interface) template_vip_alias = j2_env.get_template(self.ETH_X_ALIAS_VIP_CONF) - super(RH, self).write_vip_interface_file( + super().write_vip_interface_file( alias_interface_file_path, primary_interface, vip, ip, broadcast, netmask, gateway, mtu, vrrp_ip, vrrp_version, render_host_routes, template_vip_alias) @@ -486,7 +486,7 @@ class RH(BaseOS): netns_interface) if not template_port: template_port = j2_env.get_template(self.ETH_X_PORT_CONF) - super(RH, self).write_port_interface_file( + super().write_port_interface_file( netns_interface, fixed_ips, mtu, interface_file_path, template_port) @@ -573,7 +573,7 @@ class RH(BaseOS): class CentOS(RH): def __init__(self, os_name): - super(CentOS, self).__init__(os_name) + super().__init__(os_name) if distro.version() == '7': self.package_name_map.update({'haproxy': 'haproxy18'}) diff --git a/octavia/amphorae/backends/agent/api_server/server.py b/octavia/amphorae/backends/agent/api_server/server.py index 6675b9693a..b3708fb686 100644 --- a/octavia/amphorae/backends/agent/api_server/server.py +++ b/octavia/amphorae/backends/agent/api_server/server.py @@ -186,9 +186,9 @@ class Server(object): assert 'subnet_cidr' in net_info assert 'gateway' in net_info assert 'mac_address' in net_info - except Exception: + except Exception as e: raise exceptions.BadRequest( - description='Invalid subnet information') + description='Invalid subnet information') from e return self._plug.plug_vip(vip, net_info['subnet_cidr'], net_info['gateway'], @@ -202,8 +202,9 @@ class Server(object): port_info = flask.request.get_json() assert type(port_info) is dict assert 'mac_address' in port_info - except Exception: - raise exceptions.BadRequest(description='Invalid port information') + except Exception as e: + raise exceptions.BadRequest( + description='Invalid port information') from e return self._plug.plug_network(port_info['mac_address'], port_info.get('fixed_ips'), port_info.get('mtu')) diff --git a/octavia/amphorae/backends/utils/haproxy_query.py b/octavia/amphorae/backends/utils/haproxy_query.py index 136ae565aa..9ee6ceca76 100644 --- a/octavia/amphorae/backends/utils/haproxy_query.py +++ b/octavia/amphorae/backends/utils/haproxy_query.py @@ -47,8 +47,9 @@ class HAProxyQuery(object): try: sock.connect(self.socket) - except socket.error: - raise Exception(_("HAProxy '{0}' query failed.").format(query)) + except socket.error as e: + raise Exception( + _("HAProxy '{0}' query failed.").format(query)) from e try: sock.send(octavia_utils.b(query + '\n')) diff --git a/octavia/amphorae/backends/utils/network_utils.py b/octavia/amphorae/backends/utils/network_utils.py index c3f773f31c..9ae1a81b63 100644 --- a/octavia/amphorae/backends/utils/network_utils.py +++ b/octavia/amphorae/backends/utils/network_utils.py @@ -69,8 +69,8 @@ def get_interface_name(ip_address, net_ns=None): # fe80:0000:0000:0000:f816:3eff:fef2:2058 == fe80::f816:3eff:fef2:2058 try: normalized_addr = ipaddress.ip_address(ip_address).compressed - except ValueError: - raise exceptions.InvalidIPAddress(ip_addr=ip_address) + except ValueError as e: + raise exceptions.InvalidIPAddress(ip_addr=ip_address) from e if net_ns: with pyroute2.NetNS(net_ns) as rtnl_api: diff --git a/octavia/amphorae/driver_exceptions/exceptions.py b/octavia/amphorae/driver_exceptions/exceptions.py index 540dde31dd..42b9ea24d7 100644 --- a/octavia/amphorae/driver_exceptions/exceptions.py +++ b/octavia/amphorae/driver_exceptions/exceptions.py @@ -23,14 +23,14 @@ class AmphoraDriverError(Exception): def __init__(self, **kwargs): try: - super(AmphoraDriverError, self).__init__(self.message % kwargs) + super().__init__(self.message % kwargs) self.msg = self.message % kwargs except Exception: with excutils.save_and_reraise_exception() as ctxt: if not self.use_fatal_exceptions(): ctxt.reraise = False # at least get the core message out if something happened - super(AmphoraDriverError, self).__init__(self.message) + super().__init__(self.message) def __unicode__(self): return self.msg diff --git a/octavia/amphorae/drivers/haproxy/exceptions.py b/octavia/amphorae/drivers/haproxy/exceptions.py index 78d87963b6..b5a30175d1 100644 --- a/octavia/amphorae/drivers/haproxy/exceptions.py +++ b/octavia/amphorae/drivers/haproxy/exceptions.py @@ -52,7 +52,7 @@ class APIException(exc.HTTPClientError): def __init__(self, **kwargs): self.msg = self.msg % kwargs - super(APIException, self).__init__(detail=self.msg) + super().__init__(detail=self.msg) class InvalidRequest(APIException): diff --git a/octavia/amphorae/drivers/haproxy/rest_api_driver.py b/octavia/amphorae/drivers/haproxy/rest_api_driver.py index 943e48a9a7..1a05896532 100644 --- a/octavia/amphorae/drivers/haproxy/rest_api_driver.py +++ b/octavia/amphorae/drivers/haproxy/rest_api_driver.py @@ -53,7 +53,7 @@ class HaproxyAmphoraLoadBalancerDriver( vrrp_rest_driver.KeepalivedAmphoraDriverMixin): def __init__(self): - super(HaproxyAmphoraLoadBalancerDriver, self).__init__() + super().__init__() self.clients = { 'base': AmphoraAPIClientBase(), '0.5': AmphoraAPIClient0_5(), @@ -587,10 +587,10 @@ class HaproxyAmphoraLoadBalancerDriver( self._populate_amphora_api_version(amphora) self.clients[amphora.api_version].update_agent_config( amphora, agent_config, timeout_dict=timeout_dict) - except exc.NotFound: + except exc.NotFound as e: LOG.debug('Amphora {} does not support the update_agent_config ' 'API.'.format(amphora.id)) - raise driver_except.AmpDriverNotImplementedError() + raise driver_except.AmpDriverNotImplementedError() from e def get_interface_from_ip(self, amphora, ip_address, timeout_dict=None): """Get the interface name for an IP address. @@ -619,19 +619,17 @@ class HaproxyAmphoraLoadBalancerDriver( class CustomHostNameCheckingAdapter(requests.adapters.HTTPAdapter): def cert_verify(self, conn, url, verify, cert): conn.assert_hostname = self.uuid - return super(CustomHostNameCheckingAdapter, - self).cert_verify(conn, url, verify, cert) + return super().cert_verify(conn, url, verify, cert) def init_poolmanager(self, *pool_args, **pool_kwargs): proto = CONF.amphora_agent.agent_tls_protocol.replace('.', '_') pool_kwargs['ssl_version'] = getattr(ssl, "PROTOCOL_%s" % proto) - return super(CustomHostNameCheckingAdapter, - self).init_poolmanager(*pool_args, **pool_kwargs) + return super().init_poolmanager(*pool_args, **pool_kwargs) class AmphoraAPIClientBase(object): def __init__(self): - super(AmphoraAPIClientBase, self).__init__() + super().__init__() self.get = functools.partial(self.request, 'get') self.post = functools.partial(self.request, 'post') @@ -753,7 +751,7 @@ class AmphoraAPIClientBase(object): class AmphoraAPIClient0_5(AmphoraAPIClientBase): def __init__(self): - super(AmphoraAPIClient0_5, self).__init__() + super().__init__() self.start_listener = functools.partial(self._action, consts.AMP_ACTION_START) @@ -868,7 +866,7 @@ class AmphoraAPIClient0_5(AmphoraAPIClientBase): class AmphoraAPIClient1_0(AmphoraAPIClientBase): def __init__(self): - super(AmphoraAPIClient1_0, self).__init__() + super().__init__() self.start_listener = functools.partial(self._action, consts.AMP_ACTION_START) diff --git a/octavia/amphorae/drivers/keepalived/jinja/jinja_cfg.py b/octavia/amphorae/drivers/keepalived/jinja/jinja_cfg.py index 7460f20932..6cad8b255c 100644 --- a/octavia/amphorae/drivers/keepalived/jinja/jinja_cfg.py +++ b/octavia/amphorae/drivers/keepalived/jinja/jinja_cfg.py @@ -35,7 +35,7 @@ class KeepalivedJinjaTemplater(object): :param keepalived_template: Absolute path to keepalived Jinja template """ - super(KeepalivedJinjaTemplater, self).__init__() + super().__init__() self.keepalived_template = (keepalived_template if keepalived_template else KEEPALIVED_TEMPLATE) diff --git a/octavia/amphorae/drivers/keepalived/vrrp_rest_driver.py b/octavia/amphorae/drivers/keepalived/vrrp_rest_driver.py index 7d8eaa130f..7d21c31aef 100644 --- a/octavia/amphorae/drivers/keepalived/vrrp_rest_driver.py +++ b/octavia/amphorae/drivers/keepalived/vrrp_rest_driver.py @@ -24,7 +24,7 @@ API_VERSION = constants.API_VERSION class KeepalivedAmphoraDriverMixin(driver_base.VRRPDriverMixin): def __init__(self): - super(KeepalivedAmphoraDriverMixin, self).__init__() + super().__init__() # The Mixed class must define a self.client object for the # AmphoraApiClient diff --git a/octavia/amphorae/drivers/noop_driver/driver.py b/octavia/amphorae/drivers/noop_driver/driver.py index e6638989b8..53a4fc1bbf 100644 --- a/octavia/amphorae/drivers/noop_driver/driver.py +++ b/octavia/amphorae/drivers/noop_driver/driver.py @@ -34,7 +34,7 @@ class LoggingUpdate(object): class NoopManager(object): def __init__(self): - super(NoopManager, self).__init__() + super().__init__() self.amphoraconfig = {} def update_amphora_listeners(self, loadbalancer, amphora, timeout_dict): @@ -135,7 +135,7 @@ class NoopAmphoraLoadBalancerDriver( driver_base.AmphoraLoadBalancerDriver, driver_base.VRRPDriverMixin): def __init__(self): - super(NoopAmphoraLoadBalancerDriver, self).__init__() + super().__init__() self.driver = NoopManager() def update_amphora_listeners(self, loadbalancer, amphora, timeout_dict): diff --git a/octavia/api/common/pagination.py b/octavia/api/common/pagination.py index 81eb45dacd..128e0e4a70 100644 --- a/octavia/api/common/pagination.py +++ b/octavia/api/common/pagination.py @@ -77,8 +77,8 @@ class PaginationHelper(object): # Otherwise, we need to compare against the max else: limit = min(int(limit), page_max_limit) - except ValueError: - raise exceptions.InvalidLimit(key=limit) + except ValueError as e: + raise exceptions.InvalidLimit(key=limit) from e return limit def _parse_sort_keys(self, params): @@ -318,8 +318,9 @@ class PaginationHelper(object): try: sort_key_attr = getattr(model, current_sort_key) - except AttributeError: - raise exceptions.InvalidSortKey(key=current_sort_key) + except AttributeError as e: + raise exceptions.InvalidSortKey( + key=current_sort_key) from e query = query.order_by(sort_dir_func(sort_key_attr)) # Add pagination diff --git a/octavia/api/common/types.py b/octavia/api/common/types.py index caf6c99c74..07bdd2f121 100644 --- a/octavia/api/common/types.py +++ b/octavia/api/common/types.py @@ -36,9 +36,9 @@ class IPAddressType(wtypes.UserType): try: wtypes.IPv6AddressType.validate(value) return value - except ValueError: + except ValueError as e: error = 'Value should be IPv4 or IPv6 format' - raise ValueError(error) + raise ValueError(error) from e class CidrType(wtypes.UserType): @@ -50,9 +50,9 @@ class CidrType(wtypes.UserType): """Validates whether value is an IPv4 or IPv6 CIDR.""" try: return str(netaddr.IPNetwork(value).cidr) - except (ValueError, netaddr.core.AddrFormatError): + except (ValueError, netaddr.core.AddrFormatError) as e: error = 'Value should be IPv4 or IPv6 CIDR format' - raise ValueError(error) + raise ValueError(error) from e class URLType(wtypes.UserType): @@ -60,15 +60,15 @@ class URLType(wtypes.UserType): name = 'url' def __init__(self, require_scheme=True): - super(URLType, self).__init__() + super().__init__() self.require_scheme = require_scheme def validate(self, value): try: validate.url(value, require_scheme=self.require_scheme) - except exceptions.InvalidURL: + except exceptions.InvalidURL as e: error = 'Value must be a valid URL string' - raise ValueError(error) + raise ValueError(error) from e return value @@ -80,9 +80,9 @@ class URLPathType(wtypes.UserType): def validate(value): try: validate.url_path(value) - except exceptions.InvalidURLPath: + except exceptions.InvalidURLPath as e: error = 'Value must be a valid URL Path string' - raise ValueError(error) + raise ValueError(error) from e return value diff --git a/octavia/api/drivers/amphora_driver/v1/driver.py b/octavia/api/drivers/amphora_driver/v1/driver.py index f10e0ee1c6..40ba5f8f0a 100644 --- a/octavia/api/drivers/amphora_driver/v1/driver.py +++ b/octavia/api/drivers/amphora_driver/v1/driver.py @@ -46,7 +46,7 @@ AMPHORA_SUPPORTED_LB_ALGORITHMS = [ class AmphoraProviderDriver(driver_base.ProviderDriver): def __init__(self): - super(AmphoraProviderDriver, self).__init__() + super().__init__() topic = cfg.CONF.oslo_messaging.topic self.target = messaging.Target( namespace=consts.RPC_NAMESPACE_CONTROLLER_AGENT, diff --git a/octavia/api/drivers/amphora_driver/v2/driver.py b/octavia/api/drivers/amphora_driver/v2/driver.py index 83d7b7e037..7be8e916e8 100644 --- a/octavia/api/drivers/amphora_driver/v2/driver.py +++ b/octavia/api/drivers/amphora_driver/v2/driver.py @@ -47,7 +47,7 @@ AMPHORA_SUPPORTED_LB_ALGORITHMS = [ class AmphoraProviderDriver(driver_base.ProviderDriver): def __init__(self): - super(AmphoraProviderDriver, self).__init__() + super().__init__() self.target = messaging.Target( namespace=consts.RPC_NAMESPACE_CONTROLLER_AGENT, topic=consts.TOPIC_AMPHORA_V2, version="2.0", fanout=False) diff --git a/octavia/api/drivers/driver_agent/driver_updater.py b/octavia/api/drivers/driver_agent/driver_updater.py index c672a2a618..d73c0abd3f 100644 --- a/octavia/api/drivers/driver_agent/driver_updater.py +++ b/octavia/api/drivers/driver_agent/driver_updater.py @@ -34,7 +34,7 @@ class DriverUpdater(object): self.listener_stats_repo = repo.ListenerStatisticsRepository() self.db_session = db_apis.get_session() - super(DriverUpdater, self).__init__(**kwargs) + super().__init__(**kwargs) def _check_for_lb_vip_deallocate(self, repo, lb_id): lb = repo.get(self.db_session, id=lb_id) diff --git a/octavia/api/drivers/noop_driver/driver.py b/octavia/api/drivers/noop_driver/driver.py index 8eba116625..d98d179d6d 100644 --- a/octavia/api/drivers/noop_driver/driver.py +++ b/octavia/api/drivers/noop_driver/driver.py @@ -23,7 +23,7 @@ LOG = logging.getLogger(__name__) class NoopManager(object): def __init__(self): - super(NoopManager, self).__init__() + super().__init__() self.driverconfig = {} # Load Balancer @@ -262,7 +262,7 @@ class NoopManager(object): class NoopProviderDriver(driver_base.ProviderDriver): def __init__(self): - super(NoopProviderDriver, self).__init__() + super().__init__() self.driver = NoopManager() # Load Balancer diff --git a/octavia/api/healthcheck/healthcheck_plugins.py b/octavia/api/healthcheck/healthcheck_plugins.py index d17a134c82..29141c4db2 100644 --- a/octavia/api/healthcheck/healthcheck_plugins.py +++ b/octavia/api/healthcheck/healthcheck_plugins.py @@ -22,7 +22,7 @@ class OctaviaDBHealthcheck(pluginbase.HealthcheckBaseExtension): UNAVAILABLE_REASON = 'The Octavia database is unavailable.' def __init__(self, *args, **kwargs): - super(OctaviaDBHealthcheck, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) def healthcheck(self, server_port): try: @@ -44,4 +44,4 @@ class OctaviaDBCheckResult(pluginbase.HealthcheckResult): """Result sub-class to provide a unique name in detail reports.""" def __init__(self, *args, **kwargs): - super(OctaviaDBCheckResult, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) diff --git a/octavia/api/root_controller.py b/octavia/api/root_controller.py index 9a3f50042b..09076e5b07 100644 --- a/octavia/api/root_controller.py +++ b/octavia/api/root_controller.py @@ -31,7 +31,7 @@ class RootController(object): """The controller with which the pecan wsgi app should be created.""" def __init__(self): - super(RootController, self).__init__() + super().__init__() setattr(self, 'v2.0', v2_controller.V2Controller()) setattr(self, 'v2', v2_controller.V2Controller()) if CONF.api_settings.healthcheck_enabled: diff --git a/octavia/api/v2/controllers/__init__.py b/octavia/api/v2/controllers/__init__.py index 9184b957b3..c9525b3ed4 100644 --- a/octavia/api/v2/controllers/__init__.py +++ b/octavia/api/v2/controllers/__init__.py @@ -39,7 +39,7 @@ class BaseV2Controller(base.BaseController): quotas = None def __init__(self): - super(BaseV2Controller, self).__init__() + super().__init__() self.loadbalancers = load_balancer.LoadBalancersController() self.listeners = listener.ListenersController() self.pools = pool.PoolsController() @@ -63,7 +63,7 @@ class OctaviaV2Controller(base.BaseController): amphorae = None def __init__(self): - super(OctaviaV2Controller, self).__init__() + super().__init__() self.amphorae = amphora.AmphoraController() @wsme_pecan.wsexpose(wtypes.text) @@ -75,6 +75,6 @@ class V2Controller(BaseV2Controller): lbaas = None def __init__(self): - super(V2Controller, self).__init__() + super().__init__() self.lbaas = BaseV2Controller() self.octavia = OctaviaV2Controller() diff --git a/octavia/api/v2/controllers/amphora.py b/octavia/api/v2/controllers/amphora.py index fc96c7b985..10bae344dc 100644 --- a/octavia/api/v2/controllers/amphora.py +++ b/octavia/api/v2/controllers/amphora.py @@ -36,7 +36,7 @@ class AmphoraController(base.BaseController): RBAC_TYPE = constants.RBAC_AMPHORA def __init__(self): - super(AmphoraController, self).__init__() + super().__init__() @wsme_pecan.wsexpose(amp_types.AmphoraRootResponse, wtypes.text, [wtypes.text], ignore_extra_args=True) @@ -97,7 +97,7 @@ class FailoverController(base.BaseController): RBAC_TYPE = constants.RBAC_AMPHORA def __init__(self, amp_id): - super(FailoverController, self).__init__() + super().__init__() if CONF.api_settings.default_provider_driver == constants.AMPHORAV2: topic = constants.TOPIC_AMPHORA_V2 version = "2.0" @@ -147,7 +147,7 @@ class AmphoraUpdateController(base.BaseController): RBAC_TYPE = constants.RBAC_AMPHORA def __init__(self, amp_id): - super(AmphoraUpdateController, self).__init__() + super().__init__() if CONF.api_settings.default_provider_driver == constants.AMPHORAV2: topic = constants.TOPIC_AMPHORA_V2 @@ -194,7 +194,7 @@ class AmphoraStatsController(base.BaseController): RBAC_TYPE = constants.RBAC_AMPHORA def __init__(self, amp_id): - super(AmphoraStatsController, self).__init__() + super().__init__() self.amp_id = amp_id @wsme_pecan.wsexpose(amp_types.StatisticsRootResponse, wtypes.text, diff --git a/octavia/api/v2/controllers/availability_zone_profiles.py b/octavia/api/v2/controllers/availability_zone_profiles.py index 5176ea9d49..0072eebab6 100644 --- a/octavia/api/v2/controllers/availability_zone_profiles.py +++ b/octavia/api/v2/controllers/availability_zone_profiles.py @@ -37,7 +37,7 @@ class AvailabilityZoneProfileController(base.BaseController): RBAC_TYPE = constants.RBAC_AVAILABILITY_ZONE_PROFILE def __init__(self): - super(AvailabilityZoneProfileController, self).__init__() + super().__init__() @wsme_pecan.wsexpose(profile_types.AvailabilityZoneProfileRootResponse, wtypes.text, [wtypes.text], ignore_extra_args=True) @@ -94,10 +94,10 @@ class AvailabilityZoneProfileController(base.BaseController): try: availability_zone_data_dict = jsonutils.loads( availability_zone_profile.availability_zone_data) - except Exception: + except Exception as e: raise exceptions.InvalidOption( value=availability_zone_profile.availability_zone_data, - option=constants.AVAILABILITY_ZONE_DATA) + option=constants.AVAILABILITY_ZONE_DATA) from e # Validate that the provider driver supports the metadata driver = driver_factory.get_driver( @@ -115,9 +115,9 @@ class AvailabilityZoneProfileController(base.BaseController): self.repositories.availability_zone_profile.create( lock_session, **availability_zone_profile_dict)) lock_session.commit() - except odb_exceptions.DBDuplicateEntry: + except odb_exceptions.DBDuplicateEntry as e: lock_session.rollback() - raise exceptions.IDAlreadyExists() + raise exceptions.IDAlreadyExists() from e except Exception: with excutils.save_and_reraise_exception(): lock_session.rollback() @@ -170,10 +170,10 @@ class AvailabilityZoneProfileController(base.BaseController): try: availability_zone_data_dict = jsonutils.loads( availability_zone_profile.availability_zone_data) - except Exception: + except Exception as e: raise exceptions.InvalidOption( value=availability_zone_profile.availability_zone_data, - option=constants.FLAVOR_DATA) + option=constants.FLAVOR_DATA) from e if isinstance(availability_zone_profile.provider_name, wtypes.UnsetType): @@ -232,6 +232,6 @@ class AvailabilityZoneProfileController(base.BaseController): try: self.repositories.availability_zone_profile.delete( context.session, id=availability_zone_profile_id) - except sa_exception.NoResultFound: + except sa_exception.NoResultFound as e: raise exceptions.NotFound(resource='Availability Zone Profile', - id=availability_zone_profile_id) + id=availability_zone_profile_id) from e diff --git a/octavia/api/v2/controllers/availability_zones.py b/octavia/api/v2/controllers/availability_zones.py index 5f75036560..4eff5e33e6 100644 --- a/octavia/api/v2/controllers/availability_zones.py +++ b/octavia/api/v2/controllers/availability_zones.py @@ -34,7 +34,7 @@ class AvailabilityZonesController(base.BaseController): RBAC_TYPE = constants.RBAC_AVAILABILITY_ZONE def __init__(self): - super(AvailabilityZonesController, self).__init__() + super().__init__() @wsme_pecan.wsexpose(availability_zone_types.AvailabilityZoneRootResponse, wtypes.text, [wtypes.text], ignore_extra_args=True) @@ -93,10 +93,10 @@ class AvailabilityZonesController(base.BaseController): db_availability_zone = self.repositories.availability_zone.create( lock_session, **availability_zone_dict) lock_session.commit() - except odb_exceptions.DBDuplicateEntry: + except odb_exceptions.DBDuplicateEntry as e: lock_session.rollback() - raise exceptions.RecordAlreadyExists(field='availability zone', - name=availability_zone.name) + raise exceptions.RecordAlreadyExists( + field='availability zone', name=availability_zone.name) from e except Exception: with excutils.save_and_reraise_exception(): lock_session.rollback() @@ -159,14 +159,14 @@ class AvailabilityZonesController(base.BaseController): serial_session, name=availability_zone_name) serial_session.commit() # Handle when load balancers still reference this availability_zone - except odb_exceptions.DBReferenceError: + except odb_exceptions.DBReferenceError as e: serial_session.rollback() raise exceptions.ObjectInUse(object='Availability Zone', - id=availability_zone_name) - except sa_exception.NoResultFound: + id=availability_zone_name) from e + except sa_exception.NoResultFound as e: serial_session.rollback() raise exceptions.NotFound(resource='Availability Zone', - id=availability_zone_name) + id=availability_zone_name) from e except Exception as e: with excutils.save_and_reraise_exception(): LOG.error( diff --git a/octavia/api/v2/controllers/base.py b/octavia/api/v2/controllers/base.py index 4bad735b92..d3771fbeb0 100644 --- a/octavia/api/v2/controllers/base.py +++ b/octavia/api/v2/controllers/base.py @@ -36,7 +36,7 @@ class BaseController(pecan_rest.RestController): RBAC_TYPE = None def __init__(self): - super(BaseController, self).__init__() + super().__init__() self.cert_manager = stevedore_driver.DriverManager( namespace='octavia.cert_manager', name=CONF.certificates.cert_manager, diff --git a/octavia/api/v2/controllers/flavor_profiles.py b/octavia/api/v2/controllers/flavor_profiles.py index 91f915f6ab..3156121db4 100644 --- a/octavia/api/v2/controllers/flavor_profiles.py +++ b/octavia/api/v2/controllers/flavor_profiles.py @@ -38,7 +38,7 @@ class FlavorProfileController(base.BaseController): RBAC_TYPE = constants.RBAC_FLAVOR_PROFILE def __init__(self): - super(FlavorProfileController, self).__init__() + super().__init__() @wsme_pecan.wsexpose(profile_types.FlavorProfileRootResponse, wtypes.text, [wtypes.text], ignore_extra_args=True) @@ -87,10 +87,10 @@ class FlavorProfileController(base.BaseController): # Do a basic JSON validation on the metadata try: flavor_data_dict = jsonutils.loads(flavorprofile.flavor_data) - except Exception: + except Exception as e: raise exceptions.InvalidOption( value=flavorprofile.flavor_data, - option=constants.FLAVOR_DATA) + option=constants.FLAVOR_DATA) from e # Validate that the provider driver supports the metadata driver = driver_factory.get_driver(flavorprofile.provider_name) @@ -104,9 +104,9 @@ class FlavorProfileController(base.BaseController): db_flavor_profile = self.repositories.flavor_profile.create( lock_session, **flavorprofile_dict) lock_session.commit() - except odb_exceptions.DBDuplicateEntry: + except odb_exceptions.DBDuplicateEntry as e: lock_session.rollback() - raise exceptions.IDAlreadyExists() + raise exceptions.IDAlreadyExists() from e except Exception: with excutils.save_and_reraise_exception(): lock_session.rollback() @@ -151,10 +151,10 @@ class FlavorProfileController(base.BaseController): # Do a basic JSON validation on the metadata try: flavor_data_dict = jsonutils.loads(flavorprofile.flavor_data) - except Exception: + except Exception as e: raise exceptions.InvalidOption( value=flavorprofile.flavor_data, - option=constants.FLAVOR_DATA) + option=constants.FLAVOR_DATA) from e if isinstance(flavorprofile.provider_name, wtypes.UnsetType): db_flavor_profile = self._get_db_flavor_profile( @@ -207,6 +207,6 @@ class FlavorProfileController(base.BaseController): try: self.repositories.flavor_profile.delete(context.session, id=flavor_profile_id) - except sa_exception.NoResultFound: - raise exceptions.NotFound(resource='Flavor profile', - id=flavor_profile_id) + except sa_exception.NoResultFound as e: + raise exceptions.NotFound( + resource='Flavor profile', id=flavor_profile_id) from e diff --git a/octavia/api/v2/controllers/flavors.py b/octavia/api/v2/controllers/flavors.py index edde0590e3..cc0b879402 100644 --- a/octavia/api/v2/controllers/flavors.py +++ b/octavia/api/v2/controllers/flavors.py @@ -36,7 +36,7 @@ class FlavorsController(base.BaseController): RBAC_TYPE = constants.RBAC_FLAVOR def __init__(self): - super(FlavorsController, self).__init__() + super().__init__() @wsme_pecan.wsexpose(flavor_types.FlavorRootResponse, wtypes.text, [wtypes.text], ignore_extra_args=True) @@ -90,10 +90,10 @@ class FlavorsController(base.BaseController): db_flavor = self.repositories.flavor.create(lock_session, **flavor_dict) lock_session.commit() - except odb_exceptions.DBDuplicateEntry: + except odb_exceptions.DBDuplicateEntry as e: lock_session.rollback() raise exceptions.RecordAlreadyExists(field='flavor', - name=flavor.name) + name=flavor.name) from e except Exception: with excutils.save_and_reraise_exception(): lock_session.rollback() @@ -147,12 +147,12 @@ class FlavorsController(base.BaseController): self.repositories.flavor.delete(serial_session, id=flavor_id) serial_session.commit() # Handle when load balancers still reference this flavor - except odb_exceptions.DBReferenceError: + except odb_exceptions.DBReferenceError as e: serial_session.rollback() - raise exceptions.ObjectInUse(object='Flavor', id=flavor_id) - except sa_exception.NoResultFound: + raise exceptions.ObjectInUse(object='Flavor', id=flavor_id) from e + except sa_exception.NoResultFound as e: serial_session.rollback() - raise exceptions.NotFound(resource='Flavor', id=flavor_id) + raise exceptions.NotFound(resource='Flavor', id=flavor_id) from e except Exception as e: with excutils.save_and_reraise_exception(): LOG.error('Unknown flavor delete exception: %s', str(e)) diff --git a/octavia/api/v2/controllers/health_monitor.py b/octavia/api/v2/controllers/health_monitor.py index aa6511fcc0..29c0778707 100644 --- a/octavia/api/v2/controllers/health_monitor.py +++ b/octavia/api/v2/controllers/health_monitor.py @@ -42,7 +42,7 @@ class HealthMonitorController(base.BaseController): RBAC_TYPE = consts.RBAC_HEALTHMONITOR def __init__(self): - super(HealthMonitorController, self).__init__() + super().__init__() @wsme_pecan.wsexpose(hm_types.HealthMonitorRootResponse, wtypes.text, [wtypes.text], ignore_extra_args=True) @@ -156,13 +156,13 @@ class HealthMonitorController(base.BaseController): try: return self.repositories.health_monitor.create( lock_session, **hm_dict) - except odb_exceptions.DBDuplicateEntry: - raise exceptions.DuplicateHealthMonitor() - except odb_exceptions.DBError: + except odb_exceptions.DBDuplicateEntry as e: + raise exceptions.DuplicateHealthMonitor() from e + except odb_exceptions.DBError as e: # TODO(blogan): will have to do separate validation protocol # before creation or update since the exception messages # do not give any information as to what constraint failed - raise exceptions.InvalidOption(value='', option='') + raise exceptions.InvalidOption(value='', option='') from e def _validate_healthmonitor_request_for_udp(self, request): if request.type not in ( @@ -248,10 +248,10 @@ class HealthMonitorController(base.BaseController): driver.name, driver.health_monitor_create, provider_healthmon) lock_session.commit() - except odb_exceptions.DBError: + except odb_exceptions.DBError as e: lock_session.rollback() raise exceptions.InvalidOption( - value=hm_dict.get('type'), option='type') + value=hm_dict.get('type'), option='type') from e except Exception: with excutils.save_and_reraise_exception(): lock_session.rollback() diff --git a/octavia/api/v2/controllers/l7policy.py b/octavia/api/v2/controllers/l7policy.py index a0fa08603c..478622dc07 100644 --- a/octavia/api/v2/controllers/l7policy.py +++ b/octavia/api/v2/controllers/l7policy.py @@ -43,7 +43,7 @@ class L7PolicyController(base.BaseController): RBAC_TYPE = constants.RBAC_L7POLICY def __init__(self): - super(L7PolicyController, self).__init__() + super().__init__() @wsme_pecan.wsexpose(l7policy_types.L7PolicyRootResponse, wtypes.text, [wtypes.text], ignore_extra_args=True) @@ -103,13 +103,13 @@ class L7PolicyController(base.BaseController): return self.repositories.l7policy.create(lock_session, **l7policy_dict) - except odb_exceptions.DBDuplicateEntry: - raise exceptions.IDAlreadyExists() - except odb_exceptions.DBError: + except odb_exceptions.DBDuplicateEntry as e: + raise exceptions.IDAlreadyExists() from e + except odb_exceptions.DBError as e: # TODO(blogan): will have to do separate validation protocol # before creation or update since the exception messages # do not give any information as to what constraint failed - raise exceptions.InvalidOption(value='', option='') + raise exceptions.InvalidOption(value='', option='') from e @wsme_pecan.wsexpose(l7policy_types.L7PolicyRootResponse, body=l7policy_types.L7PolicyRootPOST, status_code=201) diff --git a/octavia/api/v2/controllers/l7rule.py b/octavia/api/v2/controllers/l7rule.py index 52e1990eed..56611d4541 100644 --- a/octavia/api/v2/controllers/l7rule.py +++ b/octavia/api/v2/controllers/l7rule.py @@ -39,7 +39,7 @@ class L7RuleController(base.BaseController): RBAC_TYPE = constants.RBAC_L7RULE def __init__(self, l7policy_id): - super(L7RuleController, self).__init__() + super().__init__() self.l7policy_id = l7policy_id @wsme_pecan.wsexpose(l7rule_types.L7RuleRootResponse, wtypes.text, @@ -110,13 +110,13 @@ class L7RuleController(base.BaseController): def _validate_create_l7rule(self, lock_session, l7rule_dict): try: return self.repositories.l7rule.create(lock_session, **l7rule_dict) - except odb_exceptions.DBDuplicateEntry: - raise exceptions.IDAlreadyExists() - except odb_exceptions.DBError: + except odb_exceptions.DBDuplicateEntry as e: + raise exceptions.IDAlreadyExists() from e + except odb_exceptions.DBError as e: # TODO(blogan): will have to do separate validation protocol # before creation or update since the exception messages # do not give any information as to what constraint failed - raise exceptions.InvalidOption(value='', option='') + raise exceptions.InvalidOption(value='', option='') from e @wsme_pecan.wsexpose(l7rule_types.L7RuleRootResponse, body=l7rule_types.L7RuleRootPOST, status_code=201) diff --git a/octavia/api/v2/controllers/listener.py b/octavia/api/v2/controllers/listener.py index 53bf4f2ccd..e44d0b43b7 100644 --- a/octavia/api/v2/controllers/listener.py +++ b/octavia/api/v2/controllers/listener.py @@ -47,7 +47,7 @@ class ListenersController(base.BaseController): RBAC_TYPE = constants.RBAC_LISTENER def __init__(self): - super(ListenersController, self).__init__() + super().__init__() @wsme_pecan.wsexpose(listener_types.ListenerRootResponse, wtypes.text, [wtypes.text], ignore_extra_args=True) @@ -323,9 +323,9 @@ class ListenersController(base.BaseController): raise exceptions.DuplicateListenerEntry( protocol=listener_dict.get('protocol'), port=listener_dict.get('protocol_port')) - except odb_exceptions.DBError: + except odb_exceptions.DBError as e: raise exceptions.InvalidOption(value=listener_dict.get('protocol'), - option='protocol') + option='protocol') from e @wsme_pecan.wsexpose(listener_types.ListenerRootResponse, body=listener_types.ListenerRootPOST, status_code=201) @@ -647,7 +647,7 @@ class StatisticsController(base.BaseController, stats.StatsMixin): RBAC_TYPE = constants.RBAC_LISTENER def __init__(self, listener_id): - super(StatisticsController, self).__init__() + super().__init__() self.id = listener_id @wsme_pecan.wsexpose(listener_types.StatisticsRootResponse, wtypes.text, diff --git a/octavia/api/v2/controllers/load_balancer.py b/octavia/api/v2/controllers/load_balancer.py index 870fafc38e..4a34d245b9 100644 --- a/octavia/api/v2/controllers/load_balancer.py +++ b/octavia/api/v2/controllers/load_balancer.py @@ -52,7 +52,7 @@ class LoadBalancersController(base.BaseController): RBAC_TYPE = constants.RBAC_LOADBALANCER def __init__(self): - super(LoadBalancersController, self).__init__() + super().__init__() @wsme_pecan.wsexpose(lb_types.LoadBalancerRootResponse, wtypes.text, [wtypes.text], ignore_extra_args=True) @@ -293,9 +293,9 @@ class LoadBalancersController(base.BaseController): try: provider = self.repositories.flavor.get_flavor_provider( session, load_balancer.flavor_id) - except sa_exception.NoResultFound: + except sa_exception.NoResultFound as e: raise exceptions.ValidationException( - detail=_("Invalid flavor_id.")) + detail=_("Invalid flavor_id.")) from e # No provider specified and no flavor specified, use conf default if (isinstance(load_balancer.provider, wtypes.UnsetType) and @@ -322,9 +322,9 @@ class LoadBalancersController(base.BaseController): flavor_dict = ( self.repositories.flavor.get_flavor_metadata_dict( lock_session, lb_dict['flavor_id'])) - except sa_exception.NoResultFound: + except sa_exception.NoResultFound as e: raise exceptions.ValidationException( - detail=_("Invalid flavor_id.")) + detail=_("Invalid flavor_id.")) from e # Make sure the driver will still accept the flavor metadata if flavor_dict: @@ -361,9 +361,9 @@ class LoadBalancersController(base.BaseController): self.repositories.availability_zone .get_availability_zone_metadata_dict(lock_session, az.name) ) - except sa_exception.NoResultFound: + except sa_exception.NoResultFound as e: raise exceptions.ValidationException( - detail=_("Invalid availability_zone.")) + detail=_("Invalid availability_zone.")) from e # Make sure the driver will still accept the availability zone metadata if az_dict: @@ -371,10 +371,10 @@ class LoadBalancersController(base.BaseController): driver_utils.call_provider(driver.name, driver.validate_availability_zone, az_dict) - except NotImplementedError: + except NotImplementedError as e: raise exceptions.ProviderNotImplementedError( prov=driver.name, user_msg="This provider does not support" - " availability zones.") + " availability zones.") from e return az_dict @@ -513,9 +513,9 @@ class LoadBalancersController(base.BaseController): driver_dm.LoadBalancer.from_dict(driver_lb_dict)) lock_session.commit() - except odb_exceptions.DBDuplicateEntry: + except odb_exceptions.DBDuplicateEntry as e: lock_session.rollback() - raise exceptions.IDAlreadyExists() + raise exceptions.IDAlreadyExists() from e except Exception: with excutils.save_and_reraise_exception(): lock_session.rollback() @@ -758,7 +758,7 @@ class StatusController(base.BaseController): RBAC_TYPE = constants.RBAC_LOADBALANCER def __init__(self, lb_id): - super(StatusController, self).__init__() + super().__init__() self.id = lb_id @wsme_pecan.wsexpose(lb_types.StatusRootResponse, wtypes.text, @@ -786,7 +786,7 @@ class StatisticsController(base.BaseController, stats.StatsMixin): RBAC_TYPE = constants.RBAC_LOADBALANCER def __init__(self, lb_id): - super(StatisticsController, self).__init__() + super().__init__() self.id = lb_id @wsme_pecan.wsexpose(lb_types.StatisticsRootResponse, wtypes.text, @@ -814,7 +814,7 @@ class StatisticsController(base.BaseController, stats.StatsMixin): class FailoverController(LoadBalancersController): def __init__(self, lb_id): - super(FailoverController, self).__init__() + super().__init__() self.lb_id = lb_id @wsme_pecan.wsexpose(None, wtypes.text, status_code=202) diff --git a/octavia/api/v2/controllers/member.py b/octavia/api/v2/controllers/member.py index 3b925eb04e..7e21a9ddd2 100644 --- a/octavia/api/v2/controllers/member.py +++ b/octavia/api/v2/controllers/member.py @@ -41,7 +41,7 @@ class MemberController(base.BaseController): RBAC_TYPE = constants.RBAC_MEMBER def __init__(self, pool_id): - super(MemberController, self).__init__() + super().__init__() self.pool_id = pool_id @wsme_pecan.wsexpose(member_types.MemberRootResponse, wtypes.text, @@ -129,11 +129,11 @@ class MemberController(base.BaseController): raise exceptions.DuplicateMemberEntry( ip_address=member_dict.get('ip_address'), port=member_dict.get('protocol_port')) - except odb_exceptions.DBError: + except odb_exceptions.DBError as e: # TODO(blogan): will have to do separate validation protocol # before creation or update since the exception messages # do not give any information as to what constraint failed - raise exceptions.InvalidOption(value='', option='') + raise exceptions.InvalidOption(value='', option='') from e def _validate_pool_id(self, member_id, db_member_pool_id): if db_member_pool_id != self.pool_id: @@ -319,7 +319,7 @@ class MemberController(base.BaseController): class MembersController(MemberController): def __init__(self, pool_id): - super(MembersController, self).__init__(pool_id) + super().__init__(pool_id) @wsme_pecan.wsexpose(None, wtypes.text, body=member_types.MembersRootPUT, status_code=202) diff --git a/octavia/api/v2/controllers/pool.py b/octavia/api/v2/controllers/pool.py index 102a0d1f0d..49ac7ee73f 100644 --- a/octavia/api/v2/controllers/pool.py +++ b/octavia/api/v2/controllers/pool.py @@ -46,7 +46,7 @@ class PoolsController(base.BaseController): RBAC_TYPE = constants.RBAC_POOL def __init__(self): - super(PoolsController, self).__init__() + super().__init__() @wsme_pecan.wsexpose(pool_types.PoolRootResponse, wtypes.text, [wtypes.text], ignore_extra_args=True) @@ -141,13 +141,13 @@ class PoolsController(base.BaseController): return self.repositories.create_pool_on_load_balancer( lock_session, pool_dict, listener_id=listener_id) - except odb_exceptions.DBDuplicateEntry: - raise exceptions.IDAlreadyExists() - except odb_exceptions.DBError: + except odb_exceptions.DBDuplicateEntry as e: + raise exceptions.IDAlreadyExists() from e + except odb_exceptions.DBError as e: # TODO(blogan): will have to do separate validation protocol # before creation or update since the exception messages # do not give any information as to what constraint failed - raise exceptions.InvalidOption(value='', option='') + raise exceptions.InvalidOption(value='', option='') from e def _is_only_specified_in_request(self, request, **kwargs): request_attrs = [] diff --git a/octavia/api/v2/controllers/provider.py b/octavia/api/v2/controllers/provider.py index 63ab5a1f10..be340bcaa5 100644 --- a/octavia/api/v2/controllers/provider.py +++ b/octavia/api/v2/controllers/provider.py @@ -34,7 +34,7 @@ class ProviderController(base.BaseController): RBAC_TYPE = constants.RBAC_PROVIDER def __init__(self): - super(ProviderController, self).__init__() + super().__init__() @wsme_pecan.wsexpose(provider_types.ProvidersRootResponse, [wtypes.text], ignore_extra_args=True) @@ -76,7 +76,7 @@ class FlavorCapabilitiesController(base.BaseController): RBAC_TYPE = constants.RBAC_PROVIDER_FLAVOR def __init__(self, provider): - super(FlavorCapabilitiesController, self).__init__() + super().__init__() self.provider = provider @wsme_pecan.wsexpose(provider_types.FlavorCapabilitiesResponse, @@ -126,7 +126,7 @@ class AvailabilityZoneCapabilitiesController(base.BaseController): RBAC_TYPE = constants.RBAC_PROVIDER_AVAILABILITY_ZONE def __init__(self, provider): - super(AvailabilityZoneCapabilitiesController, self).__init__() + super().__init__() self.provider = provider @wsme_pecan.wsexpose(provider_types.AvailabilityZoneCapabilitiesResponse, diff --git a/octavia/api/v2/controllers/quotas.py b/octavia/api/v2/controllers/quotas.py index 5c386ea477..aa1f06a7f6 100644 --- a/octavia/api/v2/controllers/quotas.py +++ b/octavia/api/v2/controllers/quotas.py @@ -31,7 +31,7 @@ class QuotasController(base.BaseController): RBAC_TYPE = constants.RBAC_QUOTA def __init__(self): - super(QuotasController, self).__init__() + super().__init__() @wsme_pecan.wsexpose(quota_types.QuotaResponse, wtypes.text) def get(self, project_id): @@ -103,7 +103,7 @@ class QuotasDefaultController(base.BaseController): RBAC_TYPE = constants.RBAC_QUOTA def __init__(self, project_id): - super(QuotasDefaultController, self).__init__() + super().__init__() self.project_id = project_id @wsme_pecan.wsexpose(quota_types.QuotaResponse, wtypes.text) diff --git a/octavia/api/v2/types/quotas.py b/octavia/api/v2/types/quotas.py index 3b24490023..c898de45b4 100644 --- a/octavia/api/v2/types/quotas.py +++ b/octavia/api/v2/types/quotas.py @@ -42,7 +42,7 @@ class QuotaBase(base.BaseType): minimum=consts.MIN_QUOTA, maximum=consts.MAX_QUOTA)) def to_dict(self, render_unsets=False): - quota_dict = super(QuotaBase, self).to_dict(render_unsets) + quota_dict = super().to_dict(render_unsets) if 'loadbalancer' in quota_dict: quota_dict['load_balancer'] = quota_dict.pop('loadbalancer') if 'healthmonitor' in quota_dict: diff --git a/octavia/certificates/generator/local.py b/octavia/certificates/generator/local.py index 3a7f9ab30c..3462830217 100644 --- a/octavia/certificates/generator/local.py +++ b/octavia/certificates/generator/local.py @@ -46,20 +46,20 @@ class LocalCertGenerator(cert_gen.CertGenerator): LOG.info("Using CA Certificate from config.") try: ca_cert = open(CONF.certificates.ca_certificate, 'rb').read() - except IOError: + except IOError as e: raise exceptions.CertificateGenerationException( msg="Failed to load CA Certificate {0}." .format(CONF.certificates.ca_certificate) - ) + ) from e if not ca_key: LOG.info("Using CA Private Key from config.") try: ca_key = open(CONF.certificates.ca_private_key, 'rb').read() - except IOError: + except IOError as e: raise exceptions.CertificateGenerationException( msg="Failed to load CA Private Key {0}." .format(CONF.certificates.ca_private_key) - ) + ) from e if not ca_key_pass: ca_key_pass = CONF.certificates.ca_private_key_passphrase if ca_key_pass: @@ -92,10 +92,10 @@ class LocalCertGenerator(cert_gen.CertGenerator): ca_digest = CONF.certificates.signing_digest try: algorithm = getattr(hashes, ca_digest.upper())() - except AttributeError: + except AttributeError as e: raise crypto_exceptions.UnsupportedAlgorithm( "Supplied digest method not found: %s" % ca_digest - ) + ) from e if not ca_cert: with open(CONF.certificates.ca_certificate, 'rb') as f: diff --git a/octavia/certificates/manager/barbican.py b/octavia/certificates/manager/barbican.py index a6b36399f6..663f6c4ba7 100644 --- a/octavia/certificates/manager/barbican.py +++ b/octavia/certificates/manager/barbican.py @@ -38,7 +38,7 @@ class BarbicanCertManager(cert_mgr.CertManager): """Certificate Manager that wraps the Barbican client API.""" def __init__(self): - super(BarbicanCertManager, self).__init__() + super().__init__() self.auth = stevedore_driver.DriverManager( namespace='octavia.barbican_auth', name=cfg.CONF.certificates.barbican_auth, diff --git a/octavia/certificates/manager/barbican_legacy.py b/octavia/certificates/manager/barbican_legacy.py index f783d07624..4df6acd051 100644 --- a/octavia/certificates/manager/barbican_legacy.py +++ b/octavia/certificates/manager/barbican_legacy.py @@ -32,7 +32,7 @@ class BarbicanCertManager(cert_mgr.CertManager): """Certificate Manager that wraps the Barbican client API.""" def __init__(self, auth=None): - super(BarbicanCertManager, self).__init__() + super().__init__() if auth: self.auth = auth else: diff --git a/octavia/certificates/manager/castellan_mgr.py b/octavia/certificates/manager/castellan_mgr.py index 71cb88dc72..cfe592586f 100644 --- a/octavia/certificates/manager/castellan_mgr.py +++ b/octavia/certificates/manager/castellan_mgr.py @@ -32,7 +32,7 @@ class CastellanCertManager(cert_mgr.CertManager): """Certificate Manager for the Castellan library.""" def __init__(self): - super(CastellanCertManager, self).__init__() + super().__init__() self.manager = key_manager.API() def store_cert(self, context, certificate, private_key, intermediates=None, diff --git a/octavia/certificates/manager/local.py b/octavia/certificates/manager/local.py index 99fa640d44..ecd7d6e28e 100644 --- a/octavia/certificates/manager/local.py +++ b/octavia/certificates/manager/local.py @@ -117,17 +117,17 @@ class LocalCertManager(cert_mgr.CertManager): try: with os.fdopen(os.open(filename_certificate, flags)) as cert_file: cert_data['certificate'] = cert_file.read() - except IOError: + except IOError as e: LOG.error("Failed to read certificate for %s.", cert_ref) raise exceptions.CertificateStorageException( - msg="Certificate could not be read.") + msg="Certificate could not be read.") from e try: with os.fdopen(os.open(filename_private_key, flags)) as key_file: cert_data['private_key'] = key_file.read() - except IOError: + except IOError as e: LOG.error("Failed to read private key for %s", cert_ref) raise exceptions.CertificateStorageException( - msg="Private Key could not be read.") + msg="Private Key could not be read.") from e try: with os.fdopen(os.open(filename_intermediates, flags)) as int_file: @@ -204,8 +204,9 @@ class LocalCertManager(cert_mgr.CertManager): try: with os.fdopen(os.open(filename_secret, flags)) as secret_file: secret_data = secret_file.read() - except IOError: + except IOError as e: LOG.error("Failed to read secret for %s.", secret_ref) - raise exceptions.CertificateRetrievalException(ref=secret_ref) + raise exceptions.CertificateRetrievalException( + ref=secret_ref) from e return secret_data diff --git a/octavia/cmd/agent.py b/octavia/cmd/agent.py index 7e8af0ed3a..f6f59ef7d8 100644 --- a/octavia/cmd/agent.py +++ b/octavia/cmd/agent.py @@ -37,7 +37,7 @@ class AmphoraAgent(gunicorn.app.base.BaseApplication): def __init__(self, app, options=None): self.options = options or {} self.application = app - super(AmphoraAgent, self).__init__() + super().__init__() def load_config(self): config = {key: value for key, value in self.options.items() diff --git a/octavia/common/base_taskflow.py b/octavia/common/base_taskflow.py index 27622cc0d0..3324dfa03e 100644 --- a/octavia/common/base_taskflow.py +++ b/octavia/common/base_taskflow.py @@ -76,7 +76,7 @@ class BaseTaskFlowEngine(object): class ExtendExpiryListener(base.Listener): def __init__(self, engine, job): - super(ExtendExpiryListener, self).__init__(engine) + super().__init__(engine) self.job = job def _task_receiver(self, state, details): @@ -92,14 +92,14 @@ class ExtendExpiryListener(base.Listener): class DynamicLoggingConductor(impl_blocking.BlockingConductor): def _listeners_from_job(self, job, engine): - listeners = super(DynamicLoggingConductor, self)._listeners_from_job( + listeners = super()._listeners_from_job( job, engine) listeners.append(logging.DynamicLoggingListener(engine, log=LOG)) return listeners def _on_job_done(self, job, fut): - super(DynamicLoggingConductor, self)._on_job_done(job, fut) + super()._on_job_done(job, fut) # Double check that job is complete. if (not CONF.task_flow.jobboard_save_logbook and job.state == states.COMPLETE): @@ -115,8 +115,7 @@ class DynamicLoggingConductor(impl_blocking.BlockingConductor): class RedisDynamicLoggingConductor(DynamicLoggingConductor): def _listeners_from_job(self, job, engine): - listeners = super(RedisDynamicLoggingConductor, - self)._listeners_from_job(job, engine) + listeners = super()._listeners_from_job(job, engine) listeners.append(ExtendExpiryListener(engine, job)) return listeners diff --git a/octavia/common/context.py b/octavia/common/context.py index f39a661e45..51292d84a3 100644 --- a/octavia/common/context.py +++ b/octavia/common/context.py @@ -31,7 +31,7 @@ class Context(common_context.RequestContext): if project_id: kwargs['tenant'] = project_id - super(Context, self).__init__(**kwargs) + super().__init__(**kwargs) self.is_admin = (policy.get_enforcer().check_is_admin(self) or CONF.api_settings.auth_strategy == constants.NOAUTH) diff --git a/octavia/common/exceptions.py b/octavia/common/exceptions.py index 2b16f6013e..9eff1a2842 100644 --- a/octavia/common/exceptions.py +++ b/octavia/common/exceptions.py @@ -40,14 +40,14 @@ class OctaviaException(Exception): self.message = args[0] self.orig_msg = kwargs.get('orig_msg') self.orig_code = kwargs.get('orig_code') - super(OctaviaException, self).__init__(self.message % kwargs) + super().__init__(self.message % kwargs) self.msg = self.message % kwargs except Exception: with excutils.save_and_reraise_exception() as ctxt: if not self.use_fatal_exceptions(): ctxt.reraise = False # at least get the core message out if something happened - super(OctaviaException, self).__init__(self.message) + super().__init__(self.message) def __unicode__(self): return self.msg @@ -66,7 +66,7 @@ class APIException(exc.HTTPClientError): def __init__(self, **kwargs): self.msg = self.msg % kwargs - super(APIException, self).__init__(detail=self.msg) + super().__init__(detail=self.msg) class NotFound(APIException): diff --git a/octavia/common/keystone.py b/octavia/common/keystone.py index 1fd6334ac2..8c5214d390 100644 --- a/octavia/common/keystone.py +++ b/octavia/common/keystone.py @@ -77,4 +77,4 @@ class SkippingAuthProtocol(auth_token.AuthProtocol): 'authentication', path) return None # return NONE to reach actual logic - return super(SkippingAuthProtocol, self).process_request(request) + return super().process_request(request) diff --git a/octavia/common/policy.py b/octavia/common/policy.py index ca9b95c771..ee8d088b80 100644 --- a/octavia/common/policy.py +++ b/octavia/common/policy.py @@ -63,8 +63,8 @@ class Policy(oslo_policy.Enforcer): rules from config file. """ - super(Policy, self).__init__(conf, policy_file, rules, default_rule, - use_conf, overwrite) + super().__init__(conf, policy_file, rules, default_rule, use_conf, + overwrite) self.register_defaults(policies.list_rules()) @@ -107,7 +107,7 @@ class Policy(oslo_policy.Enforcer): exc = exceptions.PolicyForbidden try: - return super(Policy, self).authorize( + return super().authorize( action, target, credentials, do_raise=do_raise, exc=exc) except oslo_policy.PolicyNotRegistered: with excutils.save_and_reraise_exception(): @@ -139,7 +139,7 @@ class IsAdminCheck(oslo_policy.Check): self.expected = match.lower() == 'true' - super(IsAdminCheck, self).__init__(kind, str(self.expected)) + super().__init__(kind, str(self.expected)) def __call__(self, target, creds, enforcer): """Determine whether is_admin matches the requested value.""" diff --git a/octavia/common/stats.py b/octavia/common/stats.py index 5e35de3125..e33b0f0c1d 100644 --- a/octavia/common/stats.py +++ b/octavia/common/stats.py @@ -24,7 +24,7 @@ LOG = logging.getLogger(__name__) class StatsMixin(object): def __init__(self): - super(StatsMixin, self).__init__() + super().__init__() self.listener_stats_repo = repo.ListenerStatisticsRepository() self.repo_amphora = repo.AmphoraRepository() self.repo_loadbalancer = repo.LoadBalancerRepository() diff --git a/octavia/common/tls_utils/cert_parser.py b/octavia/common/tls_utils/cert_parser.py index 2f6d6a1f10..945236b3e2 100644 --- a/octavia/common/tls_utils/cert_parser.py +++ b/octavia/common/tls_utils/cert_parser.py @@ -80,9 +80,9 @@ def _read_private_key(private_key_pem, passphrase=None): try: return serialization.load_pem_private_key(private_key_pem, passphrase, backends.default_backend()) - except Exception: + except Exception as e: LOG.exception("Passphrase required.") - raise exceptions.NeedsPassphrase + raise exceptions.NeedsPassphrase from e def prepare_private_key(private_key, passphrase=None): @@ -166,9 +166,9 @@ def _parse_pkcs7_bundle(pkcs7): for substrate in _read_pem_blocks(pkcs7): for cert in _get_certs_from_pkcs7_substrate(substrate): yield cert - except Exception: + except Exception as e: LOG.exception('Unreadable Certificate.') - raise exceptions.UnreadableCert + raise exceptions.UnreadableCert from e # If no PEM encoding, assume this is DER encoded and try to decode else: @@ -225,9 +225,9 @@ def _get_certs_from_pkcs7_substrate(substrate): contentInfo, _ = der_decoder.decode(substrate, asn1Spec=rfc2315.ContentInfo()) contentType = contentInfo.getComponentByName('contentType') - except Exception: + except Exception as e: LOG.exception('Unreadable Certificate.') - raise exceptions.UnreadableCert + raise exceptions.UnreadableCert from e if contentType != rfc2315.signedData: LOG.exception('Unreadable Certificate.') raise exceptions.UnreadableCert @@ -236,9 +236,9 @@ def _get_certs_from_pkcs7_substrate(substrate): content, _ = der_decoder.decode( contentInfo.getComponentByName('content'), asn1Spec=rfc2315.SignedData()) - except Exception: + except Exception as e: LOG.exception('Unreadable Certificate.') - raise exceptions.UnreadableCert + raise exceptions.UnreadableCert from e for cert in content.getComponentByName('certificates'): yield der_encoder.encode(cert) @@ -275,9 +275,9 @@ def get_host_names(certificate): x509.OID_SUBJECT_ALTERNATIVE_NAME) return host_names - except Exception: + except Exception as e: LOG.exception('Unreadable Certificate.') - raise exceptions.UnreadableCert + raise exceptions.UnreadableCert from e def get_cert_expiration(certificate_pem): @@ -290,9 +290,9 @@ def get_cert_expiration(certificate_pem): cert = x509.load_pem_x509_certificate(certificate_pem, backends.default_backend()) return cert.not_valid_after - except Exception: + except Exception as e: LOG.exception('Unreadable Certificate.') - raise exceptions.UnreadableCert + raise exceptions.UnreadableCert from e def _get_x509_from_pem_bytes(certificate_pem): @@ -306,9 +306,9 @@ def _get_x509_from_pem_bytes(certificate_pem): try: x509cert = x509.load_pem_x509_certificate(certificate_pem, backends.default_backend()) - except Exception: + except Exception as e: LOG.exception('Unreadable Certificate.') - raise exceptions.UnreadableCert + raise exceptions.UnreadableCert from e return x509cert @@ -321,9 +321,9 @@ def _get_x509_from_der_bytes(certificate_der): try: x509cert = x509.load_der_x509_certificate(certificate_der, backends.default_backend()) - except Exception: + except Exception as e: LOG.exception('Unreadable Certificate.') - raise exceptions.UnreadableCert + raise exceptions.UnreadableCert from e return x509cert diff --git a/octavia/common/validate.py b/octavia/common/validate.py index c8361f4a67..46004e244b 100644 --- a/octavia/common/validate.py +++ b/octavia/common/validate.py @@ -44,8 +44,8 @@ def url(url, require_scheme=True): if require_scheme: if p_url.scheme != 'http' and p_url.scheme != 'https': raise exceptions.InvalidURL(url=url) - except Exception: - raise exceptions.InvalidURL(url=url) + except Exception as e: + raise exceptions.InvalidURL(url=url) from e return True @@ -63,8 +63,8 @@ def url_path(url_path): if invalid_path: raise exceptions.InvalidURLPath(url_path=url_path) - except Exception: - raise exceptions.InvalidURLPath(url_path=url_path) + except Exception as e: + raise exceptions.InvalidURLPath(url_path=url_path) from e return True @@ -317,8 +317,8 @@ def port_exists(port_id, context=None): network_driver = utils.get_network_driver() try: port = network_driver.get_port(port_id, context=context) - except Exception: - raise exceptions.InvalidSubresource(resource='Port', id=port_id) + except Exception as e: + raise exceptions.InvalidSubresource(resource='Port', id=port_id) from e return port @@ -336,8 +336,9 @@ def subnet_exists(subnet_id, context=None): network_driver = utils.get_network_driver() try: subnet = network_driver.get_subnet(subnet_id, context=context) - except Exception: - raise exceptions.InvalidSubresource(resource='Subnet', id=subnet_id) + except Exception as e: + raise exceptions.InvalidSubresource( + resource='Subnet', id=subnet_id) from e return subnet @@ -346,9 +347,9 @@ def qos_policy_exists(qos_policy_id): qos_extension_enabled(network_driver) try: qos_policy = network_driver.get_qos_policy(qos_policy_id) - except Exception: - raise exceptions.InvalidSubresource(resource='qos_policy', - id=qos_policy_id) + except Exception as e: + raise exceptions.InvalidSubresource( + resource='qos_policy', id=qos_policy_id) from e return qos_policy @@ -367,8 +368,9 @@ def network_exists_optionally_contains_subnet(network_id, subnet_id=None, network_driver = utils.get_network_driver() try: network = network_driver.get_network(network_id, context=context) - except Exception: - raise exceptions.InvalidSubresource(resource='Network', id=network_id) + except Exception as e: + raise exceptions.InvalidSubresource( + resource='Network', id=network_id) from e if subnet_id: if not network.subnets or subnet_id not in network.subnets: raise exceptions.InvalidSubresource(resource='Subnet', @@ -414,9 +416,9 @@ def check_session_persistence(SP_dict): '"APP_COOKIE" session persistence type.')) except exceptions.ValidationException: raise - except Exception: + except Exception as e: raise exceptions.ValidationException(detail=_( - 'Invalid session_persistence provided.')) + 'Invalid session_persistence provided.')) from e def ip_not_reserved(ip_address): diff --git a/octavia/compute/drivers/noop_driver/driver.py b/octavia/compute/drivers/noop_driver/driver.py index f9939410e8..6640403d15 100644 --- a/octavia/compute/drivers/noop_driver/driver.py +++ b/octavia/compute/drivers/noop_driver/driver.py @@ -25,7 +25,7 @@ LOG = logging.getLogger(__name__) class NoopManager(object): def __init__(self): - super(NoopManager, self).__init__() + super().__init__() self.computeconfig = {} def build(self, name="amphora_name", amphora_flavor=None, @@ -120,7 +120,7 @@ class NoopManager(object): class NoopComputeDriver(driver_base.ComputeBase): def __init__(self): - super(NoopComputeDriver, self).__init__() + super().__init__() self.driver = NoopManager() def build(self, name="amphora_name", amphora_flavor=None, diff --git a/octavia/compute/drivers/nova_driver.py b/octavia/compute/drivers/nova_driver.py index aa36eb9816..f07d8d0178 100644 --- a/octavia/compute/drivers/nova_driver.py +++ b/octavia/compute/drivers/nova_driver.py @@ -61,7 +61,7 @@ class VirtualMachineManager(compute_base.ComputeBase): '''Compute implementation of virtual machines via nova.''' def __init__(self): - super(VirtualMachineManager, self).__init__() + super().__init__() # Must initialize nova api self._nova_client = clients.NovaAuth.get_nova_client( endpoint=CONF.nova.endpoint, @@ -201,9 +201,9 @@ class VirtualMachineManager(compute_base.ComputeBase): amphora, fault = self.get_amphora(compute_id) if amphora and amphora.status == 'ACTIVE': return constants.UP - except Exception: + except Exception as e: LOG.exception("Error retrieving nova virtual machine status.") - raise exceptions.ComputeStatusException() + raise exceptions.ComputeStatusException() from e return constants.DOWN def get_amphora(self, compute_id, management_network_id=None): @@ -217,9 +217,9 @@ class VirtualMachineManager(compute_base.ComputeBase): # utilize nova client ServerManager 'get' method to retrieve info try: amphora = self.manager.get(compute_id) - except Exception: + except Exception as e: LOG.exception("Error retrieving nova virtual machine.") - raise exceptions.ComputeGetException() + raise exceptions.ComputeGetException() from e return self._translate_amphora(amphora, management_network_id) def _translate_amphora(self, nova_response, management_network_id=None): @@ -307,9 +307,9 @@ class VirtualMachineManager(compute_base.ComputeBase): try: server_group_obj = self.server_groups.create(**kwargs) return server_group_obj - except Exception: + except Exception as e: LOG.exception("Error create server group instance.") - raise exceptions.ServerGroupObjectCreateException() + raise exceptions.ServerGroupObjectCreateException() from e def delete_server_group(self, server_group_id): """Delete a server group object @@ -323,9 +323,9 @@ class VirtualMachineManager(compute_base.ComputeBase): except nova_exceptions.NotFound: LOG.warning("Server group instance with id: %s not found. " "Assuming already deleted.", server_group_id) - except Exception: + except Exception as e: LOG.exception("Error delete server group instance.") - raise exceptions.ServerGroupObjectDeleteException() + raise exceptions.ServerGroupObjectDeleteException() from e def attach_network_or_port(self, compute_id, network_id=None, ip_address=None, port_id=None): @@ -409,10 +409,10 @@ class VirtualMachineManager(compute_base.ComputeBase): """ try: self.flavor_manager.get(flavor_id) - except nova_exceptions.NotFound: + except nova_exceptions.NotFound as e: LOG.info('Flavor %s was not found in nova.', flavor_id) raise exceptions.InvalidSubresource(resource='Nova flavor', - id=flavor_id) + id=flavor_id) from e except Exception as e: LOG.exception('Nova reports a failure getting flavor details for ' 'flavor ID %s: %s', flavor_id, e) diff --git a/octavia/controller/healthmanager/health_drivers/update_db.py b/octavia/controller/healthmanager/health_drivers/update_db.py index e011fc00cc..bd9a2845f9 100644 --- a/octavia/controller/healthmanager/health_drivers/update_db.py +++ b/octavia/controller/healthmanager/health_drivers/update_db.py @@ -35,7 +35,7 @@ LOG = logging.getLogger(__name__) class UpdateHealthDb(update_base.HealthUpdateBase): def __init__(self): - super(UpdateHealthDb, self).__init__() + super().__init__() # first setup repo for amphora, listener,member(nodes),pool repo self.amphora_repo = repo.AmphoraRepository() self.amphora_health_repo = repo.AmphoraHealthRepository() diff --git a/octavia/controller/queue/v1/consumer.py b/octavia/controller/queue/v1/consumer.py index 7498e4ffdc..f21bbae67f 100644 --- a/octavia/controller/queue/v1/consumer.py +++ b/octavia/controller/queue/v1/consumer.py @@ -26,7 +26,7 @@ LOG = logging.getLogger(__name__) class ConsumerService(cotyledon.Service): def __init__(self, worker_id, conf): - super(ConsumerService, self).__init__(worker_id) + super().__init__(worker_id) self.conf = conf self.topic = conf.oslo_messaging.topic self.server = conf.host @@ -61,4 +61,4 @@ class ConsumerService(cotyledon.Service): e.worker.executor.shutdown() except AttributeError: pass - super(ConsumerService, self).terminate() + super().terminate() diff --git a/octavia/controller/queue/v2/consumer.py b/octavia/controller/queue/v2/consumer.py index 3224ffe2bc..2fae259ce9 100644 --- a/octavia/controller/queue/v2/consumer.py +++ b/octavia/controller/queue/v2/consumer.py @@ -31,7 +31,7 @@ CONF = cfg.CONF class ConsumerService(cotyledon.Service): def __init__(self, worker_id, conf): - super(ConsumerService, self).__init__(worker_id) + super().__init__(worker_id) self.conf = conf self.topic = constants.TOPIC_AMPHORA_V2 self.server = conf.host @@ -71,4 +71,4 @@ class ConsumerService(cotyledon.Service): e.worker.executor.shutdown() except AttributeError: pass - super(ConsumerService, self).terminate() + super().terminate() diff --git a/octavia/controller/worker/task_utils.py b/octavia/controller/worker/task_utils.py index 7f78034067..fd1e876ab3 100644 --- a/octavia/controller/worker/task_utils.py +++ b/octavia/controller/worker/task_utils.py @@ -36,7 +36,7 @@ class TaskUtils(object): self.amp_health_repo = repo.AmphoraHealthRepository() self.l7policy_repo = repo.L7PolicyRepository() self.l7rule_repo = repo.L7RuleRepository() - super(TaskUtils, self).__init__(**kwargs) + super().__init__(**kwargs) def unmark_amphora_health_busy(self, amphora_id): """Unmark the amphora_health record busy for an amphora. diff --git a/octavia/controller/worker/v1/controller_worker.py b/octavia/controller/worker/v1/controller_worker.py index ca2f056249..3831d6431a 100644 --- a/octavia/controller/worker/v1/controller_worker.py +++ b/octavia/controller/worker/v1/controller_worker.py @@ -69,7 +69,7 @@ class ControllerWorker(base_taskflow.BaseTaskFlowEngine): self._flavor_repo = repo.FlavorRepository() self._az_repo = repo.AvailabilityZoneRepository() - super(ControllerWorker, self).__init__() + super().__init__() @tenacity.retry( retry=( diff --git a/octavia/controller/worker/v1/tasks/amphora_driver_tasks.py b/octavia/controller/worker/v1/tasks/amphora_driver_tasks.py index 3352297a42..6a2a0239d4 100644 --- a/octavia/controller/worker/v1/tasks/amphora_driver_tasks.py +++ b/octavia/controller/worker/v1/tasks/amphora_driver_tasks.py @@ -36,7 +36,7 @@ class BaseAmphoraTask(task.Task): """Base task to load drivers common to the tasks.""" def __init__(self, **kwargs): - super(BaseAmphoraTask, self).__init__(**kwargs) + super().__init__(**kwargs) self.amphora_driver = stevedore_driver.DriverManager( namespace='octavia.amphora.drivers', name=CONF.controller_worker.amphora_driver, diff --git a/octavia/controller/worker/v1/tasks/cert_task.py b/octavia/controller/worker/v1/tasks/cert_task.py index c6c377d109..a4ad873875 100644 --- a/octavia/controller/worker/v1/tasks/cert_task.py +++ b/octavia/controller/worker/v1/tasks/cert_task.py @@ -27,7 +27,7 @@ class BaseCertTask(task.Task): """Base task to load drivers common to the tasks.""" def __init__(self, **kwargs): - super(BaseCertTask, self).__init__(**kwargs) + super().__init__(**kwargs) self.cert_generator = stevedore_driver.DriverManager( namespace='octavia.cert_generator', name=CONF.certificates.cert_generator, diff --git a/octavia/controller/worker/v1/tasks/compute_tasks.py b/octavia/controller/worker/v1/tasks/compute_tasks.py index 6acfe98423..f237e9b4f1 100644 --- a/octavia/controller/worker/v1/tasks/compute_tasks.py +++ b/octavia/controller/worker/v1/tasks/compute_tasks.py @@ -39,7 +39,7 @@ class BaseComputeTask(task.Task): """Base task to load drivers common to the tasks.""" def __init__(self, **kwargs): - super(BaseComputeTask, self).__init__(**kwargs) + super().__init__(**kwargs) self.compute = stevedore_driver.DriverManager( namespace='octavia.compute.drivers', name=CONF.controller_worker.compute_driver, @@ -163,7 +163,7 @@ class CertComputeCreate(ComputeCreate): config_drive_files = { '/etc/octavia/certs/server.pem': fer.decrypt(server_pem), '/etc/octavia/certs/client_ca.pem': ca} - return super(CertComputeCreate, self).execute( + return super().execute( amphora_id, config_drive_files=config_drive_files, build_type_priority=build_type_priority, server_group_id=server_group_id, ports=ports, flavor=flavor, diff --git a/octavia/controller/worker/v1/tasks/database_tasks.py b/octavia/controller/worker/v1/tasks/database_tasks.py index 3eccefe80e..a6defd849f 100644 --- a/octavia/controller/worker/v1/tasks/database_tasks.py +++ b/octavia/controller/worker/v1/tasks/database_tasks.py @@ -53,7 +53,7 @@ class BaseDatabaseTask(task.Task): self.l7policy_repo = repo.L7PolicyRepository() self.l7rule_repo = repo.L7RuleRepository() self.task_utils = task_utilities.TaskUtils() - super(BaseDatabaseTask, self).__init__(**kwargs) + super().__init__(**kwargs) def _delete_from_amp_health(self, amphora_id): """Delete the amphora_health record for an amphora. @@ -195,7 +195,7 @@ class DeleteHealthMonitorInDBByPool(DeleteHealthMonitorInDB): :param pool: A pool which health monitor should be deleted. :returns: None """ - super(DeleteHealthMonitorInDBByPool, self).execute( + super().execute( pool.health_monitor) def revert(self, pool, *args, **kwargs): @@ -204,7 +204,7 @@ class DeleteHealthMonitorInDBByPool(DeleteHealthMonitorInDB): :param pool: A pool which health monitor couldn't be deleted :returns: None """ - super(DeleteHealthMonitorInDBByPool, self).revert( + super().revert( pool.health_monitor, *args, **kwargs) @@ -968,7 +968,7 @@ class MarkLBActiveInDB(BaseDatabaseTask): """ def __init__(self, mark_subobjects=False, **kwargs): - super(MarkLBActiveInDB, self).__init__(**kwargs) + super().__init__(**kwargs) self.mark_subobjects = mark_subobjects def execute(self, loadbalancer): diff --git a/octavia/controller/worker/v1/tasks/lifecycle_tasks.py b/octavia/controller/worker/v1/tasks/lifecycle_tasks.py index 291b5677c5..d46e462fae 100644 --- a/octavia/controller/worker/v1/tasks/lifecycle_tasks.py +++ b/octavia/controller/worker/v1/tasks/lifecycle_tasks.py @@ -22,7 +22,7 @@ class BaseLifecycleTask(task.Task): def __init__(self, **kwargs): self.task_utils = task_utilities.TaskUtils() - super(BaseLifecycleTask, self).__init__(**kwargs) + super().__init__(**kwargs) class AmphoraIDToErrorOnRevertTask(BaseLifecycleTask): @@ -42,7 +42,7 @@ class AmphoraToErrorOnRevertTask(AmphoraIDToErrorOnRevertTask): pass def revert(self, amphora, *args, **kwargs): - super(AmphoraToErrorOnRevertTask, self).revert(amphora.id) + super().revert(amphora.id) class HealthMonitorToErrorOnRevertTask(BaseLifecycleTask): @@ -128,7 +128,7 @@ class LoadBalancerToErrorOnRevertTask(LoadBalancerIDToErrorOnRevertTask): pass def revert(self, loadbalancer, *args, **kwargs): - super(LoadBalancerToErrorOnRevertTask, self).revert(loadbalancer.id) + super().revert(loadbalancer.id) class MemberToErrorOnRevertTask(BaseLifecycleTask): diff --git a/octavia/controller/worker/v1/tasks/network_tasks.py b/octavia/controller/worker/v1/tasks/network_tasks.py index f5faa19ed1..8fa2a81eb5 100644 --- a/octavia/controller/worker/v1/tasks/network_tasks.py +++ b/octavia/controller/worker/v1/tasks/network_tasks.py @@ -37,7 +37,7 @@ class BaseNetworkTask(task.Task): """Base task to load drivers common to the tasks.""" def __init__(self, **kwargs): - super(BaseNetworkTask, self).__init__(**kwargs) + super().__init__(**kwargs) self._network_driver = None self.task_utils = task_utils.TaskUtils() self.lb_repo = repositories.LoadBalancerRepository() diff --git a/octavia/controller/worker/v1/tasks/retry_tasks.py b/octavia/controller/worker/v1/tasks/retry_tasks.py index d5dbfec6a2..a17bf6dc42 100644 --- a/octavia/controller/worker/v1/tasks/retry_tasks.py +++ b/octavia/controller/worker/v1/tasks/retry_tasks.py @@ -53,7 +53,7 @@ class SleepingRetryTimesController(retry.Times): def __init__(self, attempts=1, name=None, provides=None, requires=None, auto_extract=True, rebind=None, revert_all=False, interval=1): - super(SleepingRetryTimesController, self).__init__( + super().__init__( attempts, name, provides, requires, auto_extract, rebind, revert_all) self._interval = interval diff --git a/octavia/controller/worker/v2/tasks/amphora_driver_tasks.py b/octavia/controller/worker/v2/tasks/amphora_driver_tasks.py index 92a2ad66fc..daf070e5a6 100644 --- a/octavia/controller/worker/v2/tasks/amphora_driver_tasks.py +++ b/octavia/controller/worker/v2/tasks/amphora_driver_tasks.py @@ -39,7 +39,7 @@ class BaseAmphoraTask(task.Task): """Base task to load drivers common to the tasks.""" def __init__(self, **kwargs): - super(BaseAmphoraTask, self).__init__(**kwargs) + super().__init__(**kwargs) self.amphora_driver = stevedore_driver.DriverManager( namespace='octavia.amphora.drivers', name=CONF.controller_worker.amphora_driver, diff --git a/octavia/controller/worker/v2/tasks/cert_task.py b/octavia/controller/worker/v2/tasks/cert_task.py index 1104bb7dc2..d56e4b76bd 100644 --- a/octavia/controller/worker/v2/tasks/cert_task.py +++ b/octavia/controller/worker/v2/tasks/cert_task.py @@ -27,7 +27,7 @@ class BaseCertTask(task.Task): """Base task to load drivers common to the tasks.""" def __init__(self, **kwargs): - super(BaseCertTask, self).__init__(**kwargs) + super().__init__(**kwargs) self.cert_generator = stevedore_driver.DriverManager( namespace='octavia.cert_generator', name=CONF.certificates.cert_generator, diff --git a/octavia/controller/worker/v2/tasks/compute_tasks.py b/octavia/controller/worker/v2/tasks/compute_tasks.py index 13bd421b7e..faac953b74 100644 --- a/octavia/controller/worker/v2/tasks/compute_tasks.py +++ b/octavia/controller/worker/v2/tasks/compute_tasks.py @@ -40,7 +40,7 @@ class BaseComputeTask(task.Task): """Base task to load drivers common to the tasks.""" def __init__(self, **kwargs): - super(BaseComputeTask, self).__init__(**kwargs) + super().__init__(**kwargs) self.compute = stevedore_driver.DriverManager( namespace='octavia.compute.drivers', name=CONF.controller_worker.compute_driver, @@ -172,7 +172,7 @@ class CertComputeCreate(ComputeCreate): '/etc/octavia/certs/server.pem': fer.decrypt( server_pem.encode("utf-8")), '/etc/octavia/certs/client_ca.pem': ca} - return super(CertComputeCreate, self).execute( + return super().execute( amphora_id, config_drive_files=config_drive_files, build_type_priority=build_type_priority, server_group_id=server_group_id, ports=ports, flavor=flavor, diff --git a/octavia/controller/worker/v2/tasks/database_tasks.py b/octavia/controller/worker/v2/tasks/database_tasks.py index 7488b01477..f2422ea032 100644 --- a/octavia/controller/worker/v2/tasks/database_tasks.py +++ b/octavia/controller/worker/v2/tasks/database_tasks.py @@ -54,7 +54,7 @@ class BaseDatabaseTask(task.Task): self.l7policy_repo = repo.L7PolicyRepository() self.l7rule_repo = repo.L7RuleRepository() self.task_utils = task_utilities.TaskUtils() - super(BaseDatabaseTask, self).__init__(**kwargs) + super().__init__(**kwargs) def _delete_from_amp_health(self, amphora_id): """Delete the amphora_health record for an amphora. @@ -206,7 +206,7 @@ class DeleteHealthMonitorInDBByPool(DeleteHealthMonitorInDB): id=pool_id) provider_hm = provider_utils.db_HM_to_provider_HM( db_pool.health_monitor).to_dict() - super(DeleteHealthMonitorInDBByPool, self).execute( + super().execute( provider_hm) def revert(self, pool_id, *args, **kwargs): @@ -219,7 +219,7 @@ class DeleteHealthMonitorInDBByPool(DeleteHealthMonitorInDB): id=pool_id) provider_hm = provider_utils.db_HM_to_provider_HM( db_pool.health_monitor).to_dict() - super(DeleteHealthMonitorInDBByPool, self).revert( + super().revert( provider_hm, *args, **kwargs) @@ -1030,7 +1030,7 @@ class MarkLBActiveInDB(BaseDatabaseTask): """ def __init__(self, mark_subobjects=False, **kwargs): - super(MarkLBActiveInDB, self).__init__(**kwargs) + super().__init__(**kwargs) self.mark_subobjects = mark_subobjects def execute(self, loadbalancer): diff --git a/octavia/controller/worker/v2/tasks/lifecycle_tasks.py b/octavia/controller/worker/v2/tasks/lifecycle_tasks.py index 4a0a148fde..db521291e8 100644 --- a/octavia/controller/worker/v2/tasks/lifecycle_tasks.py +++ b/octavia/controller/worker/v2/tasks/lifecycle_tasks.py @@ -23,7 +23,7 @@ class BaseLifecycleTask(task.Task): def __init__(self, **kwargs): self.task_utils = task_utilities.TaskUtils() - super(BaseLifecycleTask, self).__init__(**kwargs) + super().__init__(**kwargs) class AmphoraIDToErrorOnRevertTask(BaseLifecycleTask): @@ -43,7 +43,7 @@ class AmphoraToErrorOnRevertTask(AmphoraIDToErrorOnRevertTask): pass def revert(self, amphora, *args, **kwargs): - super(AmphoraToErrorOnRevertTask, self).revert( + super().revert( amphora.get(constants.ID)) @@ -142,7 +142,7 @@ class LoadBalancerToErrorOnRevertTask(LoadBalancerIDToErrorOnRevertTask): pass def revert(self, loadbalancer, *args, **kwargs): - super(LoadBalancerToErrorOnRevertTask, self).revert( + super().revert( loadbalancer[constants.LOADBALANCER_ID]) diff --git a/octavia/controller/worker/v2/tasks/network_tasks.py b/octavia/controller/worker/v2/tasks/network_tasks.py index 77a52eddef..80eb43b4d2 100644 --- a/octavia/controller/worker/v2/tasks/network_tasks.py +++ b/octavia/controller/worker/v2/tasks/network_tasks.py @@ -35,7 +35,7 @@ class BaseNetworkTask(task.Task): """Base task to load drivers common to the tasks.""" def __init__(self, **kwargs): - super(BaseNetworkTask, self).__init__(**kwargs) + super().__init__(**kwargs) self._network_driver = None self.task_utils = task_utils.TaskUtils() self.loadbalancer_repo = repo.LoadBalancerRepository() diff --git a/octavia/db/repositories.py b/octavia/db/repositories.py index 0d4a885bd1..de9ce99d20 100644 --- a/octavia/db/repositories.py +++ b/octavia/db/repositories.py @@ -541,10 +541,10 @@ class Repositories(object): quotas.in_use_l7rule = l7rule_count return False return True - except db_exception.DBDeadlock: + except db_exception.DBDeadlock as e: LOG.warning('Quota project lock timed out for project: %(proj)s', {'proj': project_id}) - raise exceptions.ProjectBusyException() + raise exceptions.ProjectBusyException() from e return False def decrement_quota(self, lock_session, _class, project_id, quantity=1): @@ -648,10 +648,10 @@ class Repositories(object): 'project: %(proj)s that would cause a ' 'negative quota.', {'clss': type(_class), 'proj': project_id}) - except db_exception.DBDeadlock: + except db_exception.DBDeadlock as e: LOG.warning('Quota project lock timed out for project: %(proj)s', {'proj': project_id}) - raise exceptions.ProjectBusyException() + raise exceptions.ProjectBusyException() from e def create_load_balancer_tree(self, session, lock_session, lb_dict): listener_dicts = lb_dict.pop('listeners', []) @@ -855,7 +855,7 @@ class LoadBalancerRepository(BaseRepository): subqueryload(models.LoadBalancer._tags), noload('*')) - return super(LoadBalancerRepository, self).get_all( + return super().get_all( session, pagination_helper=pagination_helper, query_options=query_options, **filters) @@ -952,7 +952,7 @@ class HealthMonitorRepository(BaseRepository): subqueryload(models.HealthMonitor._tags), noload('*')) - return super(HealthMonitorRepository, self).get_all( + return super().get_all( session, pagination_helper=pagination_helper, query_options=query_options, **filters) @@ -1023,7 +1023,7 @@ class PoolRepository(BaseRepository): subqueryload(models.Pool._tags), noload('*')) - return super(PoolRepository, self).get_all( + return super().get_all( session, pagination_helper=pagination_helper, query_options=query_options, **filters) @@ -1051,7 +1051,7 @@ class MemberRepository(BaseRepository): subqueryload(models.Member._tags), noload('*')) - return super(MemberRepository, self).get_all( + return super().get_all( session, pagination_helper=pagination_helper, query_options=query_options, **filters) @@ -1098,7 +1098,7 @@ class ListenerRepository(BaseRepository): subqueryload(models.Listener.allowed_cidrs), noload('*')) - return super(ListenerRepository, self).get_all( + return super().get_all( session, pagination_helper=pagination_helper, query_options=query_options, **filters) @@ -1282,7 +1282,7 @@ class AmphoraRepository(BaseRepository): subqueryload(models.Amphora.load_balancer), noload('*')) - return super(AmphoraRepository, self).get_all( + return super().get_all( session, pagination_helper=pagination_helper, query_options=query_options, **filters) @@ -1691,7 +1691,7 @@ class L7RuleRepository(BaseRepository): subqueryload(models.L7Rule._tags), noload('*')) - return super(L7RuleRepository, self).get_all( + return super().get_all( session, pagination_helper=pagination_helper, query_options=query_options, **filters) diff --git a/octavia/distributor/drivers/noop_driver/driver.py b/octavia/distributor/drivers/noop_driver/driver.py index 6504433710..c7aba34609 100644 --- a/octavia/distributor/drivers/noop_driver/driver.py +++ b/octavia/distributor/drivers/noop_driver/driver.py @@ -28,7 +28,7 @@ class NoopProvidesRequiresTask(task.Task): def __init__(self, name, provides_dicts=None, requires=None): if provides_dicts is None: provides_dicts = {} - super(NoopProvidesRequiresTask, self).__init__( + super().__init__( name=name, provides=list(provides_dicts), requires=requires) @@ -40,7 +40,7 @@ class NoopProvidesRequiresTask(task.Task): class NoopManager(object): def __init__(self): - super(NoopManager, self).__init__() + super().__init__() def get_create_distributor_subflow(self): LOG.debug('Distributor %s create_distributor', self.__class__.__name__) @@ -99,7 +99,7 @@ class NoopManager(object): class NoopDistributorDriver(driver_base.DistributorDriver): def __init__(self): - super(NoopDistributorDriver, self).__init__() + super().__init__() self.driver = NoopManager() def get_create_distributor_subflow(self): diff --git a/octavia/network/drivers/neutron/allowed_address_pairs.py b/octavia/network/drivers/neutron/allowed_address_pairs.py index afaabe4b13..0199816348 100644 --- a/octavia/network/drivers/neutron/allowed_address_pairs.py +++ b/octavia/network/drivers/neutron/allowed_address_pairs.py @@ -41,7 +41,7 @@ CONF = cfg.CONF class AllowedAddressPairsDriver(neutron_base.BaseNeutronDriver): def __init__(self): - super(AllowedAddressPairsDriver, self).__init__() + super().__init__() self._check_aap_loaded() self.compute = stevedore_driver.DriverManager( namespace='octavia.compute.drivers', @@ -95,15 +95,15 @@ class AllowedAddressPairsDriver(neutron_base.BaseNeutronDriver): LOG.debug('Created vip port: %(port_id)s for amphora: %(amp)s', {'port_id': new_port.id, 'amp': amphora.id}) - except Exception: + except Exception as e: message = _('Error creating the base (VRRP) port for the VIP with ' 'port details: {}').format(port) LOG.exception(message) - raise base.PlugVIPException(message) + raise base.PlugVIPException(message) from e try: interface = self.plug_port(amphora, new_port) - except Exception: + except Exception as e: message = _('Error plugging amphora (compute_id: {compute_id}) ' 'into vip network {network_id}.').format( compute_id=amphora.compute_id, @@ -119,7 +119,7 @@ class AllowedAddressPairsDriver(neutron_base.BaseNeutronDriver): 'plug_port failed. This resource is being ' 'abandoned and should be manually deleted when ' 'neutron is functional.', new_port.id) - raise base.PlugVIPException(message) + raise base.PlugVIPException(message) from e return interface def _add_vip_address_pair(self, port_id, vip_address): @@ -127,12 +127,12 @@ class AllowedAddressPairsDriver(neutron_base.BaseNeutronDriver): self._add_allowed_address_pair_to_port(port_id, vip_address) except neutron_client_exceptions.PortNotFoundClient as e: raise base.PortNotFound(str(e)) - except Exception: + except Exception as e: message = _('Error adding allowed address pair {ip} ' 'to port {port_id}.').format(ip=vip_address, port_id=port_id) LOG.exception(message) - raise base.PlugVIPException(message) + raise base.PlugVIPException(message) from e def _get_lb_security_group(self, load_balancer_id): sec_grp_name = common_utils.get_vip_security_group_name( @@ -359,11 +359,11 @@ class AllowedAddressPairsDriver(neutron_base.BaseNeutronDriver): neutron_client_exceptions.PortNotFoundClient): LOG.debug('VIP port %s already deleted. Skipping.', vip.port_id) - except Exception: + except Exception as e: message = _('Error deleting VIP port_id {port_id} from ' 'neutron').format(port_id=vip.port_id) LOG.exception(message) - raise base.DeallocateVIPException(message) + raise base.DeallocateVIPException(message) from e elif port: LOG.info("Port %s will not be deleted by Octavia as it was " "not created by Octavia.", vip.port_id) @@ -543,12 +543,12 @@ class AllowedAddressPairsDriver(neutron_base.BaseNeutronDriver): }} self.neutron_client.update_port(interface.port_id, aap_update) - except Exception: + except Exception as e: message = _('Error unplugging VIP. Could not clear ' 'allowed address pairs from port ' '{port_id}.').format(port_id=vip.port_id) LOG.exception(message) - raise base.UnplugVIPException(message) + raise base.UnplugVIPException(message) from e # Delete the VRRP port if we created it try: @@ -566,11 +566,11 @@ class AllowedAddressPairsDriver(neutron_base.BaseNeutronDriver): def unplug_vip(self, load_balancer, vip): try: subnet = self.get_subnet(vip.subnet_id) - except base.SubnetNotFound: + except base.SubnetNotFound as e: msg = ("Can't unplug vip because vip subnet {0} was not " "found").format(vip.subnet_id) LOG.exception(msg) - raise base.PluggedVIPNotFound(msg) + raise base.PluggedVIPNotFound(msg) from e for amphora in filter( lambda amp: amp.status == constants.AMPHORA_ALLOCATED, load_balancer.amphorae): @@ -587,13 +587,13 @@ class AllowedAddressPairsDriver(neutron_base.BaseNeutronDriver): if 'Network' in str(e): raise base.NetworkNotFound(str(e)) raise base.PlugNetworkException(str(e)) - except Exception: + except Exception as e: message = _('Error plugging amphora (compute_id: {compute_id}) ' 'into network {network_id}.').format( compute_id=compute_id, network_id=network_id) LOG.exception(message) - raise base.PlugNetworkException(message) + raise base.PlugNetworkException(message) from e return self._nova_interface_to_octavia_interface(compute_id, interface) @@ -647,8 +647,8 @@ class AllowedAddressPairsDriver(neutron_base.BaseNeutronDriver): port.id, {constants.PORT: {'dns_name': ''}}) except (neutron_client_exceptions.NotFound, - neutron_client_exceptions.PortNotFoundClient): - raise base.PortNotFound() + neutron_client_exceptions.PortNotFoundClient) as e: + raise base.PortNotFound() from e def plug_port(self, amphora, port): try: @@ -671,14 +671,14 @@ class AllowedAddressPairsDriver(neutron_base.BaseNeutronDriver): network_id=port.network_id, port_id=port.id, fixed_ips=port.fixed_ips) - except Exception: + except Exception as e: message = _('Error plugging amphora (compute_id: ' '{compute_id}) into port ' '{port_id}.').format( compute_id=amphora.compute_id, port_id=port.id) LOG.exception(message) - raise base.PlugNetworkException(message) + raise base.PlugNetworkException(message) from e return plugged_interface diff --git a/octavia/network/drivers/neutron/base.py b/octavia/network/drivers/neutron/base.py index 101e10d853..93eb7730e6 100644 --- a/octavia/network/drivers/neutron/base.py +++ b/octavia/network/drivers/neutron/base.py @@ -193,18 +193,19 @@ class BaseNeutronDriver(base.AbstractNetworkDriver): resource_type)(resource_id) return getattr(utils, 'convert_%s_dict_to_model' % resource_type)(resource) - except neutron_client_exceptions.NotFound: + except neutron_client_exceptions.NotFound as e: message = _('{resource_type} not found ' '({resource_type} id: {resource_id}).').format( resource_type=resource_type, resource_id=resource_id) raise getattr(base, '%sNotFound' % ''.join( - [w.capitalize() for w in resource_type.split('_')]))(message) - except Exception: + [w.capitalize() for w in resource_type.split('_')] + ))(message) from e + except Exception as e: message = _('Error retrieving {resource_type} ' '({resource_type} id: {resource_id}.').format( resource_type=resource_type, resource_id=resource_id) LOG.exception(message) - raise base.NetworkException(message) + raise base.NetworkException(message) from e def _get_resources_by_filters(self, resource_type, unique_item=False, **filters): @@ -226,18 +227,19 @@ class BaseNeutronDriver(base.AbstractNetworkDriver): return list(map(conversion_function, resource['%ss' % resource_type])) - except neutron_client_exceptions.NotFound: + except neutron_client_exceptions.NotFound as e: message = _('{resource_type} not found ' '({resource_type} Filters: {filters}.').format( resource_type=resource_type, filters=filters) raise getattr(base, '%sNotFound' % ''.join( - [w.capitalize() for w in resource_type.split('_')]))(message) - except Exception: + [w.capitalize() for w in resource_type.split('_')] + ))(message) from e + except Exception as e: message = _('Error retrieving {resource_type} ' '({resource_type} Filters: {filters}.').format( resource_type=resource_type, filters=filters) LOG.exception(message) - raise base.NetworkException(message) + raise base.NetworkException(message) from e def get_network(self, network_id, context=None): return self._get_resource('network', network_id, context=context) diff --git a/octavia/network/drivers/noop_driver/driver.py b/octavia/network/drivers/noop_driver/driver.py index c7f5542e49..b3ad7c9070 100644 --- a/octavia/network/drivers/noop_driver/driver.py +++ b/octavia/network/drivers/noop_driver/driver.py @@ -24,7 +24,7 @@ LOG = logging.getLogger(__name__) class NoopManager(object): def __init__(self): - super(NoopManager, self).__init__() + super().__init__() self.networkconfigconfig = {} self._qos_extension_enabled = True @@ -338,7 +338,7 @@ class NoopManager(object): class NoopNetworkDriver(driver_base.AbstractNetworkDriver): def __init__(self): - super(NoopNetworkDriver, self).__init__() + super().__init__() self.driver = NoopManager() def allocate_vip(self, loadbalancer): diff --git a/octavia/tests/functional/amphorae/backend/agent/api_server/test_keepalivedlvs.py b/octavia/tests/functional/amphorae/backend/agent/api_server/test_keepalivedlvs.py index 3726034ace..bfc3e0c750 100644 --- a/octavia/tests/functional/amphorae/backend/agent/api_server/test_keepalivedlvs.py +++ b/octavia/tests/functional/amphorae/backend/agent/api_server/test_keepalivedlvs.py @@ -97,7 +97,7 @@ class KeepalivedLvsTestCase(base.TestCase): TEST_URL = server.PATH_PREFIX + '/listeners/%s/%s/udp_listener' def setUp(self): - super(KeepalivedLvsTestCase, self).setUp() + super().setUp() self.app = flask.Flask(__name__) self.client = self.app.test_client() self._ctx = self.app.test_request_context() diff --git a/octavia/tests/functional/amphorae/backend/agent/api_server/test_server.py b/octavia/tests/functional/amphorae/backend/agent/api_server/test_server.py index c86ac2b840..235917d5a9 100644 --- a/octavia/tests/functional/amphorae/backend/agent/api_server/test_server.py +++ b/octavia/tests/functional/amphorae/backend/agent/api_server/test_server.py @@ -46,7 +46,7 @@ class TestServerTestCase(base.TestCase): app = None def setUp(self): - super(TestServerTestCase, self).setUp() + super().setUp() self.conf = self.useFixture(oslo_fixture.Config(config.cfg.CONF)) self.conf.config(group="haproxy_amphora", base_path='/var/lib/octavia') self.conf.config(group="controller_worker", diff --git a/octavia/tests/functional/api/drivers/driver_agent/test_driver_agent.py b/octavia/tests/functional/api/drivers/driver_agent/test_driver_agent.py index 2cd9625f4b..24e77ce03c 100644 --- a/octavia/tests/functional/api/drivers/driver_agent/test_driver_agent.py +++ b/octavia/tests/functional/api/drivers/driver_agent/test_driver_agent.py @@ -55,7 +55,7 @@ class DriverAgentTest(base.OctaviaDBTestBase): # Note that because the driver agent is a multi-process # agent we must use a sqlite file rather than an # in-memory instance. - super(DriverAgentTest, self).setUp( + super().setUp( connection_string=sqlite_db_connection) conf = self.useFixture(oslo_fixture.Config(config.cfg.CONF)) diff --git a/octavia/tests/functional/api/test_healthcheck.py b/octavia/tests/functional/api/test_healthcheck.py index 65ffe1cce4..13ecafa5d4 100644 --- a/octavia/tests/functional/api/test_healthcheck.py +++ b/octavia/tests/functional/api/test_healthcheck.py @@ -25,7 +25,7 @@ from octavia.tests.functional.db import base as base_db_test class TestHealthCheck(base_db_test.OctaviaDBTestBase): def setUp(self): - super(TestHealthCheck, self).setUp() + super().setUp() # We need to define these early as they are late loaded in oslo # middleware and our configuration overrides would not apply. diff --git a/octavia/tests/functional/api/test_root_controller.py b/octavia/tests/functional/api/test_root_controller.py index 8c9792b9ab..fb9fa715d2 100644 --- a/octavia/tests/functional/api/test_root_controller.py +++ b/octavia/tests/functional/api/test_root_controller.py @@ -31,7 +31,7 @@ class TestRootController(base_db_test.OctaviaDBTestBase): return response def setUp(self): - super(TestRootController, self).setUp() + super().setUp() self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) self.conf.config(group='api_settings', auth_strategy=constants.NOAUTH) diff --git a/octavia/tests/functional/api/v2/base.py b/octavia/tests/functional/api/v2/base.py index eab2402e66..b4cd87e0b8 100644 --- a/octavia/tests/functional/api/v2/base.py +++ b/octavia/tests/functional/api/v2/base.py @@ -99,7 +99,7 @@ class BaseAPITest(base_db_test.OctaviaDBTestBase): 'faultstring': 'Policy does not allow this request to be performed.'} def setUp(self): - super(BaseAPITest, self).setUp() + super().setUp() self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) self.conf.config(group="controller_worker", network_driver='network_noop_driver') diff --git a/octavia/tests/functional/api/v2/test_amphora.py b/octavia/tests/functional/api/v2/test_amphora.py index b9fd9a1841..914c3bf493 100644 --- a/octavia/tests/functional/api/v2/test_amphora.py +++ b/octavia/tests/functional/api/v2/test_amphora.py @@ -33,7 +33,7 @@ class TestAmphora(base.BaseAPITest): root_tag_stats = 'amphora_stats' def setUp(self): - super(TestAmphora, self).setUp() + super().setUp() self.lb = self.create_load_balancer( uuidutils.generate_uuid()).get('loadbalancer') self.lb_id = self.lb.get('id') diff --git a/octavia/tests/functional/api/v2/test_availability_zones.py b/octavia/tests/functional/api/v2/test_availability_zones.py index e7b2788c14..240cd30b5a 100644 --- a/octavia/tests/functional/api/v2/test_availability_zones.py +++ b/octavia/tests/functional/api/v2/test_availability_zones.py @@ -31,7 +31,7 @@ class TestAvailabilityZones(base.BaseAPITest): root_tag_links = 'availability_zones_links' def setUp(self): - super(TestAvailabilityZones, self).setUp() + super().setUp() self.azp = self.create_availability_zone_profile( 'test1', 'noop_driver', '{"compute_zone": "my_az_1"}') diff --git a/octavia/tests/functional/api/v2/test_flavors.py b/octavia/tests/functional/api/v2/test_flavors.py index a3552fe03b..fa6b28ba58 100644 --- a/octavia/tests/functional/api/v2/test_flavors.py +++ b/octavia/tests/functional/api/v2/test_flavors.py @@ -31,7 +31,7 @@ class TestFlavors(base.BaseAPITest): root_tag_links = 'flavors_links' def setUp(self): - super(TestFlavors, self).setUp() + super().setUp() self.fp = self.create_flavor_profile('test1', 'noop_driver', '{"image": "ubuntu"}') diff --git a/octavia/tests/functional/api/v2/test_health_monitor.py b/octavia/tests/functional/api/v2/test_health_monitor.py index f030b9c9d8..f3c203ccab 100644 --- a/octavia/tests/functional/api/v2/test_health_monitor.py +++ b/octavia/tests/functional/api/v2/test_health_monitor.py @@ -33,7 +33,7 @@ class TestHealthMonitor(base.BaseAPITest): root_tag_links = 'healthmonitors_links' def setUp(self): - super(TestHealthMonitor, self).setUp() + super().setUp() self.lb = self.create_load_balancer( uuidutils.generate_uuid()).get('loadbalancer') self.lb_id = self.lb.get('id') diff --git a/octavia/tests/functional/api/v2/test_l7policy.py b/octavia/tests/functional/api/v2/test_l7policy.py index d0181207bf..37b5dab3b6 100644 --- a/octavia/tests/functional/api/v2/test_l7policy.py +++ b/octavia/tests/functional/api/v2/test_l7policy.py @@ -33,7 +33,7 @@ class TestL7Policy(base.BaseAPITest): root_tag_links = 'l7policies_links' def setUp(self): - super(TestL7Policy, self).setUp() + super().setUp() self.lb = self.create_load_balancer(uuidutils.generate_uuid()) self.lb_id = self.lb.get('loadbalancer').get('id') self.project_id = self.lb.get('loadbalancer').get('project_id') diff --git a/octavia/tests/functional/api/v2/test_l7rule.py b/octavia/tests/functional/api/v2/test_l7rule.py index 19903282ba..14f64cbc33 100644 --- a/octavia/tests/functional/api/v2/test_l7rule.py +++ b/octavia/tests/functional/api/v2/test_l7rule.py @@ -32,7 +32,7 @@ class TestL7Rule(base.BaseAPITest): root_tag_links = 'rules_links' def setUp(self): - super(TestL7Rule, self).setUp() + super().setUp() self.lb = self.create_load_balancer(uuidutils.generate_uuid()) self.lb_id = self.lb.get('loadbalancer').get('id') self.project_id = self.lb.get('loadbalancer').get('project_id') diff --git a/octavia/tests/functional/api/v2/test_listener.py b/octavia/tests/functional/api/v2/test_listener.py index 1671b1f5ed..b876105b29 100644 --- a/octavia/tests/functional/api/v2/test_listener.py +++ b/octavia/tests/functional/api/v2/test_listener.py @@ -38,7 +38,7 @@ class TestListener(base.BaseAPITest): root_tag_links = 'listeners_links' def setUp(self): - super(TestListener, self).setUp() + super().setUp() self.lb = self.create_load_balancer(uuidutils.generate_uuid()) self.lb_id = self.lb.get('loadbalancer').get('id') self.project_id = self.lb.get('loadbalancer').get('project_id') diff --git a/octavia/tests/functional/api/v2/test_load_balancer.py b/octavia/tests/functional/api/v2/test_load_balancer.py index cbde433471..61adbe2b2c 100644 --- a/octavia/tests/functional/api/v2/test_load_balancer.py +++ b/octavia/tests/functional/api/v2/test_load_balancer.py @@ -587,7 +587,7 @@ class TestLoadBalancer(base.BaseAPITest): class TestNeutronException(network_base.AllocateVIPException): def __init__(self, message, orig_msg, orig_code): - super(TestNeutronException, self).__init__( + super().__init__( message, orig_msg=orig_msg, orig_code=orig_code, ) @@ -2472,7 +2472,7 @@ class TestLoadBalancerGraph(base.BaseAPITest): root_tag = 'loadbalancer' def setUp(self): - super(TestLoadBalancerGraph, self).setUp() + super().setUp() self._project_id = uuidutils.generate_uuid() def _build_body(self, json): diff --git a/octavia/tests/functional/api/v2/test_member.py b/octavia/tests/functional/api/v2/test_member.py index 527135fabb..8c85eb2c65 100644 --- a/octavia/tests/functional/api/v2/test_member.py +++ b/octavia/tests/functional/api/v2/test_member.py @@ -36,7 +36,7 @@ class TestMember(base.BaseAPITest): root_tag_links = 'members_links' def setUp(self): - super(TestMember, self).setUp() + super().setUp() vip_subnet_id = uuidutils.generate_uuid() self.lb = self.create_load_balancer(vip_subnet_id) self.lb_id = self.lb.get('loadbalancer').get('id') diff --git a/octavia/tests/functional/api/v2/test_pool.py b/octavia/tests/functional/api/v2/test_pool.py index f2581f593a..e0d1161cc4 100644 --- a/octavia/tests/functional/api/v2/test_pool.py +++ b/octavia/tests/functional/api/v2/test_pool.py @@ -35,7 +35,7 @@ class TestPool(base.BaseAPITest): root_tag_links = 'pools_links' def setUp(self): - super(TestPool, self).setUp() + super().setUp() self.lb = self.create_load_balancer( uuidutils.generate_uuid()).get('loadbalancer') diff --git a/octavia/tests/functional/api/v2/test_provider.py b/octavia/tests/functional/api/v2/test_provider.py index 90ef45c11c..cd4fe399d2 100644 --- a/octavia/tests/functional/api/v2/test_provider.py +++ b/octavia/tests/functional/api/v2/test_provider.py @@ -30,7 +30,7 @@ class TestProvider(base.BaseAPITest): root_tag_list = 'providers' def setUp(self): - super(TestProvider, self).setUp() + super().setUp() def test_get_all_providers(self): octavia_dict = {u'description': u'Octavia driver.', @@ -60,7 +60,7 @@ class TestFlavorCapabilities(base.BaseAPITest): root_tag = 'flavor_capabilities' def setUp(self): - super(TestFlavorCapabilities, self).setUp() + super().setUp() def test_nonexistent_provider(self): self.get(self.FLAVOR_CAPABILITIES_PATH.format(provider='bogus'), @@ -178,7 +178,7 @@ class TestAvailabilityZoneCapabilities(base.BaseAPITest): root_tag = 'availability_zone_capabilities' def setUp(self): - super(TestAvailabilityZoneCapabilities, self).setUp() + super().setUp() def test_nonexistent_provider(self): self.get(self.AVAILABILITY_ZONE_CAPABILITIES_PATH.format( diff --git a/octavia/tests/functional/api/v2/test_quotas.py b/octavia/tests/functional/api/v2/test_quotas.py index 9c059848f8..0835f3c72d 100644 --- a/octavia/tests/functional/api/v2/test_quotas.py +++ b/octavia/tests/functional/api/v2/test_quotas.py @@ -33,7 +33,7 @@ class TestQuotas(base.BaseAPITest): root_tag_links = 'quotas_links' def setUp(self): - super(TestQuotas, self).setUp() + super().setUp() conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) conf.config( group="quotas", diff --git a/octavia/tests/functional/db/base.py b/octavia/tests/functional/db/base.py index b2e605f57f..ce636b5e1f 100644 --- a/octavia/tests/functional/db/base.py +++ b/octavia/tests/functional/db/base.py @@ -29,7 +29,7 @@ from octavia.db import models class OctaviaDBTestBase(test_base.DbTestCase): def setUp(self, connection_string='sqlite://'): - super(OctaviaDBTestBase, self).setUp() + super().setUp() # NOTE(blogan): doing this for now because using the engine and # session set up in the fixture for test_base.DbTestCase does not work # with the API functional tests. Need to investigate more if this diff --git a/octavia/tests/functional/db/test_models.py b/octavia/tests/functional/db/test_models.py index 5edf16ad6f..0cb1b77eca 100644 --- a/octavia/tests/functional/db/test_models.py +++ b/octavia/tests/functional/db/test_models.py @@ -271,7 +271,7 @@ class PoolModelTest(base.OctaviaDBTestBase, ModelTestMixin): class MemberModelTest(base.OctaviaDBTestBase, ModelTestMixin): def setUp(self): - super(MemberModelTest, self).setUp() + super().setUp() self.pool = self.create_pool(self.session) def test_create(self): @@ -317,7 +317,7 @@ class MemberModelTest(base.OctaviaDBTestBase, ModelTestMixin): class SessionPersistenceModelTest(base.OctaviaDBTestBase, ModelTestMixin): def setUp(self): - super(SessionPersistenceModelTest, self).setUp() + super().setUp() self.pool = self.create_pool(self.session) def test_create(self): @@ -449,7 +449,7 @@ class ListenerModelTest(base.OctaviaDBTestBase, ModelTestMixin): class ListenerStatisticsModelTest(base.OctaviaDBTestBase, ModelTestMixin): def setUp(self): - super(ListenerStatisticsModelTest, self).setUp() + super().setUp() self.listener = self.create_listener(self.session) self.amphora = self.create_amphora(self.session) @@ -486,7 +486,7 @@ class ListenerStatisticsModelTest(base.OctaviaDBTestBase, ModelTestMixin): class HealthMonitorModelTest(base.OctaviaDBTestBase, ModelTestMixin): def setUp(self): - super(HealthMonitorModelTest, self).setUp() + super().setUp() self.pool = self.create_pool(self.session) def test_create(self): @@ -577,7 +577,7 @@ class LoadBalancerModelTest(base.OctaviaDBTestBase, ModelTestMixin): class VipModelTest(base.OctaviaDBTestBase, ModelTestMixin): def setUp(self): - super(VipModelTest, self).setUp() + super().setUp() self.load_balancer = self.create_load_balancer(self.session) def test_create(self): @@ -610,7 +610,7 @@ class VipModelTest(base.OctaviaDBTestBase, ModelTestMixin): class SNIModelTest(base.OctaviaDBTestBase, ModelTestMixin): def setUp(self): - super(SNIModelTest, self).setUp() + super().setUp() self.listener = self.create_listener(self.session) def test_create(self): @@ -643,7 +643,7 @@ class SNIModelTest(base.OctaviaDBTestBase, ModelTestMixin): class AmphoraModelTest(base.OctaviaDBTestBase, ModelTestMixin): def setUp(self): - super(AmphoraModelTest, self).setUp() + super().setUp() self.load_balancer = self.create_load_balancer(self.session) def test_create(self): @@ -678,7 +678,7 @@ class AmphoraModelTest(base.OctaviaDBTestBase, ModelTestMixin): class AmphoraHealthModelTest(base.OctaviaDBTestBase, ModelTestMixin): def setUp(self): - super(AmphoraHealthModelTest, self).setUp() + super().setUp() self.amphora = self.create_amphora(self.session) def test_create(self): @@ -708,7 +708,7 @@ class AmphoraHealthModelTest(base.OctaviaDBTestBase, ModelTestMixin): class L7PolicyModelTest(base.OctaviaDBTestBase, ModelTestMixin): def setUp(self): - super(L7PolicyModelTest, self).setUp() + super().setUp() self.listener = self.create_listener(self.session) def test_create(self): @@ -826,7 +826,7 @@ class L7PolicyModelTest(base.OctaviaDBTestBase, ModelTestMixin): class L7RuleModelTest(base.OctaviaDBTestBase, ModelTestMixin): def setUp(self): - super(L7RuleModelTest, self).setUp() + super().setUp() self.listener = self.create_listener(self.session) self.l7policy = self.create_l7policy(self.session, self.listener.id) @@ -872,7 +872,7 @@ class L7RuleModelTest(base.OctaviaDBTestBase, ModelTestMixin): class TestDataModelConversionTest(base.OctaviaDBTestBase, ModelTestMixin): def setUp(self): - super(TestDataModelConversionTest, self).setUp() + super().setUp() self.lb = self.create_load_balancer(self.session) self.amphora = self.create_amphora(self.session) self.associate_amphora(self.lb, self.amphora) @@ -1329,7 +1329,7 @@ class TestDataModelConversionTest(base.OctaviaDBTestBase, ModelTestMixin): class TestDataModelManipulations(base.OctaviaDBTestBase, ModelTestMixin): def setUp(self): - super(TestDataModelManipulations, self).setUp() + super().setUp() self.lb = self.create_load_balancer(self.session) self.amphora = self.create_amphora(self.session) self.associate_amphora(self.lb, self.amphora) @@ -1748,7 +1748,7 @@ class TestDataModelManipulations(base.OctaviaDBTestBase, ModelTestMixin): class FlavorModelTest(base.OctaviaDBTestBase, ModelTestMixin): def setUp(self): - super(FlavorModelTest, self).setUp() + super().setUp() self.profile = self.create_flavor_profile(self.session) def test_create(self): diff --git a/octavia/tests/functional/db/test_repositories.py b/octavia/tests/functional/db/test_repositories.py index 4ea4484067..1b6f9dc5a4 100644 --- a/octavia/tests/functional/db/test_repositories.py +++ b/octavia/tests/functional/db/test_repositories.py @@ -48,7 +48,7 @@ class BaseRepositoryTest(base.OctaviaDBTestBase): FAKE_EXP_AGE = 10 def setUp(self): - super(BaseRepositoryTest, self).setUp() + super().setUp() self.pool_repo = repo.PoolRepository() self.member_repo = repo.MemberRepository() self.lb_repo = repo.LoadBalancerRepository() @@ -96,7 +96,7 @@ class AllRepositoriesTest(base.OctaviaDBTestBase): FAKE_IP = '192.0.2.44' def setUp(self): - super(AllRepositoriesTest, self).setUp() + super().setUp() self.repos = repo.Repositories() self.load_balancer = self.repos.load_balancer.create( self.session, id=self.FAKE_UUID_1, project_id=self.FAKE_UUID_2, @@ -2665,7 +2665,7 @@ class PoolRepositoryTest(BaseRepositoryTest): class MemberRepositoryTest(BaseRepositoryTest): def setUp(self): - super(MemberRepositoryTest, self).setUp() + super().setUp() self.pool = self.pool_repo.create( self.session, id=self.FAKE_UUID_1, project_id=self.FAKE_UUID_2, name="pool_test", description="pool_description", @@ -2753,7 +2753,7 @@ class MemberRepositoryTest(BaseRepositoryTest): class SessionPersistenceRepositoryTest(BaseRepositoryTest): def setUp(self): - super(SessionPersistenceRepositoryTest, self).setUp() + super().setUp() self.pool = self.pool_repo.create( self.session, id=self.FAKE_UUID_1, project_id=self.FAKE_UUID_2, name="pool_test", description="pool_description", @@ -2804,7 +2804,7 @@ class SessionPersistenceRepositoryTest(BaseRepositoryTest): class TestListenerRepositoryTest(BaseRepositoryTest): def setUp(self): - super(TestListenerRepositoryTest, self).setUp() + super().setUp() self.load_balancer = self.lb_repo.create( self.session, id=self.FAKE_UUID_1, project_id=self.FAKE_UUID_2, name="lb_name", description="lb_description", @@ -3096,7 +3096,7 @@ class TestListenerRepositoryTest(BaseRepositoryTest): class ListenerStatisticsRepositoryTest(BaseRepositoryTest): def setUp(self): - super(ListenerStatisticsRepositoryTest, self).setUp() + super().setUp() self.listener = self.listener_repo.create( self.session, id=self.FAKE_UUID_1, project_id=self.FAKE_UUID_2, name="listener_name", description="listener_description", @@ -3273,7 +3273,7 @@ class ListenerStatisticsRepositoryTest(BaseRepositoryTest): class HealthMonitorRepositoryTest(BaseRepositoryTest): def setUp(self): - super(HealthMonitorRepositoryTest, self).setUp() + super().setUp() self.pool = self.pool_repo.create( self.session, id=self.FAKE_UUID_1, project_id=self.FAKE_UUID_2, name="pool_test", description="pool_description", @@ -3637,7 +3637,7 @@ class LoadBalancerRepositoryTest(BaseRepositoryTest): class VipRepositoryTest(BaseRepositoryTest): def setUp(self): - super(VipRepositoryTest, self).setUp() + super().setUp() self.lb = self.lb_repo.create( self.session, id=self.FAKE_UUID_1, project_id=self.FAKE_UUID_2, name="lb_name", description="lb_description", @@ -3701,7 +3701,7 @@ class VipRepositoryTest(BaseRepositoryTest): class SNIRepositoryTest(BaseRepositoryTest): def setUp(self): - super(SNIRepositoryTest, self).setUp() + super().setUp() self.listener = self.listener_repo.create( self.session, id=self.FAKE_UUID_1, project_id=self.FAKE_UUID_2, name="listener_name", description="listener_description", @@ -3751,7 +3751,7 @@ class SNIRepositoryTest(BaseRepositoryTest): class AmphoraRepositoryTest(BaseRepositoryTest): def setUp(self): - super(AmphoraRepositoryTest, self).setUp() + super().setUp() self.lb = self.lb_repo.create( self.session, id=self.FAKE_UUID_1, project_id=self.FAKE_UUID_2, name="lb_name", description="lb_description", @@ -4025,7 +4025,7 @@ class AmphoraRepositoryTest(BaseRepositoryTest): class AmphoraHealthRepositoryTest(BaseRepositoryTest): def setUp(self): - super(AmphoraHealthRepositoryTest, self).setUp() + super().setUp() self.amphora = self.amphora_repo.create(self.session, id=self.FAKE_UUID_1, compute_id=self.FAKE_UUID_3, @@ -4132,7 +4132,7 @@ class AmphoraHealthRepositoryTest(BaseRepositoryTest): class VRRPGroupRepositoryTest(BaseRepositoryTest): def setUp(self): - super(VRRPGroupRepositoryTest, self).setUp() + super().setUp() self.lb = self.lb_repo.create( self.session, id=self.FAKE_UUID_1, project_id=self.FAKE_UUID_2, name="lb_name", description="lb_description", @@ -4178,7 +4178,7 @@ class VRRPGroupRepositoryTest(BaseRepositoryTest): class L7PolicyRepositoryTest(BaseRepositoryTest): def setUp(self): - super(L7PolicyRepositoryTest, self).setUp() + super().setUp() self.pool = self.create_pool(self.FAKE_UUID_1) self.listener = self.create_listener(self.FAKE_UUID_1, 80) @@ -4587,7 +4587,7 @@ class L7PolicyRepositoryTest(BaseRepositoryTest): class L7RuleRepositoryTest(BaseRepositoryTest): def setUp(self): - super(L7RuleRepositoryTest, self).setUp() + super().setUp() self.listener = self.listener_repo.create( self.session, id=uuidutils.generate_uuid(), project_id=self.FAKE_UUID_2, @@ -4958,7 +4958,7 @@ class L7RuleRepositoryTest(BaseRepositoryTest): class TestQuotasRepository(BaseRepositoryTest): def setUp(self): - super(TestQuotasRepository, self).setUp() + super().setUp() def update_quotas(self, project_id, load_balancer=20, listener=20, pool=20, health_monitor=20, member=20, l7policy=20, l7rule=20): diff --git a/octavia/tests/unit/amphorae/backends/agent/api_server/test_amphora_info.py b/octavia/tests/unit/amphorae/backends/agent/api_server/test_amphora_info.py index da5afa7032..a8f3267193 100644 --- a/octavia/tests/unit/amphorae/backends/agent/api_server/test_amphora_info.py +++ b/octavia/tests/unit/amphorae/backends/agent/api_server/test_amphora_info.py @@ -40,7 +40,7 @@ class TestAmphoraInfo(base.TestCase): LB_ID_1 = uuidutils.generate_uuid() def setUp(self): - super(TestAmphoraInfo, self).setUp() + super().setUp() self.osutils_mock = mock.MagicMock() self.amp_info = amphora_info.AmphoraInfo(self.osutils_mock) self.udp_driver = mock.MagicMock() diff --git a/octavia/tests/unit/amphorae/backends/agent/api_server/test_haproxy_compatibility.py b/octavia/tests/unit/amphorae/backends/agent/api_server/test_haproxy_compatibility.py index 8ebce71023..91d9592a1e 100644 --- a/octavia/tests/unit/amphorae/backends/agent/api_server/test_haproxy_compatibility.py +++ b/octavia/tests/unit/amphorae/backends/agent/api_server/test_haproxy_compatibility.py @@ -21,7 +21,7 @@ from octavia.tests.unit.common.sample_configs import sample_configs_combined class HAProxyCompatTestCase(base.TestCase): def setUp(self): - super(HAProxyCompatTestCase, self).setUp() + super().setUp() self.old_haproxy_global = ( "# Configuration for loadbalancer sample_loadbalancer_id_1\n" "global\n" diff --git a/octavia/tests/unit/amphorae/backends/agent/api_server/test_keepalived.py b/octavia/tests/unit/amphorae/backends/agent/api_server/test_keepalived.py index f68ed94c07..8f6c86a60f 100644 --- a/octavia/tests/unit/amphorae/backends/agent/api_server/test_keepalived.py +++ b/octavia/tests/unit/amphorae/backends/agent/api_server/test_keepalived.py @@ -22,7 +22,7 @@ import octavia.tests.unit.base as base class KeepalivedTestCase(base.TestCase): def setUp(self): - super(KeepalivedTestCase, self).setUp() + super().setUp() self.app = flask.Flask(__name__) self.client = self.app.test_client() self._ctx = self.app.test_request_context() diff --git a/octavia/tests/unit/amphorae/backends/agent/api_server/test_keepalivedlvs.py b/octavia/tests/unit/amphorae/backends/agent/api_server/test_keepalivedlvs.py index 4cb0422315..d4fdf3574b 100644 --- a/octavia/tests/unit/amphorae/backends/agent/api_server/test_keepalivedlvs.py +++ b/octavia/tests/unit/amphorae/backends/agent/api_server/test_keepalivedlvs.py @@ -24,7 +24,7 @@ class KeepalivedLvsTestCase(base.TestCase): FAKE_ID = uuidutils.generate_uuid() def setUp(self): - super(KeepalivedLvsTestCase, self).setUp() + super().setUp() self.test_keepalivedlvs = keepalivedlvs.KeepalivedLvs() @mock.patch.object(keepalivedlvs, "webob") diff --git a/octavia/tests/unit/amphorae/backends/agent/api_server/test_loadbalancer.py b/octavia/tests/unit/amphorae/backends/agent/api_server/test_loadbalancer.py index e7a868bce0..2db40b67a4 100644 --- a/octavia/tests/unit/amphorae/backends/agent/api_server/test_loadbalancer.py +++ b/octavia/tests/unit/amphorae/backends/agent/api_server/test_loadbalancer.py @@ -31,7 +31,7 @@ LB_ID1 = uuidutils.generate_uuid() class ListenerTestCase(base.TestCase): def setUp(self): - super(ListenerTestCase, self).setUp() + super().setUp() self.mock_platform = mock.patch("distro.id").start() self.mock_platform.return_value = "ubuntu" self.test_loadbalancer = loadbalancer.Loadbalancer() diff --git a/octavia/tests/unit/amphorae/backends/agent/api_server/test_osutils.py b/octavia/tests/unit/amphorae/backends/agent/api_server/test_osutils.py index ece6957b6b..1ed82db7ea 100644 --- a/octavia/tests/unit/amphorae/backends/agent/api_server/test_osutils.py +++ b/octavia/tests/unit/amphorae/backends/agent/api_server/test_osutils.py @@ -30,7 +30,7 @@ from octavia.tests.unit import base class TestOSUtils(base.TestCase): def setUp(self): - super(TestOSUtils, self).setUp() + super().setUp() self.base_os_util = osutils.BaseOS('unknown') diff --git a/octavia/tests/unit/amphorae/backends/agent/api_server/test_plug.py b/octavia/tests/unit/amphorae/backends/agent/api_server/test_plug.py index eccfcbda92..50812fb7cc 100644 --- a/octavia/tests/unit/amphorae/backends/agent/api_server/test_plug.py +++ b/octavia/tests/unit/amphorae/backends/agent/api_server/test_plug.py @@ -37,7 +37,7 @@ FAKE_INTERFACE = 'eth33' class TestPlug(base.TestCase): def setUp(self): - super(TestPlug, self).setUp() + super().setUp() self.mock_platform = mock.patch("distro.id").start() self.mock_platform.return_value = "ubuntu" self.osutil = osutils.BaseOS.get_os_util() @@ -210,7 +210,7 @@ class TestPlug(base.TestCase): class TestPlugNetwork(base.TestCase): def setUp(self): - super(TestPlugNetwork, self).setUp() + super().setUp() self.mock_platform = mock.patch("distro.id").start() def __generate_network_file_text_static_ip(self): diff --git a/octavia/tests/unit/amphorae/backends/agent/api_server/test_util.py b/octavia/tests/unit/amphorae/backends/agent/api_server/test_util.py index 0148a5bb53..38c84731c9 100644 --- a/octavia/tests/unit/amphorae/backends/agent/api_server/test_util.py +++ b/octavia/tests/unit/amphorae/backends/agent/api_server/test_util.py @@ -35,7 +35,7 @@ LB_ID1 = uuidutils.generate_uuid() class TestUtil(base.TestCase): def setUp(self): - super(TestUtil, self).setUp() + super().setUp() self.CONF = self.useFixture(oslo_fixture.Config(cfg.CONF)) self.listener_id = uuidutils.generate_uuid() self.jinja_cfg = jinja_cfg.JinjaTemplater( diff --git a/octavia/tests/unit/amphorae/backends/agent/test_agent_jinja_cfg.py b/octavia/tests/unit/amphorae/backends/agent/test_agent_jinja_cfg.py index 6e4c52917e..6c46eece12 100644 --- a/octavia/tests/unit/amphorae/backends/agent/test_agent_jinja_cfg.py +++ b/octavia/tests/unit/amphorae/backends/agent/test_agent_jinja_cfg.py @@ -25,7 +25,7 @@ AMP_ID = uuidutils.generate_uuid() class AgentJinjaTestCase(base.TestCase): def setUp(self): - super(AgentJinjaTestCase, self).setUp() + super().setUp() self.conf = oslo_fixture.Config(cfg.CONF) self.conf.config(debug=False) diff --git a/octavia/tests/unit/amphorae/backends/health_daemon/test_envelope.py b/octavia/tests/unit/amphorae/backends/health_daemon/test_envelope.py index 24b82ca871..37362d8a4c 100644 --- a/octavia/tests/unit/amphorae/backends/health_daemon/test_envelope.py +++ b/octavia/tests/unit/amphorae/backends/health_daemon/test_envelope.py @@ -21,7 +21,7 @@ from octavia.tests.unit import base class TestEnvelope(base.TestCase): def setUp(self): - super(TestEnvelope, self).setUp() + super().setUp() def test_message_hmac(self): seq = 42 diff --git a/octavia/tests/unit/amphorae/backends/health_daemon/test_health_daemon.py b/octavia/tests/unit/amphorae/backends/health_daemon/test_health_daemon.py index 34824ecd75..38d08a55cc 100644 --- a/octavia/tests/unit/amphorae/backends/health_daemon/test_health_daemon.py +++ b/octavia/tests/unit/amphorae/backends/health_daemon/test_health_daemon.py @@ -155,7 +155,7 @@ SAMPLE_MSG_HAPROXY_RESTART = { class TestHealthDaemon(base.TestCase): def setUp(self): - super(TestHealthDaemon, self).setUp() + super().setUp() conf = oslo_fixture.Config(cfg.CONF) conf.config(group="haproxy_amphora", base_path=BASE_PATH) conf.config(group="amphora_agent", amphora_id=AMPHORA_ID) diff --git a/octavia/tests/unit/amphorae/backends/health_daemon/test_health_sender.py b/octavia/tests/unit/amphorae/backends/health_daemon/test_health_sender.py index d06c083261..3813922a2e 100644 --- a/octavia/tests/unit/amphorae/backends/health_daemon/test_health_sender.py +++ b/octavia/tests/unit/amphorae/backends/health_daemon/test_health_sender.py @@ -37,7 +37,7 @@ SAMPLE_MSG_BIN = binascii.unhexlify('78daab562a492d2ec94ead54b252500a710d0e51a' class TestHealthSender(base.TestCase): def setUp(self): - super(TestHealthSender, self).setUp() + super().setUp() self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) self.conf.config(group="health_manager", controller_ip_port_list=IP_PORT) diff --git a/octavia/tests/unit/amphorae/backends/utils/test_haproxy_query.py b/octavia/tests/unit/amphorae/backends/utils/test_haproxy_query.py index 1ae45c1dd8..59f0533de6 100644 --- a/octavia/tests/unit/amphorae/backends/utils/test_haproxy_query.py +++ b/octavia/tests/unit/amphorae/backends/utils/test_haproxy_query.py @@ -73,7 +73,7 @@ INFO_SOCKET_SAMPLE = ( class QueryTestCase(base.TestCase): def setUp(self): self.q = query.HAProxyQuery('') - super(QueryTestCase, self).setUp() + super().setUp() @mock.patch('socket.socket') def test_query(self, mock_socket): diff --git a/octavia/tests/unit/amphorae/backends/utils/test_ip_advertisement.py b/octavia/tests/unit/amphorae/backends/utils/test_ip_advertisement.py index 51e31d2e91..ff8d817a13 100644 --- a/octavia/tests/unit/amphorae/backends/utils/test_ip_advertisement.py +++ b/octavia/tests/unit/amphorae/backends/utils/test_ip_advertisement.py @@ -24,7 +24,7 @@ import octavia.tests.unit.base as base class TestIPAdvertisement(base.TestCase): def setUp(self): - super(TestIPAdvertisement, self).setUp() + super().setUp() @mock.patch('octavia.amphorae.backends.utils.network_namespace.' 'NetworkNamespace') diff --git a/octavia/tests/unit/amphorae/backends/utils/test_keepalivedlvs_query.py b/octavia/tests/unit/amphorae/backends/utils/test_keepalivedlvs_query.py index 54a060ce0a..88db32a9d9 100644 --- a/octavia/tests/unit/amphorae/backends/utils/test_keepalivedlvs_query.py +++ b/octavia/tests/unit/amphorae/backends/utils/test_keepalivedlvs_query.py @@ -149,7 +149,7 @@ IPVSADM_STATS_OUTPUT_TEMPLATE = ( class LvsQueryTestCase(base.TestCase): def setUp(self): - super(LvsQueryTestCase, self).setUp() + super().setUp() self.listener_id_v4 = uuidutils.generate_uuid() self.pool_id_v4 = uuidutils.generate_uuid() self.member_id1_v4 = uuidutils.generate_uuid() diff --git a/octavia/tests/unit/amphorae/backends/utils/test_network_namespace.py b/octavia/tests/unit/amphorae/backends/utils/test_network_namespace.py index 932e8512f0..9f1d55336f 100644 --- a/octavia/tests/unit/amphorae/backends/utils/test_network_namespace.py +++ b/octavia/tests/unit/amphorae/backends/utils/test_network_namespace.py @@ -22,7 +22,7 @@ import octavia.tests.unit.base as base class TestNetworkNamespace(base.TestCase): def setUp(self): - super(TestNetworkNamespace, self).setUp() + super().setUp() @mock.patch('ctypes.get_errno') @mock.patch('ctypes.CDLL') diff --git a/octavia/tests/unit/amphorae/backends/utils/test_network_utils.py b/octavia/tests/unit/amphorae/backends/utils/test_network_utils.py index 030cc26219..6b575798d1 100644 --- a/octavia/tests/unit/amphorae/backends/utils/test_network_utils.py +++ b/octavia/tests/unit/amphorae/backends/utils/test_network_utils.py @@ -22,7 +22,7 @@ import octavia.tests.unit.base as base class TestNetworkUtils(base.TestCase): def setUp(self): - super(TestNetworkUtils, self).setUp() + super().setUp() def test_find_interface(self): FAKE_INTERFACE = 'fake0' diff --git a/octavia/tests/unit/amphorae/drivers/haproxy/test_exceptions.py b/octavia/tests/unit/amphorae/drivers/haproxy/test_exceptions.py index d9a0d09199..f98f67cba1 100644 --- a/octavia/tests/unit/amphorae/drivers/haproxy/test_exceptions.py +++ b/octavia/tests/unit/amphorae/drivers/haproxy/test_exceptions.py @@ -20,7 +20,7 @@ import octavia.tests.unit.base as base class TestHAProxyExceptions(base.TestCase): def setUp(self): - super(TestHAProxyExceptions, self).setUp() + super().setUp() @mock.patch('octavia.amphorae.drivers.haproxy.exceptions.LOG') def test_check_exception(self, mock_logger): diff --git a/octavia/tests/unit/amphorae/drivers/haproxy/test_rest_api_driver_0_5.py b/octavia/tests/unit/amphorae/drivers/haproxy/test_rest_api_driver_0_5.py index 85fa27bf6f..9a0b4fca4f 100644 --- a/octavia/tests/unit/amphorae/drivers/haproxy/test_rest_api_driver_0_5.py +++ b/octavia/tests/unit/amphorae/drivers/haproxy/test_rest_api_driver_0_5.py @@ -50,7 +50,7 @@ FAKE_MEMBER_IP_PORT_NAME_2 = "10.0.0.11:1004" class TestHaproxyAmphoraLoadBalancerDriverTest(base.TestCase): def setUp(self): - super(TestHaproxyAmphoraLoadBalancerDriverTest, self).setUp() + super().setUp() DEST1 = '198.51.100.0/24' DEST2 = '203.0.113.0/24' @@ -688,7 +688,7 @@ class TestHaproxyAmphoraLoadBalancerDriverTest(base.TestCase): class TestAmphoraAPIClientTest(base.TestCase): def setUp(self): - super(TestAmphoraAPIClientTest, self).setUp() + super().setUp() self.driver = driver.AmphoraAPIClient0_5() self.base_url = "https://192.0.2.77:9443/" self.base_url_ver = self.base_url + API_VERSION diff --git a/octavia/tests/unit/amphorae/drivers/haproxy/test_rest_api_driver_1_0.py b/octavia/tests/unit/amphorae/drivers/haproxy/test_rest_api_driver_1_0.py index ee9c95f0d2..13bd6011da 100644 --- a/octavia/tests/unit/amphorae/drivers/haproxy/test_rest_api_driver_1_0.py +++ b/octavia/tests/unit/amphorae/drivers/haproxy/test_rest_api_driver_1_0.py @@ -50,7 +50,7 @@ FAKE_MEMBER_IP_PORT_NAME_2 = "10.0.0.11:1004" class TestHaproxyAmphoraLoadBalancerDriverTest(base.TestCase): def setUp(self): - super(TestHaproxyAmphoraLoadBalancerDriverTest, self).setUp() + super().setUp() DEST1 = '198.51.100.0/24' DEST2 = '203.0.113.0/24' @@ -782,7 +782,7 @@ class TestHaproxyAmphoraLoadBalancerDriverTest(base.TestCase): class TestAmphoraAPIClientTest(base.TestCase): def setUp(self): - super(TestAmphoraAPIClientTest, self).setUp() + super().setUp() self.driver = driver.AmphoraAPIClient1_0() self.base_url = "https://192.0.2.77:9443/" self.base_url_ver = self.base_url + "1.0" diff --git a/octavia/tests/unit/amphorae/drivers/haproxy/test_rest_api_driver_common.py b/octavia/tests/unit/amphorae/drivers/haproxy/test_rest_api_driver_common.py index e36ed3daba..8bef00ebea 100644 --- a/octavia/tests/unit/amphorae/drivers/haproxy/test_rest_api_driver_common.py +++ b/octavia/tests/unit/amphorae/drivers/haproxy/test_rest_api_driver_common.py @@ -21,7 +21,7 @@ import octavia.tests.unit.base as base class TestHAProxyAmphoraDriver(base.TestCase): def setUp(self): - super(TestHAProxyAmphoraDriver, self).setUp() + super().setUp() self.driver = rest_api_driver.HaproxyAmphoraLoadBalancerDriver() @mock.patch('octavia.amphorae.drivers.haproxy.rest_api_driver.' diff --git a/octavia/tests/unit/amphorae/drivers/health/test_heartbeat_udp.py b/octavia/tests/unit/amphorae/drivers/health/test_heartbeat_udp.py index 5c3f9d6711..49d83d8313 100644 --- a/octavia/tests/unit/amphorae/drivers/health/test_heartbeat_udp.py +++ b/octavia/tests/unit/amphorae/drivers/health/test_heartbeat_udp.py @@ -44,7 +44,7 @@ STATS_DRIVER = 'stats_logger' class TestHeartbeatUDP(base.TestCase): def setUp(self): - super(TestHeartbeatUDP, self).setUp() + super().setUp() self.health_update = mock.Mock() self.stats_update = mock.Mock() diff --git a/octavia/tests/unit/amphorae/drivers/keepalived/jinja/test_jinja_cfg.py b/octavia/tests/unit/amphorae/drivers/keepalived/jinja/test_jinja_cfg.py index c03237a611..19742eb95e 100644 --- a/octavia/tests/unit/amphorae/drivers/keepalived/jinja/test_jinja_cfg.py +++ b/octavia/tests/unit/amphorae/drivers/keepalived/jinja/test_jinja_cfg.py @@ -26,7 +26,7 @@ import octavia.tests.unit.base as base class TestVRRPRestDriver(base.TestCase): def setUp(self): - super(TestVRRPRestDriver, self).setUp() + super().setUp() conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) conf.config(group="haproxy_amphora", base_path='/tmp/test') conf.config(group="keepalived_vrrp", vrrp_garp_refresh_interval=5) diff --git a/octavia/tests/unit/amphorae/drivers/keepalived/test_vrrp_rest_driver.py b/octavia/tests/unit/amphorae/drivers/keepalived/test_vrrp_rest_driver.py index 19a97fca41..e78b8281fc 100644 --- a/octavia/tests/unit/amphorae/drivers/keepalived/test_vrrp_rest_driver.py +++ b/octavia/tests/unit/amphorae/drivers/keepalived/test_vrrp_rest_driver.py @@ -45,7 +45,7 @@ class TestVRRPRestDriver(base.TestCase): vip_subnet.cidr = '192.0.2.0/24' self.amphorae_network_config[self.amphora_mock.id] = vip_subnet - super(TestVRRPRestDriver, self).setUp() + super().setUp() @mock.patch('octavia.amphorae.drivers.keepalived.jinja.' 'jinja_cfg.KeepalivedJinjaTemplater.build_keepalived_config') diff --git a/octavia/tests/unit/amphorae/drivers/test_noop_amphoraloadbalancer_driver.py b/octavia/tests/unit/amphorae/drivers/test_noop_amphoraloadbalancer_driver.py index e4c2d8a49c..7fc04bd8f7 100644 --- a/octavia/tests/unit/amphorae/drivers/test_noop_amphoraloadbalancer_driver.py +++ b/octavia/tests/unit/amphorae/drivers/test_noop_amphoraloadbalancer_driver.py @@ -27,7 +27,7 @@ FAKE_UUID_1 = uuidutils.generate_uuid() class TestLoggingUpdate(base.TestCase): def setUp(self): - super(TestLoggingUpdate, self).setUp() + super().setUp() self.mixin = driver.LoggingUpdate() def test_update_stats(self): @@ -43,7 +43,7 @@ class TestNoopAmphoraLoadBalancerDriver(base.TestCase): FAKE_UUID_1 = uuidutils.generate_uuid() def setUp(self): - super(TestNoopAmphoraLoadBalancerDriver, self).setUp() + super().setUp() self.driver = driver.NoopAmphoraLoadBalancerDriver() self.listener = data_models.Listener() self.listener.id = uuidutils.generate_uuid() diff --git a/octavia/tests/unit/api/common/test_types.py b/octavia/tests/unit/api/common/test_types.py index 531409dfb3..ea89d9cbc4 100644 --- a/octavia/tests/unit/api/common/test_types.py +++ b/octavia/tests/unit/api/common/test_types.py @@ -58,7 +58,7 @@ class TestModel(data_models.BaseDataModel): self.enabled = enabled def to_dict(self): - result = super(TestModel, self).to_dict() + result = super().to_dict() result['child'] = self.child.to_dict() return result @@ -66,7 +66,7 @@ class TestModel(data_models.BaseDataModel): class TestTypeDataModelRenames(base.TestCase): def setUp(self): - super(TestTypeDataModelRenames, self).setUp() + super().setUp() child_model = ChildTestModel(one='baby_turtle_one', two='baby_turtle_two') self.model = TestModel(id='1234', original='turtles', @@ -163,7 +163,7 @@ class TestDataModelToDict(base.TestCase): 'children': []} def setUp(self): - super(TestDataModelToDict, self).setUp() + super().setUp() self.model = TestToDictModel('parent_text') self.model.set_child(TestToDictModel('child_text', self.model)) self.model.set_children([TestToDictModel('child1_text', self.model), diff --git a/octavia/tests/unit/api/drivers/amphora_driver/v1/test_amphora_driver.py b/octavia/tests/unit/api/drivers/amphora_driver/v1/test_amphora_driver.py index 7cb6e43fb5..07bf73d127 100644 --- a/octavia/tests/unit/api/drivers/amphora_driver/v1/test_amphora_driver.py +++ b/octavia/tests/unit/api/drivers/amphora_driver/v1/test_amphora_driver.py @@ -26,7 +26,7 @@ from octavia.tests.unit import base class TestAmphoraDriver(base.TestRpc): def setUp(self): - super(TestAmphoraDriver, self).setUp() + super().setUp() self.amp_driver = driver.AmphoraProviderDriver() self.sample_data = sample_data_models.SampleDriverDataModels() diff --git a/octavia/tests/unit/api/drivers/amphora_driver/v2/test_amphora_driver.py b/octavia/tests/unit/api/drivers/amphora_driver/v2/test_amphora_driver.py index a22df08e66..822ce8dfd1 100644 --- a/octavia/tests/unit/api/drivers/amphora_driver/v2/test_amphora_driver.py +++ b/octavia/tests/unit/api/drivers/amphora_driver/v2/test_amphora_driver.py @@ -26,7 +26,7 @@ from octavia.tests.unit import base class TestAmphoraDriver(base.TestRpc): def setUp(self): - super(TestAmphoraDriver, self).setUp() + super().setUp() self.amp_driver = driver.AmphoraProviderDriver() self.sample_data = sample_data_models.SampleDriverDataModels() diff --git a/octavia/tests/unit/api/drivers/driver_agent/test_driver_listener.py b/octavia/tests/unit/api/drivers/driver_agent/test_driver_listener.py index 732958cc10..33c08fe644 100644 --- a/octavia/tests/unit/api/drivers/driver_agent/test_driver_listener.py +++ b/octavia/tests/unit/api/drivers/driver_agent/test_driver_listener.py @@ -26,7 +26,7 @@ CONF = cfg.CONF class TestDriverListener(base.TestCase): def setUp(self): - super(TestDriverListener, self).setUp() + super().setUp() @mock.patch('octavia.api.drivers.driver_agent.driver_listener.memoryview') def test_recv(self, mock_memoryview): diff --git a/octavia/tests/unit/api/drivers/driver_agent/test_driver_updater.py b/octavia/tests/unit/api/drivers/driver_agent/test_driver_updater.py index dd453516d5..be978ce76c 100644 --- a/octavia/tests/unit/api/drivers/driver_agent/test_driver_updater.py +++ b/octavia/tests/unit/api/drivers/driver_agent/test_driver_updater.py @@ -35,7 +35,7 @@ class TestDriverUpdater(base.TestCase): def setUp(self, mock_get_session, mock_member_repo, mock_health_repo, mock_pool_repo, mock_l7r_repo, mock_l7p_repo, mock_list_repo, mock_lb_repo): - super(TestDriverUpdater, self).setUp() + super().setUp() self.mock_session = "FAKE_DB_SESSION" mock_get_session.return_value = self.mock_session diff --git a/octavia/tests/unit/api/drivers/test_driver_factory.py b/octavia/tests/unit/api/drivers/test_driver_factory.py index 6fd4a66e54..f30f309929 100644 --- a/octavia/tests/unit/api/drivers/test_driver_factory.py +++ b/octavia/tests/unit/api/drivers/test_driver_factory.py @@ -22,7 +22,7 @@ import octavia.tests.unit.base as base class TestDriverFactory(base.TestCase): def setUp(self): - super(TestDriverFactory, self).setUp() + super().setUp() @mock.patch('stevedore.driver.DriverManager') def test_driver_factory_no_provider(self, mock_drivermgr): diff --git a/octavia/tests/unit/api/drivers/test_provider_noop_agent.py b/octavia/tests/unit/api/drivers/test_provider_noop_agent.py index 0b42659a76..b32a0e7f97 100644 --- a/octavia/tests/unit/api/drivers/test_provider_noop_agent.py +++ b/octavia/tests/unit/api/drivers/test_provider_noop_agent.py @@ -21,7 +21,7 @@ import octavia.tests.unit.base as base class TestNoopProviderAgent(base.TestCase): def setUp(self): - super(TestNoopProviderAgent, self).setUp() + super().setUp() @mock.patch('time.sleep') def test_noop_provider_agent(self, mock_sleep): diff --git a/octavia/tests/unit/api/drivers/test_provider_noop_driver.py b/octavia/tests/unit/api/drivers/test_provider_noop_driver.py index faf95f28a8..85d06d335f 100644 --- a/octavia/tests/unit/api/drivers/test_provider_noop_driver.py +++ b/octavia/tests/unit/api/drivers/test_provider_noop_driver.py @@ -22,7 +22,7 @@ import octavia.tests.unit.base as base class TestNoopProviderDriver(base.TestCase): def setUp(self): - super(TestNoopProviderDriver, self).setUp() + super().setUp() self.driver = driver.NoopProviderDriver() self.loadbalancer_id = uuidutils.generate_uuid() diff --git a/octavia/tests/unit/api/drivers/test_utils.py b/octavia/tests/unit/api/drivers/test_utils.py index 204aabe8f4..4d41d29e68 100644 --- a/octavia/tests/unit/api/drivers/test_utils.py +++ b/octavia/tests/unit/api/drivers/test_utils.py @@ -27,7 +27,7 @@ from octavia.tests.unit import base class TestUtils(base.TestCase): def setUp(self): - super(TestUtils, self).setUp() + super().setUp() self.sample_data = sample_data_models.SampleDriverDataModels() def test_call_provider(self): diff --git a/octavia/tests/unit/api/v2/types/test_l7policies.py b/octavia/tests/unit/api/v2/types/test_l7policies.py index 8575b0a9f2..c0eddaf249 100644 --- a/octavia/tests/unit/api/v2/types/test_l7policies.py +++ b/octavia/tests/unit/api/v2/types/test_l7policies.py @@ -27,7 +27,7 @@ class TestL7PolicyPOST(base.BaseTypesTest): _type = l7policy_type.L7PolicyPOST def setUp(self): - super(TestL7PolicyPOST, self).setUp() + super().setUp() self.listener_id = uuidutils.generate_uuid() def test_l7policy(self): diff --git a/octavia/tests/unit/base.py b/octavia/tests/unit/base.py index 7022cfe1d1..d4a18ec158 100644 --- a/octavia/tests/unit/base.py +++ b/octavia/tests/unit/base.py @@ -29,7 +29,7 @@ from octavia.common import config # noqa: F401 class TestCase(testtools.TestCase): def setUp(self): - super(TestCase, self).setUp() + super().setUp() config.register_cli_opts() self.addCleanup(mock.patch.stopall) self.addCleanup(self.clean_caches) @@ -41,7 +41,7 @@ class TestCase(testtools.TestCase): class TestRpc(testtools.TestCase): def __init__(self, *args, **kwargs): - super(TestRpc, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) self._buses = {} def _fake_create_transport(self, url): @@ -52,7 +52,7 @@ class TestRpc(testtools.TestCase): return self._buses[url] def setUp(self): - super(TestRpc, self).setUp() + super().setUp() self.addCleanup(rpc.cleanup) self.messaging_conf = messaging_conffixture.ConfFixture(cfg.CONF) self.messaging_conf.transport_url = 'fake:/' diff --git a/octavia/tests/unit/certificates/common/auth/test_barbican_acl.py b/octavia/tests/unit/certificates/common/auth/test_barbican_acl.py index 6ea52e5713..79d6ddcede 100644 --- a/octavia/tests/unit/certificates/common/auth/test_barbican_acl.py +++ b/octavia/tests/unit/certificates/common/auth/test_barbican_acl.py @@ -29,7 +29,7 @@ CONF = cfg.CONF class TestBarbicanACLAuth(base.TestCase): def setUp(self): - super(TestBarbicanACLAuth, self).setUp() + super().setUp() # Reset the client keystone._SESSION = None self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) diff --git a/octavia/tests/unit/certificates/common/test_local.py b/octavia/tests/unit/certificates/common/test_local.py index 96504bb6e3..8bb13bf2f3 100644 --- a/octavia/tests/unit/certificates/common/test_local.py +++ b/octavia/tests/unit/certificates/common/test_local.py @@ -23,7 +23,7 @@ class TestLocalCommon(base.TestCase): self.private_key = "My Private Key" self.private_key_passphrase = "My Private Key Passphrase" - super(TestLocalCommon, self).setUp() + super().setUp() def test_local_cert(self): # Create a cert diff --git a/octavia/tests/unit/certificates/generator/local_csr.py b/octavia/tests/unit/certificates/generator/local_csr.py index 40d0e90cd4..7c30715429 100644 --- a/octavia/tests/unit/certificates/generator/local_csr.py +++ b/octavia/tests/unit/certificates/generator/local_csr.py @@ -54,7 +54,7 @@ class BaseLocalCSRTestCase(base.TestCase): self.ca_private_key_passphrase), ) - super(BaseLocalCSRTestCase, self).setUp() + super().setUp() def test_generate_csr(self): cn = 'testCN' diff --git a/octavia/tests/unit/certificates/generator/test_local.py b/octavia/tests/unit/certificates/generator/test_local.py index dd73e4f800..a3b5733b9d 100644 --- a/octavia/tests/unit/certificates/generator/test_local.py +++ b/octavia/tests/unit/certificates/generator/test_local.py @@ -25,7 +25,7 @@ from octavia.tests.unit.certificates.generator import local_csr class TestLocalGenerator(local_csr.BaseLocalCSRTestCase): def setUp(self): - super(TestLocalGenerator, self).setUp() + super().setUp() self.signing_digest = "sha256" # Setup CA data diff --git a/octavia/tests/unit/certificates/manager/test_barbican.py b/octavia/tests/unit/certificates/manager/test_barbican.py index efec072679..3711d4282e 100644 --- a/octavia/tests/unit/certificates/manager/test_barbican.py +++ b/octavia/tests/unit/certificates/manager/test_barbican.py @@ -61,7 +61,7 @@ class TestBarbicanManager(base.TestCase): self.context = mock.Mock() self.context.project_id = PROJECT_ID - super(TestBarbicanManager, self).setUp() + super().setUp() def test_store_cert(self): # Mock out the client diff --git a/octavia/tests/unit/certificates/manager/test_barbican_legacy.py b/octavia/tests/unit/certificates/manager/test_barbican_legacy.py index ef92f22add..802d2293a4 100644 --- a/octavia/tests/unit/certificates/manager/test_barbican_legacy.py +++ b/octavia/tests/unit/certificates/manager/test_barbican_legacy.py @@ -95,7 +95,7 @@ class TestBarbicanManager(base.TestCase): self.context = mock.Mock() self.context.project_id = PROJECT_ID - super(TestBarbicanManager, self).setUp() + super().setUp() def test_store_cert(self): # Mock out the client diff --git a/octavia/tests/unit/certificates/manager/test_castellan_mgr.py b/octavia/tests/unit/certificates/manager/test_castellan_mgr.py index fb3145b5fa..5c97df0bb1 100644 --- a/octavia/tests/unit/certificates/manager/test_castellan_mgr.py +++ b/octavia/tests/unit/certificates/manager/test_castellan_mgr.py @@ -28,7 +28,7 @@ class TestCastellanCertManager(base.TestCase): self.certbag = mock.MagicMock() self.manager.get.return_value = self.certbag - super(TestCastellanCertManager, self).setUp() + super().setUp() @mock.patch('castellan.key_manager.API') def test_get_secret(self, mock_api): diff --git a/octavia/tests/unit/certificates/manager/test_local.py b/octavia/tests/unit/certificates/manager/test_local.py index 78335fc1d6..aea65451d6 100644 --- a/octavia/tests/unit/certificates/manager/test_local.py +++ b/octavia/tests/unit/certificates/manager/test_local.py @@ -38,7 +38,7 @@ class TestLocalManager(base.TestCase): conf = oslo_fixture.Config(cfg.CONF) conf.config(group="certificates", storage_path="/tmp/") - super(TestLocalManager, self).setUp() + super().setUp() def _store_cert(self): fd_mock = mock.mock_open() diff --git a/octavia/tests/unit/cmd/test_agent.py b/octavia/tests/unit/cmd/test_agent.py index d44b267e18..9656733137 100644 --- a/octavia/tests/unit/cmd/test_agent.py +++ b/octavia/tests/unit/cmd/test_agent.py @@ -19,7 +19,7 @@ from octavia.tests.unit import base class TestAmphoraAgentCMD(base.TestCase): def setUp(self): - super(TestAmphoraAgentCMD, self).setUp() + super().setUp() @mock.patch('octavia.cmd.agent.AmphoraAgent') @mock.patch('octavia.amphorae.backends.agent.api_server.server.Server') diff --git a/octavia/tests/unit/cmd/test_driver_agent.py b/octavia/tests/unit/cmd/test_driver_agent.py index 809a5854b2..35d5f5cd7b 100644 --- a/octavia/tests/unit/cmd/test_driver_agent.py +++ b/octavia/tests/unit/cmd/test_driver_agent.py @@ -27,7 +27,7 @@ CONF = cfg.CONF class TestDriverAgentCMD(base.TestCase): def setUp(self): - super(TestDriverAgentCMD, self).setUp() + super().setUp() self.CONF = self.useFixture(oslo_fixture.Config(cfg.CONF)) @mock.patch('os.kill') diff --git a/octavia/tests/unit/cmd/test_haproxy_vrrp_check.py b/octavia/tests/unit/cmd/test_haproxy_vrrp_check.py index 8c5c8ea65d..a785b846e6 100644 --- a/octavia/tests/unit/cmd/test_haproxy_vrrp_check.py +++ b/octavia/tests/unit/cmd/test_haproxy_vrrp_check.py @@ -21,7 +21,7 @@ from octavia.tests.unit import base class TestHAproxyVRRPCheckCMD(base.TestCase): def setUp(self): - super(TestHAproxyVRRPCheckCMD, self).setUp() + super().setUp() @mock.patch('socket.socket') def test_health_check(self, mock_socket): diff --git a/octavia/tests/unit/cmd/test_health_manager.py b/octavia/tests/unit/cmd/test_health_manager.py index cff7357476..c6a38a61d2 100644 --- a/octavia/tests/unit/cmd/test_health_manager.py +++ b/octavia/tests/unit/cmd/test_health_manager.py @@ -21,7 +21,7 @@ from octavia.tests.unit import base class TestHealthManagerCMD(base.TestCase): def setUp(self): - super(TestHealthManagerCMD, self).setUp() + super().setUp() @mock.patch('multiprocessing.Event') @mock.patch('octavia.amphorae.drivers.health.' diff --git a/octavia/tests/unit/cmd/test_house_keeping.py b/octavia/tests/unit/cmd/test_house_keeping.py index 466b02dd33..0f5985629b 100644 --- a/octavia/tests/unit/cmd/test_house_keeping.py +++ b/octavia/tests/unit/cmd/test_house_keeping.py @@ -20,7 +20,7 @@ from octavia.tests.unit import base class TestHouseKeepingCMD(base.TestCase): def setUp(self): - super(TestHouseKeepingCMD, self).setUp() + super().setUp() @mock.patch('octavia.cmd.house_keeping.spare_amp_thread_event') @mock.patch('octavia.controller.housekeeping.' diff --git a/octavia/tests/unit/cmd/test_status.py b/octavia/tests/unit/cmd/test_status.py index 75576c73f0..a8e81a62f5 100644 --- a/octavia/tests/unit/cmd/test_status.py +++ b/octavia/tests/unit/cmd/test_status.py @@ -21,7 +21,7 @@ from octavia.tests.unit import base class TestUpgradeChecks(base.TestCase): def setUp(self): - super(TestUpgradeChecks, self).setUp() + super().setUp() self.cmd = status.Checks() def test__sample_check(self): diff --git a/octavia/tests/unit/common/jinja/haproxy/combined_listeners/test_jinja_cfg.py b/octavia/tests/unit/common/jinja/haproxy/combined_listeners/test_jinja_cfg.py index e4fd9614b4..c9cd52fc0f 100644 --- a/octavia/tests/unit/common/jinja/haproxy/combined_listeners/test_jinja_cfg.py +++ b/octavia/tests/unit/common/jinja/haproxy/combined_listeners/test_jinja_cfg.py @@ -29,7 +29,7 @@ CONF = cfg.CONF class TestHaproxyCfg(base.TestCase): def setUp(self): - super(TestHaproxyCfg, self).setUp() + super().setUp() self.jinja_cfg = jinja_cfg.JinjaTemplater( base_amp_path='/var/lib/octavia', base_crt_dir='/var/lib/octavia/certs') diff --git a/octavia/tests/unit/common/jinja/haproxy/split_listeners/test_jinja_cfg.py b/octavia/tests/unit/common/jinja/haproxy/split_listeners/test_jinja_cfg.py index a306b0e117..2972102e1f 100644 --- a/octavia/tests/unit/common/jinja/haproxy/split_listeners/test_jinja_cfg.py +++ b/octavia/tests/unit/common/jinja/haproxy/split_listeners/test_jinja_cfg.py @@ -29,7 +29,7 @@ CONF = cfg.CONF class TestHaproxyCfg(base.TestCase): def setUp(self): - super(TestHaproxyCfg, self).setUp() + super().setUp() self.jinja_cfg = jinja_cfg.JinjaTemplater( base_amp_path='/var/lib/octavia', base_crt_dir='/var/lib/octavia/certs') diff --git a/octavia/tests/unit/common/jinja/logging/test_logging_jinja_cfg.py b/octavia/tests/unit/common/jinja/logging/test_logging_jinja_cfg.py index 25b906575c..bf9abd4d7e 100644 --- a/octavia/tests/unit/common/jinja/logging/test_logging_jinja_cfg.py +++ b/octavia/tests/unit/common/jinja/logging/test_logging_jinja_cfg.py @@ -22,7 +22,7 @@ import octavia.tests.unit.base as base class LoggingJinjaTestCase(base.TestCase): def setUp(self): - super(LoggingJinjaTestCase, self).setUp() + super().setUp() self.conf = oslo_fixture.Config(cfg.CONF) self.conf.config(debug=False) diff --git a/octavia/tests/unit/common/jinja/lvs/test_lvs_jinja_cfg.py b/octavia/tests/unit/common/jinja/lvs/test_lvs_jinja_cfg.py index 2a9985e879..e55a9c007e 100644 --- a/octavia/tests/unit/common/jinja/lvs/test_lvs_jinja_cfg.py +++ b/octavia/tests/unit/common/jinja/lvs/test_lvs_jinja_cfg.py @@ -26,7 +26,7 @@ BASE_PATH = '/var/lib/octavia' class TestLvsCfg(base.TestCase): def setUp(self): - super(TestLvsCfg, self).setUp() + super().setUp() self.udp_jinja_cfg = jinja_cfg.LvsJinjaTemplater() conf = oslo_fixture.Config(cfg.CONF) conf.config(group="haproxy_amphora", base_path=BASE_PATH) diff --git a/octavia/tests/unit/common/jinja/test_user_data_jinja_cfg.py b/octavia/tests/unit/common/jinja/test_user_data_jinja_cfg.py index 774999d2ff..c3860f297c 100644 --- a/octavia/tests/unit/common/jinja/test_user_data_jinja_cfg.py +++ b/octavia/tests/unit/common/jinja/test_user_data_jinja_cfg.py @@ -44,7 +44,7 @@ RUN_CMD = ('runcmd:\n' class TestUserDataJinjaCfg(base.TestCase): def setUp(self): - super(TestUserDataJinjaCfg, self).setUp() + super().setUp() def test_build_user_data_config(self): udc = user_data_jinja_cfg.UserDataJinjaCfg() diff --git a/octavia/tests/unit/common/test_base_taskflow.py b/octavia/tests/unit/common/test_base_taskflow.py index ab8e293331..09076d9394 100644 --- a/octavia/tests/unit/common/test_base_taskflow.py +++ b/octavia/tests/unit/common/test_base_taskflow.py @@ -37,7 +37,7 @@ class TestBaseTaskFlowEngine(base.TestCase): conf.config(group="task_flow", max_workers=MAX_WORKERS) conf.config(group="task_flow", engine=ENGINE) conf.config(group="task_flow", disable_revert=True) - super(TestBaseTaskFlowEngine, self).setUp() + super().setUp() @mock.patch('concurrent.futures.ThreadPoolExecutor', return_value='TESTEXECUTOR') @@ -83,7 +83,7 @@ class TestTaskFlowServiceController(base.TestCase): self.persistence_mock) self.service_controller = base_taskflow.TaskFlowServiceController( self.driver_mock) - super(TestTaskFlowServiceController, self).setUp() + super().setUp() @mock.patch('oslo_utils.uuidutils.generate_uuid', return_value=_mock_uuid) @mock.patch('taskflow.engines.save_factory_details') diff --git a/octavia/tests/unit/common/test_clients.py b/octavia/tests/unit/common/test_clients.py index 9960246bc2..5b8e144bad 100644 --- a/octavia/tests/unit/common/test_clients.py +++ b/octavia/tests/unit/common/test_clients.py @@ -31,7 +31,7 @@ class TestNovaAuth(base.TestCase): clients.NovaAuth.nova_client = None keystone._SESSION = None - super(TestNovaAuth, self).setUp() + super().setUp() @mock.patch('keystoneauth1.session.Session', mock.Mock()) def test_get_nova_client(self): @@ -69,7 +69,7 @@ class TestNeutronAuth(base.TestCase): clients.NeutronAuth.neutron_client = None keystone._SESSION = None - super(TestNeutronAuth, self).setUp() + super().setUp() @mock.patch('keystoneauth1.session.Session', mock.Mock()) def test_get_neutron_client(self): @@ -107,7 +107,7 @@ class TestGlanceAuth(base.TestCase): clients.GlanceAuth.glance_client = None keystone._SESSION = None - super(TestGlanceAuth, self).setUp() + super().setUp() @mock.patch('keystoneauth1.session.Session', mock.Mock()) def test_get_glance_client(self): @@ -145,7 +145,7 @@ class TestCinderAuth(base.TestCase): clients.CinderAuth.cinder_client = None keystone._SESSION = None - super(TestCinderAuth, self).setUp() + super().setUp() @mock.patch('keystoneauth1.session.Session', mock.Mock()) def test_get_cinder_client(self): diff --git a/octavia/tests/unit/common/test_data_models.py b/octavia/tests/unit/common/test_data_models.py index 20d9551ee3..7373c9d1d0 100644 --- a/octavia/tests/unit/common/test_data_models.py +++ b/octavia/tests/unit/common/test_data_models.py @@ -138,7 +138,7 @@ class TestDataModels(base.TestCase): in_use_l7rule=None ) - super(TestDataModels, self).setUp() + super().setUp() def test_LoadBalancer_update(self): diff --git a/octavia/tests/unit/common/test_policy.py b/octavia/tests/unit/common/test_policy.py index 3ea60c90cf..f9da8c0e66 100644 --- a/octavia/tests/unit/common/test_policy.py +++ b/octavia/tests/unit/common/test_policy.py @@ -32,7 +32,7 @@ LOG = logging.getLogger(__name__) class PolicyFileTestCase(base.TestCase): def setUp(self): - super(PolicyFileTestCase, self).setUp() + super().setUp() self.conf = self.useFixture(oslo_fixture.Config(CONF)) policy.reset() @@ -66,7 +66,7 @@ class PolicyFileTestCase(base.TestCase): class PolicyTestCase(base.TestCase): def setUp(self): - super(PolicyTestCase, self).setUp() + super().setUp() self.conf = self.useFixture(oslo_fixture.Config()) # diltram: this one must be removed after fixing issue in oslo.config @@ -175,7 +175,7 @@ class PolicyTestCase(base.TestCase): class IsAdminCheckTestCase(base.TestCase): def setUp(self): - super(IsAdminCheckTestCase, self).setUp() + super().setUp() self.conf = self.useFixture(oslo_fixture.Config()) # diltram: this one must be removed after fixing issue in oslo.config @@ -218,7 +218,7 @@ class IsAdminCheckTestCase(base.TestCase): class AdminRolePolicyTestCase(base.TestCase): def setUp(self): - super(AdminRolePolicyTestCase, self).setUp() + super().setUp() self.conf = self.useFixture(oslo_fixture.Config()) # diltram: this one must be removed after fixing issue in oslo.config diff --git a/octavia/tests/unit/common/test_stats.py b/octavia/tests/unit/common/test_stats.py index 456655fbb1..7be20eb68a 100644 --- a/octavia/tests/unit/common/test_stats.py +++ b/octavia/tests/unit/common/test_stats.py @@ -25,7 +25,7 @@ from octavia.tests.unit import base class TestStatsMixin(base.TestCase): def setUp(self): - super(TestStatsMixin, self).setUp() + super().setUp() self.sm = stats.StatsMixin() self.session = mock.MagicMock() diff --git a/octavia/tests/unit/common/test_validations.py b/octavia/tests/unit/common/test_validations.py index 8063810622..ce4d1c6374 100644 --- a/octavia/tests/unit/common/test_validations.py +++ b/octavia/tests/unit/common/test_validations.py @@ -30,7 +30,7 @@ class TestValidations(base.TestCase): # functional tests elsewhere (ex. repository tests) def setUp(self): - super(TestValidations, self).setUp() + super().setUp() self.conf = oslo_fixture.Config(cfg.CONF) def test_validate_url(self): diff --git a/octavia/tests/unit/compute/drivers/test_compute_noop_driver.py b/octavia/tests/unit/compute/drivers/test_compute_noop_driver.py index 05893adbeb..344b653272 100644 --- a/octavia/tests/unit/compute/drivers/test_compute_noop_driver.py +++ b/octavia/tests/unit/compute/drivers/test_compute_noop_driver.py @@ -27,7 +27,7 @@ class TestNoopComputeDriver(base.TestCase): FAKE_UUID_6 = uuidutils.generate_uuid() def setUp(self): - super(TestNoopComputeDriver, self).setUp() + super().setUp() self.driver = driver.NoopComputeDriver() self.name = "amphora_name" diff --git a/octavia/tests/unit/compute/drivers/test_nova_driver.py b/octavia/tests/unit/compute/drivers/test_nova_driver.py index f74820f70a..5f45d392f3 100644 --- a/octavia/tests/unit/compute/drivers/test_nova_driver.py +++ b/octavia/tests/unit/compute/drivers/test_nova_driver.py @@ -141,7 +141,7 @@ class TestNovaClient(base.TestCase): self.mock_image_tag.return_value = 1 self.addCleanup(self.mock_image_tag.stop) - super(TestNovaClient, self).setUp() + super().setUp() def test_build(self): amphora_id = self.manager.build(amphora_flavor=1, image_tag='stout', diff --git a/octavia/tests/unit/controller/healthmanager/health_drivers/test_update_base.py b/octavia/tests/unit/controller/healthmanager/health_drivers/test_update_base.py index d6afda28bd..0a2b756cc1 100644 --- a/octavia/tests/unit/controller/healthmanager/health_drivers/test_update_base.py +++ b/octavia/tests/unit/controller/healthmanager/health_drivers/test_update_base.py @@ -20,7 +20,7 @@ from octavia.tests.unit import base class TestHealthUpdateBase(base.TestCase): def setUp(self): - super(TestHealthUpdateBase, self).setUp() + super().setUp() self.logger = update_base.HealthUpdateBase() def test_update_health(self): @@ -30,7 +30,7 @@ class TestHealthUpdateBase(base.TestCase): class TestStatsUpdateBase(base.TestCase): def setUp(self): - super(TestStatsUpdateBase, self).setUp() + super().setUp() self.logger = update_base.StatsUpdateBase() def test_update_stats(self): diff --git a/octavia/tests/unit/controller/healthmanager/health_drivers/test_update_db.py b/octavia/tests/unit/controller/healthmanager/health_drivers/test_update_db.py index 22ce85ab43..9c8ddebb80 100644 --- a/octavia/tests/unit/controller/healthmanager/health_drivers/test_update_db.py +++ b/octavia/tests/unit/controller/healthmanager/health_drivers/test_update_db.py @@ -40,7 +40,7 @@ class TestUpdateHealthDb(base.TestCase): FAKE_UUID_1 = uuidutils.generate_uuid() def setUp(self): - super(TestUpdateHealthDb, self).setUp() + super().setUp() session_patch = mock.patch('octavia.db.api.get_session') self.addCleanup(session_patch.stop) @@ -1344,7 +1344,7 @@ class TestUpdateHealthDb(base.TestCase): class TestUpdateStatsDb(base.TestCase): def setUp(self): - super(TestUpdateStatsDb, self).setUp() + super().setUp() self.sm = update_db.UpdateStatsDb() diff --git a/octavia/tests/unit/controller/healthmanager/health_drivers/test_update_logging.py b/octavia/tests/unit/controller/healthmanager/health_drivers/test_update_logging.py index 6a90f25cea..a4a6aab48a 100644 --- a/octavia/tests/unit/controller/healthmanager/health_drivers/test_update_logging.py +++ b/octavia/tests/unit/controller/healthmanager/health_drivers/test_update_logging.py @@ -22,7 +22,7 @@ from octavia.tests.unit import base class TestHealthUpdateLogger(base.TestCase): def setUp(self): - super(TestHealthUpdateLogger, self).setUp() + super().setUp() self.logger = update_logging.HealthUpdateLogger() @mock.patch('octavia.controller.healthmanager.health_drivers' @@ -34,7 +34,7 @@ class TestHealthUpdateLogger(base.TestCase): class TestStatsUpdateLogger(base.TestCase): def setUp(self): - super(TestStatsUpdateLogger, self).setUp() + super().setUp() self.logger = update_logging.StatsUpdateLogger() @mock.patch('octavia.controller.healthmanager.health_drivers' diff --git a/octavia/tests/unit/controller/healthmanager/test_health_manager.py b/octavia/tests/unit/controller/healthmanager/test_health_manager.py index df850ed112..bb9a6f82e7 100644 --- a/octavia/tests/unit/controller/healthmanager/test_health_manager.py +++ b/octavia/tests/unit/controller/healthmanager/test_health_manager.py @@ -40,7 +40,7 @@ class TestException(Exception): class TestHealthManager(base.TestCase): def setUp(self): - super(TestHealthManager, self).setUp() + super().setUp() @mock.patch('octavia.db.api.wait_for_connection') @mock.patch('octavia.controller.worker.v1.controller_worker.' diff --git a/octavia/tests/unit/controller/housekeeping/test_house_keeping.py b/octavia/tests/unit/controller/housekeeping/test_house_keeping.py index e00bda5d68..8ea152b5da 100644 --- a/octavia/tests/unit/controller/housekeeping/test_house_keeping.py +++ b/octavia/tests/unit/controller/housekeeping/test_house_keeping.py @@ -44,7 +44,7 @@ class TestSpareCheck(base.TestCase): FAKE_CUR_SPAR2 = 3 def setUp(self): - super(TestSpareCheck, self).setUp() + super().setUp() self.CONF = self.useFixture(oslo_fixture.Config(cfg.CONF)) self.CONF.config(group="api_settings", default_provider_driver='amphora') @@ -143,7 +143,7 @@ class TestDatabaseCleanup(base.TestCase): FAKE_EXP_AGE = 60 def setUp(self): - super(TestDatabaseCleanup, self).setUp() + super().setUp() self.dbclean = house_keeping.DatabaseCleanup() self.amp_health_repo = mock.MagicMock() self.amp_repo = mock.MagicMock() @@ -254,7 +254,7 @@ class TestDatabaseCleanup(base.TestCase): class TestCertRotation(base.TestCase): def setUp(self): - super(TestCertRotation, self).setUp() + super().setUp() self.CONF = self.useFixture(oslo_fixture.Config(cfg.CONF)) @mock.patch('octavia.controller.worker.v1.controller_worker.' diff --git a/octavia/tests/unit/controller/queue/v1/test_consumer.py b/octavia/tests/unit/controller/queue/v1/test_consumer.py index 2b01fdbf45..ae1c9a7291 100644 --- a/octavia/tests/unit/controller/queue/v1/test_consumer.py +++ b/octavia/tests/unit/controller/queue/v1/test_consumer.py @@ -25,7 +25,7 @@ from octavia.tests.unit import base class TestConsumer(base.TestRpc): def setUp(self): - super(TestConsumer, self).setUp() + super().setUp() conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) conf.config(group="oslo_messaging", topic='foo_topic') conf.config(host='test-hostname') diff --git a/octavia/tests/unit/controller/queue/v1/test_endpoints.py b/octavia/tests/unit/controller/queue/v1/test_endpoints.py index 0f7da26d8a..7b5ae2b4d0 100644 --- a/octavia/tests/unit/controller/queue/v1/test_endpoints.py +++ b/octavia/tests/unit/controller/queue/v1/test_endpoints.py @@ -25,7 +25,7 @@ from octavia.tests.unit import base class TestEndpoints(base.TestCase): def setUp(self): - super(TestEndpoints, self).setUp() + super().setUp() conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) conf.config(octavia_plugins='hot_plug_plugin') diff --git a/octavia/tests/unit/controller/queue/v2/test_consumer.py b/octavia/tests/unit/controller/queue/v2/test_consumer.py index 2f5850e6d7..68ed22d17b 100644 --- a/octavia/tests/unit/controller/queue/v2/test_consumer.py +++ b/octavia/tests/unit/controller/queue/v2/test_consumer.py @@ -26,7 +26,7 @@ from octavia.tests.unit import base class TestConsumer(base.TestRpc): def setUp(self): - super(TestConsumer, self).setUp() + super().setUp() conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) conf.config(host='test-hostname') self.conf = conf.conf diff --git a/octavia/tests/unit/controller/queue/v2/test_endpoints.py b/octavia/tests/unit/controller/queue/v2/test_endpoints.py index 5e308a3b0f..6f066004e4 100644 --- a/octavia/tests/unit/controller/queue/v2/test_endpoints.py +++ b/octavia/tests/unit/controller/queue/v2/test_endpoints.py @@ -25,7 +25,7 @@ from octavia.tests.unit import base class TestEndpoints(base.TestCase): def setUp(self): - super(TestEndpoints, self).setUp() + super().setUp() conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) conf.config(octavia_plugins='hot_plug_plugin') diff --git a/octavia/tests/unit/controller/worker/test_amphora_rate_limit.py b/octavia/tests/unit/controller/worker/test_amphora_rate_limit.py index 05155aa466..a792256506 100644 --- a/octavia/tests/unit/controller/worker/test_amphora_rate_limit.py +++ b/octavia/tests/unit/controller/worker/test_amphora_rate_limit.py @@ -28,7 +28,7 @@ USED_BUILD_SLOTS = 0 class TestAmphoraBuildRateLimit(base.TestCase): def setUp(self): - super(TestAmphoraBuildRateLimit, self).setUp() + super().setUp() self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) self.rate_limit = amphora_rate_limit.AmphoraBuildRateLimit() diff --git a/octavia/tests/unit/controller/worker/test_task_utils.py b/octavia/tests/unit/controller/worker/test_task_utils.py index e6b333bffa..fb89cb22c3 100644 --- a/octavia/tests/unit/controller/worker/test_task_utils.py +++ b/octavia/tests/unit/controller/worker/test_task_utils.py @@ -37,7 +37,7 @@ class TestTaskUtils(base.TestCase): self.MEMBER_ID = uuidutils.generate_uuid() self.POOL_ID = uuidutils.generate_uuid() - super(TestTaskUtils, self).setUp() + super().setUp() @mock.patch('octavia.db.api.get_session', return_value=TEST_SESSION) @mock.patch('octavia.db.repositories.AmphoraRepository.update') diff --git a/octavia/tests/unit/controller/worker/v1/flows/test_amphora_flows.py b/octavia/tests/unit/controller/worker/v1/flows/test_amphora_flows.py index 4dfe21dcae..69f798b301 100644 --- a/octavia/tests/unit/controller/worker/v1/flows/test_amphora_flows.py +++ b/octavia/tests/unit/controller/worker/v1/flows/test_amphora_flows.py @@ -33,7 +33,7 @@ AUTH_VERSION = '2' class TestAmphoraFlows(base.TestCase): def setUp(self): - super(TestAmphoraFlows, self).setUp() + super().setUp() self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) self.conf.config( group="controller_worker", diff --git a/octavia/tests/unit/controller/worker/v1/flows/test_health_monitor_flows.py b/octavia/tests/unit/controller/worker/v1/flows/test_health_monitor_flows.py index e63c29fa6e..407880a927 100644 --- a/octavia/tests/unit/controller/worker/v1/flows/test_health_monitor_flows.py +++ b/octavia/tests/unit/controller/worker/v1/flows/test_health_monitor_flows.py @@ -25,7 +25,7 @@ class TestHealthMonitorFlows(base.TestCase): def setUp(self): self.HealthMonitorFlow = health_monitor_flows.HealthMonitorFlows() - super(TestHealthMonitorFlows, self).setUp() + super().setUp() def test_get_create_health_monitor_flow(self): diff --git a/octavia/tests/unit/controller/worker/v1/flows/test_l7policy_flows.py b/octavia/tests/unit/controller/worker/v1/flows/test_l7policy_flows.py index 823d5ac854..7c4b73e047 100644 --- a/octavia/tests/unit/controller/worker/v1/flows/test_l7policy_flows.py +++ b/octavia/tests/unit/controller/worker/v1/flows/test_l7policy_flows.py @@ -25,7 +25,7 @@ class TestL7PolicyFlows(base.TestCase): def setUp(self): self.L7PolicyFlow = l7policy_flows.L7PolicyFlows() - super(TestL7PolicyFlows, self).setUp() + super().setUp() def test_get_create_l7policy_flow(self): diff --git a/octavia/tests/unit/controller/worker/v1/flows/test_l7rule_flows.py b/octavia/tests/unit/controller/worker/v1/flows/test_l7rule_flows.py index 36fce25e49..50102ffb8a 100644 --- a/octavia/tests/unit/controller/worker/v1/flows/test_l7rule_flows.py +++ b/octavia/tests/unit/controller/worker/v1/flows/test_l7rule_flows.py @@ -25,7 +25,7 @@ class TestL7RuleFlows(base.TestCase): def setUp(self): self.L7RuleFlow = l7rule_flows.L7RuleFlows() - super(TestL7RuleFlows, self).setUp() + super().setUp() def test_get_create_l7rule_flow(self): diff --git a/octavia/tests/unit/controller/worker/v1/flows/test_listener_flows.py b/octavia/tests/unit/controller/worker/v1/flows/test_listener_flows.py index 2aca9f7b8e..2fd1090e0b 100644 --- a/octavia/tests/unit/controller/worker/v1/flows/test_listener_flows.py +++ b/octavia/tests/unit/controller/worker/v1/flows/test_listener_flows.py @@ -29,7 +29,7 @@ class TestListenerFlows(base.TestCase): def setUp(self): self.ListenerFlow = listener_flows.ListenerFlows() - super(TestListenerFlows, self).setUp() + super().setUp() def test_get_create_listener_flow(self, mock_get_net_driver): diff --git a/octavia/tests/unit/controller/worker/v1/flows/test_load_balancer_flows.py b/octavia/tests/unit/controller/worker/v1/flows/test_load_balancer_flows.py index 4cabebc1b7..ac1293761b 100644 --- a/octavia/tests/unit/controller/worker/v1/flows/test_load_balancer_flows.py +++ b/octavia/tests/unit/controller/worker/v1/flows/test_load_balancer_flows.py @@ -31,7 +31,7 @@ import octavia.tests.unit.base as base class TestLoadBalancerFlows(base.TestCase): def setUp(self): - super(TestLoadBalancerFlows, self).setUp() + super().setUp() self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) self.conf.config( group="controller_worker", diff --git a/octavia/tests/unit/controller/worker/v1/flows/test_member_flows.py b/octavia/tests/unit/controller/worker/v1/flows/test_member_flows.py index 138dfb5056..cfd6affb8e 100644 --- a/octavia/tests/unit/controller/worker/v1/flows/test_member_flows.py +++ b/octavia/tests/unit/controller/worker/v1/flows/test_member_flows.py @@ -29,7 +29,7 @@ class TestMemberFlows(base.TestCase): def setUp(self): self.MemberFlow = member_flows.MemberFlows() - super(TestMemberFlows, self).setUp() + super().setUp() def test_get_create_member_flow(self, mock_get_net_driver): diff --git a/octavia/tests/unit/controller/worker/v1/flows/test_pool_flows.py b/octavia/tests/unit/controller/worker/v1/flows/test_pool_flows.py index fd9cd8a929..908a4b4f29 100644 --- a/octavia/tests/unit/controller/worker/v1/flows/test_pool_flows.py +++ b/octavia/tests/unit/controller/worker/v1/flows/test_pool_flows.py @@ -25,7 +25,7 @@ class TestPoolFlows(base.TestCase): def setUp(self): self.PoolFlow = pool_flows.PoolFlows() - super(TestPoolFlows, self).setUp() + super().setUp() def test_get_create_pool_flow(self): diff --git a/octavia/tests/unit/controller/worker/v1/tasks/test_amphora_driver_tasks.py b/octavia/tests/unit/controller/worker/v1/tasks/test_amphora_driver_tasks.py index eb12e97d38..ab72029ac7 100644 --- a/octavia/tests/unit/controller/worker/v1/tasks/test_amphora_driver_tasks.py +++ b/octavia/tests/unit/controller/worker/v1/tasks/test_amphora_driver_tasks.py @@ -81,7 +81,7 @@ class TestAmphoraDriverTasks(base.TestCase): constants.REQ_READ_TIMEOUT: 2, constants.CONN_MAX_RETRIES: 3, constants.CONN_RETRY_INTERVAL: 4} - super(TestAmphoraDriverTasks, self).setUp() + super().setUp() def test_amp_listeners_update(self, mock_driver, diff --git a/octavia/tests/unit/controller/worker/v1/tasks/test_compute_tasks.py b/octavia/tests/unit/controller/worker/v1/tasks/test_compute_tasks.py index ae06c5831c..f41f917f7a 100644 --- a/octavia/tests/unit/controller/worker/v1/tasks/test_compute_tasks.py +++ b/octavia/tests/unit/controller/worker/v1/tasks/test_compute_tasks.py @@ -83,7 +83,7 @@ class TestComputeTasks(base.TestCase): logging_mock = mock.MagicMock() compute_tasks.LOG = logging_mock - super(TestComputeTasks, self).setUp() + super().setUp() @mock.patch('octavia.common.jinja.logging.logging_jinja_cfg.' 'LoggingJinjaTemplater.build_logging_config') diff --git a/octavia/tests/unit/controller/worker/v1/tasks/test_database_tasks.py b/octavia/tests/unit/controller/worker/v1/tasks/test_database_tasks.py index 0a6c23535f..a4c5f1262d 100644 --- a/octavia/tests/unit/controller/worker/v1/tasks/test_database_tasks.py +++ b/octavia/tests/unit/controller/worker/v1/tasks/test_database_tasks.py @@ -126,7 +126,7 @@ class TestDatabaseTasks(base.TestCase): self.l7rule_mock.id = L7RULE_ID self.l7rule_mock.l7policy = self.l7policy_mock - super(TestDatabaseTasks, self).setUp() + super().setUp() @mock.patch('octavia.db.repositories.AmphoraRepository.create', return_value=_amphora_mock) diff --git a/octavia/tests/unit/controller/worker/v1/tasks/test_database_tasks_quota.py b/octavia/tests/unit/controller/worker/v1/tasks/test_database_tasks_quota.py index a68917301e..fc02ad7d3a 100644 --- a/octavia/tests/unit/controller/worker/v1/tasks/test_database_tasks_quota.py +++ b/octavia/tests/unit/controller/worker/v1/tasks/test_database_tasks_quota.py @@ -30,7 +30,7 @@ class TestDatabaseTasksQuota(base.TestCase): self._tf_failure_mock = mock.Mock(spec=failure.Failure) self.zero_pool_child_count = {'HM': 0, 'member': 0} - super(TestDatabaseTasksQuota, self).setUp() + super().setUp() @mock.patch('octavia.db.api.get_session', return_value='TEST') @mock.patch('octavia.db.repositories.Repositories.decrement_quota') diff --git a/octavia/tests/unit/controller/worker/v1/tasks/test_lifecycle_tasks.py b/octavia/tests/unit/controller/worker/v1/tasks/test_lifecycle_tasks.py index ce058a0716..82348db9ad 100644 --- a/octavia/tests/unit/controller/worker/v1/tasks/test_lifecycle_tasks.py +++ b/octavia/tests/unit/controller/worker/v1/tasks/test_lifecycle_tasks.py @@ -51,7 +51,7 @@ class TestLifecycleTasks(base.TestCase): self.POOL_ID = uuidutils.generate_uuid() self.POOL.id = self.POOL_ID - super(TestLifecycleTasks, self).setUp() + super().setUp() @mock.patch('octavia.controller.worker.task_utils.TaskUtils.' 'unmark_amphora_health_busy') diff --git a/octavia/tests/unit/controller/worker/v1/tasks/test_model_tasks.py b/octavia/tests/unit/controller/worker/v1/tasks/test_model_tasks.py index f87c8c7fec..2969758df1 100644 --- a/octavia/tests/unit/controller/worker/v1/tasks/test_model_tasks.py +++ b/octavia/tests/unit/controller/worker/v1/tasks/test_model_tasks.py @@ -26,7 +26,7 @@ class TestObjectUpdateTasks(base.TestCase): self.listener_mock = mock.MagicMock() self.listener_mock.name = 'TEST' - super(TestObjectUpdateTasks, self).setUp() + super().setUp() def test_delete_model_object(self): diff --git a/octavia/tests/unit/controller/worker/v1/tasks/test_network_tasks.py b/octavia/tests/unit/controller/worker/v1/tasks/test_network_tasks.py index ccb25acef0..adc21508e7 100644 --- a/octavia/tests/unit/controller/worker/v1/tasks/test_network_tasks.py +++ b/octavia/tests/unit/controller/worker/v1/tasks/test_network_tasks.py @@ -85,7 +85,7 @@ class TestNetworkTasks(base.TestCase): conf.config(group="controller_worker", amp_boot_network_list=[self.boot_net_id]) conf.config(group="networking", max_retries=1) - super(TestNetworkTasks, self).setUp() + super().setUp() def test_calculate_amphora_delta(self, mock_get_net_driver): DELETE_NETWORK_ID = uuidutils.generate_uuid() diff --git a/octavia/tests/unit/controller/worker/v1/tasks/test_retry_tasks.py b/octavia/tests/unit/controller/worker/v1/tasks/test_retry_tasks.py index ea2cf5d293..2ac26f4a1e 100644 --- a/octavia/tests/unit/controller/worker/v1/tasks/test_retry_tasks.py +++ b/octavia/tests/unit/controller/worker/v1/tasks/test_retry_tasks.py @@ -22,7 +22,7 @@ import octavia.tests.unit.base as base class TestRetryTasks(base.TestCase): def setUp(self): - super(TestRetryTasks, self).setUp() + super().setUp() @mock.patch('time.sleep') def test_sleeping_retry_times_controller(self, mock_sleep): diff --git a/octavia/tests/unit/controller/worker/v1/test_controller_worker.py b/octavia/tests/unit/controller/worker/v1/test_controller_worker.py index 269c6a5ad5..019baebe55 100644 --- a/octavia/tests/unit/controller/worker/v1/test_controller_worker.py +++ b/octavia/tests/unit/controller/worker/v1/test_controller_worker.py @@ -118,7 +118,7 @@ class TestControllerWorker(base.TestCase): _health_mon_mock.pool_id = POOL_ID _health_mon_mock.id = HM_ID - super(TestControllerWorker, self).setUp() + super().setUp() @mock.patch('octavia.controller.worker.v1.flows.' 'amphora_flows.AmphoraFlows.get_create_amphora_flow', diff --git a/octavia/tests/unit/controller/worker/v2/flows/test_amphora_flows.py b/octavia/tests/unit/controller/worker/v2/flows/test_amphora_flows.py index e5383bb0b3..3965848803 100644 --- a/octavia/tests/unit/controller/worker/v2/flows/test_amphora_flows.py +++ b/octavia/tests/unit/controller/worker/v2/flows/test_amphora_flows.py @@ -32,7 +32,7 @@ AUTH_VERSION = '2' class TestAmphoraFlows(base.TestCase): def setUp(self): - super(TestAmphoraFlows, self).setUp() + super().setUp() self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) self.conf.config( group="controller_worker", diff --git a/octavia/tests/unit/controller/worker/v2/flows/test_health_monitor_flows.py b/octavia/tests/unit/controller/worker/v2/flows/test_health_monitor_flows.py index 47d61edad2..1c736a7d48 100644 --- a/octavia/tests/unit/controller/worker/v2/flows/test_health_monitor_flows.py +++ b/octavia/tests/unit/controller/worker/v2/flows/test_health_monitor_flows.py @@ -25,7 +25,7 @@ class TestHealthMonitorFlows(base.TestCase): def setUp(self): self.HealthMonitorFlow = health_monitor_flows.HealthMonitorFlows() - super(TestHealthMonitorFlows, self).setUp() + super().setUp() def test_get_create_health_monitor_flow(self): diff --git a/octavia/tests/unit/controller/worker/v2/flows/test_l7policy_flows.py b/octavia/tests/unit/controller/worker/v2/flows/test_l7policy_flows.py index 796db9c060..4a216553a9 100644 --- a/octavia/tests/unit/controller/worker/v2/flows/test_l7policy_flows.py +++ b/octavia/tests/unit/controller/worker/v2/flows/test_l7policy_flows.py @@ -25,7 +25,7 @@ class TestL7PolicyFlows(base.TestCase): def setUp(self): self.L7PolicyFlow = l7policy_flows.L7PolicyFlows() - super(TestL7PolicyFlows, self).setUp() + super().setUp() def test_get_create_l7policy_flow(self): diff --git a/octavia/tests/unit/controller/worker/v2/flows/test_l7rule_flows.py b/octavia/tests/unit/controller/worker/v2/flows/test_l7rule_flows.py index e9722e6ac7..3dc6cb709d 100644 --- a/octavia/tests/unit/controller/worker/v2/flows/test_l7rule_flows.py +++ b/octavia/tests/unit/controller/worker/v2/flows/test_l7rule_flows.py @@ -25,7 +25,7 @@ class TestL7RuleFlows(base.TestCase): def setUp(self): self.L7RuleFlow = l7rule_flows.L7RuleFlows() - super(TestL7RuleFlows, self).setUp() + super().setUp() def test_get_create_l7rule_flow(self): diff --git a/octavia/tests/unit/controller/worker/v2/flows/test_listener_flows.py b/octavia/tests/unit/controller/worker/v2/flows/test_listener_flows.py index e229709e49..709c91b9df 100644 --- a/octavia/tests/unit/controller/worker/v2/flows/test_listener_flows.py +++ b/octavia/tests/unit/controller/worker/v2/flows/test_listener_flows.py @@ -29,7 +29,7 @@ class TestListenerFlows(base.TestCase): def setUp(self): self.ListenerFlow = listener_flows.ListenerFlows() - super(TestListenerFlows, self).setUp() + super().setUp() def test_get_create_listener_flow(self, mock_get_net_driver): diff --git a/octavia/tests/unit/controller/worker/v2/flows/test_load_balancer_flows.py b/octavia/tests/unit/controller/worker/v2/flows/test_load_balancer_flows.py index 3e855fea94..ba2127ea95 100644 --- a/octavia/tests/unit/controller/worker/v2/flows/test_load_balancer_flows.py +++ b/octavia/tests/unit/controller/worker/v2/flows/test_load_balancer_flows.py @@ -30,7 +30,7 @@ import octavia.tests.unit.base as base class TestLoadBalancerFlows(base.TestCase): def setUp(self): - super(TestLoadBalancerFlows, self).setUp() + super().setUp() self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) self.conf.config( group="controller_worker", diff --git a/octavia/tests/unit/controller/worker/v2/flows/test_member_flows.py b/octavia/tests/unit/controller/worker/v2/flows/test_member_flows.py index 0713669fd1..2ffab476de 100644 --- a/octavia/tests/unit/controller/worker/v2/flows/test_member_flows.py +++ b/octavia/tests/unit/controller/worker/v2/flows/test_member_flows.py @@ -29,7 +29,7 @@ class TestMemberFlows(base.TestCase): def setUp(self): self.MemberFlow = member_flows.MemberFlows() - super(TestMemberFlows, self).setUp() + super().setUp() def test_get_create_member_flow(self, mock_get_net_driver): diff --git a/octavia/tests/unit/controller/worker/v2/flows/test_pool_flows.py b/octavia/tests/unit/controller/worker/v2/flows/test_pool_flows.py index 16f64ff98c..6cbca3bbec 100644 --- a/octavia/tests/unit/controller/worker/v2/flows/test_pool_flows.py +++ b/octavia/tests/unit/controller/worker/v2/flows/test_pool_flows.py @@ -25,7 +25,7 @@ class TestPoolFlows(base.TestCase): def setUp(self): self.PoolFlow = pool_flows.PoolFlows() - super(TestPoolFlows, self).setUp() + super().setUp() def test_get_create_pool_flow(self): diff --git a/octavia/tests/unit/controller/worker/v2/tasks/test_amphora_driver_tasks.py b/octavia/tests/unit/controller/worker/v2/tasks/test_amphora_driver_tasks.py index ba491cd3f0..daf927e3d8 100644 --- a/octavia/tests/unit/controller/worker/v2/tasks/test_amphora_driver_tasks.py +++ b/octavia/tests/unit/controller/worker/v2/tasks/test_amphora_driver_tasks.py @@ -81,7 +81,7 @@ class TestAmphoraDriverTasks(base.TestCase): active_connection_rety_interval=CONN_RETRY_INTERVAL) conf.config(group="controller_worker", loadbalancer_topology=constants.TOPOLOGY_SINGLE) - super(TestAmphoraDriverTasks, self).setUp() + super().setUp() @mock.patch('octavia.db.repositories.LoadBalancerRepository.get') def test_amp_listener_update(self, diff --git a/octavia/tests/unit/controller/worker/v2/tasks/test_compute_tasks.py b/octavia/tests/unit/controller/worker/v2/tasks/test_compute_tasks.py index 3553b7dae1..7ea980ddfa 100644 --- a/octavia/tests/unit/controller/worker/v2/tasks/test_compute_tasks.py +++ b/octavia/tests/unit/controller/worker/v2/tasks/test_compute_tasks.py @@ -93,7 +93,7 @@ class TestComputeTasks(base.TestCase): logging_mock = mock.MagicMock() compute_tasks.LOG = logging_mock - super(TestComputeTasks, self).setUp() + super().setUp() @mock.patch('octavia.common.jinja.logging.logging_jinja_cfg.' 'LoggingJinjaTemplater.build_logging_config') diff --git a/octavia/tests/unit/controller/worker/v2/tasks/test_database_tasks.py b/octavia/tests/unit/controller/worker/v2/tasks/test_database_tasks.py index 10c1cabb99..cdbffad15d 100644 --- a/octavia/tests/unit/controller/worker/v2/tasks/test_database_tasks.py +++ b/octavia/tests/unit/controller/worker/v2/tasks/test_database_tasks.py @@ -171,7 +171,7 @@ class TestDatabaseTasks(base.TestCase): } _db_amphora_mock.to_dict.return_value = self.amphora - super(TestDatabaseTasks, self).setUp() + super().setUp() @mock.patch('octavia.db.repositories.AmphoraRepository.create', return_value=_db_amphora_mock) diff --git a/octavia/tests/unit/controller/worker/v2/tasks/test_database_tasks_quota.py b/octavia/tests/unit/controller/worker/v2/tasks/test_database_tasks_quota.py index d202b86586..f086e5526a 100644 --- a/octavia/tests/unit/controller/worker/v2/tasks/test_database_tasks_quota.py +++ b/octavia/tests/unit/controller/worker/v2/tasks/test_database_tasks_quota.py @@ -31,7 +31,7 @@ class TestDatabaseTasksQuota(base.TestCase): self._tf_failure_mock = mock.Mock(spec=failure.Failure) self.zero_pool_child_count = {'HM': 0, 'member': 0} - super(TestDatabaseTasksQuota, self).setUp() + super().setUp() @mock.patch('octavia.db.repositories.L7PolicyRepository.get') @mock.patch('octavia.db.api.get_session', return_value='TEST') diff --git a/octavia/tests/unit/controller/worker/v2/tasks/test_lifecycle_tasks.py b/octavia/tests/unit/controller/worker/v2/tasks/test_lifecycle_tasks.py index c690de4c7b..cbeb54663a 100644 --- a/octavia/tests/unit/controller/worker/v2/tasks/test_lifecycle_tasks.py +++ b/octavia/tests/unit/controller/worker/v2/tasks/test_lifecycle_tasks.py @@ -54,7 +54,7 @@ class TestLifecycleTasks(base.TestCase): constants.POOL_ID: self.POOL_ID, } - super(TestLifecycleTasks, self).setUp() + super().setUp() @mock.patch('octavia.controller.worker.task_utils.TaskUtils.' 'unmark_amphora_health_busy') diff --git a/octavia/tests/unit/controller/worker/v2/tasks/test_network_tasks.py b/octavia/tests/unit/controller/worker/v2/tasks/test_network_tasks.py index ba1adf688a..858d95bc4e 100644 --- a/octavia/tests/unit/controller/worker/v2/tasks/test_network_tasks.py +++ b/octavia/tests/unit/controller/worker/v2/tasks/test_network_tasks.py @@ -96,7 +96,7 @@ class TestNetworkTasks(base.TestCase): conf = oslo_fixture.Config(cfg.CONF) conf.config(group="controller_worker", amp_boot_network_list=['netid']) - super(TestNetworkTasks, self).setUp() + super().setUp() @mock.patch('octavia.db.repositories.LoadBalancerRepository.get') @mock.patch('octavia.db.api.get_session', return_value=_session_mock) diff --git a/octavia/tests/unit/controller/worker/v2/test_controller_worker.py b/octavia/tests/unit/controller/worker/v2/test_controller_worker.py index e55c65c3b3..03e7798870 100644 --- a/octavia/tests/unit/controller/worker/v2/test_controller_worker.py +++ b/octavia/tests/unit/controller/worker/v2/test_controller_worker.py @@ -148,7 +148,7 @@ class TestControllerWorker(base.TestCase): constants.POOL_ID: POOL_ID } - super(TestControllerWorker, self).setUp() + super().setUp() @mock.patch('octavia.controller.worker.v2.flows.' 'amphora_flows.AmphoraFlows.get_create_amphora_flow', diff --git a/octavia/tests/unit/network/drivers/neutron/test_allowed_address_pairs.py b/octavia/tests/unit/network/drivers/neutron/test_allowed_address_pairs.py index 9d94fb8964..05a93381fa 100644 --- a/octavia/tests/unit/network/drivers/neutron/test_allowed_address_pairs.py +++ b/octavia/tests/unit/network/drivers/neutron/test_allowed_address_pairs.py @@ -57,7 +57,7 @@ class TestAllowedAddressPairsDriver(base.TestCase): DEVICE_ID = uuidutils.generate_uuid() def setUp(self): - super(TestAllowedAddressPairsDriver, self).setUp() + super().setUp() with mock.patch('octavia.common.clients.neutron_client.Client', autospec=True) as neutron_client: with mock.patch('stevedore.driver.DriverManager.driver', diff --git a/octavia/tests/unit/network/drivers/neutron/test_base.py b/octavia/tests/unit/network/drivers/neutron/test_base.py index 15bbd4bb49..eabd7a4690 100644 --- a/octavia/tests/unit/network/drivers/neutron/test_base.py +++ b/octavia/tests/unit/network/drivers/neutron/test_base.py @@ -41,7 +41,7 @@ class TestBaseNeutronNetworkDriver(base.TestCase): return impl_class() def setUp(self): - super(TestBaseNeutronNetworkDriver, self).setUp() + super().setUp() with mock.patch('octavia.common.clients.neutron_client.Client', autospec=True) as neutron_client: client = neutron_client(clients.NEUTRON_VERSION) diff --git a/octavia/tests/unit/network/drivers/neutron/test_utils.py b/octavia/tests/unit/network/drivers/neutron/test_utils.py index 91cd417e2a..dad6d21953 100644 --- a/octavia/tests/unit/network/drivers/neutron/test_utils.py +++ b/octavia/tests/unit/network/drivers/neutron/test_utils.py @@ -19,7 +19,7 @@ from octavia.tests.unit import base class TestNeutronUtils(base.TestCase): def setUp(self): - super(TestNeutronUtils, self).setUp() + super().setUp() def _compare_ignore_value_none(self, obj1_in, obj2_in): obj1 = {key: obj1_in[key] for key in obj1_in diff --git a/octavia/tests/unit/network/drivers/test_network_noop_driver.py b/octavia/tests/unit/network/drivers/test_network_noop_driver.py index cfd9595d6d..fde3301af1 100644 --- a/octavia/tests/unit/network/drivers/test_network_noop_driver.py +++ b/octavia/tests/unit/network/drivers/test_network_noop_driver.py @@ -30,7 +30,7 @@ class TestNoopNetworkDriver(base.TestCase): FAKE_UUID_6 = uuidutils.generate_uuid() def setUp(self): - super(TestNoopNetworkDriver, self).setUp() + super().setUp() self.driver = driver.NoopNetworkDriver() self.port = mock.MagicMock() self.port_id = 88 diff --git a/octavia/tests/unit/test_opts.py b/octavia/tests/unit/test_opts.py index 07f4e3df58..58cc964d4d 100644 --- a/octavia/tests/unit/test_opts.py +++ b/octavia/tests/unit/test_opts.py @@ -19,7 +19,7 @@ import octavia.tests.unit.base as base class TestOpts(base.TestCase): def setUp(self): - super(TestOpts, self).setUp() + super().setUp() def test_list_opts(self): opts_list = opts.list_opts()[0] diff --git a/octavia/tests/unit/test_version.py b/octavia/tests/unit/test_version.py index c64cef2957..9866d16329 100644 --- a/octavia/tests/unit/test_version.py +++ b/octavia/tests/unit/test_version.py @@ -21,7 +21,7 @@ from octavia import version class TestVersion(base.TestCase): def setUp(self): - super(TestVersion, self).setUp() + super().setUp() def test_vendor_str(self): self.assertEqual("OpenStack Foundation", version.vendor_string()) diff --git a/octavia/tests/unit/volume/drivers/test_cinder_driver.py b/octavia/tests/unit/volume/drivers/test_cinder_driver.py index a51af0d149..b23c343add 100644 --- a/octavia/tests/unit/volume/drivers/test_cinder_driver.py +++ b/octavia/tests/unit/volume/drivers/test_cinder_driver.py @@ -45,7 +45,7 @@ class TestCinderClient(base.TestCase): self.image_id = fake_uuid2 self.volume_id = fake_uuid3 - super(TestCinderClient, self).setUp() + super().setUp() def test_create_volume_from_image(self): self.conf.config(group="controller_worker", diff --git a/octavia/tests/unit/volume/drivers/test_volume_noop_driver.py b/octavia/tests/unit/volume/drivers/test_volume_noop_driver.py index 3954a8bf7b..49087c6062 100644 --- a/octavia/tests/unit/volume/drivers/test_volume_noop_driver.py +++ b/octavia/tests/unit/volume/drivers/test_volume_noop_driver.py @@ -25,7 +25,7 @@ class TestNoopVolumeDriver(base.TestCase): FAKE_UUID_2 = uuidutils.generate_uuid() def setUp(self): - super(TestNoopVolumeDriver, self).setUp() + super().setUp() self.driver = driver.NoopVolumeDriver() self.image_id = self.FAKE_UUID_1 diff --git a/octavia/volume/drivers/cinder_driver.py b/octavia/volume/drivers/cinder_driver.py index 2b119d2193..5244844ffd 100644 --- a/octavia/volume/drivers/cinder_driver.py +++ b/octavia/volume/drivers/cinder_driver.py @@ -32,7 +32,7 @@ class VolumeManager(volume_base.VolumeBase): '''Volume implementation of virtual machines via cinder.''' def __init__(self): - super(VolumeManager, self).__init__() + super().__init__() # Must initialize cinder api self._cinder_client = clients.CinderAuth.get_cinder_client( service_name=CONF.cinder.service_name, @@ -93,10 +93,10 @@ class VolumeManager(volume_base.VolumeBase): try: instance_volume.delete() LOG.debug("Deleted volume %s", volume_id) - except Exception: + except Exception as e: LOG.exception("Error deleting cinder volume %s", volume_id) - raise exceptions.VolumeDeleteException() + raise exceptions.VolumeDeleteException() from e except cinder_exceptions.NotFound: LOG.warning("Volume %s not found: assuming already deleted", volume_id) @@ -112,9 +112,9 @@ class VolumeManager(volume_base.VolumeBase): LOG.debug('Get glance image for volume %s', volume_id) try: instance_volume = self.manager.get(volume_id) - except cinder_exceptions.NotFound: + except cinder_exceptions.NotFound as e: LOG.exception("Volume %s not found", volume_id) - raise exceptions.VolumeGetException() + raise exceptions.VolumeGetException() from e if hasattr(instance_volume, 'volume_image_metadata'): image_id = instance_volume.volume_image_metadata.get("image_id") else: diff --git a/octavia/volume/drivers/noop_driver/driver.py b/octavia/volume/drivers/noop_driver/driver.py index 5008f6d06e..c046c0009f 100644 --- a/octavia/volume/drivers/noop_driver/driver.py +++ b/octavia/volume/drivers/noop_driver/driver.py @@ -20,7 +20,7 @@ LOG = logging.getLogger(__name__) class NoopManager(object): def __init__(self): - super(NoopManager, self).__init__() + super().__init__() self.volumeconfig = {} def create_volume_from_image(self, image_id): @@ -45,7 +45,7 @@ class NoopManager(object): class NoopVolumeDriver(driver_base.VolumeBase): def __init__(self): - super(NoopVolumeDriver, self).__init__() + super().__init__() self.driver = NoopManager() def create_volume_from_image(self, image_id):