Blackify openstack.load_balancer

Black used with the '-l 79 -S' flags.

A future change will ignore this commit in git-blame history by adding a
'git-blame-ignore-revs' file.

Change-Id: I4f3f4228b94230d3b2f52bed4e928df67f82017f
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
This commit is contained in:
Stephen Finucane 2023-05-05 10:57:04 +01:00
parent f8e42017e7
commit 82c2a53402
28 changed files with 1386 additions and 942 deletions

View File

@ -12,8 +12,9 @@
from openstack.load_balancer.v2 import amphora as _amphora
from openstack.load_balancer.v2 import availability_zone as _availability_zone
from openstack.load_balancer.v2 import availability_zone_profile as \
_availability_zone_profile
from openstack.load_balancer.v2 import (
availability_zone_profile as _availability_zone_profile,
)
from openstack.load_balancer.v2 import flavor as _flavor
from openstack.load_balancer.v2 import flavor_profile as _flavor_profile
from openstack.load_balancer.v2 import health_monitor as _hm
@ -33,8 +34,7 @@ class Proxy(proxy.Proxy):
_resource_registry = {
"amphora": _amphora.Amphora,
"availability_zone": _availability_zone.AvailabilityZone,
"availability_zone_profile":
_availability_zone_profile.AvailabilityZoneProfile,
"availability_zone_profile": _availability_zone_profile.AvailabilityZoneProfile, # noqa: E501
"flavor": _flavor.Flavor,
"flavor_profile": _flavor_profile.FlavorProfile,
"health_monitor": _hm.HealthMonitor,
@ -44,7 +44,7 @@ class Proxy(proxy.Proxy):
"member": _member.Member,
"pool": _pool.Pool,
"provider": _provider.Provider,
"quota": _quota.Quota
"quota": _quota.Quota,
}
def create_load_balancer(self, **attrs):
@ -82,8 +82,9 @@ class Proxy(proxy.Proxy):
:returns: One
:class:`~openstack.load_balancer.v2.load_balancer.LoadBalancerStats`
"""
return self._get(_lb.LoadBalancerStats, lb_id=load_balancer,
requires_id=False)
return self._get(
_lb.LoadBalancerStats, lb_id=load_balancer, requires_id=False
)
def load_balancers(self, **query):
"""Retrieve a generator of load balancers
@ -92,8 +93,9 @@ class Proxy(proxy.Proxy):
"""
return self._list(_lb.LoadBalancer, **query)
def delete_load_balancer(self, load_balancer, ignore_missing=True,
cascade=False):
def delete_load_balancer(
self, load_balancer, ignore_missing=True, cascade=False
):
"""Delete a load balancer
:param load_balancer: The load_balancer can be either the ID or a
@ -111,8 +113,9 @@ class Proxy(proxy.Proxy):
"""
load_balancer = self._get_resource(_lb.LoadBalancer, load_balancer)
load_balancer.cascade = cascade
return self._delete(_lb.LoadBalancer, load_balancer,
ignore_missing=ignore_missing)
return self._delete(
_lb.LoadBalancer, load_balancer, ignore_missing=ignore_missing
)
def find_load_balancer(self, name_or_id, ignore_missing=True):
"""Find a single load balancer
@ -126,8 +129,9 @@ class Proxy(proxy.Proxy):
:returns: ``None``
"""
return self._find(_lb.LoadBalancer, name_or_id,
ignore_missing=ignore_missing)
return self._find(
_lb.LoadBalancer, name_or_id, ignore_missing=ignore_missing
)
def update_load_balancer(self, load_balancer, **attrs):
"""Update a load balancer
@ -143,8 +147,14 @@ class Proxy(proxy.Proxy):
"""
return self._update(_lb.LoadBalancer, load_balancer, **attrs)
def wait_for_load_balancer(self, name_or_id, status='ACTIVE',
failures=['ERROR'], interval=2, wait=300):
def wait_for_load_balancer(
self,
name_or_id,
status='ACTIVE',
failures=['ERROR'],
interval=2,
wait=300,
):
"""Wait for load balancer status
:param name_or_id: The name or ID of the load balancer.
@ -167,8 +177,15 @@ class Proxy(proxy.Proxy):
"""
lb = self._find(_lb.LoadBalancer, name_or_id, ignore_missing=False)
return resource.wait_for_status(self, lb, status, failures, interval,
wait, attribute='provisioning_status')
return resource.wait_for_status(
self,
lb,
status,
failures,
interval,
wait,
attribute='provisioning_status',
)
def failover_load_balancer(self, load_balancer, **attrs):
"""Failover a load balancer
@ -206,8 +223,9 @@ class Proxy(proxy.Proxy):
:returns: ``None``
"""
self._delete(_listener.Listener, listener,
ignore_missing=ignore_missing)
self._delete(
_listener.Listener, listener, ignore_missing=ignore_missing
)
def find_listener(self, name_or_id, ignore_missing=True):
"""Find a single listener
@ -222,8 +240,9 @@ class Proxy(proxy.Proxy):
:returns: One :class:`~openstack.load_balancer.v2.listener.Listener`
or None
"""
return self._find(_listener.Listener, name_or_id,
ignore_missing=ignore_missing)
return self._find(
_listener.Listener, name_or_id, ignore_missing=ignore_missing
)
def get_listener(self, listener):
"""Get a single listener
@ -250,8 +269,9 @@ class Proxy(proxy.Proxy):
:raises: :class:`~openstack.exceptions.ResourceNotFound` when no
resource can be found.
"""
return self._get(_listener.ListenerStats, listener_id=listener,
requires_id=False)
return self._get(
_listener.ListenerStats, listener_id=listener, requires_id=False
)
def listeners(self, **query):
"""Return a generator of listeners
@ -322,8 +342,7 @@ class Proxy(proxy.Proxy):
:returns: ``None``
"""
return self._delete(_pool.Pool, pool,
ignore_missing=ignore_missing)
return self._delete(_pool.Pool, pool, ignore_missing=ignore_missing)
def find_pool(self, name_or_id, ignore_missing=True):
"""Find a single pool
@ -337,8 +356,9 @@ class Proxy(proxy.Proxy):
:returns: ``None``
"""
return self._find(_pool.Pool, name_or_id,
ignore_missing=ignore_missing)
return self._find(
_pool.Pool, name_or_id, ignore_missing=ignore_missing
)
def update_pool(self, pool, **attrs):
"""Update a pool
@ -368,8 +388,7 @@ class Proxy(proxy.Proxy):
:rtype: :class:`~openstack.load_balancer.v2.member.Member`
"""
poolobj = self._get_resource(_pool.Pool, pool)
return self._create(_member.Member, pool_id=poolobj.id,
**attrs)
return self._create(_member.Member, pool_id=poolobj.id, **attrs)
def delete_member(self, member, pool, ignore_missing=True):
"""Delete a member
@ -389,8 +408,12 @@ class Proxy(proxy.Proxy):
:returns: ``None``
"""
poolobj = self._get_resource(_pool.Pool, pool)
self._delete(_member.Member, member,
ignore_missing=ignore_missing, pool_id=poolobj.id)
self._delete(
_member.Member,
member,
ignore_missing=ignore_missing,
pool_id=poolobj.id,
)
def find_member(self, name_or_id, pool, ignore_missing=True):
"""Find a single member
@ -409,8 +432,12 @@ class Proxy(proxy.Proxy):
or None
"""
poolobj = self._get_resource(_pool.Pool, pool)
return self._find(_member.Member, name_or_id,
ignore_missing=ignore_missing, pool_id=poolobj.id)
return self._find(
_member.Member,
name_or_id,
ignore_missing=ignore_missing,
pool_id=poolobj.id,
)
def get_member(self, member, pool):
"""Get a single member
@ -427,8 +454,7 @@ class Proxy(proxy.Proxy):
when no resource can be found.
"""
poolobj = self._get_resource(_pool.Pool, pool)
return self._get(_member.Member, member,
pool_id=poolobj.id)
return self._get(_member.Member, member, pool_id=poolobj.id)
def members(self, pool, **query):
"""Return a generator of members
@ -461,8 +487,9 @@ class Proxy(proxy.Proxy):
:rtype: :class:`~openstack.load_balancer.v2.member.Member`
"""
poolobj = self._get_resource(_pool.Pool, pool)
return self._update(_member.Member, member,
pool_id=poolobj.id, **attrs)
return self._update(
_member.Member, member, pool_id=poolobj.id, **attrs
)
def find_health_monitor(self, name_or_id, ignore_missing=True):
"""Find a single health monitor
@ -483,8 +510,9 @@ class Proxy(proxy.Proxy):
:raises: :class:`openstack.exceptions.ResourceNotFound` if nothing
is found and ignore_missing is ``False``.
"""
return self._find(_hm.HealthMonitor, name_or_id,
ignore_missing=ignore_missing)
return self._find(
_hm.HealthMonitor, name_or_id, ignore_missing=ignore_missing
)
def create_health_monitor(self, **attrs):
"""Create a new health monitor from attributes
@ -544,8 +572,9 @@ class Proxy(proxy.Proxy):
:returns: ``None``
"""
return self._delete(_hm.HealthMonitor, healthmonitor,
ignore_missing=ignore_missing)
return self._delete(
_hm.HealthMonitor, healthmonitor, ignore_missing=ignore_missing
)
def update_health_monitor(self, healthmonitor, **attrs):
"""Update a health monitor
@ -561,8 +590,7 @@ class Proxy(proxy.Proxy):
:rtype:
:class:`~openstack.load_balancer.v2.healthmonitor.HealthMonitor`
"""
return self._update(_hm.HealthMonitor, healthmonitor,
**attrs)
return self._update(_hm.HealthMonitor, healthmonitor, **attrs)
def create_l7_policy(self, **attrs):
"""Create a new l7policy from attributes
@ -589,8 +617,9 @@ class Proxy(proxy.Proxy):
:returns: ``None``
"""
self._delete(_l7policy.L7Policy, l7_policy,
ignore_missing=ignore_missing)
self._delete(
_l7policy.L7Policy, l7_policy, ignore_missing=ignore_missing
)
def find_l7_policy(self, name_or_id, ignore_missing=True):
"""Find a single l7policy
@ -605,8 +634,9 @@ class Proxy(proxy.Proxy):
:returns: One :class:`~openstack.load_balancer.v2.l7_policy.L7Policy`
or None
"""
return self._find(_l7policy.L7Policy, name_or_id,
ignore_missing=ignore_missing)
return self._find(
_l7policy.L7Policy, name_or_id, ignore_missing=ignore_missing
)
def get_l7_policy(self, l7_policy):
"""Get a single l7policy
@ -660,8 +690,9 @@ class Proxy(proxy.Proxy):
:rtype: :class:`~openstack.load_balancer.v2.l7_rule.L7Rule`
"""
l7policyobj = self._get_resource(_l7policy.L7Policy, l7_policy)
return self._create(_l7rule.L7Rule, l7policy_id=l7policyobj.id,
**attrs)
return self._create(
_l7rule.L7Rule, l7policy_id=l7policyobj.id, **attrs
)
def delete_l7_rule(self, l7rule, l7_policy, ignore_missing=True):
"""Delete a l7rule
@ -680,8 +711,12 @@ class Proxy(proxy.Proxy):
:returns: ``None``
"""
l7policyobj = self._get_resource(_l7policy.L7Policy, l7_policy)
self._delete(_l7rule.L7Rule, l7rule, ignore_missing=ignore_missing,
l7policy_id=l7policyobj.id)
self._delete(
_l7rule.L7Rule,
l7rule,
ignore_missing=ignore_missing,
l7policy_id=l7policyobj.id,
)
def find_l7_rule(self, name_or_id, l7_policy, ignore_missing=True):
"""Find a single l7rule
@ -700,9 +735,12 @@ class Proxy(proxy.Proxy):
or None
"""
l7policyobj = self._get_resource(_l7policy.L7Policy, l7_policy)
return self._find(_l7rule.L7Rule, name_or_id,
ignore_missing=ignore_missing,
l7policy_id=l7policyobj.id)
return self._find(
_l7rule.L7Rule,
name_or_id,
ignore_missing=ignore_missing,
l7policy_id=l7policyobj.id,
)
def get_l7_rule(self, l7rule, l7_policy):
"""Get a single l7rule
@ -719,8 +757,7 @@ class Proxy(proxy.Proxy):
when no resource can be found.
"""
l7policyobj = self._get_resource(_l7policy.L7Policy, l7_policy)
return self._get(_l7rule.L7Rule, l7rule,
l7policy_id=l7policyobj.id)
return self._get(_l7rule.L7Rule, l7rule, l7policy_id=l7policyobj.id)
def l7_rules(self, l7_policy, **query):
"""Return a generator of l7rules
@ -753,8 +790,9 @@ class Proxy(proxy.Proxy):
:rtype: :class:`~openstack.load_balancer.v2.l7_rule.L7Rule`
"""
l7policyobj = self._get_resource(_l7policy.L7Policy, l7_policy)
return self._update(_l7rule.L7Rule, l7rule,
l7policy_id=l7policyobj.id, **attrs)
return self._update(
_l7rule.L7Rule, l7rule, l7policy_id=l7policyobj.id, **attrs
)
def quotas(self, **query):
"""Return a generator of quotas
@ -833,8 +871,9 @@ class Proxy(proxy.Proxy):
:returns: A generator of provider flavor capabilities instances
"""
return self._list(_provider.ProviderFlavorCapabilities,
provider=provider, **query)
return self._list(
_provider.ProviderFlavorCapabilities, provider=provider, **query
)
def create_flavor_profile(self, **attrs):
"""Create a new flavor profile from attributes
@ -882,8 +921,11 @@ class Proxy(proxy.Proxy):
:returns: ``None``
"""
self._delete(_flavor_profile.FlavorProfile, flavor_profile,
ignore_missing=ignore_missing)
self._delete(
_flavor_profile.FlavorProfile,
flavor_profile,
ignore_missing=ignore_missing,
)
def find_flavor_profile(self, name_or_id, ignore_missing=True):
"""Find a single flavor profile
@ -897,8 +939,11 @@ class Proxy(proxy.Proxy):
:returns: ``None``
"""
return self._find(_flavor_profile.FlavorProfile, name_or_id,
ignore_missing=ignore_missing)
return self._find(
_flavor_profile.FlavorProfile,
name_or_id,
ignore_missing=ignore_missing,
)
def update_flavor_profile(self, flavor_profile, **attrs):
"""Update a flavor profile
@ -913,8 +958,9 @@ class Proxy(proxy.Proxy):
:rtype:
:class:`~openstack.load_balancer.v2.flavor_profile.FlavorProfile`
"""
return self._update(_flavor_profile.FlavorProfile, flavor_profile,
**attrs)
return self._update(
_flavor_profile.FlavorProfile, flavor_profile, **attrs
)
def create_flavor(self, **attrs):
"""Create a new flavor from attributes
@ -973,8 +1019,9 @@ class Proxy(proxy.Proxy):
:returns: ``None``
"""
return self._find(_flavor.Flavor, name_or_id,
ignore_missing=ignore_missing)
return self._find(
_flavor.Flavor, name_or_id, ignore_missing=ignore_missing
)
def update_flavor(self, flavor, **attrs):
"""Update a flavor
@ -1019,8 +1066,9 @@ class Proxy(proxy.Proxy):
:returns: ``None``
"""
return self._find(_amphora.Amphora, amphora_id,
ignore_missing=ignore_missing)
return self._find(
_amphora.Amphora, amphora_id, ignore_missing=ignore_missing
)
def configure_amphora(self, amphora_id, **attrs):
"""Update the configuration of an amphora agent
@ -1052,8 +1100,9 @@ class Proxy(proxy.Proxy):
:rtype:
:class:`~openstack.load_balancer.v2.availability_zone_profile.AvailabilityZoneProfile`
"""
return self._create(_availability_zone_profile.AvailabilityZoneProfile,
**attrs)
return self._create(
_availability_zone_profile.AvailabilityZoneProfile, **attrs
)
def get_availability_zone_profile(self, *attrs):
"""Get an availability zone profile
@ -1066,19 +1115,22 @@ class Proxy(proxy.Proxy):
:returns: One
:class:`~openstack.load_balancer.v2.availability_zone_profile.AvailabilityZoneProfile`
"""
return self._get(_availability_zone_profile.AvailabilityZoneProfile,
*attrs)
return self._get(
_availability_zone_profile.AvailabilityZoneProfile, *attrs
)
def availability_zone_profiles(self, **query):
"""Retrieve a generator of availability zone profiles
:returns: A generator of availability zone profiles instances
"""
return self._list(_availability_zone_profile.AvailabilityZoneProfile,
**query)
return self._list(
_availability_zone_profile.AvailabilityZoneProfile, **query
)
def delete_availability_zone_profile(self, availability_zone_profile,
ignore_missing=True):
def delete_availability_zone_profile(
self, availability_zone_profile, ignore_missing=True
):
"""Delete an availability zone profile
:param availability_zone_profile: The availability_zone_profile can be
@ -1093,8 +1145,11 @@ class Proxy(proxy.Proxy):
:returns: ``None``
"""
self._delete(_availability_zone_profile.AvailabilityZoneProfile,
availability_zone_profile, ignore_missing=ignore_missing)
self._delete(
_availability_zone_profile.AvailabilityZoneProfile,
availability_zone_profile,
ignore_missing=ignore_missing,
)
def find_availability_zone_profile(self, name_or_id, ignore_missing=True):
"""Find a single availability zone profile
@ -1108,11 +1163,15 @@ class Proxy(proxy.Proxy):
:returns: ``None``
"""
return self._find(_availability_zone_profile.AvailabilityZoneProfile,
name_or_id, ignore_missing=ignore_missing)
return self._find(
_availability_zone_profile.AvailabilityZoneProfile,
name_or_id,
ignore_missing=ignore_missing,
)
def update_availability_zone_profile(self, availability_zone_profile,
**attrs):
def update_availability_zone_profile(
self, availability_zone_profile, **attrs
):
"""Update an availability zone profile
:param availability_zone_profile: The availability_zone_profile can be
@ -1126,8 +1185,11 @@ class Proxy(proxy.Proxy):
:rtype:
:class:`~openstack.load_balancer.v2.availability_zone_profile.AvailabilityZoneProfile`
"""
return self._update(_availability_zone_profile.AvailabilityZoneProfile,
availability_zone_profile, **attrs)
return self._update(
_availability_zone_profile.AvailabilityZoneProfile,
availability_zone_profile,
**attrs
)
def create_availability_zone(self, **attrs):
"""Create a new availability zone from attributes
@ -1177,8 +1239,11 @@ class Proxy(proxy.Proxy):
:returns: ``None``
"""
self._delete(_availability_zone.AvailabilityZone, availability_zone,
ignore_missing=ignore_missing)
self._delete(
_availability_zone.AvailabilityZone,
availability_zone,
ignore_missing=ignore_missing,
)
def find_availability_zone(self, name_or_id, ignore_missing=True):
"""Find a single availability zone
@ -1192,8 +1257,11 @@ class Proxy(proxy.Proxy):
:returns: ``None``
"""
return self._find(_availability_zone.AvailabilityZone, name_or_id,
ignore_missing=ignore_missing)
return self._find(
_availability_zone.AvailabilityZone,
name_or_id,
ignore_missing=ignore_missing,
)
def update_availability_zone(self, availability_zone, **attrs):
"""Update an availability zone
@ -1209,5 +1277,6 @@ class Proxy(proxy.Proxy):
:rtype:
:class:`~openstack.load_balancer.v2.availability_zone.AvailabilityZone`
"""
return self._update(_availability_zone.AvailabilityZone,
availability_zone, **attrs)
return self._update(
_availability_zone.AvailabilityZone, availability_zone, **attrs
)

View File

@ -28,10 +28,26 @@ class Amphora(resource.Resource):
allow_list = True
_query_mapping = resource.QueryParameters(
'id', 'loadbalancer_id', 'compute_id', 'lb_network_ip', 'vrrp_ip',
'ha_ip', 'vrrp_port_id', 'ha_port_id', 'cert_expiration', 'cert_busy',
'role', 'status', 'vrrp_interface', 'vrrp_id', 'vrrp_priority',
'cached_zone', 'created_at', 'updated_at', 'image_id', 'image_id'
'id',
'loadbalancer_id',
'compute_id',
'lb_network_ip',
'vrrp_ip',
'ha_ip',
'vrrp_port_id',
'ha_port_id',
'cert_expiration',
'cert_busy',
'role',
'status',
'vrrp_interface',
'vrrp_id',
'vrrp_priority',
'cached_zone',
'created_at',
'updated_at',
'image_id',
'image_id',
)
# Properties
@ -99,7 +115,8 @@ class AmphoraConfig(resource.Resource):
# way to pass has_body into this function, so overriding the method here.
def commit(self, session, base_path=None):
return super(AmphoraConfig, self).commit(
session, base_path=base_path, has_body=False)
session, base_path=base_path, has_body=False
)
class AmphoraFailover(resource.Resource):
@ -123,4 +140,5 @@ class AmphoraFailover(resource.Resource):
# way to pass has_body into this function, so overriding the method here.
def commit(self, session, base_path=None):
return super(AmphoraFailover, self).commit(
session, base_path=base_path, has_body=False)
session, base_path=base_path, has_body=False
)

View File

@ -27,8 +27,10 @@ class AvailabilityZone(resource.Resource):
allow_list = True
_query_mapping = resource.QueryParameters(
'name', 'description', 'availability_zone_profile_id',
is_enabled='enabled'
'name',
'description',
'availability_zone_profile_id',
is_enabled='enabled',
)
# Properties
@ -38,6 +40,7 @@ class AvailabilityZone(resource.Resource):
description = resource.Body('description')
#: The associated availability zone profile ID
availability_zone_profile_id = resource.Body(
'availability_zone_profile_id')
'availability_zone_profile_id'
)
#: Whether the availability zone is enabled for use or not.
is_enabled = resource.Body('enabled')

View File

@ -26,10 +26,22 @@ class HealthMonitor(resource.Resource, tag.TagMixin):
allow_commit = True
_query_mapping = resource.QueryParameters(
'name', 'created_at', 'updated_at', 'delay', 'expected_codes',
'http_method', 'max_retries', 'max_retries_down', 'pool_id',
'provisioning_status', 'operating_status', 'timeout',
'project_id', 'type', 'url_path', is_admin_state_up='admin_state_up',
'name',
'created_at',
'updated_at',
'delay',
'expected_codes',
'http_method',
'max_retries',
'max_retries_down',
'pool_id',
'provisioning_status',
'operating_status',
'timeout',
'project_id',
'type',
'url_path',
is_admin_state_up='admin_state_up',
**tag.TagMixin._tag_query_parameters
)

View File

@ -26,9 +26,17 @@ class L7Policy(resource.Resource, tag.TagMixin):
allow_delete = True
_query_mapping = resource.QueryParameters(
'action', 'description', 'listener_id', 'name', 'position',
'redirect_pool_id', 'redirect_url', 'provisioning_status',
'operating_status', 'redirect_prefix', 'project_id',
'action',
'description',
'listener_id',
'name',
'position',
'redirect_pool_id',
'redirect_url',
'provisioning_status',
'operating_status',
'redirect_prefix',
'project_id',
is_admin_state_up='admin_state_up',
**tag.TagMixin._tag_query_parameters
)

View File

@ -26,10 +26,19 @@ class L7Rule(resource.Resource, tag.TagMixin):
allow_delete = True
_query_mapping = resource.QueryParameters(
'compare_type', 'created_at', 'invert', 'key', 'project_id',
'provisioning_status', 'type', 'updated_at', 'rule_value',
'operating_status', is_admin_state_up='admin_state_up',
l7_policy_id='l7policy_id', **tag.TagMixin._tag_query_parameters
'compare_type',
'created_at',
'invert',
'key',
'project_id',
'provisioning_status',
'type',
'updated_at',
'rule_value',
'operating_status',
is_admin_state_up='admin_state_up',
l7_policy_id='l7policy_id',
**tag.TagMixin._tag_query_parameters
)
#: Properties

View File

@ -26,13 +26,29 @@ class Listener(resource.Resource, tag.TagMixin):
allow_list = True
_query_mapping = resource.QueryParameters(
'connection_limit', 'default_pool_id', 'default_tls_container_ref',
'description', 'name', 'project_id', 'protocol', 'protocol_port',
'created_at', 'updated_at', 'provisioning_status', 'operating_status',
'sni_container_refs', 'insert_headers', 'load_balancer_id',
'timeout_client_data', 'timeout_member_connect',
'timeout_member_data', 'timeout_tcp_inspect', 'allowed_cidrs',
'tls_ciphers', 'tls_versions', 'alpn_protocols',
'connection_limit',
'default_pool_id',
'default_tls_container_ref',
'description',
'name',
'project_id',
'protocol',
'protocol_port',
'created_at',
'updated_at',
'provisioning_status',
'operating_status',
'sni_container_refs',
'insert_headers',
'load_balancer_id',
'timeout_client_data',
'timeout_member_connect',
'timeout_member_data',
'timeout_tcp_inspect',
'allowed_cidrs',
'tls_ciphers',
'tls_versions',
'alpn_protocols',
is_admin_state_up='admin_state_up',
**tag.TagMixin._tag_query_parameters
)

View File

@ -26,10 +26,20 @@ class LoadBalancer(resource.Resource, tag.TagMixin):
allow_list = True
_query_mapping = resource.QueryParameters(
'description', 'flavor_id', 'name', 'project_id', 'provider',
'vip_address', 'vip_network_id', 'vip_port_id', 'vip_subnet_id',
'vip_qos_policy_id', 'provisioning_status', 'operating_status',
'availability_zone', is_admin_state_up='admin_state_up',
'description',
'flavor_id',
'name',
'project_id',
'provider',
'vip_address',
'vip_network_id',
'vip_port_id',
'vip_subnet_id',
'vip_qos_policy_id',
'provisioning_status',
'operating_status',
'availability_zone',
is_admin_state_up='admin_state_up',
**tag.TagMixin._tag_query_parameters
)
@ -76,14 +86,17 @@ class LoadBalancer(resource.Resource, tag.TagMixin):
def delete(self, session, error_message=None):
request = self._prepare_request()
params = {}
if (hasattr(self, 'cascade') and isinstance(self.cascade, bool)
and self.cascade):
if (
hasattr(self, 'cascade')
and isinstance(self.cascade, bool)
and self.cascade
):
params['cascade'] = True
response = session.delete(request.url,
params=params)
response = session.delete(request.url, params=params)
self._translate_response(response, has_body=False,
error_message=error_message)
self._translate_response(
response, has_body=False, error_message=error_message
)
return self
@ -134,4 +147,5 @@ class LoadBalancerFailover(resource.Resource):
# way to pass has_body into this function, so overriding the method here.
def commit(self, session, base_path=None):
return super(LoadBalancerFailover, self).commit(
session, base_path=base_path, has_body=False)
session, base_path=base_path, has_body=False
)

View File

@ -26,9 +26,19 @@ class Member(resource.Resource, tag.TagMixin):
allow_list = True
_query_mapping = resource.QueryParameters(
'address', 'name', 'protocol_port', 'subnet_id', 'weight',
'created_at', 'updated_at', 'provisioning_status', 'operating_status',
'project_id', 'monitor_address', 'monitor_port', 'backup',
'address',
'name',
'protocol_port',
'subnet_id',
'weight',
'created_at',
'updated_at',
'provisioning_status',
'operating_status',
'project_id',
'monitor_address',
'monitor_port',
'backup',
is_admin_state_up='admin_state_up',
**tag.TagMixin._tag_query_parameters
)

View File

@ -26,10 +26,22 @@ class Pool(resource.Resource, tag.TagMixin):
allow_commit = True
_query_mapping = resource.QueryParameters(
'health_monitor_id', 'lb_algorithm', 'listener_id', 'loadbalancer_id',
'description', 'name', 'project_id', 'protocol',
'created_at', 'updated_at', 'provisioning_status', 'operating_status',
'tls_enabled', 'tls_ciphers', 'tls_versions', 'alpn_protocols',
'health_monitor_id',
'lb_algorithm',
'listener_id',
'loadbalancer_id',
'description',
'name',
'project_id',
'protocol',
'created_at',
'updated_at',
'provisioning_status',
'operating_status',
'tls_enabled',
'tls_ciphers',
'tls_versions',
'alpn_protocols',
is_admin_state_up='admin_state_up',
**tag.TagMixin._tag_query_parameters
)

View File

@ -41,11 +41,12 @@ class Quota(resource.Resource):
#: The ID of the project this quota is associated with.
project_id = resource.Body('project_id', alternate_id=True)
def _prepare_request(self, requires_id=True,
base_path=None, prepend_key=False, **kwargs):
_request = super(Quota, self)._prepare_request(requires_id,
prepend_key,
base_path=base_path)
def _prepare_request(
self, requires_id=True, base_path=None, prepend_key=False, **kwargs
):
_request = super(Quota, self)._prepare_request(
requires_id, prepend_key, base_path=base_path
)
if self.resource_key in _request.body:
_body = _request.body[self.resource_key]
else:

View File

@ -84,56 +84,73 @@ class TestLoadBalancer(base.BaseFunctionalTest):
self.VIP_SUBNET_ID = subnets[0].id
self.PROJECT_ID = self.conn.session.get_project_id()
test_quota = self.conn.load_balancer.update_quota(
self.PROJECT_ID, **{'load_balancer': 100,
'pool': 100,
'listener': 100,
'health_monitor': 100,
'member': 100})
self.PROJECT_ID,
**{
'load_balancer': 100,
'pool': 100,
'listener': 100,
'health_monitor': 100,
'member': 100,
}
)
assert isinstance(test_quota, quota.Quota)
self.assertEqual(self.PROJECT_ID, test_quota.id)
test_flavor_profile = self.conn.load_balancer.create_flavor_profile(
name=self.FLAVOR_PROFILE_NAME, provider_name=self.AMPHORA,
flavor_data=self.FLAVOR_DATA)
name=self.FLAVOR_PROFILE_NAME,
provider_name=self.AMPHORA,
flavor_data=self.FLAVOR_DATA,
)
assert isinstance(test_flavor_profile, flavor_profile.FlavorProfile)
self.assertEqual(self.FLAVOR_PROFILE_NAME, test_flavor_profile.name)
self.FLAVOR_PROFILE_ID = test_flavor_profile.id
test_flavor = self.conn.load_balancer.create_flavor(
name=self.FLAVOR_NAME, flavor_profile_id=self.FLAVOR_PROFILE_ID,
is_enabled=True, description=self.DESCRIPTION)
name=self.FLAVOR_NAME,
flavor_profile_id=self.FLAVOR_PROFILE_ID,
is_enabled=True,
description=self.DESCRIPTION,
)
assert isinstance(test_flavor, flavor.Flavor)
self.assertEqual(self.FLAVOR_NAME, test_flavor.name)
self.FLAVOR_ID = test_flavor.id
test_az_profile = \
test_az_profile = (
self.conn.load_balancer.create_availability_zone_profile(
name=self.AVAILABILITY_ZONE_PROFILE_NAME,
provider_name=self.AMPHORA,
availability_zone_data=self.AVAILABILITY_ZONE_DATA)
assert isinstance(test_az_profile,
availability_zone_profile.AvailabilityZoneProfile)
self.assertEqual(self.AVAILABILITY_ZONE_PROFILE_NAME,
test_az_profile.name)
availability_zone_data=self.AVAILABILITY_ZONE_DATA,
)
)
assert isinstance(
test_az_profile, availability_zone_profile.AvailabilityZoneProfile
)
self.assertEqual(
self.AVAILABILITY_ZONE_PROFILE_NAME, test_az_profile.name
)
self.AVAILABILITY_ZONE_PROFILE_ID = test_az_profile.id
test_az = self.conn.load_balancer.create_availability_zone(
name=self.AVAILABILITY_ZONE_NAME,
availability_zone_profile_id=self.AVAILABILITY_ZONE_PROFILE_ID,
is_enabled=True, description=self.DESCRIPTION)
is_enabled=True,
description=self.DESCRIPTION,
)
assert isinstance(test_az, availability_zone.AvailabilityZone)
self.assertEqual(self.AVAILABILITY_ZONE_NAME, test_az.name)
test_lb = self.conn.load_balancer.create_load_balancer(
name=self.LB_NAME, vip_subnet_id=self.VIP_SUBNET_ID,
project_id=self.PROJECT_ID)
name=self.LB_NAME,
vip_subnet_id=self.VIP_SUBNET_ID,
project_id=self.PROJECT_ID,
)
assert isinstance(test_lb, load_balancer.LoadBalancer)
self.assertEqual(self.LB_NAME, test_lb.name)
# Wait for the LB to go ACTIVE. On non-virtualization enabled hosts
# it can take nova up to ten minutes to boot a VM.
self.conn.load_balancer.wait_for_load_balancer(
test_lb.id, interval=1,
wait=self._wait_for_timeout)
test_lb.id, interval=1, wait=self._wait_for_timeout
)
self.LB_ID = test_lb.id
amphorae = self.conn.load_balancer.amphorae(loadbalancer_id=self.LB_ID)
@ -141,113 +158,156 @@ class TestLoadBalancer(base.BaseFunctionalTest):
self.AMPHORA_ID = amp.id
test_listener = self.conn.load_balancer.create_listener(
name=self.LISTENER_NAME, protocol=self.PROTOCOL,
protocol_port=self.PROTOCOL_PORT, loadbalancer_id=self.LB_ID)
name=self.LISTENER_NAME,
protocol=self.PROTOCOL,
protocol_port=self.PROTOCOL_PORT,
loadbalancer_id=self.LB_ID,
)
assert isinstance(test_listener, listener.Listener)
self.assertEqual(self.LISTENER_NAME, test_listener.name)
self.LISTENER_ID = test_listener.id
self.conn.load_balancer.wait_for_load_balancer(
self.LB_ID, wait=self._wait_for_timeout)
self.LB_ID, wait=self._wait_for_timeout
)
test_pool = self.conn.load_balancer.create_pool(
name=self.POOL_NAME, protocol=self.PROTOCOL,
lb_algorithm=self.LB_ALGORITHM, listener_id=self.LISTENER_ID)
name=self.POOL_NAME,
protocol=self.PROTOCOL,
lb_algorithm=self.LB_ALGORITHM,
listener_id=self.LISTENER_ID,
)
assert isinstance(test_pool, pool.Pool)
self.assertEqual(self.POOL_NAME, test_pool.name)
self.POOL_ID = test_pool.id
self.conn.load_balancer.wait_for_load_balancer(
self.LB_ID, wait=self._wait_for_timeout)
self.LB_ID, wait=self._wait_for_timeout
)
test_member = self.conn.load_balancer.create_member(
pool=self.POOL_ID, name=self.MEMBER_NAME,
pool=self.POOL_ID,
name=self.MEMBER_NAME,
address=self.MEMBER_ADDRESS,
protocol_port=self.PROTOCOL_PORT, weight=self.WEIGHT)
protocol_port=self.PROTOCOL_PORT,
weight=self.WEIGHT,
)
assert isinstance(test_member, member.Member)
self.assertEqual(self.MEMBER_NAME, test_member.name)
self.MEMBER_ID = test_member.id
self.conn.load_balancer.wait_for_load_balancer(
self.LB_ID, wait=self._wait_for_timeout)
self.LB_ID, wait=self._wait_for_timeout
)
test_hm = self.conn.load_balancer.create_health_monitor(
pool_id=self.POOL_ID, name=self.HM_NAME, delay=self.DELAY,
timeout=self.TIMEOUT, max_retries=self.MAX_RETRY,
type=self.HM_TYPE)
pool_id=self.POOL_ID,
name=self.HM_NAME,
delay=self.DELAY,
timeout=self.TIMEOUT,
max_retries=self.MAX_RETRY,
type=self.HM_TYPE,
)
assert isinstance(test_hm, health_monitor.HealthMonitor)
self.assertEqual(self.HM_NAME, test_hm.name)
self.HM_ID = test_hm.id
self.conn.load_balancer.wait_for_load_balancer(
self.LB_ID, wait=self._wait_for_timeout)
self.LB_ID, wait=self._wait_for_timeout
)
test_l7policy = self.conn.load_balancer.create_l7_policy(
listener_id=self.LISTENER_ID, name=self.L7POLICY_NAME,
action=self.ACTION, redirect_url=self.REDIRECT_URL)
listener_id=self.LISTENER_ID,
name=self.L7POLICY_NAME,
action=self.ACTION,
redirect_url=self.REDIRECT_URL,
)
assert isinstance(test_l7policy, l7_policy.L7Policy)
self.assertEqual(self.L7POLICY_NAME, test_l7policy.name)
self.L7POLICY_ID = test_l7policy.id
self.conn.load_balancer.wait_for_load_balancer(
self.LB_ID, wait=self._wait_for_timeout)
self.LB_ID, wait=self._wait_for_timeout
)
test_l7rule = self.conn.load_balancer.create_l7_rule(
l7_policy=self.L7POLICY_ID, compare_type=self.COMPARE_TYPE,
type=self.L7RULE_TYPE, value=self.L7RULE_VALUE)
l7_policy=self.L7POLICY_ID,
compare_type=self.COMPARE_TYPE,
type=self.L7RULE_TYPE,
value=self.L7RULE_VALUE,
)
assert isinstance(test_l7rule, l7_rule.L7Rule)
self.assertEqual(self.COMPARE_TYPE, test_l7rule.compare_type)
self.L7RULE_ID = test_l7rule.id
self.conn.load_balancer.wait_for_load_balancer(
self.LB_ID, wait=self._wait_for_timeout)
self.LB_ID, wait=self._wait_for_timeout
)
def tearDown(self):
self.conn.load_balancer.get_load_balancer(self.LB_ID)
self.conn.load_balancer.wait_for_load_balancer(
self.LB_ID, wait=self._wait_for_timeout)
self.LB_ID, wait=self._wait_for_timeout
)
self.conn.load_balancer.delete_quota(self.PROJECT_ID,
ignore_missing=False)
self.conn.load_balancer.delete_quota(
self.PROJECT_ID, ignore_missing=False
)
self.conn.load_balancer.delete_l7_rule(
self.L7RULE_ID, l7_policy=self.L7POLICY_ID, ignore_missing=False)
self.L7RULE_ID, l7_policy=self.L7POLICY_ID, ignore_missing=False
)
self.conn.load_balancer.wait_for_load_balancer(
self.LB_ID, wait=self._wait_for_timeout)
self.LB_ID, wait=self._wait_for_timeout
)
self.conn.load_balancer.delete_l7_policy(
self.L7POLICY_ID, ignore_missing=False)
self.L7POLICY_ID, ignore_missing=False
)
self.conn.load_balancer.wait_for_load_balancer(
self.LB_ID, wait=self._wait_for_timeout)
self.LB_ID, wait=self._wait_for_timeout
)
self.conn.load_balancer.delete_health_monitor(
self.HM_ID, ignore_missing=False)
self.HM_ID, ignore_missing=False
)
self.conn.load_balancer.wait_for_load_balancer(
self.LB_ID, wait=self._wait_for_timeout)
self.LB_ID, wait=self._wait_for_timeout
)
self.conn.load_balancer.delete_member(
self.MEMBER_ID, self.POOL_ID, ignore_missing=False)
self.MEMBER_ID, self.POOL_ID, ignore_missing=False
)
self.conn.load_balancer.wait_for_load_balancer(
self.LB_ID, wait=self._wait_for_timeout)
self.LB_ID, wait=self._wait_for_timeout
)
self.conn.load_balancer.delete_pool(self.POOL_ID, ignore_missing=False)
self.conn.load_balancer.wait_for_load_balancer(
self.LB_ID, wait=self._wait_for_timeout)
self.LB_ID, wait=self._wait_for_timeout
)
self.conn.load_balancer.delete_listener(self.LISTENER_ID,
ignore_missing=False)
self.conn.load_balancer.delete_listener(
self.LISTENER_ID, ignore_missing=False
)
self.conn.load_balancer.wait_for_load_balancer(
self.LB_ID, wait=self._wait_for_timeout)
self.LB_ID, wait=self._wait_for_timeout
)
self.conn.load_balancer.delete_load_balancer(
self.LB_ID, ignore_missing=False)
self.LB_ID, ignore_missing=False
)
super(TestLoadBalancer, self).tearDown()
self.conn.load_balancer.delete_flavor(self.FLAVOR_ID,
ignore_missing=False)
self.conn.load_balancer.delete_flavor(
self.FLAVOR_ID, ignore_missing=False
)
self.conn.load_balancer.delete_flavor_profile(self.FLAVOR_PROFILE_ID,
ignore_missing=False)
self.conn.load_balancer.delete_flavor_profile(
self.FLAVOR_PROFILE_ID, ignore_missing=False
)
self.conn.load_balancer.delete_availability_zone(
self.AVAILABILITY_ZONE_NAME, ignore_missing=False)
self.AVAILABILITY_ZONE_NAME, ignore_missing=False
)
self.conn.load_balancer.delete_availability_zone_profile(
self.AVAILABILITY_ZONE_PROFILE_ID, ignore_missing=False)
self.AVAILABILITY_ZONE_PROFILE_ID, ignore_missing=False
)
def test_lb_find(self):
test_lb = self.conn.load_balancer.find_load_balancer(self.LB_NAME)
@ -261,7 +321,8 @@ class TestLoadBalancer(base.BaseFunctionalTest):
def test_lb_get_stats(self):
test_lb_stats = self.conn.load_balancer.get_load_balancer_statistics(
self.LB_ID)
self.LB_ID
)
self.assertEqual(0, test_lb_stats.active_connections)
self.assertEqual(0, test_lb_stats.bytes_in)
self.assertEqual(0, test_lb_stats.bytes_out)
@ -274,29 +335,35 @@ class TestLoadBalancer(base.BaseFunctionalTest):
def test_lb_update(self):
self.conn.load_balancer.update_load_balancer(
self.LB_ID, name=self.UPDATE_NAME)
self.LB_ID, name=self.UPDATE_NAME
)
self.conn.load_balancer.wait_for_load_balancer(
self.LB_ID, wait=self._wait_for_timeout)
self.LB_ID, wait=self._wait_for_timeout
)
test_lb = self.conn.load_balancer.get_load_balancer(self.LB_ID)
self.assertEqual(self.UPDATE_NAME, test_lb.name)
self.conn.load_balancer.update_load_balancer(
self.LB_ID, name=self.LB_NAME)
self.LB_ID, name=self.LB_NAME
)
self.conn.load_balancer.wait_for_load_balancer(
self.LB_ID, wait=self._wait_for_timeout)
self.LB_ID, wait=self._wait_for_timeout
)
test_lb = self.conn.load_balancer.get_load_balancer(self.LB_ID)
self.assertEqual(self.LB_NAME, test_lb.name)
def test_lb_failover(self):
self.conn.load_balancer.failover_load_balancer(self.LB_ID)
self.conn.load_balancer.wait_for_load_balancer(
self.LB_ID, wait=self._wait_for_timeout)
self.LB_ID, wait=self._wait_for_timeout
)
test_lb = self.conn.load_balancer.get_load_balancer(self.LB_ID)
self.assertEqual(self.LB_NAME, test_lb.name)
def test_listener_find(self):
test_listener = self.conn.load_balancer.find_listener(
self.LISTENER_NAME)
self.LISTENER_NAME
)
self.assertEqual(self.LISTENER_ID, test_listener.id)
def test_listener_get(self):
@ -308,7 +375,8 @@ class TestLoadBalancer(base.BaseFunctionalTest):
def test_listener_get_stats(self):
test_listener_stats = self.conn.load_balancer.get_listener_statistics(
self.LISTENER_ID)
self.LISTENER_ID
)
self.assertEqual(0, test_listener_stats.active_connections)
self.assertEqual(0, test_listener_stats.bytes_in)
self.assertEqual(0, test_listener_stats.bytes_out)
@ -323,16 +391,20 @@ class TestLoadBalancer(base.BaseFunctionalTest):
self.conn.load_balancer.get_load_balancer(self.LB_ID)
self.conn.load_balancer.update_listener(
self.LISTENER_ID, name=self.UPDATE_NAME)
self.LISTENER_ID, name=self.UPDATE_NAME
)
self.conn.load_balancer.wait_for_load_balancer(
self.LB_ID, wait=self._wait_for_timeout)
self.LB_ID, wait=self._wait_for_timeout
)
test_listener = self.conn.load_balancer.get_listener(self.LISTENER_ID)
self.assertEqual(self.UPDATE_NAME, test_listener.name)
self.conn.load_balancer.update_listener(
self.LISTENER_ID, name=self.LISTENER_NAME)
self.LISTENER_ID, name=self.LISTENER_NAME
)
self.conn.load_balancer.wait_for_load_balancer(
self.LB_ID, wait=self._wait_for_timeout)
self.LB_ID, wait=self._wait_for_timeout
)
test_listener = self.conn.load_balancer.get_listener(self.LISTENER_ID)
self.assertEqual(self.LISTENER_NAME, test_listener.name)
@ -353,28 +425,32 @@ class TestLoadBalancer(base.BaseFunctionalTest):
def test_pool_update(self):
self.conn.load_balancer.get_load_balancer(self.LB_ID)
self.conn.load_balancer.update_pool(self.POOL_ID,
name=self.UPDATE_NAME)
self.conn.load_ba