diff --git a/openstack/network/v2/_base.py b/openstack/network/v2/_base.py index cee129f0e..e151e8144 100644 --- a/openstack/network/v2/_base.py +++ b/openstack/network/v2/_base.py @@ -18,12 +18,23 @@ class NetworkResource(resource.Resource): _allow_unknown_attrs_in_body = True - def _prepare_request(self, requires_id=None, prepend_key=False, - patch=False, base_path=None, params=None, - if_revision=None, **kwargs): + def _prepare_request( + self, + requires_id=None, + prepend_key=False, + patch=False, + base_path=None, + params=None, + if_revision=None, + **kwargs + ): req = super(NetworkResource, self)._prepare_request( - requires_id=requires_id, prepend_key=prepend_key, patch=patch, - base_path=base_path, params=params) + requires_id=requires_id, + prepend_key=prepend_key, + patch=patch, + base_path=base_path, + params=params, + ) if if_revision is not None: req.headers['If-Match'] = "revision_number=%d" % if_revision return req diff --git a/openstack/network/v2/_proxy.py b/openstack/network/v2/_proxy.py index dd7140abc..c7a3a60bc 100644 --- a/openstack/network/v2/_proxy.py +++ b/openstack/network/v2/_proxy.py @@ -18,18 +18,22 @@ from openstack import exceptions from openstack.network.v2 import address_group as _address_group from openstack.network.v2 import address_scope as _address_scope from openstack.network.v2 import agent as _agent -from openstack.network.v2 import auto_allocated_topology as \ - _auto_allocated_topology +from openstack.network.v2 import ( + auto_allocated_topology as _auto_allocated_topology, +) from openstack.network.v2 import availability_zone from openstack.network.v2 import bgp_peer as _bgp_peer from openstack.network.v2 import bgp_speaker as _bgp_speaker from openstack.network.v2 import bgpvpn as _bgpvpn -from openstack.network.v2 import bgpvpn_network_association as \ - _bgpvpn_network_association -from openstack.network.v2 import bgpvpn_port_association as \ - _bgpvpn_port_association -from openstack.network.v2 import bgpvpn_router_association as \ - _bgpvpn_router_association +from openstack.network.v2 import ( + bgpvpn_network_association as _bgpvpn_network_association, +) +from openstack.network.v2 import ( + bgpvpn_port_association as _bgpvpn_port_association, +) +from openstack.network.v2 import ( + bgpvpn_router_association as _bgpvpn_router_association, +) from openstack.network.v2 import extension from openstack.network.v2 import firewall_group as _firewall_group from openstack.network.v2 import firewall_policy as _firewall_policy @@ -47,20 +51,25 @@ from openstack.network.v2 import metering_label_rule as _metering_label_rule from openstack.network.v2 import ndp_proxy as _ndp_proxy from openstack.network.v2 import network as _network from openstack.network.v2 import network_ip_availability -from openstack.network.v2 import network_segment_range as \ - _network_segment_range +from openstack.network.v2 import ( + network_segment_range as _network_segment_range, +) from openstack.network.v2 import pool as _pool from openstack.network.v2 import pool_member as _pool_member from openstack.network.v2 import port as _port from openstack.network.v2 import port_forwarding as _port_forwarding -from openstack.network.v2 import qos_bandwidth_limit_rule as \ - _qos_bandwidth_limit_rule -from openstack.network.v2 import qos_dscp_marking_rule as \ - _qos_dscp_marking_rule -from openstack.network.v2 import qos_minimum_bandwidth_rule as \ - _qos_minimum_bandwidth_rule -from openstack.network.v2 import qos_minimum_packet_rate_rule as \ - _qos_minimum_packet_rate_rule +from openstack.network.v2 import ( + qos_bandwidth_limit_rule as _qos_bandwidth_limit_rule, +) +from openstack.network.v2 import ( + qos_dscp_marking_rule as _qos_dscp_marking_rule, +) +from openstack.network.v2 import ( + qos_minimum_bandwidth_rule as _qos_minimum_bandwidth_rule, +) +from openstack.network.v2 import ( + qos_minimum_packet_rate_rule as _qos_minimum_packet_rate_rule, +) from openstack.network.v2 import qos_policy as _qos_policy from openstack.network.v2 import qos_rule_type as _qos_rule_type from openstack.network.v2 import quota as _quota @@ -79,8 +88,9 @@ from openstack.network.v2 import trunk as _trunk from openstack.network.v2 import vpn_endpoint_group as _vpn_endpoint_group from openstack.network.v2 import vpn_ike_policy as _ike_policy from openstack.network.v2 import vpn_ipsec_policy as _ipsec_policy -from openstack.network.v2 import vpn_ipsec_site_connection as \ - _ipsec_site_connection +from openstack.network.v2 import ( + vpn_ipsec_site_connection as _ipsec_site_connection, +) from openstack.network.v2 import vpn_service as _vpn_service from openstack import proxy @@ -92,18 +102,22 @@ class Proxy(proxy.Proxy, Generic[T]): "address_group": _address_group.AddressGroup, "address_scope": _address_scope.AddressScope, "agent": _agent.Agent, - "auto_allocated_topology": - _auto_allocated_topology.AutoAllocatedTopology, + "auto_allocated_topology": ( + _auto_allocated_topology.AutoAllocatedTopology + ), "availability_zone": availability_zone.AvailabilityZone, "bgp_peer": _bgp_peer.BgpPeer, "bgp_speaker": _bgp_speaker.BgpSpeaker, "bgpvpn": _bgpvpn.BgpVpn, - "bgpvpn_network_association": - _bgpvpn_network_association.BgpVpnNetworkAssociation, - "bgpvpn_port_association": - _bgpvpn_port_association.BgpVpnPortAssociation, - "bgpvpn_router_association": - _bgpvpn_router_association.BgpVpnRouterAssociation, + "bgpvpn_network_association": ( + _bgpvpn_network_association.BgpVpnNetworkAssociation + ), + "bgpvpn_port_association": ( + _bgpvpn_port_association.BgpVpnPortAssociation + ), + "bgpvpn_router_association": ( + _bgpvpn_router_association.BgpVpnRouterAssociation + ), "extension": extension.Extension, "firewall_group": _firewall_group.FirewallGroup, "firewall_policy": _firewall_policy.FirewallPolicy, @@ -120,20 +134,24 @@ class Proxy(proxy.Proxy, Generic[T]): "metering_label_rule": _metering_label_rule.MeteringLabelRule, "ndp_proxy": _ndp_proxy.NDPProxy, "network": _network.Network, - "network_ip_availability": - network_ip_availability.NetworkIPAvailability, + "network_ip_availability": ( + network_ip_availability.NetworkIPAvailability + ), "network_segment_range": _network_segment_range.NetworkSegmentRange, "pool": _pool.Pool, "pool_member": _pool_member.PoolMember, "port": _port.Port, "port_forwarding": _port_forwarding.PortForwarding, - "qos_bandwidth_limit_rule": - _qos_bandwidth_limit_rule.QoSBandwidthLimitRule, + "qos_bandwidth_limit_rule": ( + _qos_bandwidth_limit_rule.QoSBandwidthLimitRule + ), "qos_dscp_marking_rule": _qos_dscp_marking_rule.QoSDSCPMarkingRule, - "qos_minimum_bandwidth_rule": - _qos_minimum_bandwidth_rule.QoSMinimumBandwidthRule, - "qos_minimum_packet_rate_rule": - _qos_minimum_packet_rate_rule.QoSMinimumPacketRateRule, + "qos_minimum_bandwidth_rule": ( + _qos_minimum_bandwidth_rule.QoSMinimumBandwidthRule + ), + "qos_minimum_packet_rate_rule": ( + _qos_minimum_packet_rate_rule.QoSMinimumPacketRateRule + ), "qos_policy": _qos_policy.QoSPolicy, "qos_rule_type": _qos_rule_type.QoSRuleType, "quota": _quota.Quota, @@ -152,20 +170,33 @@ class Proxy(proxy.Proxy, Generic[T]): "vpn_endpoint_group": _vpn_endpoint_group.VpnEndpointGroup, "vpn_ike_policy": _ike_policy.VpnIkePolicy, "vpn_ipsec_policy": _ipsec_policy.VpnIpsecPolicy, - "vpn_ipsec_site_connection": - _ipsec_site_connection.VpnIPSecSiteConnection, + "vpn_ipsec_site_connection": ( + _ipsec_site_connection.VpnIPSecSiteConnection + ), "vpn_service": _vpn_service.VpnService, } @proxy._check_resource(strict=False) - def _update(self, resource_type: Type[T], value, base_path=None, - if_revision=None, **attrs) -> T: + def _update( + self, + resource_type: Type[T], + value, + base_path=None, + if_revision=None, + **attrs, + ) -> T: res = self._get_resource(resource_type, value, **attrs) return res.commit(self, base_path=base_path, if_revision=if_revision) @proxy._check_resource(strict=False) - def _delete(self, resource_type: Type[T], value, ignore_missing=True, - if_revision=None, **attrs) -> Optional[T]: + def _delete( + self, + resource_type: Type[T], + value, + ignore_missing=True, + if_revision=None, + **attrs, + ) -> Optional[T]: res = self._get_resource(resource_type, value, **attrs) try: @@ -204,8 +235,11 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: ``None`` """ - self._delete(_address_group.AddressGroup, address_group, - ignore_missing=ignore_missing) + self._delete( + _address_group.AddressGroup, + address_group, + ignore_missing=ignore_missing, + ) def find_address_group(self, name_or_id, ignore_missing=True, **query): """Find a single address group @@ -221,8 +255,12 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: One :class:`~openstack.network.v2.address_group.AddressGroup` or None """ - return self._find(_address_group.AddressGroup, name_or_id, - ignore_missing=ignore_missing, **query) + return self._find( + _address_group.AddressGroup, + name_or_id, + ignore_missing=ignore_missing, + **query, + ) def get_address_group(self, address_group): """Get a single address group @@ -251,8 +289,9 @@ class Proxy(proxy.Proxy, Generic[T]): """ return self._list(_address_group.AddressGroup, **query) - def update_address_group(self, address_group, - **attrs) -> _address_group.AddressGroup: + def update_address_group( + self, address_group, **attrs + ) -> _address_group.AddressGroup: """Update an address group :param address_group: Either the ID of an address group or a @@ -263,8 +302,9 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: The updated address group :rtype: :class:`~openstack.network.v2.address_group.AddressGroup` """ - return self._update(_address_group.AddressGroup, address_group, - **attrs) + return self._update( + _address_group.AddressGroup, address_group, **attrs + ) def add_addresses_to_address_group(self, address_group, addresses): """Add addresses to a address group @@ -317,8 +357,11 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: ``None`` """ - self._delete(_address_scope.AddressScope, address_scope, - ignore_missing=ignore_missing) + self._delete( + _address_scope.AddressScope, + address_scope, + ignore_missing=ignore_missing, + ) def find_address_scope(self, name_or_id, ignore_missing=True, **query): """Find a single address scope @@ -334,8 +377,12 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: One :class:`~openstack.network.v2.address_scope.AddressScope` or None """ - return self._find(_address_scope.AddressScope, name_or_id, - ignore_missing=ignore_missing, **query) + return self._find( + _address_scope.AddressScope, + name_or_id, + ignore_missing=ignore_missing, + **query, + ) def get_address_scope(self, address_scope): """Get a single address scope @@ -376,8 +423,9 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: The updated address scope :rtype: :class:`~openstack.network.v2.address_scope.AddressScope` """ - return self._update(_address_scope.AddressScope, address_scope, - **attrs) + return self._update( + _address_scope.AddressScope, address_scope, **attrs + ) def agents(self, **query): """Return a generator of network agents @@ -451,8 +499,9 @@ class Proxy(proxy.Proxy, Generic[T]): :return: A generator of networks """ agent_obj = self._get_resource(_agent.Agent, agent) - return self._list(_network.DHCPAgentHostingNetwork, - agent_id=agent_obj.id, **query) + return self._list( + _network.DHCPAgentHostingNetwork, agent_id=agent_obj.id, **query + ) def add_dhcp_agent_to_network(self, agent, network): """Add a DHCP Agent to a network @@ -488,8 +537,9 @@ class Proxy(proxy.Proxy, Generic[T]): :return: A generator of hosted DHCP agents """ net = self._get_resource(_network.Network, network) - return self._list(_agent.NetworkHostingDHCPAgent, network_id=net.id, - **query) + return self._list( + _agent.NetworkHostingDHCPAgent, network_id=net.id, **query + ) def get_auto_allocated_topology(self, project=None): """Get the auto-allocated topology of a given tenant @@ -505,11 +555,13 @@ class Proxy(proxy.Proxy, Generic[T]): # If project option is not given, grab project id from session if project is None: project = self.get_project_id() - return self._get(_auto_allocated_topology.AutoAllocatedTopology, - project) + return self._get( + _auto_allocated_topology.AutoAllocatedTopology, project + ) - def delete_auto_allocated_topology(self, project=None, - ignore_missing=False): + def delete_auto_allocated_topology( + self, project=None, ignore_missing=False + ): """Delete auto-allocated topology :param project: @@ -526,8 +578,11 @@ class Proxy(proxy.Proxy, Generic[T]): # If project option is not given, grab project id from session if project is None: project = self.get_project_id() - self._delete(_auto_allocated_topology.AutoAllocatedTopology, - project, ignore_missing=ignore_missing) + self._delete( + _auto_allocated_topology.AutoAllocatedTopology, + project, + ignore_missing=ignore_missing, + ) def validate_auto_allocated_topology(self, project=None): """Validate the resources for auto allocation @@ -543,8 +598,11 @@ class Proxy(proxy.Proxy, Generic[T]): # If project option is not given, grab project id from session if project is None: project = self.get_project_id() - return self._get(_auto_allocated_topology.ValidateTopology, - project=project, requires_id=False) + return self._get( + _auto_allocated_topology.ValidateTopology, + project=project, + requires_id=False, + ) def availability_zones(self, **query): """Return a generator of availability zones @@ -570,9 +628,13 @@ class Proxy(proxy.Proxy, Generic[T]): self._delete(_bgp_peer.BgpPeer, peer, ignore_missing=ignore_missing) def find_bgp_peer(self, name_or_id, ignore_missing=True, **query): - """"Find a single BGP Peer""" - return self._find(_bgp_peer.BgpPeer, name_or_id, - ignore_missing=ignore_missing, **query) + """ "Find a single BGP Peer""" + return self._find( + _bgp_peer.BgpPeer, + name_or_id, + ignore_missing=ignore_missing, + **query, + ) def get_bgp_peer(self, peer): """Get a signle BGP Peer""" @@ -592,13 +654,18 @@ class Proxy(proxy.Proxy, Generic[T]): def delete_bgp_speaker(self, speaker, ignore_missing=True): """Delete a BGP Speaker""" - self._delete(_bgp_speaker.BgpSpeaker, speaker, - ignore_missing=ignore_missing) + self._delete( + _bgp_speaker.BgpSpeaker, speaker, ignore_missing=ignore_missing + ) def find_bgp_speaker(self, name_or_id, ignore_missing=True, **query): - """"Find a single BGP Peer""" - return self._find(_bgp_speaker.BgpSpeaker, name_or_id, - ignore_missing=ignore_missing, **query) + """ "Find a single BGP Peer""" + return self._find( + _bgp_speaker.BgpSpeaker, + name_or_id, + ignore_missing=ignore_missing, + **query, + ) def get_bgp_speaker(self, speaker): """Get a signle BGP Speaker""" @@ -689,7 +756,7 @@ class Proxy(proxy.Proxy, Generic[T]): self._delete(_bgpvpn.BgpVpn, bgpvpn, ignore_missing=ignore_missing) def find_bgpvpn(self, name_or_id, ignore_missing=True, **query): - """"Find a single BGPVPN + """ "Find a single BGPVPN :param name_or_id: The name or ID of a BGPVPN. :param bool ignore_missing: When set to ``False`` @@ -702,8 +769,9 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: One :class:`~openstack.network.v2.bgpvpn.BGPVPN` or None """ - return self._find(_bgpvpn.BgpVpn, name_or_id, - ignore_missing=ignore_missing, **query) + return self._find( + _bgpvpn.BgpVpn, name_or_id, ignore_missing=ignore_missing, **query + ) def get_bgpvpn(self, bgpvpn): """Get a signle BGPVPN @@ -758,10 +826,13 @@ class Proxy(proxy.Proxy, Generic[T]): bgpvpn_res = self._get_resource(_bgpvpn.BgpVpn, bgpvpn) return self._create( _bgpvpn_network_association.BgpVpnNetworkAssociation, - bgpvpn_id=bgpvpn_res.id, **attrs) + bgpvpn_id=bgpvpn_res.id, + **attrs, + ) - def delete_bgpvpn_network_association(self, bgpvpn, net_association, - ignore_missing=True): + def delete_bgpvpn_network_association( + self, bgpvpn, net_association, ignore_missing=True + ): """Delete a BGPVPN Network Association :param bgpvpn: The value can be either the ID of a bgpvpn or @@ -781,8 +852,10 @@ class Proxy(proxy.Proxy, Generic[T]): bgpvpn_res = self._get_resource(_bgpvpn.BgpVpn, bgpvpn) self._delete( _bgpvpn_network_association.BgpVpnNetworkAssociation, - net_association, ignore_missing=ignore_missing, - bgpvpn_id=bgpvpn_res.id) + net_association, + ignore_missing=ignore_missing, + bgpvpn_id=bgpvpn_res.id, + ) def get_bgpvpn_network_association(self, bgpvpn, net_association): """Get a signle BGPVPN Network Association @@ -802,7 +875,9 @@ class Proxy(proxy.Proxy, Generic[T]): bgpvpn_res = self._get_resource(_bgpvpn.BgpVpn, bgpvpn) return self._get( _bgpvpn_network_association.BgpVpnNetworkAssociation, - net_association, bgpvpn_id=bgpvpn_res.id) + net_association, + bgpvpn_id=bgpvpn_res.id, + ) def bgpvpn_network_associations(self, bgpvpn, **query): """Return a generator of BGP VPN Network Associations @@ -819,7 +894,9 @@ class Proxy(proxy.Proxy, Generic[T]): bgpvpn_res = self._get_resource(_bgpvpn.BgpVpn, bgpvpn) return self._list( _bgpvpn_network_association.BgpVpnNetworkAssociation, - bgpvpn_id=bgpvpn_res.id, **query) + bgpvpn_id=bgpvpn_res.id, + **query, + ) def create_bgpvpn_port_association(self, bgpvpn, **attrs): """Create a new BGPVPN Port Association @@ -838,10 +915,13 @@ class Proxy(proxy.Proxy, Generic[T]): bgpvpn_res = self._get_resource(_bgpvpn.BgpVpn, bgpvpn) return self._create( _bgpvpn_port_association.BgpVpnPortAssociation, - bgpvpn_id=bgpvpn_res.id, **attrs) + bgpvpn_id=bgpvpn_res.id, + **attrs, + ) - def delete_bgpvpn_port_association(self, bgpvpn, port_association, - ignore_missing=True): + def delete_bgpvpn_port_association( + self, bgpvpn, port_association, ignore_missing=True + ): """Delete a BGPVPN Port Association :param bgpvpn: The value can be either the ID of a bgpvpn or @@ -861,12 +941,15 @@ class Proxy(proxy.Proxy, Generic[T]): bgpvpn_res = self._get_resource(_bgpvpn.BgpVpn, bgpvpn) self._delete( _bgpvpn_port_association.BgpVpnPortAssociation, - port_association, ignore_missing=ignore_missing, - bgpvpn_id=bgpvpn_res.id) + port_association, + ignore_missing=ignore_missing, + bgpvpn_id=bgpvpn_res.id, + ) - def find_bgpvpn_port_association(self, name_or_id, bgpvpn_id, - ignore_missing=True, **query): - """"Find a single BGPVPN Port Association + def find_bgpvpn_port_association( + self, name_or_id, bgpvpn_id, ignore_missing=True, **query + ): + """ "Find a single BGPVPN Port Association :param name_or_id: The name or ID of a BgpVpnNetworkAssociation. :param bgpvpn_id: The value can be the ID of a BGPVPN. @@ -883,7 +966,10 @@ class Proxy(proxy.Proxy, Generic[T]): return self._find( _bgpvpn_port_association.BgpVpnPortAssociation, name_or_id, - ignore_missing=ignore_missing, bgpvpn_id=bgpvpn_id, **query) + ignore_missing=ignore_missing, + bgpvpn_id=bgpvpn_id, + **query, + ) def get_bgpvpn_port_association(self, bgpvpn, port_association): """Get a signle BGPVPN Port Association @@ -903,10 +989,13 @@ class Proxy(proxy.Proxy, Generic[T]): bgpvpn_res = self._get_resource(_bgpvpn.BgpVpn, bgpvpn) return self._get( _bgpvpn_port_association.BgpVpnPortAssociation, - port_association, bgpvpn_id=bgpvpn_res.id) + port_association, + bgpvpn_id=bgpvpn_res.id, + ) - def update_bgpvpn_port_association(self, bgpvpn, port_association, - **attrs): + def update_bgpvpn_port_association( + self, bgpvpn, port_association, **attrs + ): """Update a BPGPN Port Association :param bgpvpn: Either the ID of a BGPVPN or a @@ -924,7 +1013,10 @@ class Proxy(proxy.Proxy, Generic[T]): bgpvpn_res = self._get_resource(_bgpvpn.BgpVpn, bgpvpn) return self._update( _bgpvpn_port_association.BgpVpnPortAssociation, - port_association, bgpvpn_id=bgpvpn_res.id, **attrs) + port_association, + bgpvpn_id=bgpvpn_res.id, + **attrs, + ) def bgpvpn_port_associations(self, bgpvpn, **query): """Return a generator of BGP VPN Port Associations @@ -941,7 +1033,9 @@ class Proxy(proxy.Proxy, Generic[T]): bgpvpn_res = self._get_resource(_bgpvpn.BgpVpn, bgpvpn) return self._list( _bgpvpn_port_association.BgpVpnPortAssociation, - bgpvpn_id=bgpvpn_res.id, **query) + bgpvpn_id=bgpvpn_res.id, + **query, + ) def create_bgpvpn_router_association(self, bgpvpn, **attrs): """Create a new BGPVPN Router Association @@ -960,10 +1054,13 @@ class Proxy(proxy.Proxy, Generic[T]): bgpvpn_res = self._get_resource(_bgpvpn.BgpVpn, bgpvpn) return self._create( _bgpvpn_router_association.BgpVpnRouterAssociation, - bgpvpn_id=bgpvpn_res.id, **attrs) + bgpvpn_id=bgpvpn_res.id, + **attrs, + ) - def delete_bgpvpn_router_association(self, bgpvpn, router_association, - ignore_missing=True): + def delete_bgpvpn_router_association( + self, bgpvpn, router_association, ignore_missing=True + ): """Delete a BGPVPN Router Association :param bgpvpn: The value can be either the ID of a bgpvpn or @@ -983,8 +1080,10 @@ class Proxy(proxy.Proxy, Generic[T]): bgpvpn_res = self._get_resource(_bgpvpn.BgpVpn, bgpvpn) self._delete( _bgpvpn_router_association.BgpVpnRouterAssociation, - router_association, ignore_missing=ignore_missing, - bgpvpn_id=bgpvpn_res.id) + router_association, + ignore_missing=ignore_missing, + bgpvpn_id=bgpvpn_res.id, + ) def get_bgpvpn_router_association(self, bgpvpn, router_association): """Get a signle BGPVPN Router Association @@ -1004,10 +1103,13 @@ class Proxy(proxy.Proxy, Generic[T]): bgpvpn_res = self._get_resource(_bgpvpn.BgpVpn, bgpvpn) return self._get( _bgpvpn_router_association.BgpVpnRouterAssociation, - router_association, bgpvpn_id=bgpvpn_res.id) + router_association, + bgpvpn_id=bgpvpn_res.id, + ) - def update_bgpvpn_router_association(self, bgpvpn, - router_association, **attrs): + def update_bgpvpn_router_association( + self, bgpvpn, router_association, **attrs + ): """Update a BPGPN Router Association :param dict query: Optional query parameters to be sent to limit @@ -1020,7 +1122,10 @@ class Proxy(proxy.Proxy, Generic[T]): bgpvpn_res = self._get_resource(_bgpvpn.BgpVpn, bgpvpn) return self._update( _bgpvpn_router_association.BgpVpnRouterAssociation, - router_association, bgpvpn_id=bgpvpn_res.id, **attrs) + router_association, + bgpvpn_id=bgpvpn_res.id, + **attrs, + ) def bgpvpn_router_associations(self, bgpvpn, **query): """Return a generator of BGP VPN router Associations @@ -1037,7 +1142,9 @@ class Proxy(proxy.Proxy, Generic[T]): bgpvpn_res = self._get_resource(_bgpvpn.BgpVpn, bgpvpn) return self._list( _bgpvpn_router_association.BgpVpnRouterAssociation, - bgpvpn_id=bgpvpn_res.id, **query) + bgpvpn_id=bgpvpn_res.id, + **query, + ) def find_extension(self, name_or_id, ignore_missing=True, **query): """Find a single extension @@ -1053,8 +1160,12 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: One :class:`~openstack.network.v2.extension.Extension` or None """ - return self._find(extension.Extension, name_or_id, - ignore_missing=ignore_missing, **query) + return self._find( + extension.Extension, + name_or_id, + ignore_missing=ignore_missing, + **query, + ) def extensions(self, **query): """Return a generator of extensions @@ -1109,8 +1220,9 @@ class Proxy(proxy.Proxy, Generic[T]): underlying methods. such as query filters. :returns: One :class:`~openstack.network.v2.flavor.Flavor` or None """ - return self._find(_flavor.Flavor, name_or_id, - ignore_missing=ignore_missing, **query) + return self._find( + _flavor.Flavor, name_or_id, ignore_missing=ignore_missing, **query + ) def get_flavor(self, flavor): """Get a single network service flavor @@ -1169,12 +1281,15 @@ class Proxy(proxy.Proxy, Generic[T]): """ flavor = self._get_resource(_flavor.Flavor, flavor) service_profile = self._get_resource( - _service_profile.ServiceProfile, service_profile) + _service_profile.ServiceProfile, service_profile + ) return flavor.associate_flavor_with_service_profile( - self, service_profile.id) + self, service_profile.id + ) def disassociate_flavor_from_service_profile( - self, flavor, service_profile): + self, flavor, service_profile + ): """Disassociate network flavor from service profile. :param flavor: @@ -1188,9 +1303,11 @@ class Proxy(proxy.Proxy, Generic[T]): """ flavor = self._get_resource(_flavor.Flavor, flavor) service_profile = self._get_resource( - _service_profile.ServiceProfile, service_profile) + _service_profile.ServiceProfile, service_profile + ) return flavor.disassociate_flavor_from_service_profile( - self, service_profile.id) + self, service_profile.id + ) def create_local_ip(self, **attrs): """Create a new local ip from attributes @@ -1220,8 +1337,12 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: ``None`` """ - self._delete(_local_ip.LocalIP, local_ip, - ignore_missing=ignore_missing, if_revision=if_revision) + self._delete( + _local_ip.LocalIP, + local_ip, + ignore_missing=ignore_missing, + if_revision=if_revision, + ) def find_local_ip(self, name_or_id, ignore_missing=True, **query): """Find a local IP @@ -1237,8 +1358,12 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: One :class:`~openstack.network.v2.local_ip.LocalIP` or None """ - return self._find(_local_ip.LocalIP, name_or_id, - ignore_missing=ignore_missing, **query) + return self._find( + _local_ip.LocalIP, + name_or_id, + ignore_missing=ignore_missing, + **query, + ) def get_local_ip(self, local_ip): """Get a single local ip @@ -1286,8 +1411,9 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: The updated ip :rtype: :class:`~openstack.network.v2.local_ip.LocalIP` """ - return self._update(_local_ip.LocalIP, local_ip, - if_revision=if_revision, **attrs) + return self._update( + _local_ip.LocalIP, local_ip, if_revision=if_revision, **attrs + ) def create_local_ip_association(self, local_ip, **attrs): """Create a new local ip association from attributes @@ -1305,11 +1431,15 @@ class Proxy(proxy.Proxy, Generic[T]): :class:`~openstack.network.v2.local_ip_association.LocalIPAssociation` """ local_ip = self._get_resource(_local_ip.LocalIP, local_ip) - return self._create(_local_ip_association.LocalIPAssociation, - local_ip_id=local_ip.id, **attrs) + return self._create( + _local_ip_association.LocalIPAssociation, + local_ip_id=local_ip.id, + **attrs, + ) - def delete_local_ip_association(self, local_ip, fixed_port_id, - ignore_missing=True, if_revision=None): + def delete_local_ip_association( + self, local_ip, fixed_port_id, ignore_missing=True, if_revision=None + ): """Delete a local ip association :param local_ip: The value can be the ID of a Local IP or a @@ -1330,12 +1460,17 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: ``None`` """ local_ip = self._get_resource(_local_ip.LocalIP, local_ip) - self._delete(_local_ip_association.LocalIPAssociation, fixed_port_id, - local_ip_id=local_ip.id, - ignore_missing=ignore_missing, if_revision=if_revision) + self._delete( + _local_ip_association.LocalIPAssociation, + fixed_port_id, + local_ip_id=local_ip.id, + ignore_missing=ignore_missing, + if_revision=if_revision, + ) - def find_local_ip_association(self, name_or_id, local_ip, - ignore_missing=True, **query): + def find_local_ip_association( + self, name_or_id, local_ip, ignore_missing=True, **query + ): """Find a local ip association :param name_or_id: The name or ID of local ip association. @@ -1354,9 +1489,13 @@ class Proxy(proxy.Proxy, Generic[T]): or None """ local_ip = self._get_resource(_local_ip.LocalIP, local_ip) - return self._find(_local_ip_association.LocalIPAssociation, name_or_id, - local_ip_id=local_ip.id, - ignore_missing=ignore_missing, **query) + return self._find( + _local_ip_association.LocalIPAssociation, + name_or_id, + local_ip_id=local_ip.id, + ignore_missing=ignore_missing, + **query, + ) def get_local_ip_association(self, local_ip_association, local_ip): """Get a single local ip association @@ -1375,9 +1514,11 @@ class Proxy(proxy.Proxy, Generic[T]): when no resource can be found. """ local_ip = self._get_resource(_local_ip.LocalIP, local_ip) - return self._get(_local_ip_association.LocalIPAssociation, - local_ip_association, - local_ip_id=local_ip.id) + return self._get( + _local_ip_association.LocalIPAssociation, + local_ip_association, + local_ip_id=local_ip.id, + ) def local_ip_associations(self, local_ip, **query): """Return a generator of local ip associations @@ -1398,8 +1539,11 @@ class Proxy(proxy.Proxy, Generic[T]): :class:`~openstack.network.v2.local_ip_association.LocalIPAssociation` """ local_ip = self._get_resource(_local_ip.LocalIP, local_ip) - return self._list(_local_ip_association.LocalIPAssociation, - local_ip_id=local_ip.id, **query) + return self._list( + _local_ip_association.LocalIPAssociation, + local_ip_id=local_ip.id, + **query, + ) def create_ip(self, **attrs): """Create a new floating ip from attributes @@ -1429,8 +1573,12 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: ``None`` """ - self._delete(_floating_ip.FloatingIP, floating_ip, - ignore_missing=ignore_missing, if_revision=if_revision) + self._delete( + _floating_ip.FloatingIP, + floating_ip, + ignore_missing=ignore_missing, + if_revision=if_revision, + ) def find_available_ip(self): """Find an available IP @@ -1454,8 +1602,12 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: One :class:`~openstack.network.v2.floating_ip.FloatingIP` or None """ - return self._find(_floating_ip.FloatingIP, name_or_id, - ignore_missing=ignore_missing, **query) + return self._find( + _floating_ip.FloatingIP, + name_or_id, + ignore_missing=ignore_missing, + **query, + ) def get_ip(self, floating_ip): """Get a single floating ip @@ -1509,8 +1661,12 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: The updated ip :rtype: :class:`~openstack.network.v2.floating_ip.FloatingIP` """ - return self._update(_floating_ip.FloatingIP, floating_ip, - if_revision=if_revision, **attrs) + return self._update( + _floating_ip.FloatingIP, + floating_ip, + if_revision=if_revision, + **attrs, + ) def create_port_forwarding(self, **attrs): """Create a new floating ip port forwarding from attributes @@ -1540,11 +1696,15 @@ class Proxy(proxy.Proxy, Generic[T]): when no resource can be found. """ floating_ip = self._get_resource(_floating_ip.FloatingIP, floating_ip) - return self._get(_port_forwarding.PortForwarding, port_forwarding, - floatingip_id=floating_ip.id) + return self._get( + _port_forwarding.PortForwarding, + port_forwarding, + floatingip_id=floating_ip.id, + ) - def find_port_forwarding(self, pf_id, floating_ip, ignore_missing=True, - **query): + def find_port_forwarding( + self, pf_id, floating_ip, ignore_missing=True, **query + ): """Find a single port forwarding :param pf_id: The ID of a port forwarding. @@ -1563,12 +1723,17 @@ class Proxy(proxy.Proxy, Generic[T]): or None """ floating_ip = self._get_resource(_floating_ip.FloatingIP, floating_ip) - return self._find(_port_forwarding.PortForwarding, pf_id, - floatingip_id=floating_ip.id, - ignore_missing=ignore_missing, **query) + return self._find( + _port_forwarding.PortForwarding, + pf_id, + floatingip_id=floating_ip.id, + ignore_missing=ignore_missing, + **query, + ) - def delete_port_forwarding(self, port_forwarding, floating_ip, - ignore_missing=True): + def delete_port_forwarding( + self, port_forwarding, floating_ip, ignore_missing=True + ): """Delete a port forwarding :param port_forwarding: The value can be the ID of a port forwarding @@ -1586,9 +1751,12 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: ``None`` """ fip = self._get_resource(_floating_ip.FloatingIP, floating_ip) - self._delete(_port_forwarding.PortForwarding, port_forwarding, - floatingip_id=fip.id, - ignore_missing=ignore_missing) + self._delete( + _port_forwarding.PortForwarding, + port_forwarding, + floatingip_id=fip.id, + ignore_missing=ignore_missing, + ) def port_forwardings(self, floating_ip, **query): """Return a generator of port forwardings @@ -1607,8 +1775,9 @@ class Proxy(proxy.Proxy, Generic[T]): :rtype: :class:`~openstack.network.v2.port_forwarding.PortForwarding` """ fip = self._get_resource(_floating_ip.FloatingIP, floating_ip) - return self._list(_port_forwarding.PortForwarding, - floatingip_id=fip.id, **query) + return self._list( + _port_forwarding.PortForwarding, floatingip_id=fip.id, **query + ) def update_port_forwarding(self, port_forwarding, floating_ip, **attrs): """Update a port forwarding @@ -1626,8 +1795,12 @@ class Proxy(proxy.Proxy, Generic[T]): :rtype: :class:`~openstack.network.v2.port_forwarding.PortForwarding` """ fip = self._get_resource(_floating_ip.FloatingIP, floating_ip) - return self._update(_port_forwarding.PortForwarding, - port_forwarding, floatingip_id=fip.id, **attrs) + return self._update( + _port_forwarding.PortForwarding, + port_forwarding, + floatingip_id=fip.id, + **attrs, + ) def create_health_monitor(self, **attrs): """Create a new health monitor from attributes @@ -1656,8 +1829,11 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: ``None`` """ - self._delete(_health_monitor.HealthMonitor, health_monitor, - ignore_missing=ignore_missing) + self._delete( + _health_monitor.HealthMonitor, + health_monitor, + ignore_missing=ignore_missing, + ) def find_health_monitor(self, name_or_id, ignore_missing=True, **query): """Find a single health monitor @@ -1674,8 +1850,12 @@ class Proxy(proxy.Proxy, Generic[T]): :class:`~openstack.network.v2.health_monitor.HealthMonitor` or None """ - return self._find(_health_monitor.HealthMonitor, - name_or_id, ignore_missing=ignore_missing, **query) + return self._find( + _health_monitor.HealthMonitor, + name_or_id, + ignore_missing=ignore_missing, + **query, + ) def get_health_monitor(self, health_monitor): """Get a single health monitor @@ -1731,8 +1911,9 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: The updated health monitor :rtype: :class:`~openstack.network.v2.health_monitor.HealthMonitor` """ - return self._update(_health_monitor.HealthMonitor, health_monitor, - **attrs) + return self._update( + _health_monitor.HealthMonitor, health_monitor, **attrs + ) def create_listener(self, **attrs): """Create a new listener from attributes @@ -1759,8 +1940,9 @@ class Proxy(proxy.Proxy, Generic[T]): :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, **query): """Find a single listener @@ -1775,8 +1957,12 @@ class Proxy(proxy.Proxy, Generic[T]): underlying methods. such as query filters. :returns: One :class:`~openstack.network.v2.listener.Listener` or None """ - return self._find(_listener.Listener, name_or_id, - ignore_missing=ignore_missing, **query) + return self._find( + _listener.Listener, + name_or_id, + ignore_missing=ignore_missing, + **query, + ) def get_listener(self, listener): """Get a single listener @@ -1854,8 +2040,11 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: ``None`` """ - self._delete(_load_balancer.LoadBalancer, load_balancer, - ignore_missing=ignore_missing) + self._delete( + _load_balancer.LoadBalancer, + load_balancer, + ignore_missing=ignore_missing, + ) def find_load_balancer(self, name_or_id, ignore_missing=True, **query): """Find a single load balancer @@ -1871,8 +2060,12 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: One :class:`~openstack.network.v2.load_balancer.LoadBalancer` or None """ - return self._find(_load_balancer.LoadBalancer, name_or_id, - ignore_missing=ignore_missing, **query) + return self._find( + _load_balancer.LoadBalancer, + name_or_id, + ignore_missing=ignore_missing, + **query, + ) def get_load_balancer(self, load_balancer): """Get a single load balancer @@ -1910,8 +2103,9 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: The updated load balancer :rtype: :class:`~openstack.network.v2.load_balancer.LoadBalancer` """ - return self._update(_load_balancer.LoadBalancer, load_balancer, - **attrs) + return self._update( + _load_balancer.LoadBalancer, load_balancer, **attrs + ) def create_metering_label(self, **attrs): """Create a new metering label from attributes @@ -1940,8 +2134,11 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: ``None`` """ - self._delete(_metering_label.MeteringLabel, metering_label, - ignore_missing=ignore_missing) + self._delete( + _metering_label.MeteringLabel, + metering_label, + ignore_missing=ignore_missing, + ) def find_metering_label(self, name_or_id, ignore_missing=True, **query): """Find a single metering label @@ -1958,8 +2155,12 @@ class Proxy(proxy.Proxy, Generic[T]): :class:`~openstack.network.v2.metering_label.MeteringLabel` or None """ - return self._find(_metering_label.MeteringLabel, name_or_id, - ignore_missing=ignore_missing, **query) + return self._find( + _metering_label.MeteringLabel, + name_or_id, + ignore_missing=ignore_missing, + **query, + ) def get_metering_label(self, metering_label): """Get a single metering label @@ -2005,8 +2206,9 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: The updated metering label :rtype: :class:`~openstack.network.v2.metering_label.MeteringLabel` """ - return self._update(_metering_label.MeteringLabel, metering_label, - **attrs) + return self._update( + _metering_label.MeteringLabel, metering_label, **attrs + ) def create_metering_label_rule(self, **attrs): """Create a new metering label rule from attributes @@ -2021,8 +2223,9 @@ class Proxy(proxy.Proxy, Generic[T]): """ return self._create(_metering_label_rule.MeteringLabelRule, **attrs) - def delete_metering_label_rule(self, metering_label_rule, - ignore_missing=True): + def delete_metering_label_rule( + self, metering_label_rule, ignore_missing=True + ): """Delete a metering label rule :param metering_label_rule: @@ -2038,11 +2241,15 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: ``None`` """ - self._delete(_metering_label_rule.MeteringLabelRule, - metering_label_rule, ignore_missing=ignore_missing) + self._delete( + _metering_label_rule.MeteringLabelRule, + metering_label_rule, + ignore_missing=ignore_missing, + ) - def find_metering_label_rule(self, name_or_id, ignore_missing=True, - **query): + def find_metering_label_rule( + self, name_or_id, ignore_missing=True, **query + ): """Find a single metering label rule :param name_or_id: The name or ID of a metering label rule. @@ -2057,8 +2264,12 @@ class Proxy(proxy.Proxy, Generic[T]): :class:`~openstack.network.v2.metering_label_rule.MeteringLabelRule` or None """ - return self._find(_metering_label_rule.MeteringLabelRule, name_or_id, - ignore_missing=ignore_missing, **query) + return self._find( + _metering_label_rule.MeteringLabelRule, + name_or_id, + ignore_missing=ignore_missing, + **query, + ) def get_metering_label_rule(self, metering_label_rule): """Get a single metering label rule @@ -2073,8 +2284,9 @@ class Proxy(proxy.Proxy, Generic[T]): :raises: :class:`~openstack.exceptions.ResourceNotFound` when no resource can be found. """ - return self._get(_metering_label_rule.MeteringLabelRule, - metering_label_rule) + return self._get( + _metering_label_rule.MeteringLabelRule, metering_label_rule + ) def metering_label_rules(self, **query): """Return a generator of metering label rules @@ -2111,8 +2323,11 @@ class Proxy(proxy.Proxy, Generic[T]): :rtype: :class:`~openstack.network.v2.metering_label_rule.MeteringLabelRule` """ - return self._update(_metering_label_rule.MeteringLabelRule, - metering_label_rule, **attrs) + return self._update( + _metering_label_rule.MeteringLabelRule, + metering_label_rule, + **attrs, + ) def create_network(self, **attrs): """Create a new network from attributes @@ -2142,8 +2357,12 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: ``None`` """ - self._delete(_network.Network, network, ignore_missing=ignore_missing, - if_revision=if_revision) + self._delete( + _network.Network, + network, + ignore_missing=ignore_missing, + if_revision=if_revision, + ) def find_network(self, name_or_id, ignore_missing=True, **query): """Find a single network @@ -2158,8 +2377,12 @@ class Proxy(proxy.Proxy, Generic[T]): underlying methods. such as query filters. :returns: One :class:`~openstack.network.v2.network.Network` or None """ - return self._find(_network.Network, name_or_id, - ignore_missing=ignore_missing, **query) + return self._find( + _network.Network, + name_or_id, + ignore_missing=ignore_missing, + **query, + ) def get_network(self, network): """Get a single network @@ -2215,11 +2438,13 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: The updated network :rtype: :class:`~openstack.network.v2.network.Network` """ - return self._update(_network.Network, network, if_revision=if_revision, - **attrs) + return self._update( + _network.Network, network, if_revision=if_revision, **attrs + ) - def find_network_ip_availability(self, name_or_id, ignore_missing=True, - **query): + def find_network_ip_availability( + self, name_or_id, ignore_missing=True, **query + ): """Find IP availability of a network :param name_or_id: The name or ID of a network. @@ -2234,8 +2459,12 @@ class Proxy(proxy.Proxy, Generic[T]): :class:`~openstack.network.v2.network_ip_availability.NetworkIPAvailability` or None """ - return self._find(network_ip_availability.NetworkIPAvailability, - name_or_id, ignore_missing=ignore_missing, **query) + return self._find( + network_ip_availability.NetworkIPAvailability, + name_or_id, + ignore_missing=ignore_missing, + **query, + ) def get_network_ip_availability(self, network): """Get IP availability of a network @@ -2249,8 +2478,9 @@ class Proxy(proxy.Proxy, Generic[T]): :raises: :class:`~openstack.exceptions.ResourceNotFound` when no resource can be found. """ - return self._get(network_ip_availability.NetworkIPAvailability, - network) + return self._get( + network_ip_availability.NetworkIPAvailability, network + ) def network_ip_availabilities(self, **query): """Return a generator of network ip availabilities @@ -2269,8 +2499,9 @@ class Proxy(proxy.Proxy, Generic[T]): :rtype: :class:`~openstack.network.v2.network_ip_availability.NetworkIPAvailability` """ - return self._list(network_ip_availability.NetworkIPAvailability, - **query) + return self._list( + network_ip_availability.NetworkIPAvailability, **query + ) def create_network_segment_range(self, **attrs): """Create a new network segment range from attributes @@ -2284,11 +2515,13 @@ class Proxy(proxy.Proxy, Generic[T]): :rtype: :class:`~openstack.network.v2.network_segment_range.NetworkSegmentRange` """ - return self._create(_network_segment_range.NetworkSegmentRange, - **attrs) + return self._create( + _network_segment_range.NetworkSegmentRange, **attrs + ) - def delete_network_segment_range(self, network_segment_range, - ignore_missing=True): + def delete_network_segment_range( + self, network_segment_range, ignore_missing=True + ): """Delete a network segment range :param network_segment_range: The value can be either the ID of a @@ -2303,11 +2536,15 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: ``None`` """ - self._delete(_network_segment_range.NetworkSegmentRange, - network_segment_range, ignore_missing=ignore_missing) + self._delete( + _network_segment_range.NetworkSegmentRange, + network_segment_range, + ignore_missing=ignore_missing, + ) - def find_network_segment_range(self, name_or_id, ignore_missing=True, - **query): + def find_network_segment_range( + self, name_or_id, ignore_missing=True, **query + ): """Find a single network segment range :param name_or_id: The name or ID of a network segment range. @@ -2322,8 +2559,12 @@ class Proxy(proxy.Proxy, Generic[T]): :class:`~openstack.network.v2.network_segment_range.NetworkSegmentRange` or None """ - return self._find(_network_segment_range.NetworkSegmentRange, - name_or_id, ignore_missing=ignore_missing, **query) + return self._find( + _network_segment_range.NetworkSegmentRange, + name_or_id, + ignore_missing=ignore_missing, + **query, + ) def get_network_segment_range(self, network_segment_range): """Get a single network segment range @@ -2338,8 +2579,9 @@ class Proxy(proxy.Proxy, Generic[T]): :raises: :class:`~openstack.exceptions.ResourceNotFound` when no resource can be found. """ - return self._get(_network_segment_range.NetworkSegmentRange, - network_segment_range) + return self._get( + _network_segment_range.NetworkSegmentRange, network_segment_range + ) def network_segment_ranges(self, **query): """Return a generator of network segment ranges @@ -2386,8 +2628,11 @@ class Proxy(proxy.Proxy, Generic[T]): :rtype: :class:`~openstack.network.v2._network_segment_range.NetworkSegmentRange` """ - return self._update(_network_segment_range.NetworkSegmentRange, - network_segment_range, **attrs) + return self._update( + _network_segment_range.NetworkSegmentRange, + network_segment_range, + **attrs, + ) def create_pool(self, **attrs): """Create a new pool from attributes @@ -2429,8 +2674,9 @@ class Proxy(proxy.Proxy, Generic[T]): underlying methods. such as query filters. :returns: One :class:`~openstack.network.v2.pool.Pool` or None """ - return self._find(_pool.Pool, name_or_id, - ignore_missing=ignore_missing, **query) + return self._find( + _pool.Pool, name_or_id, ignore_missing=ignore_missing, **query + ) def get_pool(self, pool): """Get a single pool @@ -2497,8 +2743,9 @@ class Proxy(proxy.Proxy, Generic[T]): :rtype: :class:`~openstack.network.v2.pool_member.PoolMember` """ poolobj = self._get_resource(_pool.Pool, pool) - return self._create(_pool_member.PoolMember, pool_id=poolobj.id, - **attrs) + return self._create( + _pool_member.PoolMember, pool_id=poolobj.id, **attrs + ) def delete_pool_member(self, pool_member, pool, ignore_missing=True): """Delete a pool member @@ -2518,8 +2765,12 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: ``None`` """ poolobj = self._get_resource(_pool.Pool, pool) - self._delete(_pool_member.PoolMember, pool_member, - ignore_missing=ignore_missing, pool_id=poolobj.id) + self._delete( + _pool_member.PoolMember, + pool_member, + ignore_missing=ignore_missing, + pool_id=poolobj.id, + ) def find_pool_member(self, name_or_id, pool, ignore_missing=True, **query): """Find a single pool member @@ -2539,9 +2790,13 @@ class Proxy(proxy.Proxy, Generic[T]): or None """ poolobj = self._get_resource(_pool.Pool, pool) - return self._find(_pool_member.PoolMember, name_or_id, - ignore_missing=ignore_missing, pool_id=poolobj.id, - **query) + return self._find( + _pool_member.PoolMember, + name_or_id, + ignore_missing=ignore_missing, + pool_id=poolobj.id, + **query, + ) def get_pool_member(self, pool_member, pool): """Get a single pool member @@ -2558,8 +2813,9 @@ class Proxy(proxy.Proxy, Generic[T]): when no resource can be found. """ poolobj = self._get_resource(_pool.Pool, pool) - return self._get(_pool_member.PoolMember, pool_member, - pool_id=poolobj.id) + return self._get( + _pool_member.PoolMember, pool_member, pool_id=poolobj.id + ) def pool_members(self, pool, **query): """Return a generator of pool members @@ -2604,8 +2860,9 @@ class Proxy(proxy.Proxy, Generic[T]): :rtype: :class:`~openstack.network.v2.pool_member.PoolMember` """ poolobj = self._get_resource(_pool.Pool, pool) - return self._update(_pool_member.PoolMember, pool_member, - pool_id=poolobj.id, **attrs) + return self._update( + _pool_member.PoolMember, pool_member, pool_id=poolobj.id, **attrs + ) def create_port(self, **attrs): """Create a new port from attributes @@ -2646,8 +2903,12 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: ``None`` """ - self._delete(_port.Port, port, ignore_missing=ignore_missing, - if_revision=if_revision) + self._delete( + _port.Port, + port, + ignore_missing=ignore_missing, + if_revision=if_revision, + ) def find_port(self, name_or_id, ignore_missing=True, **query): """Find a single port @@ -2662,8 +2923,9 @@ class Proxy(proxy.Proxy, Generic[T]): underlying methods. such as query filters. :returns: One :class:`~openstack.network.v2.port.Port` or None """ - return self._find(_port.Port, name_or_id, - ignore_missing=ignore_missing, **query) + return self._find( + _port.Port, name_or_id, ignore_missing=ignore_missing, **query + ) def get_port(self, port): """Get a single port @@ -2714,8 +2976,7 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: The updated port :rtype: :class:`~openstack.network.v2.port.Port` """ - return self._update(_port.Port, port, if_revision=if_revision, - **attrs) + return self._update(_port.Port, port, if_revision=if_revision, **attrs) def add_ip_to_port(self, port, ip): ip.port_id = port.id @@ -2751,11 +3012,15 @@ class Proxy(proxy.Proxy, Generic[T]): :class:`~openstack.network.v2.qos_bandwidth_limit_rule.QoSBandwidthLimitRule` """ policy = self._get_resource(_qos_policy.QoSPolicy, qos_policy) - return self._create(_qos_bandwidth_limit_rule.QoSBandwidthLimitRule, - qos_policy_id=policy.id, **attrs) + return self._create( + _qos_bandwidth_limit_rule.QoSBandwidthLimitRule, + qos_policy_id=policy.id, + **attrs, + ) - def delete_qos_bandwidth_limit_rule(self, qos_rule, qos_policy, - ignore_missing=True): + def delete_qos_bandwidth_limit_rule( + self, qos_rule, qos_policy, ignore_missing=True + ): """Delete a bandwidth limit rule :param qos_rule: The value can be either the ID of a bandwidth limit @@ -2774,12 +3039,16 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: ``None`` """ policy = self._get_resource(_qos_policy.QoSPolicy, qos_policy) - self._delete(_qos_bandwidth_limit_rule.QoSBandwidthLimitRule, - qos_rule, ignore_missing=ignore_missing, - qos_policy_id=policy.id) + self._delete( + _qos_bandwidth_limit_rule.QoSBandwidthLimitRule, + qos_rule, + ignore_missing=ignore_missing, + qos_policy_id=policy.id, + ) - def find_qos_bandwidth_limit_rule(self, qos_rule_id, qos_policy, - ignore_missing=True, **query): + def find_qos_bandwidth_limit_rule( + self, qos_rule_id, qos_policy, ignore_missing=True, **query + ): """Find a bandwidth limit rule :param qos_rule_id: The ID of a bandwidth limit rule. @@ -2798,9 +3067,13 @@ class Proxy(proxy.Proxy, Generic[T]): or None """ policy = self._get_resource(_qos_policy.QoSPolicy, qos_policy) - return self._find(_qos_bandwidth_limit_rule.QoSBandwidthLimitRule, - qos_rule_id, ignore_missing=ignore_missing, - qos_policy_id=policy.id, **query) + return self._find( + _qos_bandwidth_limit_rule.QoSBandwidthLimitRule, + qos_rule_id, + ignore_missing=ignore_missing, + qos_policy_id=policy.id, + **query, + ) def get_qos_bandwidth_limit_rule(self, qos_rule, qos_policy): """Get a single bandwidth limit rule @@ -2818,8 +3091,11 @@ class Proxy(proxy.Proxy, Generic[T]): when no resource can be found. """ policy = self._get_resource(_qos_policy.QoSPolicy, qos_policy) - return self._get(_qos_bandwidth_limit_rule.QoSBandwidthLimitRule, - qos_rule, qos_policy_id=policy.id) + return self._get( + _qos_bandwidth_limit_rule.QoSBandwidthLimitRule, + qos_rule, + qos_policy_id=policy.id, + ) def qos_bandwidth_limit_rules(self, qos_policy, **query): """Return a generator of bandwidth limit rules @@ -2834,11 +3110,17 @@ class Proxy(proxy.Proxy, Generic[T]): :class:`~openstack.network.v2.qos_bandwidth_limit_rule.QoSBandwidthLimitRule` """ policy = self._get_resource(_qos_policy.QoSPolicy, qos_policy) - return self._list(_qos_bandwidth_limit_rule.QoSBandwidthLimitRule, - qos_policy_id=policy.id, **query) + return self._list( + _qos_bandwidth_limit_rule.QoSBandwidthLimitRule, + qos_policy_id=policy.id, + **query, + ) def update_qos_bandwidth_limit_rule( - self, qos_rule, qos_policy, **attrs, + self, + qos_rule, + qos_policy, + **attrs, ): """Update a bandwidth limit rule @@ -2856,8 +3138,12 @@ class Proxy(proxy.Proxy, Generic[T]): :class:`~openstack.network.v2.qos_bandwidth_limit_rule.QoSBandwidthLimitRule` """ policy = self._get_resource(_qos_policy.QoSPolicy, qos_policy) - return self._update(_qos_bandwidth_limit_rule.QoSBandwidthLimitRule, - qos_rule, qos_policy_id=policy.id, **attrs) + return self._update( + _qos_bandwidth_limit_rule.QoSBandwidthLimitRule, + qos_rule, + qos_policy_id=policy.id, + **attrs, + ) def create_qos_dscp_marking_rule(self, qos_policy, **attrs): """Create a new QoS DSCP marking rule @@ -2876,11 +3162,15 @@ class Proxy(proxy.Proxy, Generic[T]): :class:`~openstack.network.v2.qos_dscp_marking_rule.QoSDSCPMarkingRule` """ policy = self._get_resource(_qos_policy.QoSPolicy, qos_policy) - return self._create(_qos_dscp_marking_rule.QoSDSCPMarkingRule, - qos_policy_id=policy.id, **attrs) + return self._create( + _qos_dscp_marking_rule.QoSDSCPMarkingRule, + qos_policy_id=policy.id, + **attrs, + ) - def delete_qos_dscp_marking_rule(self, qos_rule, qos_policy, - ignore_missing=True): + def delete_qos_dscp_marking_rule( + self, qos_rule, qos_policy, ignore_missing=True + ): """Delete a QoS DSCP marking rule :param qos_rule: The value can be either the ID of a minimum bandwidth @@ -2899,12 +3189,16 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: ``None`` """ policy = self._get_resource(_qos_policy.QoSPolicy, qos_policy) - self._delete(_qos_dscp_marking_rule.QoSDSCPMarkingRule, - qos_rule, ignore_missing=ignore_missing, - qos_policy_id=policy.id) + self._delete( + _qos_dscp_marking_rule.QoSDSCPMarkingRule, + qos_rule, + ignore_missing=ignore_missing, + qos_policy_id=policy.id, + ) - def find_qos_dscp_marking_rule(self, qos_rule_id, qos_policy, - ignore_missing=True, **query): + def find_qos_dscp_marking_rule( + self, qos_rule_id, qos_policy, ignore_missing=True, **query + ): """Find a QoS DSCP marking rule :param qos_rule_id: The ID of a QoS DSCP marking rule. @@ -2923,9 +3217,13 @@ class Proxy(proxy.Proxy, Generic[T]): or None """ policy = self._get_resource(_qos_policy.QoSPolicy, qos_policy) - return self._find(_qos_dscp_marking_rule.QoSDSCPMarkingRule, - qos_rule_id, ignore_missing=ignore_missing, - qos_policy_id=policy.id, **query) + return self._find( + _qos_dscp_marking_rule.QoSDSCPMarkingRule, + qos_rule_id, + ignore_missing=ignore_missing, + qos_policy_id=policy.id, + **query, + ) def get_qos_dscp_marking_rule(self, qos_rule, qos_policy): """Get a single QoS DSCP marking rule @@ -2943,8 +3241,11 @@ class Proxy(proxy.Proxy, Generic[T]): when no resource can be found. """ policy = self._get_resource(_qos_policy.QoSPolicy, qos_policy) - return self._get(_qos_dscp_marking_rule.QoSDSCPMarkingRule, - qos_rule, qos_policy_id=policy.id) + return self._get( + _qos_dscp_marking_rule.QoSDSCPMarkingRule, + qos_rule, + qos_policy_id=policy.id, + ) def qos_dscp_marking_rules(self, qos_policy, **query): """Return a generator of QoS DSCP marking rules @@ -2959,8 +3260,11 @@ class Proxy(proxy.Proxy, Generic[T]): :class:`~openstack.network.v2.qos_dscp_marking_rule.QoSDSCPMarkingRule` """ policy = self._get_resource(_qos_policy.QoSPolicy, qos_policy) - return self._list(_qos_dscp_marking_rule.QoSDSCPMarkingRule, - qos_policy_id=policy.id, **query) + return self._list( + _qos_dscp_marking_rule.QoSDSCPMarkingRule, + qos_policy_id=policy.id, + **query, + ) def update_qos_dscp_marking_rule(self, qos_rule, qos_policy, **attrs): """Update a QoS DSCP marking rule @@ -2979,8 +3283,12 @@ class Proxy(proxy.Proxy, Generic[T]): :class:`~openstack.network.v2.qos_dscp_marking_rule.QoSDSCPMarkingRule` """ policy = self._get_resource(_qos_policy.QoSPolicy, qos_policy) - return self._update(_qos_dscp_marking_rule.QoSDSCPMarkingRule, - qos_rule, qos_policy_id=policy.id, **attrs) + return self._update( + _qos_dscp_marking_rule.QoSDSCPMarkingRule, + qos_rule, + qos_policy_id=policy.id, + **attrs, + ) def create_qos_minimum_bandwidth_rule(self, qos_policy, **attrs): """Create a new minimum bandwidth rule @@ -3001,10 +3309,13 @@ class Proxy(proxy.Proxy, Generic[T]): policy = self._get_resource(_qos_policy.QoSPolicy, qos_policy) return self._create( _qos_minimum_bandwidth_rule.QoSMinimumBandwidthRule, - qos_policy_id=policy.id, **attrs) + qos_policy_id=policy.id, + **attrs, + ) - def delete_qos_minimum_bandwidth_rule(self, qos_rule, qos_policy, - ignore_missing=True): + def delete_qos_minimum_bandwidth_rule( + self, qos_rule, qos_policy, ignore_missing=True + ): """Delete a minimum bandwidth rule :param qos_rule: The value can be either the ID of a minimum bandwidth @@ -3023,12 +3334,16 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: ``None`` """ policy = self._get_resource(_qos_policy.QoSPolicy, qos_policy) - self._delete(_qos_minimum_bandwidth_rule.QoSMinimumBandwidthRule, - qos_rule, ignore_missing=ignore_missing, - qos_policy_id=policy.id) + self._delete( + _qos_minimum_bandwidth_rule.QoSMinimumBandwidthRule, + qos_rule, + ignore_missing=ignore_missing, + qos_policy_id=policy.id, + ) - def find_qos_minimum_bandwidth_rule(self, qos_rule_id, qos_policy, - ignore_missing=True, **query): + def find_qos_minimum_bandwidth_rule( + self, qos_rule_id, qos_policy, ignore_missing=True, **query + ): """Find a minimum bandwidth rule :param qos_rule_id: The ID of a minimum bandwidth rule. @@ -3047,9 +3362,13 @@ class Proxy(proxy.Proxy, Generic[T]): or None """ policy = self._get_resource(_qos_policy.QoSPolicy, qos_policy) - return self._find(_qos_minimum_bandwidth_rule.QoSMinimumBandwidthRule, - qos_rule_id, ignore_missing=ignore_missing, - qos_policy_id=policy.id, **query) + return self._find( + _qos_minimum_bandwidth_rule.QoSMinimumBandwidthRule, + qos_rule_id, + ignore_missing=ignore_missing, + qos_policy_id=policy.id, + **query, + ) def get_qos_minimum_bandwidth_rule(self, qos_rule, qos_policy): """Get a single minimum bandwidth rule @@ -3069,8 +3388,11 @@ class Proxy(proxy.Proxy, Generic[T]): when no resource can be found. """ policy = self._get_resource(_qos_policy.QoSPolicy, qos_policy) - return self._get(_qos_minimum_bandwidth_rule.QoSMinimumBandwidthRule, - qos_rule, qos_policy_id=policy.id) + return self._get( + _qos_minimum_bandwidth_rule.QoSMinimumBandwidthRule, + qos_rule, + qos_policy_id=policy.id, + ) def qos_minimum_bandwidth_rules(self, qos_policy, **query): """Return a generator of minimum bandwidth rules @@ -3085,11 +3407,13 @@ class Proxy(proxy.Proxy, Generic[T]): :class:`~openstack.network.v2.qos_minimum_bandwidth_rule.QoSMinimumBandwidthRule` """ policy = self._get_resource(_qos_policy.QoSPolicy, qos_policy) - return self._list(_qos_minimum_bandwidth_rule.QoSMinimumBandwidthRule, - qos_policy_id=policy.id, **query) + return self._list( + _qos_minimum_bandwidth_rule.QoSMinimumBandwidthRule, + qos_policy_id=policy.id, + **query, + ) - def update_qos_minimum_bandwidth_rule(self, qos_rule, qos_policy, - **attrs): + def update_qos_minimum_bandwidth_rule(self, qos_rule, qos_policy, **attrs): """Update a minimum bandwidth rule :param qos_rule: Either the id of a minimum bandwidth rule or a @@ -3107,9 +3431,12 @@ class Proxy(proxy.Proxy, Generic[T]): :class:`~openstack.network.v2.qos_minimum_bandwidth_rule.QoSMinimumBandwidthRule` """ policy = self._get_resource(_qos_policy.QoSPolicy, qos_policy) - return self._update(_qos_minimum_bandwidth_rule. - QoSMinimumBandwidthRule, qos_rule, - qos_policy_id=policy.id, **attrs) + return self._update( + _qos_minimum_bandwidth_rule.QoSMinimumBandwidthRule, + qos_rule, + qos_policy_id=policy.id, + **attrs, + ) def create_qos_minimum_packet_rate_rule(self, qos_policy, **attrs): """Create a new minimum packet rate rule @@ -3128,10 +3455,13 @@ class Proxy(proxy.Proxy, Generic[T]): policy = self._get_resource(_qos_policy.QoSPolicy, qos_policy) return self._create( _qos_minimum_packet_rate_rule.QoSMinimumPacketRateRule, - qos_policy_id=policy.id, **attrs) + qos_policy_id=policy.id, + **attrs, + ) - def delete_qos_minimum_packet_rate_rule(self, qos_rule, qos_policy, - ignore_missing=True): + def delete_qos_minimum_packet_rate_rule( + self, qos_rule, qos_policy, ignore_missing=True + ): """Delete a minimum packet rate rule :param qos_rule: The value can be either the ID of a minimum packet @@ -3150,12 +3480,16 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: ``None`` """ policy = self._get_resource(_qos_policy.QoSPolicy, qos_policy) - self._delete(_qos_minimum_packet_rate_rule.QoSMinimumPacketRateRule, - qos_rule, ignore_missing=ignore_missing, - qos_policy_id=policy.id) + self._delete( + _qos_minimum_packet_rate_rule.QoSMinimumPacketRateRule, + qos_rule, + ignore_missing=ignore_missing, + qos_policy_id=policy.id, + ) - def find_qos_minimum_packet_rate_rule(self, qos_rule_id, qos_policy, - ignore_missing=True, **query): + def find_qos_minimum_packet_rate_rule( + self, qos_rule_id, qos_policy, ignore_missing=True, **query + ): """Find a minimum packet rate rule :param qos_rule_id: The ID of a minimum packet rate rule. @@ -3175,8 +3509,11 @@ class Proxy(proxy.Proxy, Generic[T]): policy = self._get_resource(_qos_policy.QoSPolicy, qos_policy) return self._find( _qos_minimum_packet_rate_rule.QoSMinimumPacketRateRule, - qos_rule_id, ignore_missing=ignore_missing, - qos_policy_id=policy.id, **query) + qos_rule_id, + ignore_missing=ignore_missing, + qos_policy_id=policy.id, + **query, + ) def get_qos_minimum_packet_rate_rule(self, qos_rule, qos_policy): """Get a single minimum packet rate rule @@ -3196,7 +3533,9 @@ class Proxy(proxy.Proxy, Generic[T]): policy = self._get_resource(_qos_policy.QoSPolicy, qos_policy) return self._get( _qos_minimum_packet_rate_rule.QoSMinimumPacketRateRule, - qos_rule, qos_policy_id=policy.id) + qos_rule, + qos_policy_id=policy.id, + ) def qos_minimum_packet_rate_rules(self, qos_policy, **query): """Return a generator of minimum packet rate rules @@ -3213,10 +3552,13 @@ class Proxy(proxy.Proxy, Generic[T]): policy = self._get_resource(_qos_policy.QoSPolicy, qos_policy) return self._list( _qos_minimum_packet_rate_rule.QoSMinimumPacketRateRule, - qos_policy_id=policy.id, **query) + qos_policy_id=policy.id, + **query, + ) - def update_qos_minimum_packet_rate_rule(self, qos_rule, qos_policy, - **attrs): + def update_qos_minimum_packet_rate_rule( + self, qos_rule, qos_policy, **attrs + ): """Update a minimum packet rate rule :param qos_rule: Either the id of a minimum packet rate rule or a @@ -3267,8 +3609,9 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: ``None`` """ - self._delete(_qos_policy.QoSPolicy, qos_policy, - ignore_missing=ignore_missing) + self._delete( + _qos_policy.QoSPolicy, qos_policy, ignore_missing=ignore_missing + ) def find_qos_policy(self, name_or_id, ignore_missing=True, **query): """Find a single QoS policy @@ -3284,8 +3627,12 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: One :class:`~openstack.network.v2.qos_policy.QoSPolicy` or None """ - return self._find(_qos_policy.QoSPolicy, name_or_id, - ignore_missing=ignore_missing, **query) + return self._find( + _qos_policy.QoSPolicy, + name_or_id, + ignore_missing=ignore_missing, + **query, + ) def get_qos_policy(self, qos_policy): """Get a single QoS policy @@ -3341,8 +3688,11 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: One :class:`~openstack.network.v2.qos_rule_type.QoSRuleType` or None """ - return self._find(_qos_rule_type.QoSRuleType, rule_type_name, - ignore_missing=ignore_missing) + return self._find( + _qos_rule_type.QoSRuleType, + rule_type_name, + ignore_missing=ignore_missing, + ) def get_qos_rule_type(self, qos_rule_type): """Get details about single QoS rule type @@ -3404,8 +3754,9 @@ class Proxy(proxy.Proxy, Generic[T]): """ if details: quota_obj = self._get_resource(_quota.Quota, quota) - quota = self._get(_quota.QuotaDetails, project=quota_obj.id, - requires_id=False) + quota = self._get( + _quota.QuotaDetails, project=quota_obj.id, requires_id=False + ) else: quota = self._get(_quota.Quota, quota) return quota @@ -3423,8 +3774,9 @@ class Proxy(proxy.Proxy, Generic[T]): when no resource can be found. """ quota_obj = self._get_resource(_quota.Quota, quota) - return self._get(_quota.QuotaDefault, project=quota_obj.id, - requires_id=False) + return self._get( + _quota.QuotaDefault, project=quota_obj.id, requires_id=False + ) def quotas(self, **query): """Return a generator of quotas @@ -3478,8 +3830,9 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: ``None`` """ - self._delete(_rbac_policy.RBACPolicy, rbac_policy, - ignore_missing=ignore_missing) + self._delete( + _rbac_policy.RBACPolicy, rbac_policy, ignore_missing=ignore_missing + ) def find_rbac_policy(self, rbac_policy, ignore_missing=True, **query): """Find a single RBAC policy @@ -3495,8 +3848,12 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: One :class:`~openstack.network.v2.rbac_policy.RBACPolicy` or None """ - return self._find(_rbac_policy.RBACPolicy, rbac_policy, - ignore_missing=ignore_missing, **query) + return self._find( + _rbac_policy.RBACPolicy, + rbac_policy, + ignore_missing=ignore_missing, + **query, + ) def get_rbac_policy(self, rbac_policy): """Get a single RBAC policy @@ -3568,8 +3925,12 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: ``None`` """ - self._delete(_router.Router, router, ignore_missing=ignore_missing, - if_revision=if_revision) + self._delete( + _router.Router, + router, + ignore_missing=ignore_missing, + if_revision=if_revision, + ) def find_router(self, name_or_id, ignore_missing=True, **query): """Find a single router @@ -3584,8 +3945,9 @@ class Proxy(proxy.Proxy, Generic[T]): underlying methods. such as query filters. :returns: One :class:`~openstack.network.v2.router.Router` or None """ - return self._find(_router.Router, name_or_id, - ignore_missing=ignore_missing, **query) + return self._find( + _router.Router, name_or_id, ignore_missing=ignore_missing, **query + ) def get_router(self, router): """Get a single router @@ -3633,8 +3995,9 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: The updated router :rtype: :class:`~openstack.network.v2.router.Router` """ - return self._update(_router.Router, router, if_revision=if_revision, - **attrs) + return self._update( + _router.Router, router, if_revision=if_revision, **attrs + ) def add_interface_to_router(self, router, subnet_id=None, port_id=None): """Add Interface to a router @@ -3654,8 +4017,9 @@ class Proxy(proxy.Proxy, Generic[T]): router = self._get_resource(_router.Router, router) return router.add_interface(self, **body) - def remove_interface_from_router(self, router, subnet_id=None, - port_id=None): + def remove_interface_from_router( + self, router, subnet_id=None, port_id=None + ): """Remove Interface from a router :param router: Either the router ID or an instance of @@ -3802,8 +4166,7 @@ class Proxy(proxy.Proxy, Generic[T]): """ return self._get(_ndp_proxy.NDPProxy, ndp_proxy) - def find_ndp_proxy(self, ndp_proxy_id, - ignore_missing=True, **query): + def find_ndp_proxy(self, ndp_proxy_id, ignore_missing=True, **query): """Find a single ndp proxy :param ndp_proxy_id: The ID of a ndp proxy. @@ -3817,9 +4180,11 @@ class Proxy(proxy.Proxy, Generic[T]): One :class:`~openstack.network.v2.ndp_proxy.NDPProxy` or None """ return self._find( - _ndp_proxy.NDPProxy, ndp_proxy_id, + _ndp_proxy.NDPProxy, + ndp_proxy_id, ignore_missing=ignore_missing, - **query) + **query, + ) def delete_ndp_proxy(self, ndp_proxy, ignore_missing=True): """Delete a ndp proxy @@ -3835,8 +4200,8 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: ``None`` """ self._delete( - _ndp_proxy.NDPProxy, ndp_proxy, - ignore_missing=ignore_missing) + _ndp_proxy.NDPProxy, ndp_proxy, ignore_missing=ignore_missing + ) def ndp_proxies(self, **query): """Return a generator of ndp proxies @@ -3893,8 +4258,11 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: ``None`` """ - self._delete(_firewall_group.FirewallGroup, firewall_group, - ignore_missing=ignore_missing) + self._delete( + _firewall_group.FirewallGroup, + firewall_group, + ignore_missing=ignore_missing, + ) def find_firewall_group(self, name_or_id, ignore_missing=True, **query): """Find a single firewall group @@ -3910,8 +4278,12 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: One :class:`~openstack.network.v2.firewall_group.FirewallGroup` or None """ - return self._find(_firewall_group.FirewallGroup, - name_or_id, ignore_missing=ignore_missing, **query) + return self._find( + _firewall_group.FirewallGroup, + name_or_id, + ignore_missing=ignore_missing, + **query, + ) def get_firewall_group(self, firewall_group): """Get a single firewall group @@ -3963,8 +4335,9 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: The updated firewall group :rtype: :class:`~openstack.network.v2.firewall_group.FirewallGroup` """ - return self._update(_firewall_group.FirewallGroup, firewall_group, - **attrs) + return self._update( + _firewall_group.FirewallGroup, firewall_group, **attrs + ) def create_firewall_policy(self, **attrs): """Create a new firewall policy from attributes @@ -3993,8 +4366,11 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: ``None`` """ - self._delete(_firewall_policy.FirewallPolicy, firewall_policy, - ignore_missing=ignore_missing) + self._delete( + _firewall_policy.FirewallPolicy, + firewall_policy, + ignore_missing=ignore_missing, + ) def find_firewall_policy(self, name_or_id, ignore_missing=True, **query): """Find a single firewall policy @@ -4011,8 +4387,12 @@ class Proxy(proxy.Proxy, Generic[T]): :class:`~openstack.network.v2.firewall_policy.FirewallPolicy` or None """ - return self._find(_firewall_policy.FirewallPolicy, - name_or_id, ignore_missing=ignore_missing, **query) + return self._find( + _firewall_policy.FirewallPolicy, + name_or_id, + ignore_missing=ignore_missing, + **query, + ) def get_firewall_policy(self, firewall_policy): """Get a single firewall policy @@ -4059,11 +4439,17 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: The updated firewall policy :rtype: :class:`~openstack.network.v2.firewall_policy.FirewallPolicy` """ - return self._update(_firewall_policy.FirewallPolicy, firewall_policy, - **attrs) + return self._update( + _firewall_policy.FirewallPolicy, firewall_policy, **attrs + ) - def insert_rule_into_policy(self, firewall_policy_id, firewall_rule_id, - insert_after=None, insert_before=None): + def insert_rule_into_policy( + self, + firewall_policy_id, + firewall_rule_id, + insert_after=None, + insert_before=None, + ): """Insert a firewall_rule into a firewall_policy in order :param firewall_policy_id: The ID of the firewall policy. @@ -4077,11 +4463,14 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: The updated firewall policy :rtype: :class:`~openstack.network.v2.firewall_policy.FirewallPolicy` """ - body = {'firewall_rule_id': firewall_rule_id, - 'insert_after': insert_after, - 'insert_before': insert_before} - policy = self._get_resource(_firewall_policy.FirewallPolicy, - firewall_policy_id) + body = { + 'firewall_rule_id': firewall_rule_id, + 'insert_after': insert_after, + 'insert_before': insert_before, + } + policy = self._get_resource( + _firewall_policy.FirewallPolicy, firewall_policy_id + ) return policy.insert_rule(self, **body) def remove_rule_from_policy(self, firewall_policy_id, firewall_rule_id): @@ -4094,8 +4483,9 @@ class Proxy(proxy.Proxy, Generic[T]): :rtype: :class:`~openstack.network.v2.firewall_policy.FirewallPolicy` """ body = {'firewall_rule_id': firewall_rule_id} - policy = self._get_resource(_firewall_policy.FirewallPolicy, - firewall_policy_id) + policy = self._get_resource( + _firewall_policy.FirewallPolicy, firewall_policy_id + ) return policy.remove_rule(self, **body) def create_firewall_rule(self, **attrs): @@ -4125,8 +4515,11 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: ``None`` """ - self._delete(_firewall_rule.FirewallRule, firewall_rule, - ignore_missing=ignore_missing) + self._delete( + _firewall_rule.FirewallRule, + firewall_rule, + ignore_missing=ignore_missing, + ) def find_firewall_rule(self, name_or_id, ignore_missing=True, **query): """Find a single firewall rule @@ -4143,8 +4536,12 @@ class Proxy(proxy.Proxy, Generic[T]): :class:`~openstack.network.v2.firewall_rule.FirewallRule` or None """ - return self._find(_firewall_rule.FirewallRule, - name_or_id, ignore_missing=ignore_missing, **query) + return self._find( + _firewall_rule.FirewallRule, + name_or_id, + ignore_missing=ignore_missing, + **query, + ) def get_firewall_rule(self, firewall_rule): """Get a single firewall rule @@ -4202,8 +4599,9 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: The updated firewall rule :rtype: :class:`~openstack.network.v2.firewall_rule.FirewallRule` """ - return self._update(_firewall_rule.FirewallRule, firewall_rule, - **attrs) + return self._update( + _firewall_rule.FirewallRule, firewall_rule, **attrs + ) def create_security_group(self, **attrs): """Create a new security group from attributes @@ -4217,8 +4615,9 @@ class Proxy(proxy.Proxy, Generic[T]): """ return self._create(_security_group.SecurityGroup, **attrs) - def delete_security_group(self, security_group, ignore_missing=True, - if_revision=None): + def delete_security_group( + self, security_group, ignore_missing=True, if_revision=None + ): """Delete a security group :param security_group: @@ -4235,8 +4634,12 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: ``None`` """ - self._delete(_security_group.SecurityGroup, security_group, - ignore_missing=ignore_missing, if_revision=if_revision) + self._delete( + _security_group.SecurityGroup, + security_group, + ignore_missing=ignore_missing, + if_revision=if_revision, + ) def find_security_group(self, name_or_id, ignore_missing=True, **query): """Find a single security group @@ -4253,8 +4656,12 @@ class Proxy(proxy.Proxy, Generic[T]): :class:`~openstack.network.v2.security_group.SecurityGroup` or None """ - return self._find(_security_group.SecurityGroup, name_or_id, - ignore_missing=ignore_missing, **query) + return self._find( + _security_group.SecurityGroup, + name_or_id, + ignore_missing=ignore_missing, + **query, + ) def get_security_group(self, security_group): """Get a single security group @@ -4301,8 +4708,12 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: The updated security group :rtype: :class:`~openstack.network.v2.security_group.SecurityGroup` """ - return self._update(_security_group.SecurityGroup, security_group, - if_revision=if_revision, **attrs) + return self._update( + _security_group.SecurityGroup, + security_group, + if_revision=if_revision, + **attrs, + ) def create_security_group_rule(self, **attrs): """Create a new security group rule from attributes @@ -4333,8 +4744,9 @@ class Proxy(proxy.Proxy, Generic[T]): """ return self._bulk_create(_security_group_rule.SecurityGroupRule, data) - def delete_security_group_rule(self, security_group_rule, - ignore_missing=True, if_revision=None): + def delete_security_group_rule( + self, security_group_rule, ignore_missing=True, if_revision=None + ): """Delete a security group rule :param security_group_rule: @@ -4352,12 +4764,16 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: ``None`` """ - self._delete(_security_group_rule.SecurityGroupRule, - security_group_rule, ignore_missing=ignore_missing, - if_revision=if_revision) + self._delete( + _security_group_rule.SecurityGroupRule, + security_group_rule, + ignore_missing=ignore_missing, + if_revision=if_revision, + ) - def find_security_group_rule(self, name_or_id, ignore_missing=True, - **query): + def find_security_group_rule( + self, name_or_id, ignore_missing=True, **query + ): """Find a single security group rule :param str name_or_id: The ID of a security group rule. @@ -4372,8 +4788,12 @@ class Proxy(proxy.Proxy, Generic[T]): :class:`~openstack.network.v2.security_group_rule.SecurityGroupRule` or None """ - return self._find(_security_group_rule.SecurityGroupRule, - name_or_id, ignore_missing=ignore_missing, **query) + return self._find( + _security_group_rule.SecurityGroupRule, + name_or_id, + ignore_missing=ignore_missing, + **query, + ) def get_security_group_rule(self, security_group_rule): """Get a single security group rule @@ -4388,8 +4808,9 @@ class Proxy(proxy.Proxy, Generic[T]): :raises: :class:`~openstack.exceptions.ResourceNotFound` when no resource can be found. """ - return self._get(_security_group_rule.SecurityGroupRule, - security_group_rule) + return self._get( + _security_group_rule.SecurityGroupRule, security_group_rule + ) def security_group_rules(self, **query): """Return a generator of security group rules @@ -4454,8 +4875,12 @@ class Proxy(proxy.Proxy, Generic[T]): underlying methods. such as query filters. :returns: One :class:`~openstack.network.v2.segment.Segment` or None """ - return self._find(_segment.Segment, name_or_id, - ignore_missing=ignore_missing, **query) + return self._find( + _segment.Segment, + name_or_id, + ignore_missing=ignore_missing, + **query, + ) def get_segment(self, segment): """Get a single segment @@ -4541,8 +4966,11 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: ``None`` """ - self._delete(_service_profile.ServiceProfile, service_profile, - ignore_missing=ignore_missing) + self._delete( + _service_profile.ServiceProfile, + service_profile, + ignore_missing=ignore_missing, + ) def find_service_profile(self, name_or_id, ignore_missing=True, **query): """Find a single network service flavor profile @@ -4559,8 +4987,12 @@ class Proxy(proxy.Proxy, Generic[T]): :class:`~openstack.network.v2.service_profile.ServiceProfile` or None """ - return self._find(_service_profile.ServiceProfile, name_or_id, - ignore_missing=ignore_missing, **query) + return self._find( + _service_profile.ServiceProfile, + name_or_id, + ignore_missing=ignore_missing, + **query, + ) def get_service_profile(self, service_profile): """Get a single network service flavor profile @@ -4604,8 +5036,9 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: The updated service profile :rtype: :class:`~openstack.network.v2.service_profile.ServiceProfile` """ - return self._update(_service_profile.ServiceProfile, service_profile, - **attrs) + return self._update( + _service_profile.ServiceProfile, service_profile, **attrs + ) def create_subnet(self, **attrs): """Create a new subnet from attributes @@ -4634,8 +5067,12 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: ``None`` """ - self._delete(_subnet.Subnet, subnet, ignore_missing=ignore_missing, - if_revision=if_revision) + self._delete( + _subnet.Subnet, + subnet, + ignore_missing=ignore_missing, + if_revision=if_revision, + ) def find_subnet(self, name_or_id, ignore_missing=True, **query): """Find a single subnet @@ -4650,8 +5087,9 @@ class Proxy(proxy.Proxy, Generic[T]): underlying methods. such as query filters. :returns: One :class:`~openstack.network.v2.subnet.Subnet` or None """ - return self._find(_subnet.Subnet, name_or_id, - ignore_missing=ignore_missing, **query) + return self._find( + _subnet.Subnet, name_or_id, ignore_missing=ignore_missing, **query + ) def get_subnet(self, subnet): """Get a single subnet @@ -4702,8 +5140,9 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: The updated subnet :rtype: :class:`~openstack.network.v2.subnet.Subnet` """ - return self._update(_subnet.Subnet, subnet, if_revision=if_revision, - **attrs) + return self._update( + _subnet.Subnet, subnet, if_revision=if_revision, **attrs + ) def create_subnet_pool(self, **attrs): """Create a new subnet pool from attributes @@ -4730,8 +5169,9 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: ``None`` """ - self._delete(_subnet_pool.SubnetPool, subnet_pool, - ignore_missing=ignore_missing) + self._delete( + _subnet_pool.SubnetPool, subnet_pool, ignore_missing=ignore_missing + ) def find_subnet_pool(self, name_or_id, ignore_missing=True, **query): """Find a single subnet pool @@ -4747,8 +5187,12 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: One :class:`~openstack.network.v2.subnet_pool.SubnetPool` or None """ - return self._find(_subnet_pool.SubnetPool, name_or_id, - ignore_missing=ignore_missing, **query) + return self._find( + _subnet_pool.SubnetPool, + name_or_id, + ignore_missing=ignore_missing, + **query, + ) def get_subnet_pool(self, subnet_pool): """Get a single subnet pool @@ -4801,8 +5245,9 @@ class Proxy(proxy.Proxy, Generic[T]): resource.tags except AttributeError: raise exceptions.InvalidRequest( - '%s resource does not support tag' % - resource.__class__.__name__) + '%s resource does not support tag' + % resource.__class__.__name__ + ) def set_tags(self, resource, tags): """Replace tags of a specified resource with specified tags @@ -4854,8 +5299,9 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: One :class:`~openstack.network.v2.trunk.Trunk` or None """ - return self._find(_trunk.Trunk, name_or_id, - ignore_missing=ignore_missing, **query) + return self._find( + _trunk.Trunk, name_or_id, ignore_missing=ignore_missing, **query + ) def get_trunk(self, trunk): """Get a single trunk @@ -4948,8 +5394,7 @@ class Proxy(proxy.Proxy, Generic[T]): :rtype: :class:`~openstack.network.v2.vpn_endpoint_group.VpnEndpointGroup` """ - return self._create( - _vpn_endpoint_group.VpnEndpointGroup, **attrs) + return self._create(_vpn_endpoint_group.VpnEndpointGroup, **attrs) def delete_vpn_endpoint_group( self, vpn_endpoint_group, ignore_missing=True @@ -4969,8 +5414,10 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: ``None`` """ self._delete( - _vpn_endpoint_group.VpnEndpointGroup, vpn_endpoint_group, - ignore_missing=ignore_missing) + _vpn_endpoint_group.VpnEndpointGroup, + vpn_endpoint_group, + ignore_missing=ignore_missing, + ) def find_vpn_endpoint_group( self, name_or_id, ignore_missing=True, **query @@ -4990,8 +5437,11 @@ class Proxy(proxy.Proxy, Generic[T]): or None """ return self._find( - _vpn_endpoint_group.VpnEndpointGroup, name_or_id, - ignore_missing=ignore_missing, **query) + _vpn_endpoint_group.VpnEndpointGroup, + name_or_id, + ignore_missing=ignore_missing, + **query, + ) def get_vpn_endpoint_group(self, vpn_endpoint_group): """Get a single vpn service @@ -5007,7 +5457,8 @@ class Proxy(proxy.Proxy, Generic[T]): when no resource can be found. """ return self._get( - _vpn_endpoint_group.VpnEndpointGroup, vpn_endpoint_group) + _vpn_endpoint_group.VpnEndpointGroup, vpn_endpoint_group + ) def vpn_endpoint_groups(self, **query): """Return a generator of vpn services @@ -5035,7 +5486,8 @@ class Proxy(proxy.Proxy, Generic[T]): :class:`~openstack.network.v2.vpn_endpoint_group.VpnEndpointGroup` """ return self._update( - _vpn_endpoint_group.VpnEndpointGroup, vpn_endpoint_group, **attrs) + _vpn_endpoint_group.VpnEndpointGroup, vpn_endpoint_group, **attrs + ) # ========== IPsec Site Connection ========== def create_vpn_ipsec_site_connection(self, **attrs): @@ -5050,8 +5502,8 @@ class Proxy(proxy.Proxy, Generic[T]): :class:`~openstack.network.v2.vpn_ipsec_site_connection.VpnIPSecSiteConnection` """ return self._create( - _ipsec_site_connection.VpnIPSecSiteConnection, - **attrs) + _ipsec_site_connection.VpnIPSecSiteConnection, **attrs + ) def find_vpn_ipsec_site_connection( self, name_or_id, ignore_missing=True, **query @@ -5072,7 +5524,10 @@ class Proxy(proxy.Proxy, Generic[T]): """ return self._find( _ipsec_site_connection.VpnIPSecSiteConnection, - name_or_id, ignore_missing=ignore_missing, **query) + name_or_id, + ignore_missing=ignore_missing, + **query, + ) def get_vpn_ipsec_site_connection(self, ipsec_site_connection): """Get a single IPsec site connection @@ -5089,7 +5544,8 @@ class Proxy(proxy.Proxy, Generic[T]): """ return self._get( _ipsec_site_connection.VpnIPSecSiteConnection, - ipsec_site_connection) + ipsec_site_connection, + ) def vpn_ipsec_site_connections(self, **query): """Return a generator of IPsec site connections @@ -5102,7 +5558,8 @@ class Proxy(proxy.Proxy, Generic[T]): :class:`~openstack.network.v2.vpn_ipsec_site_connection.VpnIPSecSiteConnection` """ return self._list( - _ipsec_site_connection.VpnIPSecSiteConnection, **query) + _ipsec_site_connection.VpnIPSecSiteConnection, **query + ) def update_vpn_ipsec_site_connection(self, ipsec_site_connection, **attrs): """Update a IPsec site connection @@ -5120,7 +5577,9 @@ class Proxy(proxy.Proxy, Generic[T]): """ return self._update( _ipsec_site_connection.VpnIPSecSiteConnection, - ipsec_site_connection, **attrs) + ipsec_site_connection, + **attrs, + ) def delete_vpn_ipsec_site_connection( self, ipsec_site_connection, ignore_missing=True @@ -5142,7 +5601,9 @@ class Proxy(proxy.Proxy, Generic[T]): """ self._delete( _ipsec_site_connection.VpnIPSecSiteConnection, - ipsec_site_connection, ignore_missing=ignore_missing) + ipsec_site_connection, + ignore_missing=ignore_missing, + ) # ========== IKEPolicy ========== def create_vpn_ike_policy(self, **attrs): @@ -5155,12 +5616,9 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: The results of ike policy creation :rtype: :class:`~openstack.network.v2.vpn_ike_policy.VpnIkePolicy` """ - return self._create( - _ike_policy.VpnIkePolicy, **attrs) + return self._create(_ike_policy.VpnIkePolicy, **attrs) - def find_vpn_ike_policy( - self, name_or_id, ignore_missing=True, **query - ): + def find_vpn_ike_policy(self, name_or_id, ignore_missing=True, **query): """Find a single ike policy :param name_or_id: The name or ID of an IKE policy. @@ -5175,8 +5633,11 @@ class Proxy(proxy.Proxy, Generic[T]): :class:`~openstack.network.v2.vpn_ike_policy.VpnIkePolicy` or None. """ return self._find( - _ike_policy.VpnIkePolicy, name_or_id, - ignore_missing=ignore_missing, **query) + _ike_policy.VpnIkePolicy, + name_or_id, + ignore_missing=ignore_missing, + **query, + ) def get_vpn_ike_policy(self, ike_policy): """Get a single ike policy @@ -5191,8 +5652,7 @@ class Proxy(proxy.Proxy, Generic[T]): :raises: :class:`~openstack.exceptions.ResourceNotFound` when no resource can be found. """ - return self._get( - _ike_policy.VpnIkePolicy, ike_policy) + return self._get(_ike_policy.VpnIkePolicy, ike_policy) def vpn_ike_policies(self, **query): """Return a generator of IKE policies @@ -5217,8 +5677,7 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: The updated ike policy :rtype: :class:`~openstack.network.v2.vpn_ike_policy.VpnIkePolicy` """ - return self._update( - _ike_policy.VpnIkePolicy, ike_policy, **attrs) + return self._update(_ike_policy.VpnIkePolicy, ike_policy, **attrs) def delete_vpn_ike_policy(self, ike_policy, ignore_missing=True): """Delete an IKE policy @@ -5236,8 +5695,8 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: ``None`` """ self._delete( - _ike_policy.VpnIkePolicy, ike_policy, - ignore_missing=ignore_missing) + _ike_policy.VpnIkePolicy, ike_policy, ignore_missing=ignore_missing + ) # ========== IPSecPolicy ========== def create_vpn_ipsec_policy(self, **attrs): @@ -5250,12 +5709,9 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: The results of IPsec policy creation :rtype: :class:`~openstack.network.v2.vpn_ipsec_policy.VpnIpsecPolicy` """ - return self._create( - _ipsec_policy.VpnIpsecPolicy, **attrs) + return self._create(_ipsec_policy.VpnIpsecPolicy, **attrs) - def find_vpn_ipsec_policy( - self, name_or_id, ignore_missing=True, **query - ): + def find_vpn_ipsec_policy(self, name_or_id, ignore_missing=True, **query): """Find a single IPsec policy :param name_or_id: The name or ID of an IPsec policy. @@ -5271,8 +5727,11 @@ class Proxy(proxy.Proxy, Generic[T]): or None. """ return self._find( - _ipsec_policy.VpnIpsecPolicy, name_or_id, - ignore_missing=ignore_missing, **query) + _ipsec_policy.VpnIpsecPolicy, + name_or_id, + ignore_missing=ignore_missing, + **query, + ) def get_vpn_ipsec_policy(self, ipsec_policy): """Get a single IPsec policy @@ -5287,8 +5746,7 @@ class Proxy(proxy.Proxy, Generic[T]): :raises: :class:`~openstack.exceptions.ResourceNotFound` when no resource can be found. """ - return self._get( - _ipsec_policy.VpnIpsecPolicy, ipsec_policy) + return self._get(_ipsec_policy.VpnIpsecPolicy, ipsec_policy) def vpn_ipsec_policies(self, **query): """Return a generator of IPsec policies @@ -5299,8 +5757,7 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: A generator of IPsec policy objects :rtype: :class:`~openstack.network.v2.vpn_ipsec_policy.VpnIpsecPolicy` """ - return self._list( - _ipsec_policy.VpnIpsecPolicy, **query) + return self._list(_ipsec_policy.VpnIpsecPolicy, **query) def update_vpn_ipsec_policy(self, ipsec_policy, **attrs): """Update an IPsec policy @@ -5315,7 +5772,8 @@ class Proxy(proxy.Proxy, Generic[T]): :rtype: :class:`~openstack.network.v2.vpn_ipsec_policy.VpnIpsecPolicy` """ return self._update( - _ipsec_policy.VpnIpsecPolicy, ipsec_policy, **attrs) + _ipsec_policy.VpnIpsecPolicy, ipsec_policy, **attrs + ) def delete_vpn_ipsec_policy(self, ipsec_policy, ignore_missing=True): """Delete an IPsec policy @@ -5334,8 +5792,10 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: ``None`` """ self._delete( - _ipsec_policy.VpnIpsecPolicy, ipsec_policy, - ignore_missing=ignore_missing) + _ipsec_policy.VpnIpsecPolicy, + ipsec_policy, + ignore_missing=ignore_missing, + ) # ========== VPN Service ========== def create_vpn_service(self, **attrs): @@ -5364,8 +5824,9 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: ``None`` """ - self._delete(_vpn_service.VpnService, vpn_service, - ignore_missing=ignore_missing) + self._delete( + _vpn_service.VpnService, vpn_service, ignore_missing=ignore_missing + ) def find_vpn_service(self, name_or_id, ignore_missing=True, **query): """Find a single vpn service @@ -5381,8 +5842,12 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: One :class:`~openstack.network.v2.vpn_service.VpnService` or None """ - return self._find(_vpn_service.VpnService, name_or_id, - ignore_missing=ignore_missing, **query) + return self._find( + _vpn_service.VpnService, + name_or_id, + ignore_missing=ignore_missing, + **query, + ) def get_vpn_service(self, vpn_service): """Get a single vpn service @@ -5436,11 +5901,15 @@ class Proxy(proxy.Proxy, Generic[T]): :rtype: :class:`~openstack.network.v2.port_forwarding.PortForwarding` """ floatingip = self._get_resource(_floating_ip.FloatingIP, floating_ip) - return self._create(_port_forwarding.PortForwarding, - floatingip_id=floatingip.id, **attrs) + return self._create( + _port_forwarding.PortForwarding, + floatingip_id=floatingip.id, + **attrs, + ) - def delete_floating_ip_port_forwarding(self, floating_ip, port_forwarding, - ignore_missing=True): + def delete_floating_ip_port_forwarding( + self, floating_ip, port_forwarding, ignore_missing=True + ): """Delete a floating IP port forwarding. :param floating_ip: The value can be either the ID of a floating ip @@ -5459,12 +5928,16 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: ``None`` """ floatingip = self._get_resource(_floating_ip.FloatingIP, floating_ip) - self._delete(_port_forwarding.PortForwarding, - port_forwarding, ignore_missing=ignore_missing, - floatingip_id=floatingip.id) + self._delete( + _port_forwarding.PortForwarding, + port_forwarding, + ignore_missing=ignore_missing, + floatingip_id=floatingip.id, + ) - def find_floating_ip_port_forwarding(self, floating_ip, port_forwarding_id, - ignore_missing=True, **query): + def find_floating_ip_port_forwarding( + self, floating_ip, port_forwarding_id, ignore_missing=True, **query + ): """Find a floating ip port forwarding :param floating_ip: The value can be the ID of the Floating IP that the @@ -5483,9 +5956,13 @@ class Proxy(proxy.Proxy, Generic[T]): or None """ floatingip = self._get_resource(_floating_ip.FloatingIP, floating_ip) - return self._find(_port_forwarding.PortForwarding, - port_forwarding_id, ignore_missing=ignore_missing, - floatingip_id=floatingip.id, **query) + return self._find( + _port_forwarding.PortForwarding, + port_forwarding_id, + ignore_missing=ignore_missing, + floatingip_id=floatingip.id, + **query, + ) def get_floating_ip_port_forwarding(self, floating_ip, port_forwarding): """Get a floating ip port forwarding @@ -5503,8 +5980,11 @@ class Proxy(proxy.Proxy, Generic[T]): when no resource can be found. """ floatingip = self._get_resource(_floating_ip.FloatingIP, floating_ip) - return self._get(_port_forwarding.PortForwarding, port_forwarding, - floatingip_id=floatingip.id) + return self._get( + _port_forwarding.PortForwarding, + port_forwarding, + floatingip_id=floatingip.id, + ) def floating_ip_port_forwardings(self, floating_ip, **query): """Return a generator of floating ip port forwarding @@ -5520,11 +6000,15 @@ class Proxy(proxy.Proxy, Generic[T]): :class:`~openstack.network.v2.port_forwarding.PortForwarding` """ floatingip = self._get_resource(_floating_ip.FloatingIP, floating_ip) - return self._list(_port_forwarding.PortForwarding, - floatingip_id=floatingip.id, **query) + return self._list( + _port_forwarding.PortForwarding, + floatingip_id=floatingip.id, + **query, + ) - def update_floating_ip_port_forwarding(self, floating_ip, port_forwarding, - **attrs): + def update_floating_ip_port_forwarding( + self, floating_ip, port_forwarding, **attrs + ): """Update a floating ip port forwarding :param floating_ip: The value can be the ID of the Floating IP that the @@ -5541,8 +6025,12 @@ class Proxy(proxy.Proxy, Generic[T]): :rtype: :class:`~openstack.network.v2.port_forwarding.PortForwarding` """ floatingip = self._get_resource(_floating_ip.FloatingIP, floating_ip) - return self._update(_port_forwarding.PortForwarding, port_forwarding, - floatingip_id=floatingip.id, **attrs) + return self._update( + _port_forwarding.PortForwarding, + port_forwarding, + floatingip_id=floatingip.id, + **attrs, + ) def create_conntrack_helper(self, router, **attrs): """Create a new L3 conntrack helper from attributes @@ -5558,8 +6046,9 @@ class Proxy(proxy.Proxy, Generic[T]): :class:`~openstack.network.v2.l3_conntrack_helper.ConntrackHelper` """ router = self._get_resource(_router.Router, router) - return self._create(_l3_conntrack_helper.ConntrackHelper, - router_id=router.id, **attrs) + return self._create( + _l3_conntrack_helper.ConntrackHelper, router_id=router.id, **attrs + ) def conntrack_helpers(self, router, **query): """Return a generator of conntrack helpers @@ -5573,8 +6062,9 @@ class Proxy(proxy.Proxy, Generic[T]): :class:`~openstack.network.v2.l3_conntrack_helper.ConntrackHelper` """ router = self._get_resource(_router.Router, router) - return self._list(_l3_conntrack_helper.ConntrackHelper, - router_id=router.id, **query) + return self._list( + _l3_conntrack_helper.ConntrackHelper, router_id=router.id, **query + ) def get_conntrack_helper(self, conntrack_helper, router): """Get a single L3 conntrack helper @@ -5592,8 +6082,11 @@ class Proxy(proxy.Proxy, Generic[T]): when no resource can be found. """ router = self._get_resource(_router.Router, router) - return self._get(_l3_conntrack_helper.ConntrackHelper, - conntrack_helper, router_id=router.id) + return self._get( + _l3_conntrack_helper.ConntrackHelper, + conntrack_helper, + router_id=router.id, + ) def update_conntrack_helper(self, conntrack_helper, router, **attrs): """Update a L3 conntrack_helper @@ -5613,11 +6106,16 @@ class Proxy(proxy.Proxy, Generic[T]): """ router = self._get_resource(_router.Router, router) - return self._update(_l3_conntrack_helper.ConntrackHelper, - conntrack_helper, router_id=router.id, **attrs) + return self._update( + _l3_conntrack_helper.ConntrackHelper, + conntrack_helper, + router_id=router.id, + **attrs, + ) - def delete_conntrack_helper(self, conntrack_helper, router, - ignore_missing=True): + def delete_conntrack_helper( + self, conntrack_helper, router, ignore_missing=True + ): """Delete a L3 conntrack_helper :param conntrack_helper: The value can be the ID of a L3 conntrack @@ -5635,9 +6133,12 @@ class Proxy(proxy.Proxy, Generic[T]): :returns: ``None`` """ router = self._get_resource(_router.Router, router) - self._delete(_l3_conntrack_helper.ConntrackHelper, - conntrack_helper, router_id=router.id, - ignore_missing=ignore_missing) + self._delete( + _l3_conntrack_helper.ConntrackHelper, + conntrack_helper, + router_id=router.id, + ignore_missing=ignore_missing, + ) def create_tap_flow(self, **attrs): """Create a new Tap Flow from attributes""" @@ -5645,13 +6146,18 @@ class Proxy(proxy.Proxy, Generic[T]): def delete_tap_flow(self, tap_flow, ignore_missing=True): """Delete a Tap Flow""" - self._delete(_tap_flow.TapFlow, tap_flow, - ignore_missing=ignore_missing) + self._delete( + _tap_flow.TapFlow, tap_flow, ignore_missing=ignore_missing + ) def find_tap_flow(self, name_or_id, ignore_missing=True, **query): - """"Find a single Tap Service""" - return self._find(_tap_flow.TapFlow, name_or_id, - ignore_missing=ignore_missing, **query) + """ "Find a single Tap Service""" + return self._find( + _tap_flow.TapFlow, + name_or_id, + ignore_missing=ignore_missing, + **query, + ) def get_tap_flow(self, tap_flow): """Get a signle Tap Flow""" @@ -5671,13 +6177,18 @@ class Proxy(proxy.Proxy, Generic[T]): def delete_tap_service(self, tap_service, ignore_missing=True): """Delete a Tap Service""" - self._delete(_tap_service.TapService, tap_service, - ignore_missing=ignore_missing) + self._delete( + _tap_service.TapService, tap_service, ignore_missing=ignore_missing + ) def find_tap_service(self, name_or_id, ignore_missing=True, **query): - """"Find a single Tap Service""" - return self._find(_tap_service.TapService, name_or_id, - ignore_missing=ignore_missing, **query) + """ "Find a single Tap Service""" + return self._find( + _tap_service.TapService, + name_or_id, + ignore_missing=ignore_missing, + **query, + ) def get_tap_service(self, tap_service): """Get a signle Tap Service""" @@ -5692,15 +6203,16 @@ class Proxy(proxy.Proxy, Generic[T]): return self._list(_tap_service.TapService, **query) def _get_cleanup_dependencies(self): - return { - 'network': { - 'before': ['identity'] - } - } + return {'network': {'before': ['identity']}} - def _service_cleanup(self, dry_run=True, client_status_queue=None, - identified_resources=None, - filters=None, resource_evaluation_fn=None): + def _service_cleanup( + self, + dry_run=True, + client_status_queue=None, + identified_resources=None, + filters=None, + resource_evaluation_fn=None, + ): project_id = self.get_project_id() # Delete floating_ips in the project if no filters defined OR all # filters are matching and port_id is empty @@ -5712,7 +6224,8 @@ class Proxy(proxy.Proxy, Generic[T]): client_status_queue=client_status_queue, identified_resources=identified_resources, filters=filters, - resource_evaluation_fn=fip_cleanup_evaluation) + resource_evaluation_fn=fip_cleanup_evaluation, + ) # Delete (try to delete) all security groups in the project # Let's hope we can't drop SG in use @@ -5725,22 +6238,20 @@ class Proxy(proxy.Proxy, Generic[T]): client_status_queue=client_status_queue, identified_resources=identified_resources, filters=filters, - resource_evaluation_fn=resource_evaluation_fn) + resource_evaluation_fn=resource_evaluation_fn, + ) # Networks are crazy, try to delete router+net+subnet # if there are no "other" ports allocated on the net for net in self.networks(project_id=project_id): network_has_ports_allocated = False router_if = list() - for port in self.ports( - project_id=project_id, - network_id=net.id - ): + for port in self.ports(project_id=project_id, network_id=net.id): self.log.debug('Looking at port %s' % port) if port.device_owner in [ 'network:router_interface', 'network:router_interface_distributed', - 'network:ha_router_replicated_interface' + 'network:ha_router_replicated_interface', ]: router_if.append(port) elif port.device_owner == 'network:dhcp': @@ -5768,7 +6279,8 @@ class Proxy(proxy.Proxy, Generic[T]): client_status_queue=None, identified_resources=None, filters=filters, - resource_evaluation_fn=resource_evaluation_fn) + resource_evaluation_fn=resource_evaluation_fn, + ) if not network_must_be_deleted: # If not - check another net continue @@ -5780,8 +6292,8 @@ class Proxy(proxy.Proxy, Generic[T]): if not dry_run: try: self.remove_interface_from_router( - router=port.device_id, - port_id=port.id) + router=port.device_id, port_id=port.id + ) except exceptions.SDKException: self.log.error('Cannot delete object %s' % obj) # router disconnected, drop it @@ -5792,12 +6304,10 @@ class Proxy(proxy.Proxy, Generic[T]): client_status_queue=client_status_queue, identified_resources=identified_resources, filters=None, - resource_evaluation_fn=None) + resource_evaluation_fn=None, + ) # Drop ports not belonging to anybody - for port in self.ports( - project_id=project_id, - network_id=net.id - ): + for port in self.ports(project_id=project_id, network_id=net.id): if port.device_owner is None or port.device_owner == '': self._service_cleanup_del_res( self.delete_port, @@ -5806,13 +6316,11 @@ class Proxy(proxy.Proxy, Generic[T]): client_status_queue=client_status_queue, identified_resources=identified_resources, filters=None, - resource_evaluation_fn=None) + resource_evaluation_fn=None, + ) # Drop all subnets in the net (no further conditions) - for obj in self.subnets( - project_id=project_id, - network_id=net.id - ): + for obj in self.subnets(project_id=project_id, network_id=net.id): self._service_cleanup_del_res( self.delete_subnet, obj, @@ -5820,7 +6328,8 @@ class Proxy(proxy.Proxy, Generic[T]): client_status_queue=client_status_queue, identified_resources=identified_resources, filters=None, - resource_evaluation_fn=None) + resource_evaluation_fn=None, + ) # And now the network itself (we are here definitely only if we # need that) @@ -5831,7 +6340,8 @@ class Proxy(proxy.Proxy, Generic[T]): client_status_queue=client_status_queue, identified_resources=identified_resources, filters=None, - resource_evaluation_fn=None) + resource_evaluation_fn=None, + ) # It might happen, that we have routers not attached to anything for obj in self.routers(): @@ -5844,7 +6354,8 @@ class Proxy(proxy.Proxy, Generic[T]): client_status_queue=client_status_queue, identified_resources=identified_resources, filters=None, - resource_evaluation_fn=None) + resource_evaluation_fn=None, + ) def fip_cleanup_evaluation(obj, identified_resources=None, filters=None): @@ -5855,13 +6366,10 @@ def fip_cleanup_evaluation(obj, identified_resources=None, filters=None): identified by other services for deletion. :param dict filters: dictionary with parameters """ - if ( - filters is not None - and ( - obj.port_id is not None - and identified_resources - and obj.port_id not in identified_resources - ) + if filters is not None and ( + obj.port_id is not None + and identified_resources + and obj.port_id not in identified_resources ): # If filters are set, but port is not empty and will not be empty - # skip diff --git a/openstack/network/v2/address_group.py b/openstack/network/v2/address_group.py index 3fb256f5f..73bbc6344 100644 --- a/openstack/network/v2/address_group.py +++ b/openstack/network/v2/address_group.py @@ -17,6 +17,7 @@ from openstack import utils class AddressGroup(resource.Resource): """Address group extension.""" + resource_key = 'address_group' resources_key = 'address_groups' base_path = '/address-groups' @@ -31,9 +32,11 @@ class AddressGroup(resource.Resource): _allow_unknown_attrs_in_body = True _query_mapping = resource.QueryParameters( - "sort_key", "sort_dir", - 'name', 'description', - 'project_id' + "sort_key", + "sort_dir", + 'name', + 'description', + 'project_id', ) # Properties diff --git a/openstack/network/v2/address_scope.py b/openstack/network/v2/address_scope.py index 1ad1cbd18..3b1aac26e 100644 --- a/openstack/network/v2/address_scope.py +++ b/openstack/network/v2/address_scope.py @@ -15,6 +15,7 @@ from openstack import resource class AddressScope(resource.Resource): """Address scope extension.""" + resource_key = 'address_scope' resources_key = 'address_scopes' base_path = '/address-scopes' @@ -29,7 +30,8 @@ class AddressScope(resource.Resource): allow_list = True _query_mapping = resource.QueryParameters( - 'name', 'ip_version', + 'name', + 'ip_version', 'project_id', is_shared='shared', ) diff --git a/openstack/network/v2/agent.py b/openstack/network/v2/agent.py index 3c39ddb2b..ff5f664da 100644 --- a/openstack/network/v2/agent.py +++ b/openstack/network/v2/agent.py @@ -17,6 +17,7 @@ from openstack import utils class Agent(resource.Resource): """Neutron agent extension.""" + resource_key = 'agent' resources_key = 'agents' base_path = '/agents' @@ -32,9 +33,14 @@ class Agent(resource.Resource): # NOTE: We skip query for JSON fields and datetime fields _query_mapping = resource.QueryParameters( - 'agent_type', 'availability_zone', 'binary', 'description', 'host', + 'agent_type', + 'availability_zone', + 'binary', + 'description', + 'host', 'topic', - is_admin_state_up='admin_state_up', is_alive='alive', + is_admin_state_up='admin_state_up', + is_alive='alive', ) # Properties @@ -85,8 +91,9 @@ class Agent(resource.Resource): def remove_agent_from_network(self, session, network_id): body = {'network_id': network_id} - url = utils.urljoin(self.base_path, self.id, 'dhcp-networks', - network_id) + url = utils.urljoin( + self.base_path, self.id, 'dhcp-networks', network_id + ) session.delete(url, json=body) def add_router_to_agent(self, session, router): diff --git a/openstack/network/v2/availability_zone.py b/openstack/network/v2/availability_zone.py index 3e5449d45..9879d53b4 100644 --- a/openstack/network/v2/availability_zone.py +++ b/openstack/network/v2/availability_zone.py @@ -30,7 +30,9 @@ class AvailabilityZone(_resource.Resource): # NOTE: We don't support query by state yet because there is a mapping # at neutron side difficult to map. _query_mapping = _resource.QueryParameters( - name='availability_zone', resource='agent_type') + name='availability_zone', + resource='agent_type', + ) # Properties #: Name of the availability zone. diff --git a/openstack/network/v2/bgp_speaker.py b/openstack/network/v2/bgp_speaker.py index ad553e4af..8c96764a1 100644 --- a/openstack/network/v2/bgp_speaker.py +++ b/openstack/network/v2/bgp_speaker.py @@ -43,7 +43,8 @@ class BgpSpeaker(resource.Resource): #: Whether to enable or disable the advertisement of floating ip host #: routes by the BGP Speaker. True by default. advertise_floating_ip_host_routes = resource.Body( - 'advertise_floating_ip_host_routes') + 'advertise_floating_ip_host_routes' + ) #: Whether to enable or disable the advertisement of tenant network #: routes by the BGP Speaker. True by default. advertise_tenant_networks = resource.Body('advertise_tenant_networks') @@ -164,6 +165,5 @@ class BgpSpeaker(resource.Resource): :param bgp_agent_id: The id of the dynamic routing agent from which remove the speaker. """ - url = utils.urljoin('agents', bgp_agent_id, - 'bgp-drinstances', self.id) + url = utils.urljoin('agents', bgp_agent_id, 'bgp-drinstances', self.id) session.delete(url) diff --git a/openstack/network/v2/firewall_group.py b/openstack/network/v2/firewall_group.py index 93db5b404..4f16c1c35 100644 --- a/openstack/network/v2/firewall_group.py +++ b/openstack/network/v2/firewall_group.py @@ -31,9 +31,15 @@ class FirewallGroup(resource.Resource): allow_list = True _query_mapping = resource.QueryParameters( - 'description', 'egress_firewall_policy_id', - 'ingress_firewall_policy_id', 'name', 'shared', 'status', 'ports', - 'project_id') + 'description', + 'egress_firewall_policy_id', + 'ingress_firewall_policy_id', + 'name', + 'shared', + 'status', + 'ports', + 'project_id', + ) # Properties #: The administrative state of the firewall group, which is up (true) or diff --git a/openstack/network/v2/firewall_policy.py b/openstack/network/v2/firewall_policy.py index d4dc182e8..4d760bc08 100644 --- a/openstack/network/v2/firewall_policy.py +++ b/openstack/network/v2/firewall_policy.py @@ -33,7 +33,12 @@ class FirewallPolicy(resource.Resource): allow_list = True _query_mapping = resource.QueryParameters( - 'description', 'firewall_rules', 'name', 'project_id', 'shared') + 'description', + 'firewall_rules', + 'name', + 'project_id', + 'shared', + ) # Properties #: Each time that the firewall policy or its associated rules are changed, diff --git a/openstack/network/v2/firewall_rule.py b/openstack/network/v2/firewall_rule.py index 8d5ed5056..da2df0d95 100644 --- a/openstack/network/v2/firewall_rule.py +++ b/openstack/network/v2/firewall_rule.py @@ -31,9 +31,20 @@ class FirewallRule(resource.Resource): allow_list = True _query_mapping = resource.QueryParameters( - 'action', 'description', 'destination_ip_address', 'name', - 'destination_port', 'enabled', 'ip_version', 'project_id', 'protocol', - 'shared', 'source_ip_address', 'source_port', 'firewall_policy_id') + 'action', + 'description', + 'destination_ip_address', + 'name', + 'destination_port', + 'enabled', + 'ip_version', + 'project_id', + 'protocol', + 'shared', + 'source_ip_address', + 'source_port', + 'firewall_policy_id', + ) # Properties #: The action that the API performs on traffic that matches the firewall diff --git a/openstack/network/v2/flavor.py b/openstack/network/v2/flavor.py index 361465c4d..97f35efb4 100644 --- a/openstack/network/v2/flavor.py +++ b/openstack/network/v2/flavor.py @@ -29,7 +29,11 @@ class Flavor(resource.Resource): allow_list = True _query_mapping = resource.QueryParameters( - 'description', 'name', 'service_type', is_enabled='enabled') + 'description', + 'name', + 'service_type', + is_enabled='enabled', + ) # properties #: description for the flavor @@ -44,7 +48,8 @@ class Flavor(resource.Resource): service_profile_ids = resource.Body('service_profiles', type=list) def associate_flavor_with_service_profile( - self, session, service_profile_id=None): + self, session, service_profile_id=None + ): flavor_id = self.id url = utils.urljoin(self.base_path, flavor_id, 'service_profiles') body = {"service_profile": {"id": service_profile_id}} @@ -52,9 +57,13 @@ class Flavor(resource.Resource): return resp.json() def disassociate_flavor_from_service_profile( - self, session, service_profile_id=None): + self, session, service_profile_id=None + ): flavor_id = self.id url = utils.urljoin( - self.base_path, flavor_id, 'service_profiles', service_profile_id) - session.delete(url,) + self.base_path, flavor_id, 'service_profiles', service_profile_id + ) + session.delete( + url, + ) return None diff --git a/openstack/network/v2/floating_ip.py b/openstack/network/v2/floating_ip.py index 76383b2f6..17db58ea7 100644 --- a/openstack/network/v2/floating_ip.py +++ b/openstack/network/v2/floating_ip.py @@ -30,12 +30,19 @@ class FloatingIP(_base.NetworkResource, tag.TagMixin): # For backward compatibility include tenant_id as query param _query_mapping = resource.QueryParameters( - 'description', 'fixed_ip_address', - 'floating_ip_address', 'floating_network_id', - 'port_id', 'router_id', 'status', 'subnet_id', - 'project_id', 'tenant_id', + 'description', + 'fixed_ip_address', + 'floating_ip_address', + 'floating_network_id', + 'port_id', + 'router_id', + 'status', + 'subnet_id', + 'project_id', + 'tenant_id', tenant_id='project_id', - **tag.TagMixin._tag_query_parameters) + **tag.TagMixin._tag_query_parameters + ) # Properties #: Timestamp at which the floating IP was created. diff --git a/openstack/network/v2/health_monitor.py b/openstack/network/v2/health_monitor.py index 7859d0b12..bf853cfdf 100644 --- a/openstack/network/v2/health_monitor.py +++ b/openstack/network/v2/health_monitor.py @@ -28,8 +28,14 @@ class HealthMonitor(resource.Resource): allow_list = True _query_mapping = resource.QueryParameters( - 'delay', 'expected_codes', 'http_method', 'max_retries', - 'timeout', 'type', 'url_path', 'project_id', + 'delay', + 'expected_codes', + 'http_method', + 'max_retries', + 'timeout', + 'type', + 'url_path', + 'project_id', is_admin_state_up='adminstate_up', ) diff --git a/openstack/network/v2/listener.py b/openstack/network/v2/listener.py index 376650a0e..d46ff5788 100644 --- a/openstack/network/v2/listener.py +++ b/openstack/network/v2/listener.py @@ -28,9 +28,15 @@ class Listener(resource.Resource): allow_list = True _query_mapping = resource.QueryParameters( - 'connection_limit', 'default_pool_id', 'default_tls_container_ref', - 'description', 'name', 'project_id', 'protocol', 'protocol_port', - is_admin_state_up='admin_state_up' + 'connection_limit', + 'default_pool_id', + 'default_tls_container_ref', + 'description', + 'name', + 'project_id', + 'protocol', + 'protocol_port', + is_admin_state_up='admin_state_up', ) # Properties diff --git a/openstack/network/v2/load_balancer.py b/openstack/network/v2/load_balancer.py index 6d4e07b3c..08f505b0d 100644 --- a/openstack/network/v2/load_balancer.py +++ b/openstack/network/v2/load_balancer.py @@ -28,9 +28,15 @@ class LoadBalancer(resource.Resource): allow_list = True _query_mapping = resource.QueryParameters( - 'description', 'name', 'project_id', 'provider', 'provisioning_status', - 'tenant_id', 'vip_address', 'vip_subnet_id', - is_admin_state_up='admin_state_up' + 'description', + 'name', + 'project_id', + 'provider', + 'provisioning_status', + 'tenant_id', + 'vip_address', + 'vip_subnet_id', + is_admin_state_up='admin_state_up', ) # Properties diff --git a/openstack/network/v2/local_ip.py b/openstack/network/v2/local_ip.py index b2393b367..74beb123c 100644 --- a/openstack/network/v2/local_ip.py +++ b/openstack/network/v2/local_ip.py @@ -18,6 +18,7 @@ from openstack import resource class LocalIP(resource.Resource): """Local IP extension.""" + resource_name = "local ip" resource_key = "local_ip" resources_key = "local_ips" @@ -33,10 +34,14 @@ class LocalIP(resource.Resource): _allow_unknown_attrs_in_body = True _query_mapping = resource.QueryParameters( - "sort_key", "sort_dir", - 'name', 'description', - 'project_id', 'network_id', - 'local_port_id', 'local_ip_address', + "sort_key", + "sort_dir", + 'name', + 'description', + 'project_id', + 'network_id', + 'local_port_id', + 'local_ip_address', 'ip_mode', ) diff --git a/openstack/network/v2/local_ip_association.py b/openstack/network/v2/local_ip_association.py index 310c6d6f2..c8ecfad09 100644 --- a/openstack/network/v2/local_ip_association.py +++ b/openstack/network/v2/local_ip_association.py @@ -18,6 +18,7 @@ from openstack import resource class LocalIPAssociation(resource.Resource): """Local IP extension.""" + resource_key = "port_association" resources_key = "port_associations" base_path = "/local_ips/%(local_ip_id)s/port_associations" @@ -32,8 +33,11 @@ class LocalIPAssociation(resource.Resource): _allow_unknown_attrs_in_body = True _query_mapping = resource.QueryParameters( - 'fixed_port_id', 'fixed_ip', 'host', + 'fixed_port_id', + 'fixed_ip', + 'host', ) + # Properties #: The fixed port ID. fixed_port_id = resource.Body('fixed_port_id') diff --git a/openstack/network/v2/metering_label.py b/openstack/network/v2/metering_label.py index 6bedb4ad3..0bef6b11c 100644 --- a/openstack/network/v2/metering_label.py +++ b/openstack/network/v2/metering_label.py @@ -28,7 +28,9 @@ class MeteringLabel(resource.Resource): allow_list = True _query_mapping = resource.QueryParameters( - 'description', 'name', 'project_id', + 'description', + 'name', + 'project_id', is_shared='shared', ) diff --git a/openstack/network/v2/metering_label_rule.py b/openstack/network/v2/metering_label_rule.py index a4c286345..85c7e6ae4 100644 --- a/openstack/network/v2/metering_label_rule.py +++ b/openstack/network/v2/metering_label_rule.py @@ -28,8 +28,12 @@ class MeteringLabelRule(resource.Resource): allow_list = True _query_mapping = resource.QueryParameters( - 'direction', 'metering_label_id', 'remote_ip_prefix', - 'source_ip_prefix', 'destination_ip_prefix', 'project_id', + 'direction', + 'metering_label_id', + 'remote_ip_prefix', + 'source_ip_prefix', + 'destination_ip_prefix', + 'project_id', ) # Properties @@ -49,13 +53,15 @@ class MeteringLabelRule(resource.Resource): tenant_id = resource.Body('tenant_id', deprecated=True) #: The remote IP prefix to be associated with this metering label rule. remote_ip_prefix = resource.Body( - 'remote_ip_prefix', deprecated=True, + 'remote_ip_prefix', + deprecated=True, deprecation_reason="The use of 'remote_ip_prefix' in metering label " - "rules is deprecated and will be removed in future " - "releases. One should use instead, the " - "'source_ip_prefix' and/or 'destination_ip_prefix' " - "parameters. For more details, you can check the " - "spec: https://review.opendev.org/#/c/744702/.") + "rules is deprecated and will be removed in future " + "releases. One should use instead, the " + "'source_ip_prefix' and/or 'destination_ip_prefix' " + "parameters. For more details, you can check the " + "spec: https://review.opendev.org/#/c/744702/.", + ) #: The source IP prefix to be associated with this metering label rule. source_ip_prefix = resource.Body('source_ip_prefix') diff --git a/openstack/network/v2/ndp_proxy.py b/openstack/network/v2/ndp_proxy.py index cff0b8302..ae75927cf 100644 --- a/openstack/network/v2/ndp_proxy.py +++ b/openstack/network/v2/ndp_proxy.py @@ -29,9 +29,15 @@ class NDPProxy(resource.Resource): _allow_unknown_attrs_in_body = True _query_mapping = resource.QueryParameters( - "sort_key", "sort_dir", - 'name', 'description', 'project_id', - 'router_id', 'port_id', 'ip_address') + "sort_key", + "sort_dir", + 'name', + 'description', + 'project_id', + 'router_id', + 'port_id', + 'ip_address', + ) # Properties #: Timestamp at which the NDP proxy was created. diff --git a/openstack/network/v2/network.py b/openstack/network/v2/network.py index 074bd39c1..9f9f94f0a 100644 --- a/openstack/network/v2/network.py +++ b/openstack/network/v2/network.py @@ -28,7 +28,9 @@ class Network(_base.NetworkResource, tag.TagMixin): # NOTE: We don't support query on list or datetime fields yet _query_mapping = resource.QueryParameters( - 'description', 'name', 'status', + 'description', + 'name', + 'status', 'project_id', ipv4_address_scope_id='ipv4_address_scope', ipv6_address_scope_id='ipv6_address_scope', @@ -68,13 +70,14 @@ class Network(_base.NetworkResource, tag.TagMixin): #: The port security status, which is enabled ``True`` or disabled #: ``False``. *Type: bool* *Default: False* #: Available for multiple provider extensions. - is_port_security_enabled = resource.Body('port_security_enabled', - type=bool, - default=False) + is_port_security_enabled = resource.Body( + 'port_security_enabled', type=bool, default=False + ) #: Whether or not the router is external. #: *Type: bool* *Default: False* - is_router_external = resource.Body('router:external', type=bool, - default=False) + is_router_external = resource.Body( + 'router:external', type=bool, default=False + ) #: Indicates whether this network is shared across all tenants. #: By default, only administrative users can change this value. #: *Type: bool* diff --git a/openstack/network/v2/network_ip_availability.py b/openstack/network/v2/network_ip_availability.py index a1b1d8d41..8410ece5a 100644 --- a/openstack/network/v2/network_ip_availability.py +++ b/openstack/network/v2/network_ip_availability.py @@ -29,8 +29,10 @@ class NetworkIPAvailability(resource.Resource): allow_list = True _query_mapping = resource.QueryParameters( - 'ip_version', 'network_id', 'network_name', - 'project_id' + 'ip_version', + 'network_id', + 'network_name', + 'project_id', ) # Properties diff --git a/openstack/network/v2/network_segment_range.py b/openstack/network/v2/network_segment_range.py index bb7e7ff41..67b844537 100644 --- a/openstack/network/v2/network_segment_range.py +++ b/openstack/network/v2/network_segment_range.py @@ -31,9 +31,16 @@ class NetworkSegmentRange(resource.Resource): allow_list = True _query_mapping = resource.QueryParameters( - 'name', 'default', 'shared', 'project_id', - 'network_type', 'physical_network', 'minimum', 'maximum', - 'used', 'available' + 'name', + 'default', + 'shared', + 'project_id', + 'network_type', + 'physical_network', + 'minimum', + 'maximum', + 'used', + 'available', ) # Properties diff --git a/openstack/network/v2/pool.py b/openstack/network/v2/pool.py index e5215a712..7d2ee31da 100644 --- a/openstack/network/v2/pool.py +++ b/openstack/network/v2/pool.py @@ -28,8 +28,14 @@ class Pool(resource.Resource): allow_list = True _query_mapping = resource.QueryParameters( - 'description', 'lb_algorithm', 'name', - 'protocol', 'provider', 'subnet_id', 'virtual_ip_id', 'listener_id', + 'description', + 'lb_algorithm', + 'name', + 'protocol', + 'provider', + 'subnet_id', + 'virtual_ip_id', + 'listener_id', 'project_id', is_admin_state_up='admin_state_up', load_balancer_id='loadbalancer_id', diff --git a/openstack/network/v2/pool_member.py b/openstack/network/v2/pool_member.py index aba6fb9cc..02f01e6e5 100644 --- a/openstack/network/v2/pool_member.py +++ b/openstack/network/v2/pool_member.py @@ -28,7 +28,11 @@ class PoolMember(resource.Resource): allow_list = True _query_mapping = resource.QueryParameters( - 'address', 'name', 'protocol_port', 'subnet_id', 'weight', + 'address', + 'name', + 'protocol_port', + 'subnet_id', + 'weight', 'project_id', is_admin_state_up='admin_state_up', ) diff --git a/openstack/network/v2/port.py b/openstack/network/v2/port.py index 30de433f0..c0fba5d2d 100644 --- a/openstack/network/v2/port.py +++ b/openstack/network/v2/port.py @@ -30,11 +30,25 @@ class Port(_base.NetworkResource, tag.TagMixin): # NOTE: we skip query on list or datetime fields for now _query_mapping = resource.QueryParameters( - 'binding:host_id', 'binding:profile', 'binding:vif_details', - 'binding:vif_type', 'binding:vnic_type', - 'description', 'device_id', 'device_owner', 'fields', 'fixed_ips', - 'id', 'ip_address', 'mac_address', 'name', 'network_id', 'status', - 'subnet_id', 'project_id', 'security_groups', + 'binding:host_id', + 'binding:profile', + 'binding:vif_details', + 'binding:vif_type', + 'binding:vnic_type', + 'description', + 'device_id', + 'device_owner', + 'fields', + 'fixed_ips', + 'id', + 'ip_address', + 'mac_address', + 'name', + 'network_id', + 'status', + 'subnet_id', + 'project_id', + 'security_groups', is_admin_state_up='admin_state_up', is_port_security_enabled='port_security_enabled', security_group_ids='security_groups', @@ -44,8 +58,9 @@ class Port(_base.NetworkResource, tag.TagMixin): # Properties #: Allowed address pairs list. Dictionary key ``ip_address`` is required #: and key ``mac_address`` is optional. - allowed_address_pairs: List[dict] = resource.Body('allowed_address_pairs', - type=list) + allowed_address_pairs: List[dict] = resource.Body( + 'allowed_address_pairs', type=list + ) #: The ID of the host where the port is allocated. In some cases, #: different implementations can run on different hosts. binding_host_id = resource.Body('binding:host_id') @@ -104,8 +119,9 @@ class Port(_base.NetworkResource, tag.TagMixin): is_admin_state_up = resource.Body('admin_state_up', type=bool) #: The port security status, which is enabled ``True`` or disabled #: ``False``. *Type: bool* *Default: False* - is_port_security_enabled = resource.Body('port_security_enabled', - type=bool, default=False) + is_port_security_enabled = resource.Body( + 'port_security_enabled', type=bool, default=False + ) #: The MAC address of an allowed address pair. mac_address = resource.Body('mac_address') #: The port name. @@ -120,8 +136,9 @@ class Port(_base.NetworkResource, tag.TagMixin): #: Tenant_id (deprecated attribute). tenant_id = resource.Body('tenant_id', deprecated=True) #: Whether to propagate uplink status of the port. *Type: bool* - propagate_uplink_status = resource.Body('propagate_uplink_status', - type=bool) + propagate_uplink_status = resource.Body( + 'propagate_uplink_status', type=bool + ) #: Read-only. The ID of the QoS policy attached to the network where the # port is bound. qos_network_policy_id = resource.Body('qos_network_policy_id') diff --git a/openstack/network/v2/port_forwarding.py b/openstack/network/v2/port_forwarding.py index aca7873fc..77b92928b 100644 --- a/openstack/network/v2/port_forwarding.py +++ b/openstack/network/v2/port_forwarding.py @@ -30,7 +30,9 @@ class PortForwarding(resource.Resource): allow_list = True _query_mapping = resource.QueryParameters( - 'internal_port_id', 'external_port', 'protocol' + 'internal_port_id', + 'external_port', + 'protocol', ) # Properties diff --git a/openstack/network/v2/qos_policy.py b/openstack/network/v2/qos_policy.py index ec5e98918..6967735e4 100644 --- a/openstack/network/v2/qos_policy.py +++ b/openstack/network/v2/qos_policy.py @@ -29,7 +29,9 @@ class QoSPolicy(resource.Resource, tag.TagMixin): allow_list = True _query_mapping = resource.QueryParameters( - 'name', 'description', 'is_default', + 'name', + 'description', + 'is_default', 'project_id', is_shared='shared', **tag.TagMixin._tag_query_parameters diff --git a/openstack/network/v2/qos_rule_type.py b/openstack/network/v2/qos_rule_type.py index c115b8d6b..7aff99e7d 100644 --- a/openstack/network/v2/qos_rule_type.py +++ b/openstack/network/v2/qos_rule_type.py @@ -28,7 +28,11 @@ class QoSRuleType(resource.Resource): allow_list = True _query_mapping = resource.QueryParameters( - 'type', 'drivers', 'all_rules', 'all_supported') + 'type', + 'drivers', + 'all_rules', + 'all_supported', + ) # Properties #: QoS rule type name. diff --git a/openstack/network/v2/quota.py b/openstack/network/v2/quota.py index 1c0c827df..f3b79743a 100644 --- a/openstack/network/v2/quota.py +++ b/openstack/network/v2/quota.py @@ -60,10 +60,12 @@ class Quota(resource.Resource): #: The maximum amount of security groups you can create. *Type: int* security_groups = resource.Body('security_group', type=int) - def _prepare_request(self, requires_id=True, prepend_key=False, - base_path=None, **kwargs): - _request = super(Quota, self)._prepare_request(requires_id, - prepend_key) + def _prepare_request( + self, requires_id=True, prepend_key=False, base_path=None, **kwargs + ): + _request = super(Quota, self)._prepare_request( + requires_id, prepend_key + ) if self.resource_key in _request.body: _body = _request.body[self.resource_key] else: diff --git a/openstack/network/v2/rbac_policy.py b/openstack/network/v2/rbac_policy.py index f3178dcd9..00ac27692 100644 --- a/openstack/network/v2/rbac_policy.py +++ b/openstack/network/v2/rbac_policy.py @@ -28,8 +28,12 @@ class RBACPolicy(resource.Resource): allow_list = True _query_mapping = resource.QueryParameters( - 'action', 'object_id', 'object_type', 'project_id', - 'target_project_id', target_project_id='target_tenant', + 'action', + 'object_id', + 'object_type', + 'project_id', + 'target_project_id', + target_project_id='target_tenant', ) # Properties diff --git a/openstack/network/v2/router.py b/openstack/network/v2/router.py index 9b5ef557c..30e10ca98 100644 --- a/openstack/network/v2/router.py +++ b/openstack/network/v2/router.py @@ -30,7 +30,11 @@ class Router(_base.NetworkResource, tag.TagMixin): # NOTE: We don't support query on datetime, list or dict fields _query_mapping = resource.QueryParameters( - 'description', 'flavor_id', 'name', 'status', 'project_id', + 'description', + 'flavor_id', + 'name', + 'status', + 'project_id', is_admin_state_up='admin_state_up', is_distributed='distributed', is_ha='ha', @@ -40,8 +44,9 @@ class Router(_base.NetworkResource, tag.TagMixin): # Properties #: Availability zone hints to use when scheduling the router. #: *Type: list of availability zone names* - availability_zone_hints = resource.Body('availability_zone_hints', - type=list) + availability_zone_hints = resource.Body( + 'availability_zone_hints', type=list + ) #: Availability zones for the router. #: *Type: list of availability zone names* availability_zones = resource.Body('availability_zones', type=list) @@ -155,8 +160,7 @@ class Router(_base.NetworkResource, tag.TagMixin): :returns: The body of the response as a dictionary. """ - url = utils.urljoin(self.base_path, self.id, - 'add_gateway_router') + url = utils.urljoin(self.base_path, self.id, 'add_gateway_router') resp = session.put(url, json=body) return resp.json() @@ -169,8 +173,7 @@ class Router(_base.NetworkResource, tag.TagMixin): :returns: The body of the response as a dictionary. """ - url = utils.urljoin(self.base_path, self.id, - 'remove_gateway_router') + url = utils.urljoin(self.base_path, self.id, 'remove_gateway_router') resp = session.put(url, json=body) return resp.json() @@ -188,4 +191,5 @@ class L3AgentRouter(Router): allow_delete = False allow_list = True + # NOTE: No query parameter is supported diff --git a/openstack/network/v2/security_group.py b/openstack/network/v2/security_group.py index cf2d23534..1cc9aaabf 100644 --- a/openstack/network/v2/security_group.py +++ b/openstack/network/v2/security_group.py @@ -27,8 +27,16 @@ class SecurityGroup(_base.NetworkResource, tag.TagMixin): allow_list = True _query_mapping = resource.QueryParameters( - 'description', 'fields', 'id', 'name', 'stateful', 'project_id', - 'tenant_id', 'revision_number', 'sort_dir', 'sort_key', + 'description', + 'fields', + 'id', + 'name', + 'stateful', + 'project_id', + 'tenant_id', + 'revision_number', + 'sort_dir', + 'sort_key', **tag.TagMixin._tag_query_parameters ) diff --git a/openstack/network/v2/security_group_rule.py b/openstack/network/v2/security_group_rule.py index dd5b4c8e1..369a70de2 100644 --- a/openstack/network/v2/security_group_rule.py +++ b/openstack/network/v2/security_group_rule.py @@ -27,13 +27,21 @@ class SecurityGroupRule(_base.NetworkResource, tag.TagMixin): allow_list = True _query_mapping = resource.QueryParameters( - 'description', 'direction', 'id', 'protocol', - 'remote_group_id', 'security_group_id', + 'description', + 'direction', + 'id', + 'protocol', + 'remote_group_id', + 'security_group_id', 'remote_address_group_id', - 'port_range_max', 'port_range_min', - 'remote_ip_prefix', 'revision_number', - 'project_id', 'tenant_id', - 'sort_dir', 'sort_key', + 'port_range_max', + 'port_range_min', + 'remote_ip_prefix', + 'revision_number', + 'project_id', + 'tenant_id', + 'sort_dir', + 'sort_key', ether_type='ethertype', **tag.TagMixin._tag_query_parameters ) @@ -89,7 +97,8 @@ class SecurityGroupRule(_base.NetworkResource, tag.TagMixin): def _prepare_request(self, *args, **kwargs): _request = super(SecurityGroupRule, self)._prepare_request( - *args, **kwargs) + *args, **kwargs + ) # Old versions of Neutron do not handle being passed a # remote_address_group_id and raise and error. Remove it from # the body if it is blank. diff --git a/openstack/network/v2/segment.py b/openstack/network/v2/segment.py index 81a18996d..62cd325b3 100644 --- a/openstack/network/v2/segment.py +++ b/openstack/network/v2/segment.py @@ -28,8 +28,12 @@ class Segment(resource.Resource): allow_list = True _query_mapping = resource.QueryParameters( - 'description', 'name', 'network_id', 'network_type', - 'physical_network', 'segmentation_id', + 'description', + 'name', + 'network_id', + 'network_type', + 'physical_network', + 'segmentation_id', ) # Properties diff --git a/openstack/network/v2/service_profile.py b/openstack/network/v2/service_profile.py index 26cf7bc6b..b6502164f 100644 --- a/openstack/network/v2/service_profile.py +++ b/openstack/network/v2/service_profile.py @@ -28,7 +28,9 @@ class ServiceProfile(resource.Resource): allow_list = True _query_mapping = resource.QueryParameters( - 'description', 'driver', 'project_id', + 'description', + 'driver', + 'project_id', is_enabled='enabled', ) # Properties diff --git a/openstack/network/v2/service_provider.py b/openstack/network/v2/service_provider.py index a5e9260ee..ef2e4b004 100644 --- a/openstack/network/v2/service_provider.py +++ b/openstack/network/v2/service_provider.py @@ -27,8 +27,9 @@ class ServiceProvider(resource.Resource): allow_list = True _query_mapping = resource.QueryParameters( - 'service_type', 'name', - is_default='default' + 'service_type', + 'name', + is_default='default', ) # Properties diff --git a/openstack/network/v2/subnet.py b/openstack/network/v2/subnet.py index d219e1ec8..8d83feb27 100644 --- a/openstack/network/v2/subnet.py +++ b/openstack/network/v2/subnet.py @@ -28,9 +28,17 @@ class Subnet(_base.NetworkResource, tag.TagMixin): # NOTE: Query on list or datetime fields are currently not supported. _query_mapping = resource.QueryParameters( - 'cidr', 'description', 'gateway_ip', 'ip_version', - 'ipv6_address_mode', 'ipv6_ra_mode', 'name', 'network_id', - 'segment_id', 'dns_publish_fixed_ip', 'project_id', + 'cidr', + 'description', + 'gateway_ip', + 'ip_version', + 'ipv6_address_mode', + 'ipv6_ra_mode', + 'name', + 'network_id', + 'segment_id', + 'dns_publish_fixed_ip', + 'project_id', is_dhcp_enabled='enable_dhcp', subnet_pool_id='subnetpool_id', use_default_subnet_pool='use_default_subnetpool', @@ -87,6 +95,5 @@ class Subnet(_base.NetworkResource, tag.TagMixin): updated_at = resource.Body('updated_at') #: Whether to use the default subnet pool to obtain a CIDR. use_default_subnet_pool = resource.Body( - 'use_default_subnetpool', - type=bool + 'use_default_subnetpool', type=bool ) diff --git a/openstack/network/v2/subnet_pool.py b/openstack/network/v2/subnet_pool.py index 99a24da32..22e3e05e0 100644 --- a/openstack/network/v2/subnet_pool.py +++ b/openstack/network/v2/subnet_pool.py @@ -28,8 +28,12 @@ class SubnetPool(resource.Resource, tag.TagMixin): allow_list = True _query_mapping = resource.QueryParameters( - 'address_scope_id', 'description', 'ip_version', 'is_default', - 'name', 'project_id', + 'address_scope_id', + 'description', + 'ip_version', + 'is_default', + 'name', + 'project_id', is_shared='shared', **tag.TagMixin._tag_query_parameters ) diff --git a/openstack/network/v2/tap_flow.py b/openstack/network/v2/tap_flow.py index 9707170db..e892d69fa 100644 --- a/openstack/network/v2/tap_flow.py +++ b/openstack/network/v2/tap_flow.py @@ -30,8 +30,10 @@ class TapFlow(resource.Resource): _allow_unknown_attrs_in_body = True _query_mapping = resource.QueryParameters( - "sort_key", "sort_dir", - 'name', 'project_id' + "sort_key", + "sort_dir", + 'name', + 'project_id', ) # Properties diff --git a/openstack/network/v2/tap_service.py b/openstack/network/v2/tap_service.py index 527b1e0a6..ecb2825fb 100644 --- a/openstack/network/v2/tap_service.py +++ b/openstack/network/v2/tap_service.py @@ -30,8 +30,7 @@ class TapService(resource.Resource): _allow_unknown_attrs_in_body = True _query_mapping = resource.QueryParameters( - "sort_key", "sort_dir", - 'name', 'project_id' + "sort_key", "sort_dir", 'name', 'project_id' ) # Properties diff --git a/openstack/network/v2/trunk.py b/openstack/network/v2/trunk.py index 82f1bede8..2ec34c681 100644 --- a/openstack/network/v2/trunk.py +++ b/openstack/network/v2/trunk.py @@ -30,7 +30,11 @@ class Trunk(resource.Resource, tag.TagMixin): allow_list = True _query_mapping = resource.QueryParameters( - 'name', 'description', 'port_id', 'status', 'sub_ports', + 'name', + 'description', + 'port_id', + 'status', + 'sub_ports', 'project_id', is_admin_state_up='admin_state_up', **tag.TagMixin._tag_query_parameters diff --git a/openstack/network/v2/vpn_endpoint_group.py b/openstack/network/v2/vpn_endpoint_group.py index 12a0a4e59..063f9e301 100644 --- a/openstack/network/v2/vpn_endpoint_group.py +++ b/openstack/network/v2/vpn_endpoint_group.py @@ -28,8 +28,11 @@ class VpnEndpointGroup(resource.Resource): allow_list = True _query_mapping = resource.QueryParameters( - 'description', 'name', 'project_id', 'tenant_id', - type='endpoint_type' + 'description', + 'name', + 'project_id', + 'tenant_id', + type='endpoint_type', ) # Properties diff --git a/openstack/network/v2/vpn_ike_policy.py b/openstack/network/v2/vpn_ike_policy.py index 9cc585ae0..db1ff6f7f 100644 --- a/openstack/network/v2/vpn_ike_policy.py +++ b/openstack/network/v2/vpn_ike_policy.py @@ -15,6 +15,7 @@ from openstack import resource class VpnIkePolicy(resource.Resource): """VPN IKE policy extension.""" + resource_key = 'ikepolicy' resources_key = 'ikepolicies' base_path = '/vpn/ikepolicies' @@ -27,8 +28,14 @@ class VpnIkePolicy(resource.Resource): allow_list = True _query_mapping = resource.QueryParameters( - 'auth_algorithm', 'description', 'encryption_algorithm', 'ike_version', - 'name', 'pfs', 'project_id', 'phase1_negotiation_mode', + 'auth_algorithm', + 'description', + 'encryption_algorithm', + 'ike_version', + 'name', + 'pfs', + 'project_id', + 'phase1_negotiation_mode', ) # Properties diff --git a/openstack/network/v2/vpn_ipsec_policy.py b/openstack/network/v2/vpn_ipsec_policy.py index 5b685b33e..9c9e09ec9 100644 --- a/openstack/network/v2/vpn_ipsec_policy.py +++ b/openstack/network/v2/vpn_ipsec_policy.py @@ -26,8 +26,13 @@ class VpnIpsecPolicy(resource.Resource): allow_list = True _query_mapping = resource.QueryParameters( - 'auth_algorithm', 'description', 'encryption_algorithm', 'name', 'pfs', - 'project_id', 'phase1_negotiation_mode', + 'auth_algorithm', + 'description', + 'encryption_algorithm', + 'name', + 'pfs', + 'project_id', + 'phase1_negotiation_mode', ) # Properties diff --git a/openstack/network/v2/vpn_ipsec_site_connection.py b/openstack/network/v2/vpn_ipsec_site_connection.py index f74c2c5ee..ed2bc31e8 100644 --- a/openstack/network/v2/vpn_ipsec_site_connection.py +++ b/openstack/network/v2/vpn_ipsec_site_connection.py @@ -26,11 +26,24 @@ class VpnIPSecSiteConnection(resource.Resource): allow_list = True _query_mapping = resource.QueryParameters( - 'auth_mode', 'description', 'ikepolicy_id', 'ipsecpolicy_id', - 'initiator', 'local_ep_group_id', 'peer_address', 'local_id', - 'mtu', 'name', 'peer_id', 'project_id', 'psk', 'peer_ep_group_id', - 'route_mode', 'vpnservice_id', 'status', - is_admin_state_up='admin_state_up' + 'auth_mode', + 'description', + 'ikepolicy_id', + 'ipsecpolicy_id', + 'initiator', + 'local_ep_group_id', + 'peer_address', + 'local_id', + 'mtu', + 'name', + 'peer_id', + 'project_id', + 'psk', + 'peer_ep_group_id', + 'route_mode', + 'vpnservice_id', + 'status', + is_admin_state_up='admin_state_up', ) # Properties diff --git a/openstack/network/v2/vpn_service.py b/openstack/network/v2/vpn_service.py index ef887b5a2..c03c8a6f0 100644 --- a/openstack/network/v2/vpn_service.py +++ b/openstack/network/v2/vpn_service.py @@ -28,9 +28,15 @@ class VpnService(resource.Resource): allow_list = True _query_mapping = resource.QueryParameters( - 'description', 'external_v4_ip', 'external_v6_ip', 'name', 'router_id', - 'project_id', 'tenant_id', 'subnet_id', - is_admin_state_up='admin_state_up' + 'description', + 'external_v4_ip', + 'external_v6_ip', + 'name', + 'router_id', + 'project_id', + 'tenant_id', + 'subnet_id', + is_admin_state_up='admin_state_up', ) # Properties diff --git a/openstack/tests/functional/network/v2/test_address_group.py b/openstack/tests/functional/network/v2/test_address_group.py index 66ac5885a..933e86834 100644 --- a/openstack/tests/functional/network/v2/test_address_group.py +++ b/openstack/tests/functional/network/v2/test_address_group.py @@ -46,13 +46,15 @@ class TestAddressGroup(base.BaseFunctionalTest): def tearDown(self): sot = self.user_cloud.network.delete_address_group( - self.ADDRESS_GROUP_ID) + self.ADDRESS_GROUP_ID + ) self.assertIsNone(sot) super(TestAddressGroup, self).tearDown() def test_find(self): sot = self.user_cloud.network.find_address_group( - self.ADDRESS_GROUP_NAME) + self.ADDRESS_GROUP_NAME + ) self.assertEqual(self.ADDRESS_GROUP_ID, sot.id) def test_get(self): diff --git a/openstack/tests/functional/network/v2/test_address_scope.py b/openstack/tests/functional/network/v2/test_address_scope.py index 9b5193be7..76ac60611 100644 --- a/openstack/tests/functional/network/v2/test_address_scope.py +++ b/openstack/tests/functional/network/v2/test_address_scope.py @@ -36,13 +36,15 @@ class TestAddressScope(base.BaseFunctionalTest): def tearDown(self): sot = self.user_cloud.network.delete_address_scope( - self.ADDRESS_SCOPE_ID) + self.ADDRESS_SCOPE_ID + ) self.assertIsNone(sot) super(TestAddressScope, self).tearDown() def test_find(self): sot = self.user_cloud.network.find_address_scope( - self.ADDRESS_SCOPE_NAME) + self.ADDRESS_SCOPE_NAME + ) self.assertEqual(self.ADDRESS_SCOPE_ID, sot.id) def test_get(self): diff --git a/openstack/tests/functional/network/v2/test_agent_add_remove_network.py b/openstack/tests/functional/network/v2/test_agent_add_remove_network.py index 10cdbcd84..723e227f2 100644 --- a/openstack/tests/functional/network/v2/test_agent_add_remove_network.py +++ b/openstack/tests/functional/network/v2/test_agent_add_remove_network.py @@ -54,12 +54,14 @@ class TestAgentNetworks(base.BaseFunctionalTest): def _verify_add(self, network): net = self.user_cloud.network.dhcp_agent_hosting_networks( - self.AGENT_ID) + self.AGENT_ID + ) net_ids = [n.id for n in net] self.assertIn(self.NETWORK_ID, net_ids) def _verify_remove(self, network): net = self.user_cloud.network.dhcp_agent_hosting_networks( - self.AGENT_ID) + self.AGENT_ID + ) net_ids = [n.id for n in net] self.assertNotIn(self.NETWORK_ID, net_ids) diff --git a/openstack/tests/functional/network/v2/test_agent_add_remove_router.py b/openstack/tests/functional/network/v2/test_agent_add_remove_router.py index 0b1ddca37..20313a67a 100644 --- a/openstack/tests/functional/network/v2/test_agent_add_remove_router.py +++ b/openstack/tests/functional/network/v2/test_agent_add_remove_router.py @@ -27,7 +27,8 @@ class TestAgentRouters(base.BaseFunctionalTest): self.ROUTER_NAME = "router-name-" + self.getUniqueString("router-name") self.ROUTER = self.user_cloud.network.create_router( - name=self.ROUTER_NAME) + name=self.ROUTER_NAME + ) self.addCleanup(self.user_cloud.network.delete_router, self.ROUTER) assert isinstance(self.ROUTER, router.Router) agent_list = list(self.user_cloud.network.agents()) @@ -47,7 +48,8 @@ class TestAgentRouters(base.BaseFunctionalTest): def test_remove_router_from_agent(self): self.user_cloud.network.remove_router_from_agent( - self.AGENT, self.ROUTER) + self.AGENT, self.ROUTER + ) rots = self.user_cloud.network.agent_hosted_routers(self.AGENT) routers = [router.id for router in rots] self.assertNotIn(self.ROUTER.id, routers) diff --git a/openstack/tests/functional/network/v2/test_auto_allocated_topology.py b/openstack/tests/functional/network/v2/test_auto_allocated_topology.py index ab961e8d6..73c070bfb 100644 --- a/openstack/tests/functional/network/v2/test_auto_allocated_topology.py +++ b/openstack/tests/functional/network/v2/test_auto_allocated_topology.py @@ -32,13 +32,14 @@ class TestAutoAllocatedTopology(base.BaseFunctionalTest): ) projects = [ - o.project_id - for o in self.operator_cloud.network.networks()] + o.project_id for o in self.operator_cloud.network.networks() + ] self.PROJECT_ID = projects[0] def tearDown(self): res = self.operator_cloud.network.delete_auto_allocated_topology( - self.PROJECT_ID) + self.PROJECT_ID + ) self.assertIsNone(res) super(TestAutoAllocatedTopology, self).tearDown() @@ -63,7 +64,8 @@ class TestAutoAllocatedTopology(base.BaseFunctionalTest): def test_show_project_option(self): top = self.operator_cloud.network.get_auto_allocated_topology( - self.PROJECT_ID) + self.PROJECT_ID + ) network = self.operator_cloud.network.get_network(top.id) self.assertEqual(top.project_id, network.project_id) self.assertEqual(top.id, network.id) @@ -73,4 +75,5 @@ class TestAutoAllocatedTopology(base.BaseFunctionalTest): for network in networks: if network.name == "public": self.operator_cloud.network.update_network( - network, is_default=True) + network, is_default=True + ) diff --git a/openstack/tests/functional/network/v2/test_bgp.py b/openstack/tests/functional/network/v2/test_bgp.py index a495f4107..5c1698620 100644 --- a/openstack/tests/functional/network/v2/test_bgp.py +++ b/openstack/tests/functional/network/v2/test_bgp.py @@ -16,7 +16,6 @@ from openstack.tests.functional import base class TestBGPSpeaker(base.BaseFunctionalTest): - def setUp(self): super().setUp() self.LOCAL_AS = 101 @@ -30,14 +29,19 @@ class TestBGPSpeaker(base.BaseFunctionalTest): self.skipTest("Neutron BGP Dynamic Routing Extension disabled") bgp_speaker = self.operator_cloud.network.create_bgp_speaker( - ip_version=self.IP_VERSION, local_as=self.LOCAL_AS, - name=self.SPEAKER_NAME) + ip_version=self.IP_VERSION, + local_as=self.LOCAL_AS, + name=self.SPEAKER_NAME, + ) assert isinstance(bgp_speaker, _bgp_speaker.BgpSpeaker) self.SPEAKER = bgp_speaker bgp_peer = self.operator_cloud.network.create_bgp_peer( - name=self.PEER_NAME, auth_type='none', - remote_as=self.REMOTE_AS, peer_ip=self.PEER_IP) + name=self.PEER_NAME, + auth_type='none', + remote_as=self.REMOTE_AS, + peer_ip=self.PEER_IP, + ) assert isinstance(bgp_peer, _bgp_peer.BgpPeer) self.PEER = bgp_peer @@ -62,13 +66,15 @@ class TestBGPSpeaker(base.BaseFunctionalTest): self.assertEqual(self.LOCAL_AS, sot.local_as) def test_list_bgp_speakers(self): - speaker_ids = [sp.id for sp in - self.operator_cloud.network.bgp_speakers()] + speaker_ids = [ + sp.id for sp in self.operator_cloud.network.bgp_speakers() + ] self.assertIn(self.SPEAKER.id, speaker_ids) def test_update_bgp_speaker(self): sot = self.operator_cloud.network.update_bgp_speaker( - self.SPEAKER.id, advertise_floating_ip_host_routes=False) + self.SPEAKER.id, advertise_floating_ip_host_routes=False + ) self.assertFalse(sot.advertise_floating_ip_host_routes) def test_find_bgp_peer(self): @@ -88,18 +94,21 @@ class TestBGPSpeaker(base.BaseFunctionalTest): def test_update_bgp_peer(self): name = 'new_peer_name' + self.getUniqueString() sot = self.operator_cloud.network.update_bgp_peer( - self.PEER.id, name=name) + self.PEER.id, name=name + ) self.assertEqual(name, sot.name) def test_add_remove_peer_to_speaker(self): self.operator_cloud.network.add_bgp_peer_to_speaker( - self.SPEAKER.id, self.PEER.id) + self.SPEAKER.id, self.PEER.id + ) sot = self.operator_cloud.network.get_bgp_speaker(self.SPEAKER.id) self.assertEqual([self.PEER.id], sot.peers) # Remove the peer self.operator_cloud.network.remove_bgp_peer_from_speaker( - self.SPEAKER.id, self.PEER.id) + self.SPEAKER.id, self.PEER.id + ) sot = self.operator_cloud.network.get_bgp_speaker(self.SPEAKER.id) self.assertEqual([], sot.peers) @@ -107,17 +116,20 @@ class TestBGPSpeaker(base.BaseFunctionalTest): net_name = 'my_network' + self.getUniqueString() net = self.user_cloud.create_network(name=net_name) self.operator_cloud.network.add_gateway_network_to_speaker( - self.SPEAKER.id, net.id) + self.SPEAKER.id, net.id + ) sot = self.operator_cloud.network.get_bgp_speaker(self.SPEAKER.id) self.assertEqual([net.id], sot.networks) # Remove the network self.operator_cloud.network.remove_gateway_network_from_speaker( - self.SPEAKER.id, net.id) + self.SPEAKER.id, net.id + ) sot = self.operator_cloud.network.get_bgp_speaker(self.SPEAKER.id) self.assertEqual([], sot.networks) def test_get_advertised_routes_of_speaker(self): sot = self.operator_cloud.network.get_advertised_routes_of_speaker( - self.SPEAKER.id) + self.SPEAKER.id + ) self.assertEqual({'advertised_routes': []}, sot) diff --git a/openstack/tests/functional/network/v2/test_bgpvpn.py b/openstack/tests/functional/network/v2/test_bgpvpn.py index f706b4a29..176648182 100644 --- a/openstack/tests/functional/network/v2/test_bgpvpn.py +++ b/openstack/tests/functional/network/v2/test_bgpvpn.py @@ -11,11 +11,13 @@ # under the License. from openstack.network.v2 import bgpvpn as _bgpvpn -from openstack.network.v2 import bgpvpn_network_association as \ - _bgpvpn_net_assoc +from openstack.network.v2 import ( + bgpvpn_network_association as _bgpvpn_net_assoc, +) from openstack.network.v2 import bgpvpn_port_association as _bgpvpn_port_assoc -from openstack.network.v2 import bgpvpn_router_association as \ - _bgpvpn_router_assoc +from openstack.network.v2 import ( + bgpvpn_router_association as _bgpvpn_router_assoc, +) from openstack.network.v2 import network as _network from openstack.network.v2 import port as _port from openstack.network.v2 import router as _router @@ -24,7 +26,6 @@ from openstack.tests.functional import base class TestBGPVPN(base.BaseFunctionalTest): - def setUp(self): super().setUp() @@ -36,8 +37,8 @@ class TestBGPVPN(base.BaseFunctionalTest): self.CIDR = "10.101.0.0/24" self.ROUTE_DISTINGUISHERS = ['64512:1777', '64512:1888', '64512:1999'] self.VNI = 1000 - self.ROUTE_TARGETS = '64512:1444', - self.IMPORT_TARGETS = '64512:1555', + self.ROUTE_TARGETS = ('64512:1444',) + self.IMPORT_TARGETS = ('64512:1555',) self.EXPORT_TARGETS = '64512:1666' self.TYPE = 'l3' @@ -66,48 +67,60 @@ class TestBGPVPN(base.BaseFunctionalTest): self.SUBNET = subnet port = self.operator_cloud.network.create_port( - name=self.PORT_NAME, network_id=self.NETWORK.id) + name=self.PORT_NAME, network_id=self.NETWORK.id + ) assert isinstance(port, _port.Port) self.PORT = port router = self.operator_cloud.network.create_router( - name=self.ROUTER_NAME) + name=self.ROUTER_NAME + ) assert isinstance(router, _router.Router) self.ROUTER = router net_assoc = ( self.operator_cloud.network.create_bgpvpn_network_association( - self.BGPVPN, network_id=self.NETWORK.id)) - assert isinstance(net_assoc, - _bgpvpn_net_assoc.BgpVpnNetworkAssociation) + self.BGPVPN, network_id=self.NETWORK.id + ) + ) + assert isinstance( + net_assoc, _bgpvpn_net_assoc.BgpVpnNetworkAssociation + ) self.NET_ASSOC = net_assoc port_assoc = ( self.operator_cloud.network.create_bgpvpn_port_association( - self.BGPVPN, port_id=self.PORT.id)) - assert isinstance(port_assoc, - _bgpvpn_port_assoc.BgpVpnPortAssociation) + self.BGPVPN, port_id=self.PORT.id + ) + ) + assert isinstance(port_assoc, _bgpvpn_port_assoc.BgpVpnPortAssociation) self.PORT_ASSOC = port_assoc router_assoc = ( self.operator_cloud.network.create_bgpvpn_router_association( - self.BGPVPN, router_id=self.ROUTER.id)) - assert isinstance(router_assoc, - _bgpvpn_router_assoc.BgpVpnRouterAssociation) + self.BGPVPN, router_id=self.ROUTER.id + ) + ) + assert isinstance( + router_assoc, _bgpvpn_router_assoc.BgpVpnRouterAssociation + ) self.ROUTER_ASSOC = router_assoc def tearDown(self): sot = self.operator_cloud.network.delete_bgpvpn(self.BGPVPN.id) self.assertIsNone(sot) sot = self.operator_cloud.network.delete_bgpvpn_network_association( - self.BGPVPN.id, self.NET_ASSOC.id) + self.BGPVPN.id, self.NET_ASSOC.id + ) self.assertIsNone(sot) sot = self.operator_cloud.network.delete_bgpvpn_port_association( - self.BGPVPN.id, self.PORT_ASSOC.id) + self.BGPVPN.id, self.PORT_ASSOC.id + ) self.assertIsNone(sot) sot = self.operator_cloud.network.delete_bgpvpn_router_association( - self.BGPVPN.id, self.ROUTER_ASSOC.id) + self.BGPVPN.id, self.ROUTER_ASSOC.id + ) self.assertIsNone(sot) sot = self.operator_cloud.network.delete_router(self.ROUTER) @@ -135,47 +148,64 @@ class TestBGPVPN(base.BaseFunctionalTest): self.assertEqual(list(self.IMPORT_TARGETS), sot.import_targets) def test_list_bgpvpns(self): - bgpvpn_ids = [bgpvpn.id for bgpvpn in - self.operator_cloud.network.bgpvpns()] + bgpvpn_ids = [ + bgpvpn.id for bgpvpn in self.operator_cloud.network.bgpvpns() + ] self.assertIn(self.BGPVPN.id, bgpvpn_ids) def test_update_bgpvpn(self): sot = self.operator_cloud.network.update_bgpvpn( - self.BGPVPN.id, import_targets='64512:1333') + self.BGPVPN.id, import_targets='64512:1333' + ) self.assertEqual(['64512:1333'], sot.import_targets) def test_get_bgpvpnnetwork_association(self): sot = self.operator_cloud.network.get_bgpvpn_network_association( - self.BGPVPN.id, self.NET_ASSOC.id) + self.BGPVPN.id, self.NET_ASSOC.id + ) self.assertEqual(self.NETWORK.id, sot.network_id) def test_list_bgpvpn_network_associations(self): net_assoc_ids = [ - net_assoc.id for net_assoc in - self.operator_cloud.network.bgpvpn_network_associations( - self.BGPVPN.id)] + net_assoc.id + for net_assoc in ( + self.operator_cloud.network.bgpvpn_network_associations( + self.BGPVPN.id + ) + ) + ] self.assertIn(self.NET_ASSOC.id, net_assoc_ids) def test_get_bgpvpn_port_association(self): sot = self.operator_cloud.network.get_bgpvpn_port_association( - self.BGPVPN.id, self.PORT_ASSOC.id) + self.BGPVPN.id, self.PORT_ASSOC.id + ) self.assertEqual(self.PORT.id, sot.port_id) def test_list_bgpvpn_port_associations(self): port_assoc_ids = [ - port_assoc.id for port_assoc in - self.operator_cloud.network.bgpvpn_port_associations( - self.BGPVPN.id)] + port_assoc.id + for port_assoc in ( + self.operator_cloud.network.bgpvpn_port_associations( + self.BGPVPN.id + ) + ) + ] self.assertIn(self.PORT_ASSOC.id, port_assoc_ids) def test_get_bgpvpn_router_association(self): sot = self.operator_cloud.network.get_bgpvpn_router_association( - self.BGPVPN.id, self.ROUTER_ASSOC.id) + self.BGPVPN.id, self.ROUTER_ASSOC.id + ) self.assertEqual(self.ROUTER.id, sot.router_id) def test_list_bgpvpn_router_associations(self): router_assoc_ids = [ - router_assoc.id for router_assoc in - self.operator_cloud.network.bgpvpn_router_associations( - self.BGPVPN.id)] + router_assoc.id + for router_assoc in ( + self.operator_cloud.network.bgpvpn_router_associations( + self.BGPVPN.id + ) + ) + ] self.assertIn(self.ROUTER_ASSOC.id, router_assoc_ids) diff --git a/openstack/tests/functional/network/v2/test_dvr_router.py b/openstack/tests/functional/network/v2/test_dvr_router.py index 1c4bf1b37..db595ab89 100644 --- a/openstack/tests/functional/network/v2/test_dvr_router.py +++ b/openstack/tests/functional/network/v2/test_dvr_router.py @@ -31,14 +31,16 @@ class TestDVRRouter(base.BaseFunctionalTest): self.NAME = self.getUniqueString() self.UPDATE_NAME = self.getUniqueString() sot = self.operator_cloud.network.create_router( - name=self.NAME, distributed=True) + name=self.NAME, distributed=True + ) assert isinstance(sot, router.Router) self.assertEqual(self.NAME, sot.name) self.ID = sot.id def tearDown(self): sot = self.operator_cloud.network.delete_router( - self.ID, ignore_missing=False) + self.ID, ignore_missing=False + ) self.assertIsNone(sot) super(TestDVRRouter, self).tearDown() @@ -60,5 +62,6 @@ class TestDVRRouter(base.BaseFunctionalTest): def test_update(self): sot = self.operator_cloud.network.update_router( - self.ID, name=self.UPDATE_NAME) + self.ID, name=self.UPDATE_NAME + ) self.assertEqual(self.UPDATE_NAME, sot.name) diff --git a/openstack/tests/functional/network/v2/test_firewall_rule_insert_remove_policy.py b/openstack/tests/functional/network/v2/test_firewall_rule_insert_remove_policy.py index 6eba7d65d..8be7e3508 100644 --- a/openstack/tests/functional/network/v2/test_firewall_rule_insert_remove_policy.py +++ b/openstack/tests/functional/network/v2/test_firewall_rule_insert_remove_policy.py @@ -34,15 +34,18 @@ class TestFirewallPolicyRuleAssociations(base.BaseFunctionalTest): if not self.user_cloud._has_neutron_extension("fwaas_v2"): self.skipTest("fwaas_v2 service not supported by cloud") rul1 = self.user_cloud.network.create_firewall_rule( - name=self.RULE1_NAME) + name=self.RULE1_NAME + ) assert isinstance(rul1, firewall_rule.FirewallRule) self.assertEqual(self.RULE1_NAME, rul1.name) rul2 = self.user_cloud.network.create_firewall_rule( - name=self.RULE2_NAME) + name=self.RULE2_NAME + ) assert isinstance(rul2, firewall_rule.FirewallRule) self.assertEqual(self.RULE2_NAME, rul2.name) pol = self.user_cloud.network.create_firewall_policy( - name=self.POLICY_NAME) + name=self.POLICY_NAME + ) assert isinstance(pol, firewall_policy.FirewallPolicy) self.assertEqual(self.POLICY_NAME, pol.name) self.RULE1_ID = rul1.id diff --git a/openstack/tests/functional/network/v2/test_flavor.py b/openstack/tests/functional/network/v2/test_flavor.py index 1f8a8befb..c0106eb59 100644 --- a/openstack/tests/functional/network/v2/test_flavor.py +++ b/openstack/tests/functional/network/v2/test_flavor.py @@ -97,8 +97,7 @@ class TestFlavor(base.BaseFunctionalTest): ) self.assertIsNotNone(response) - response = self.operator_cloud.network \ - .disassociate_flavor_from_service_profile( - self.ID, self.service_profiles.id - ) + response = self.operator_cloud.network.disassociate_flavor_from_service_profile( # noqa: E501 + self.ID, self.service_profiles.id + ) self.assertIsNone(response) diff --git a/openstack/tests/functional/network/v2/test_floating_ip.py b/openstack/tests/functional/network/v2/test_floating_ip.py index 1a0bda1a0..df73aa02c 100644 --- a/openstack/tests/functional/network/v2/test_floating_ip.py +++ b/openstack/tests/functional/network/v2/test_floating_ip.py @@ -95,10 +95,9 @@ class TestFloatingIP(base.BaseFunctionalTest): fip_args = dict( floating_network_id=self.EXT_NET_ID, ) - if ( - self.user_cloud._has_neutron_extension("dns-integration") - and self.user_cloud.has_service("dns") - ): + if self.user_cloud._has_neutron_extension( + "dns-integration" + ) and self.user_cloud.has_service("dns"): self.is_dns_supported = True fip_args.update( dict(dns_domain=self.DNS_DOMAIN, dns_name=self.DNS_NAME) diff --git a/openstack/tests/functional/network/v2/test_local_ip.py b/openstack/tests/functional/network/v2/test_local_ip.py index 9489a2df7..0a21c9a7d 100644 --- a/openstack/tests/functional/network/v2/test_local_ip.py +++ b/openstack/tests/functional/network/v2/test_local_ip.py @@ -55,8 +55,8 @@ class TestLocalIP(base.BaseFunctionalTest): def test_list(self): names = [ - local_ip.name - for local_ip in self.user_cloud.network.local_ips()] + local_ip.name for local_ip in self.user_cloud.network.local_ips() + ] self.assertIn(self.LOCAL_IP_NAME, names) def test_update(self): diff --git a/openstack/tests/functional/network/v2/test_local_ip_association.py b/openstack/tests/functional/network/v2/test_local_ip_association.py index a3f2c019d..4976fc43c 100644 --- a/openstack/tests/functional/network/v2/test_local_ip_association.py +++ b/openstack/tests/functional/network/v2/test_local_ip_association.py @@ -31,12 +31,13 @@ class TestLocalIPAssociation(base.BaseFunctionalTest): self.LOCAL_IP_ID = self.getUniqueString() self.FIXED_PORT_ID = self.getUniqueString() self.FIXED_IP = self.getUniqueString() - local_ip_association = self.user_cloud.network \ - .create_local_ip_association( + local_ip_association = ( + self.user_cloud.network.create_local_ip_association( local_ip=self.LOCAL_IP_ID, fixed_port_id=self.FIXED_PORT_ID, fixed_ip=self.FIXED_IP, ) + ) assert isinstance( local_ip_association, _local_ip_association.LocalIPAssociation ) diff --git a/openstack/tests/functional/network/v2/test_qos_bandwidth_limit_rule.py b/openstack/tests/functional/network/v2/test_qos_bandwidth_limit_rule.py index edd5fb1d1..3f0e43c1c 100644 --- a/openstack/tests/functional/network/v2/test_qos_bandwidth_limit_rule.py +++ b/openstack/tests/functional/network/v2/test_qos_bandwidth_limit_rule.py @@ -12,7 +12,7 @@ from openstack.network.v2 import ( - qos_bandwidth_limit_rule as _qos_bandwidth_limit_rule + qos_bandwidth_limit_rule as _qos_bandwidth_limit_rule, ) from openstack.tests.functional import base diff --git a/openstack/tests/functional/network/v2/test_qos_dscp_marking_rule.py b/openstack/tests/functional/network/v2/test_qos_dscp_marking_rule.py index 6eca0cc38..ac4849774 100644 --- a/openstack/tests/functional/network/v2/test_qos_dscp_marking_rule.py +++ b/openstack/tests/functional/network/v2/test_qos_dscp_marking_rule.py @@ -12,7 +12,7 @@ from openstack.network.v2 import ( - qos_dscp_marking_rule as _qos_dscp_marking_rule + qos_dscp_marking_rule as _qos_dscp_marking_rule, ) from openstack.tests.functional import base diff --git a/openstack/tests/functional/network/v2/test_qos_minimum_bandwidth_rule.py b/openstack/tests/functional/network/v2/test_qos_minimum_bandwidth_rule.py index 5efbc8c2c..d293e9f2b 100644 --- a/openstack/tests/functional/network/v2/test_qos_minimum_bandwidth_rule.py +++ b/openstack/tests/functional/network/v2/test_qos_minimum_bandwidth_rule.py @@ -12,7 +12,7 @@ from openstack.network.v2 import ( - qos_minimum_bandwidth_rule as _qos_minimum_bandwidth_rule + qos_minimum_bandwidth_rule as _qos_minimum_bandwidth_rule, ) from openstack.tests.functional import base @@ -35,7 +35,8 @@ class TestQoSMinimumBandwidthRule(base.BaseFunctionalTest): # Skip the tests if qos-bw-limit-direction extension is not enabled. if not self.operator_cloud.network.find_extension( - "qos-bw-limit-direction"): + "qos-bw-limit-direction" + ): self.skipTest("Network qos-bw-limit-direction extension disabled") self.QOS_POLICY_NAME = self.getUniqueString() @@ -45,12 +46,13 @@ class TestQoSMinimumBandwidthRule(base.BaseFunctionalTest): shared=self.QOS_IS_SHARED, ) self.QOS_POLICY_ID = qos_policy.id - qos_min_bw_rule = self.operator_cloud.network \ - .create_qos_minimum_bandwidth_rule( + qos_min_bw_rule = ( + self.operator_cloud.network.create_qos_minimum_bandwidth_rule( self.QOS_POLICY_ID, direction=self.RULE_DIRECTION, min_kbps=self.RULE_MIN_KBPS, ) + ) assert isinstance( qos_min_bw_rule, _qos_minimum_bandwidth_rule.QoSMinimumBandwidthRule, @@ -64,7 +66,8 @@ class TestQoSMinimumBandwidthRule(base.BaseFunctionalTest): self.RULE_ID, self.QOS_POLICY_ID ) qos_policy = self.operator_cloud.network.delete_qos_policy( - self.QOS_POLICY_ID) + self.QOS_POLICY_ID + ) self.assertIsNone(rule) self.assertIsNone(qos_policy) super(TestQoSMinimumBandwidthRule, self).tearDown() diff --git a/openstack/tests/functional/network/v2/test_qos_minimum_packet_rate_rule.py b/openstack/tests/functional/network/v2/test_qos_minimum_packet_rate_rule.py index c3aa77070..0e35f2681 100644 --- a/openstack/tests/functional/network/v2/test_qos_minimum_packet_rate_rule.py +++ b/openstack/tests/functional/network/v2/test_qos_minimum_packet_rate_rule.py @@ -12,7 +12,7 @@ from openstack.network.v2 import ( - qos_minimum_packet_rate_rule as _qos_minimum_packet_rate_rule + qos_minimum_packet_rate_rule as _qos_minimum_packet_rate_rule, ) from openstack.tests.functional import base diff --git a/openstack/tests/functional/network/v2/test_qos_rule_type.py b/openstack/tests/functional/network/v2/test_qos_rule_type.py index a0d662371..3f44c9e7a 100644 --- a/openstack/tests/functional/network/v2/test_qos_rule_type.py +++ b/openstack/tests/functional/network/v2/test_qos_rule_type.py @@ -25,12 +25,14 @@ class TestQoSRuleType(base.BaseFunctionalTest): # Skip the tests if qos-rule-type-details extension is not enabled. if not self.operator_cloud.network.find_extension( - "qos-rule-type-details"): + "qos-rule-type-details" + ): self.skipTest("Network qos-rule-type-details extension disabled") def test_find(self): sot = self.operator_cloud.network.find_qos_rule_type( - self.QOS_RULE_TYPE) + self.QOS_RULE_TYPE + ) self.assertEqual(self.QOS_RULE_TYPE, sot.type) self.assertIsInstance(sot.drivers, list) diff --git a/openstack/tests/functional/network/v2/test_service_profile.py b/openstack/tests/functional/network/v2/test_service_profile.py index 7bce681fa..86c1e8fb3 100644 --- a/openstack/tests/functional/network/v2/test_service_profile.py +++ b/openstack/tests/functional/network/v2/test_service_profile.py @@ -55,18 +55,20 @@ class TestServiceProfile(base.BaseFunctionalTest): def test_find(self): self.user_cloud.network.find_service_profile( - name_or_id="not_existing", - ignore_missing=True) + name_or_id="not_existing", ignore_missing=True + ) if self.operator_cloud and self.ID: - service_profiles = self.operator_cloud.network \ - .find_service_profile(self.ID) + service_profiles = ( + self.operator_cloud.network.find_service_profile(self.ID) + ) self.assertEqual(self.METAINFO, service_profiles.meta_info) def test_get(self): if not self.ID: self.skipTest("ServiceProfile was not created") service_profiles = self.operator_cloud.network.get_service_profile( - self.ID) + self.ID + ) self.assertEqual(self.METAINFO, service_profiles.meta_info) self.assertEqual( self.SERVICE_PROFILE_DESCRIPTION, service_profiles.description @@ -86,8 +88,8 @@ class TestServiceProfile(base.BaseFunctionalTest): # Test as operator if self.operator_cloud: metainfos = [ - f.meta_info for f in - self.operator_cloud.network.service_profiles() + f.meta_info + for f in self.operator_cloud.network.service_profiles() ] if self.ID: self.assertIn(self.METAINFO, metainfos) diff --git a/openstack/tests/functional/network/v2/test_taas.py b/openstack/tests/functional/network/v2/test_taas.py index 20eacafa5..f31f14bf3 100644 --- a/openstack/tests/functional/network/v2/test_taas.py +++ b/openstack/tests/functional/network/v2/test_taas.py @@ -18,7 +18,6 @@ from openstack.tests.functional import base class TestTapService(base.BaseFunctionalTest): - def setUp(self): super().setUp() if not self.user_cloud.network.find_extension("taas"): @@ -35,32 +34,38 @@ class TestTapService(base.BaseFunctionalTest): self.FLOW_NET_ID = net.id port = self.user_cloud.network.create_port( - network_id=self.SERVICE_NET_ID) + network_id=self.SERVICE_NET_ID + ) assert isinstance(port, _port.Port) self.SERVICE_PORT_ID = port.id - port = self.user_cloud.network.create_port( - network_id=self.FLOW_NET_ID) + port = self.user_cloud.network.create_port(network_id=self.FLOW_NET_ID) assert isinstance(port, _port.Port) self.FLOW_PORT_ID = port.id tap_service = self.user_cloud.network.create_tap_service( - name=self.TAP_S_NAME, port_id=self.SERVICE_PORT_ID) + name=self.TAP_S_NAME, port_id=self.SERVICE_PORT_ID + ) assert isinstance(tap_service, _tap_service.TapService) self.TAP_SERVICE = tap_service tap_flow = self.user_cloud.network.create_tap_flow( - name=self.TAP_F_NAME, tap_service_id=self.TAP_SERVICE.id, - source_port=self.FLOW_PORT_ID, direction='BOTH') + name=self.TAP_F_NAME, + tap_service_id=self.TAP_SERVICE.id, + source_port=self.FLOW_PORT_ID, + direction='BOTH', + ) assert isinstance(tap_flow, _tap_flow.TapFlow) self.TAP_FLOW = tap_flow def tearDown(self): - sot = self.user_cloud.network.delete_tap_flow(self.TAP_FLOW.id, - ignore_missing=False) + sot = self.user_cloud.network.delete_tap_flow( + self.TAP_FLOW.id, ignore_missing=False + ) self.assertIsNone(sot) - sot = self.user_cloud.network.delete_tap_service(self.TAP_SERVICE.id, - ignore_missing=False) + sot = self.user_cloud.network.delete_tap_service( + self.TAP_SERVICE.id, ignore_missing=False + ) self.assertIsNone(sot) sot = self.user_cloud.network.delete_port(self.SERVICE_PORT_ID) self.assertIsNone(sot) @@ -83,14 +88,16 @@ class TestTapService(base.BaseFunctionalTest): self.assertEqual(self.TAP_S_NAME, sot.name) def test_list_tap_services(self): - tap_service_ids = [ts.id for ts in - self.user_cloud.network.tap_services()] + tap_service_ids = [ + ts.id for ts in self.user_cloud.network.tap_services() + ] self.assertIn(self.TAP_SERVICE.id, tap_service_ids) def test_update_tap_service(self): description = 'My tap service' sot = self.user_cloud.network.update_tap_service( - self.TAP_SERVICE.id, description=description) + self.TAP_SERVICE.id, description=description + ) self.assertEqual(description, sot.description) def test_find_tap_flow(self): @@ -108,12 +115,12 @@ class TestTapService(base.BaseFunctionalTest): self.assertEqual('BOTH', sot.direction) def test_list_tap_flows(self): - tap_flow_ids = [tf.id for tf in - self.user_cloud.network.tap_flows()] + tap_flow_ids = [tf.id for tf in self.user_cloud.network.tap_flows()] self.assertIn(self.TAP_FLOW.id, tap_flow_ids) def test_update_tap_flow(self): description = 'My tap flow' sot = self.user_cloud.network.update_tap_flow( - self.TAP_FLOW.id, description=description) + self.TAP_FLOW.id, description=description + ) self.assertEqual(description, sot.description) diff --git a/openstack/tests/functional/network/v2/test_vpnaas.py b/openstack/tests/functional/network/v2/test_vpnaas.py index 55ed989da..bfd89169c 100644 --- a/openstack/tests/functional/network/v2/test_vpnaas.py +++ b/openstack/tests/functional/network/v2/test_vpnaas.py @@ -39,9 +39,7 @@ class TestVpnIkePolicy(base.BaseFunctionalTest): super(TestVpnIkePolicy, self).tearDown() def test_list(self): - policies = [ - f.name for f in - self.user_cloud.network.vpn_ike_policies()] + policies = [f.name for f in self.user_cloud.network.vpn_ike_policies()] self.assertIn(self.IKEPOLICY_NAME, policies) def test_find(self): diff --git a/openstack/tests/unit/network/test_version.py b/openstack/tests/unit/network/test_version.py index 77df42ba6..64724160c 100644 --- a/openstack/tests/unit/network/test_version.py +++ b/openstack/tests/unit/network/test_version.py @@ -23,7 +23,6 @@ EXAMPLE = { class TestVersion(base.TestCase): - def test_basic(self): sot = version.Version() self.assertEqual('version', sot.resource_key) diff --git a/openstack/tests/unit/network/v2/test_address_group.py b/openstack/tests/unit/network/v2/test_address_group.py index dab387afd..b9f9d6803 100644 --- a/openstack/tests/unit/network/v2/test_address_group.py +++ b/openstack/tests/unit/network/v2/test_address_group.py @@ -20,12 +20,11 @@ EXAMPLE = { 'name': '1', 'description': '2', 'project_id': '3', - 'addresses': ['10.0.0.1/32'] + 'addresses': ['10.0.0.1/32'], } class TestAddressGroup(base.TestCase): - def test_basic(self): sot = address_group.AddressGroup() self.assertEqual('address_group', sot.resource_key) @@ -37,14 +36,18 @@ class TestAddressGroup(base.TestCase): self.assertTrue(sot.allow_delete) self.assertTrue(sot.allow_list) - self.assertDictEqual({"name": "name", - "description": "description", - "project_id": "project_id", - "sort_key": "sort_key", - "sort_dir": "sort_dir", - "limit": "limit", - "marker": "marker"}, - sot._query_mapping._mapping) + self.assertDictEqual( + { + "name": "name", + "description": "description", + "project_id": "project_id", + "sort_key": "sort_key", + "sort_dir": "sort_dir", + "limit": "limit", + "marker": "marker", + }, + sot._query_mapping._mapping, + ) def test_make_it(self): sot = address_group.AddressGroup(**EXAMPLE) diff --git a/openstack/tests/unit/network/v2/test_address_scope.py b/openstack/tests/unit/network/v2/test_address_scope.py index 0badd9faf..a00e91456 100644 --- a/openstack/tests/unit/network/v2/test_address_scope.py +++ b/openstack/tests/unit/network/v2/test_address_scope.py @@ -25,7 +25,6 @@ EXAMPLE = { class TestAddressScope(base.TestCase): - def test_basic(self): sot = address_scope.AddressScope() self.assertEqual('address_scope', sot.resource_key) diff --git a/openstack/tests/unit/network/v2/test_agent.py b/openstack/tests/unit/network/v2/test_agent.py index ae2bf4858..80d4b8abe 100644 --- a/openstack/tests/unit/network/v2/test_agent.py +++ b/openstack/tests/unit/network/v2/test_agent.py @@ -31,12 +31,11 @@ EXAMPLE = { 'resources_synced': False, 'started_at': '2016-07-09T12:14:57.233772', 'topic': 'test-topic', - 'ha_state': 'active' + 'ha_state': 'active', } class TestAgent(base.TestCase): - def test_basic(self): sot = agent.Agent() self.assertEqual('agent', sot.resource_key) @@ -53,8 +52,7 @@ class TestAgent(base.TestCase): self.assertTrue(sot.is_admin_state_up) self.assertEqual(EXAMPLE['agent_type'], sot.agent_type) self.assertTrue(sot.is_alive) - self.assertEqual(EXAMPLE['availability_zone'], - sot.availability_zone) + self.assertEqual(EXAMPLE['availability_zone'], sot.availability_zone) self.assertEqual(EXAMPLE['binary'], sot.binary) self.assertEqual(EXAMPLE['configurations'], sot.configuration) self.assertEqual(EXAMPLE['created_at'], sot.created_at) @@ -79,8 +77,7 @@ class TestAgent(base.TestCase): self.assertEqual(response.body, net.add_agent_to_network(sess, **body)) url = 'agents/IDENTIFIER/dhcp-networks' - sess.post.assert_called_with(url, - json=body) + sess.post.assert_called_with(url, json=body) def test_remove_agent_from_network(self): # Remove agent from agent @@ -90,8 +87,9 @@ class TestAgent(base.TestCase): self.assertIsNone(net.remove_agent_from_network(sess, network_id)) body = {'network_id': {}} - sess.delete.assert_called_with('agents/IDENTIFIER/dhcp-networks/', - json=body) + sess.delete.assert_called_with( + 'agents/IDENTIFIER/dhcp-networks/', json=body + ) def test_add_router_to_agent(self): # Add router to agent @@ -102,12 +100,12 @@ class TestAgent(base.TestCase): sess = mock.Mock() sess.post = mock.Mock(return_value=response) router_id = '1' - self.assertEqual(response.body, - sot.add_router_to_agent(sess, router_id)) + self.assertEqual( + response.body, sot.add_router_to_agent(sess, router_id) + ) body = {'router_id': router_id} url = 'agents/IDENTIFIER/l3-routers' - sess.post.assert_called_with(url, - json=body) + sess.post.assert_called_with(url, json=body) def test_remove_router_from_agent(self): # Remove router from agent @@ -117,17 +115,16 @@ class TestAgent(base.TestCase): self.assertIsNone(sot.remove_router_from_agent(sess, router_id)) body = {'router_id': {}} - sess.delete.assert_called_with('agents/IDENTIFIER/l3-routers/', - json=body) + sess.delete.assert_called_with( + 'agents/IDENTIFIER/l3-routers/', json=body + ) def test_get_bgp_speakers_hosted_by_dragent(self): sot = agent.Agent(**EXAMPLE) sess = mock.Mock() response = mock.Mock() response.body = { - 'bgp_speakers': [ - {'name': 'bgp_speaker_1', 'ip_version': 4} - ] + 'bgp_speakers': [{'name': 'bgp_speaker_1', 'ip_version': 4}] } response.json = mock.Mock(return_value=response.body) response.status_code = 200 @@ -139,7 +136,6 @@ class TestAgent(base.TestCase): class TestNetworkHostingDHCPAgent(base.TestCase): - def test_basic(self): net = agent.NetworkHostingDHCPAgent() self.assertEqual('agent', net.resource_key) @@ -154,7 +150,6 @@ class TestNetworkHostingDHCPAgent(base.TestCase): class TestRouterL3Agent(base.TestCase): - def test_basic(self): sot = agent.RouterL3Agent() self.assertEqual('agent', sot.resource_key) diff --git a/openstack/tests/unit/network/v2/test_auto_allocated_topology.py b/openstack/tests/unit/network/v2/test_auto_allocated_topology.py index 973de536c..acb3bccc8 100644 --- a/openstack/tests/unit/network/v2/test_auto_allocated_topology.py +++ b/openstack/tests/unit/network/v2/test_auto_allocated_topology.py @@ -21,7 +21,6 @@ EXAMPLE = { class TestAutoAllocatedTopology(base.TestCase): - def test_basic(self): topo = auto_allocated_topology.AutoAllocatedTopology self.assertEqual('auto_allocated_topology', topo.resource_key) diff --git a/openstack/tests/unit/network/v2/test_availability_zone.py b/openstack/tests/unit/network/v2/test_availability_zone.py index ef5f22336..2961d6c14 100644 --- a/openstack/tests/unit/network/v2/test_availability_zone.py +++ b/openstack/tests/unit/network/v2/test_availability_zone.py @@ -24,7 +24,6 @@ EXAMPLE = { class TestAvailabilityZone(base.TestCase): - def test_basic(self): sot = availability_zone.AvailabilityZone() self.assertEqual('availability_zone', sot.resource_key) diff --git a/openstack/tests/unit/network/v2/test_bgp_peer.py b/openstack/tests/unit/network/v2/test_bgp_peer.py index 06aac5fa1..7842725ad 100644 --- a/openstack/tests/unit/network/v2/test_bgp_peer.py +++ b/openstack/tests/unit/network/v2/test_bgp_peer.py @@ -21,12 +21,11 @@ EXAMPLE = { 'name': 'bgp-peer', 'peer_ip': '10.0.0.3', 'id': IDENTIFIER, - 'project_id': '42' + 'project_id': '42', } class TestBgpPeer(base.TestCase): - def test_basic(self): sot = bgp_peer.BgpPeer() self.assertEqual('bgp_peer', sot.resource_key) @@ -48,7 +47,9 @@ class TestBgpPeer(base.TestCase): self.assertEqual(EXAMPLE['project_id'], sot.project_id) self.assertDictEqual( - {'limit': 'limit', - 'marker': 'marker', - }, - sot._query_mapping._mapping) + { + 'limit': 'limit', + 'marker': 'marker', + }, + sot._query_mapping._mapping, + ) diff --git a/openstack/tests/unit/network/v2/test_bgp_speaker.py b/openstack/tests/unit/network/v2/test_bgp_speaker.py index 8f78d3ac3..839efdd51 100644 --- a/openstack/tests/unit/network/v2/test_bgp_speaker.py +++ b/openstack/tests/unit/network/v2/test_bgp_speaker.py @@ -26,7 +26,7 @@ EXAMPLE = { 'advertise_tenant_networks': 'true', 'local_as': 1000, 'networks': [], - 'project_id': '42' + 'project_id': '42', } @@ -47,17 +47,21 @@ class TestBgpSpeaker(base.TestCase): self.assertEqual(EXAMPLE['id'], sot.id) self.assertEqual(EXAMPLE['name'], sot.name) self.assertEqual(EXAMPLE['ip_version'], sot.ip_version) - self.assertEqual(EXAMPLE['advertise_floating_ip_host_routes'], - sot.advertise_floating_ip_host_routes) + self.assertEqual( + EXAMPLE['advertise_floating_ip_host_routes'], + sot.advertise_floating_ip_host_routes, + ) self.assertEqual(EXAMPLE['local_as'], sot.local_as) self.assertEqual(EXAMPLE['networks'], sot.networks) self.assertEqual(EXAMPLE['project_id'], sot.project_id) self.assertDictEqual( - {'limit': 'limit', - 'marker': 'marker', - }, - sot._query_mapping._mapping) + { + 'limit': 'limit', + 'marker': 'marker', + }, + sot._query_mapping._mapping, + ) def test_add_bgp_peer(self): sot = bgp_speaker.BgpSpeaker(**EXAMPLE) @@ -143,9 +147,7 @@ class TestBgpSpeaker(base.TestCase): sot = bgp_speaker.BgpSpeaker(**EXAMPLE) response = mock.Mock() response.body = { - 'agents': [ - {'binary': 'neutron-bgp-dragent', 'alive': True} - ] + 'agents': [{'binary': 'neutron-bgp-dragent', 'alive': True}] } response.json = mock.Mock(return_value=response.body) response.status_code = 200 diff --git a/openstack/tests/unit/network/v2/test_bgpvpn.py b/openstack/tests/unit/network/v2/test_bgpvpn.py index af2a661be..c6e4671e0 100644 --- a/openstack/tests/unit/network/v2/test_bgpvpn.py +++ b/openstack/tests/unit/network/v2/test_bgpvpn.py @@ -35,7 +35,6 @@ EXAMPLE = { class TestBgpVpn(base.TestCase): - def test_basic(self): sot = bgpvpn.BgpVpn() self.assertEqual('bgpvpn', sot.resource_key) @@ -52,38 +51,37 @@ class TestBgpVpn(base.TestCase): self.assertEqual(EXAMPLE['id'], sot.id) self.assertEqual(EXAMPLE['name'], sot.name) self.assertEqual(EXAMPLE['project_id'], sot.project_id) - self.assertEqual(EXAMPLE['route_distinguishers'], - sot.route_distinguishers) + self.assertEqual( + EXAMPLE['route_distinguishers'], sot.route_distinguishers + ) self.assertEqual(EXAMPLE['route_targets'], sot.route_targets) self.assertEqual(EXAMPLE['import_targets'], sot.import_targets) self.assertEqual(EXAMPLE['export_targets'], sot.export_targets) self.assertDictEqual( - {'limit': 'limit', - 'marker': 'marker', - }, - sot._query_mapping._mapping) + { + 'limit': 'limit', + 'marker': 'marker', + }, + sot._query_mapping._mapping, + ) def test_create_bgpvpn_network_association(self): test_bpgvpn = bgpvpn.BgpVpn(**EXAMPLE) test_net = network.Network(**{'name': 'foo_net', 'id': NET_ID}) sot = bgpvpn_network_association.BgpVpnNetworkAssociation( - bgpvn_id=test_bpgvpn.id, - network_id=test_net.id + bgpvn_id=test_bpgvpn.id, network_id=test_net.id ) self.assertEqual(test_net.id, sot.network_id) self.assertEqual(test_bpgvpn.id, sot.bgpvn_id) def test_create_bgpvpn_port_association(self): test_bpgvpn = bgpvpn.BgpVpn(**EXAMPLE) - test_port = port.Port(**{ - 'name': 'foo_port', - 'id': PORT_ID, - 'network_id': NET_ID - }) + test_port = port.Port( + **{'name': 'foo_port', 'id': PORT_ID, 'network_id': NET_ID} + ) sot = bgpvpn_port_association.BgpVpnPortAssociation( - bgpvn_id=test_bpgvpn.id, - port_id=test_port.id + bgpvn_id=test_bpgvpn.id, port_id=test_port.id ) self.assertEqual(test_port.id, sot.port_id) self.assertEqual(test_bpgvpn.id, sot.bgpvn_id) @@ -92,8 +90,7 @@ class TestBgpVpn(base.TestCase): test_bpgvpn = bgpvpn.BgpVpn(**EXAMPLE) test_router = router.Router(**{'name': 'foo_port'}) sot = bgpvpn_router_association.BgpVpnRouterAssociation( - bgpvn_id=test_bpgvpn.id, - router_id=test_router.id + bgpvn_id=test_bpgvpn.id, router_id=test_router.id ) self.assertEqual(test_router.id, sot.router_id) self.assertEqual(test_bpgvpn.id, sot.bgpvn_id) diff --git a/openstack/tests/unit/network/v2/test_extension.py b/openstack/tests/unit/network/v2/test_extension.py index 4ae763445..6a6e6e32e 100644 --- a/openstack/tests/unit/network/v2/test_extension.py +++ b/openstack/tests/unit/network/v2/test_extension.py @@ -25,7 +25,6 @@ EXAMPLE = { class TestExtension(base.TestCase): - def test_basic(self): sot = extension.Extension() self.assertEqual('extension', sot.resource_key) diff --git a/openstack/tests/unit/network/v2/test_firewall_group.py b/openstack/tests/unit/network/v2/test_firewall_group.py index 77749f20c..9eb3bb4c9 100644 --- a/openstack/tests/unit/network/v2/test_firewall_group.py +++ b/openstack/tests/unit/network/v2/test_firewall_group.py @@ -32,7 +32,6 @@ EXAMPLE = { class TestFirewallGroup(testtools.TestCase): - def test_basic(self): sot = firewall_group.FirewallGroup() self.assertEqual('firewall_group', sot.resource_key) @@ -48,10 +47,13 @@ class TestFirewallGroup(testtools.TestCase): sot = firewall_group.FirewallGroup(**EXAMPLE) self.assertEqual(EXAMPLE['description'], sot.description) self.assertEqual(EXAMPLE['name'], sot.name) - self.assertEqual(EXAMPLE['egress_firewall_policy_id'], - sot.egress_firewall_policy_id) - self.assertEqual(EXAMPLE['ingress_firewall_policy_id'], - sot.ingress_firewall_policy_id) + self.assertEqual( + EXAMPLE['egress_firewall_policy_id'], sot.egress_firewall_policy_id + ) + self.assertEqual( + EXAMPLE['ingress_firewall_policy_id'], + sot.ingress_firewall_policy_id, + ) self.assertEqual(EXAMPLE['shared'], sot.shared) self.assertEqual(EXAMPLE['status'], sot.status) self.assertEqual(list, type(sot.ports)) diff --git a/openstack/tests/unit/network/v2/test_firewall_policy.py b/openstack/tests/unit/network/v2/test_firewall_policy.py index bf5b60fea..2d2312515 100644 --- a/openstack/tests/unit/network/v2/test_firewall_policy.py +++ b/openstack/tests/unit/network/v2/test_firewall_policy.py @@ -21,15 +21,16 @@ from openstack.network.v2 import firewall_policy EXAMPLE = { 'description': '1', 'name': '2', - 'firewall_rules': ['a30b0ec2-a468-4b1c-8dbf-928ded2a57a8', - '8d562e98-24f3-46e1-bbf3-d9347c0a67ee'], + 'firewall_rules': [ + 'a30b0ec2-a468-4b1c-8dbf-928ded2a57a8', + '8d562e98-24f3-46e1-bbf3-d9347c0a67ee', + ], 'shared': True, 'project_id': '4', } class TestFirewallPolicy(testtools.TestCase): - def test_basic(self): sot = firewall_policy.FirewallPolicy() self.assertEqual('firewall_policy', sot.resource_key) diff --git a/openstack/tests/unit/network/v2/test_firewall_rule.py b/openstack/tests/unit/network/v2/test_firewall_rule.py index d00f060cd..63c764d83 100644 --- a/openstack/tests/unit/network/v2/test_firewall_rule.py +++ b/openstack/tests/unit/network/v2/test_firewall_rule.py @@ -34,7 +34,6 @@ EXAMPLE = { class TestFirewallRule(testtools.TestCase): - def test_basic(self): sot = firewall_rule.FirewallRule() self.assertEqual('firewall_rule', sot.resource_key) @@ -50,15 +49,15 @@ class TestFirewallRule(testtools.TestCase): sot = firewall_rule.FirewallRule(**EXAMPLE) self.assertEqual(EXAMPLE['action'], sot.action) self.assertEqual(EXAMPLE['description'], sot.description) - self.assertEqual(EXAMPLE['destination_ip_address'], - sot.destination_ip_address) + self.assertEqual( + EXAMPLE['destination_ip_address'], sot.destination_ip_address + ) self.assertEqual(EXAMPLE['destination_port'], sot.destination_port) self.assertEqual(EXAMPLE['name'], sot.name) self.assertEqual(EXAMPLE['enabled'], sot.enabled) self.assertEqual(EXAMPLE['ip_version'], sot.ip_version) self.assertEqual(EXAMPLE['protocol'], sot.protocol) self.assertEqual(EXAMPLE['shared'], sot.shared) - self.assertEqual(EXAMPLE['source_ip_address'], - sot.source_ip_address) + self.assertEqual(EXAMPLE['source_ip_address'], sot.source_ip_address) self.assertEqual(EXAMPLE['source_port'], sot.source_port) self.assertEqual(EXAMPLE['project_id'], sot.project_id) diff --git a/openstack/tests/unit/network/v2/test_flavor.py b/openstack/tests/unit/network/v2/test_flavor.py index 7ba81829e..27246d0b7 100644 --- a/openstack/tests/unit/network/v2/test_flavor.py +++ b/openstack/tests/unit/network/v2/test_flavor.py @@ -52,13 +52,17 @@ class TestFlavor(base.TestCase): def test_make_it_with_optional(self): flavors = flavor.Flavor(**EXAMPLE_WITH_OPTIONAL) self.assertEqual(EXAMPLE_WITH_OPTIONAL['name'], flavors.name) - self.assertEqual(EXAMPLE_WITH_OPTIONAL['service_type'], - flavors.service_type) - self.assertEqual(EXAMPLE_WITH_OPTIONAL['description'], - flavors.description) + self.assertEqual( + EXAMPLE_WITH_OPTIONAL['service_type'], flavors.service_type + ) + self.assertEqual( + EXAMPLE_WITH_OPTIONAL['description'], flavors.description + ) self.assertEqual(EXAMPLE_WITH_OPTIONAL['enabled'], flavors.is_enabled) - self.assertEqual(EXAMPLE_WITH_OPTIONAL['service_profiles'], - flavors.service_profile_ids) + self.assertEqual( + EXAMPLE_WITH_OPTIONAL['service_profiles'], + flavors.service_profile_ids, + ) def test_associate_flavor_with_service_profile(self): flav = flavor.Flavor(EXAMPLE) @@ -71,12 +75,12 @@ class TestFlavor(base.TestCase): sess.post = mock.Mock(return_value=response) flav.id = 'IDENTIFIER' self.assertEqual( - response.body, flav.associate_flavor_with_service_profile( - sess, '1')) + response.body, + flav.associate_flavor_with_service_profile(sess, '1'), + ) url = 'flavors/IDENTIFIER/service_profiles' - sess.post.assert_called_with(url, - json=response.body) + sess.post.assert_called_with(url, json=response.body) def test_disassociate_flavor_from_service_profile(self): flav = flavor.Flavor(EXAMPLE) @@ -86,8 +90,10 @@ class TestFlavor(base.TestCase): sess.post = mock.Mock(return_value=response) flav.id = 'IDENTIFIER' self.assertEqual( - None, flav.disassociate_flavor_from_service_profile( - sess, '1')) + None, flav.disassociate_flavor_from_service_profile(sess, '1') + ) url = 'flavors/IDENTIFIER/service_profiles/1' - sess.delete.assert_called_with(url,) + sess.delete.assert_called_with( + url, + ) diff --git a/openstack/tests/unit/network/v2/test_floating_ip.py b/openstack/tests/unit/network/v2/test_floating_ip.py index c00466837..53b8cff9d 100644 --- a/openstack/tests/unit/network/v2/test_floating_ip.py +++ b/openstack/tests/unit/network/v2/test_floating_ip.py @@ -34,12 +34,11 @@ EXAMPLE = { 'revision_number': 12, 'updated_at': '13', 'subnet_id': '14', - 'tags': ['15', '16'] + 'tags': ['15', '16'], } class TestFloatingIP(base.TestCase): - def test_basic(self): sot = floating_ip.FloatingIP() self.assertEqual('floatingip', sot.resource_key) @@ -55,10 +54,12 @@ class TestFloatingIP(base.TestCase): sot = floating_ip.FloatingIP(**EXAMPLE) self.assertEqual(EXAMPLE['created_at'], sot.created_at) self.assertEqual(EXAMPLE['fixed_ip_address'], sot.fixed_ip_address) - self.assertEqual(EXAMPLE['floating_ip_address'], - sot.floating_ip_address) - self.assertEqual(EXAMPLE['floating_network_id'], - sot.floating_network_id) + self.assertEqual( + EXAMPLE['floating_ip_address'], sot.floating_ip_address + ) + self.assertEqual( + EXAMPLE['floating_network_id'], sot.floating_network_id + ) self.assertEqual(EXAMPLE['id'], sot.id) self.assertEqual(EXAMPLE['port_id'], sot.port_id) self.assertEqual(EXAMPLE['project_id'], sot.project_id) @@ -73,24 +74,26 @@ class TestFloatingIP(base.TestCase): self.assertEqual(EXAMPLE['tags'], sot.tags) self.assertDictEqual( - {'limit': 'limit', - 'marker': 'marker', - 'description': 'description', - 'project_id': 'project_id', - 'tenant_id': 'project_id', - 'status': 'status', - 'port_id': 'port_id', - 'subnet_id': 'subnet_id', - 'router_id': 'router_id', - 'fixed_ip_address': 'fixed_ip_address', - 'floating_ip_address': 'floating_ip_address', - 'floating_network_id': 'floating_network_id', - 'tags': 'tags', - 'any_tags': 'tags-any', - 'not_tags': 'not-tags', - 'not_any_tags': 'not-tags-any', - }, - sot._query_mapping._mapping) + { + 'limit': 'limit', + 'marker': 'marker', + 'description': 'description', + 'project_id': 'project_id', + 'tenant_id': 'project_id', + 'status': 'status', + 'port_id': 'port_id', + 'subnet_id': 'subnet_id', + 'router_id': 'router_id', + 'fixed_ip_address': 'fixed_ip_address', + 'floating_ip_address': 'floating_ip_address', + 'floating_network_id': 'floating_network_id', + 'tags': 'tags', + 'any_tags': 'tags-any', + 'not_tags': 'not-tags', + 'not_any_tags': 'not-tags-any', + }, + sot._query_mapping._mapping, + ) def test_find_available(self): mock_session = mock.Mock(spec=proxy.Proxy) @@ -111,7 +114,8 @@ class TestFloatingIP(base.TestCase): floating_ip.FloatingIP.base_path, headers={'Accept': 'application/json'}, params={}, - microversion=None) + microversion=None, + ) def test_find_available_nada(self): mock_session = mock.Mock(spec=proxy.Proxy) diff --git a/openstack/tests/unit/network/v2/test_health_monitor.py b/openstack/tests/unit/network/v2/test_health_monitor.py index a101e361c..fd857717a 100644 --- a/openstack/tests/unit/network/v2/test_health_monitor.py +++ b/openstack/tests/unit/network/v2/test_health_monitor.py @@ -33,7 +33,6 @@ EXAMPLE = { class TestHealthMonitor(base.TestCase): - def test_basic(self): sot = health_monitor.HealthMonitor() self.assertEqual('healthmonitor', sot.resource_key) diff --git a/openstack/tests/unit/network/v2/test_l3_conntrack_helper.py b/openstack/tests/unit/network/v2/test_l3_conntrack_helper.py index 38527b50c..4136475e9 100644 --- a/openstack/tests/unit/network/v2/test_l3_conntrack_helper.py +++ b/openstack/tests/unit/network/v2/test_l3_conntrack_helper.py @@ -18,19 +18,18 @@ EXAMPLE = { 'id': 'ct_helper_id', 'protocol': 'udp', 'port': 69, - 'helper': 'tftp' + 'helper': 'tftp', } class TestL3ConntrackHelper(base.TestCase): - def test_basic(self): sot = l3_conntrack_helper.ConntrackHelper() self.assertEqual('conntrack_helper', sot.resource_key) self.assertEqual('conntrack_helpers', sot.resources_key) self.assertEqual( - '/routers/%(router_id)s/conntrack_helpers', - sot.base_path) + '/routers/%(router_id)s/conntrack_helpers', sot.base_path + ) self.assertTrue(sot.allow_create) self.assertTrue(sot.allow_fetch) self.assertTrue(sot.allow_commit) diff --git a/openstack/tests/unit/network/v2/test_listener.py b/openstack/tests/unit/network/v2/test_listener.py index fca356e08..fea5259f4 100644 --- a/openstack/tests/unit/network/v2/test_listener.py +++ b/openstack/tests/unit/network/v2/test_listener.py @@ -33,7 +33,6 @@ EXAMPLE = { class TestListener(base.TestCase): - def test_basic(self): sot = listener.Listener() self.assertEqual('listener', sot.resource_key) @@ -58,7 +57,7 @@ class TestListener(base.TestCase): self.assertEqual(EXAMPLE['project_id'], sot.project_id) self.assertEqual(EXAMPLE['protocol'], sot.protocol) self.assertEqual(EXAMPLE['protocol_port'], sot.protocol_port) - self.assertEqual(EXAMPLE['default_tls_container_ref'], - sot.default_tls_container_ref) - self.assertEqual(EXAMPLE['sni_container_refs'], - sot.sni_container_refs) + self.assertEqual( + EXAMPLE['default_tls_container_ref'], sot.default_tls_container_ref + ) + self.assertEqual(EXAMPLE['sni_container_refs'], sot.sni_container_refs) diff --git a/openstack/tests/unit/network/v2/test_load_balancer.py b/openstack/tests/unit/network/v2/test_load_balancer.py index f6f1a51dc..6ff4725b2 100644 --- a/openstack/tests/unit/network/v2/test_load_balancer.py +++ b/openstack/tests/unit/network/v2/test_load_balancer.py @@ -33,7 +33,6 @@ EXAMPLE = { class TestLoadBalancer(base.TestCase): - def test_basic(self): sot = load_balancer.LoadBalancer() self.assertEqual('loadbalancer', sot.resource_key) @@ -53,8 +52,9 @@ class TestLoadBalancer(base.TestCase): self.assertEqual(EXAMPLE['listeners'], sot.listener_ids) self.assertEqual(EXAMPLE['name'], sot.name) self.assertEqual(EXAMPLE['operating_status'], sot.operating_status) - self.assertEqual(EXAMPLE['provisioning_status'], - sot.provisioning_status) + self.assertEqual( + EXAMPLE['provisioning_status'], sot.provisioning_status + ) self.assertEqual(EXAMPLE['project_id'], sot.project_id) self.assertEqual(EXAMPLE['vip_address'], sot.vip_address) self.assertEqual(EXAMPLE['vip_subnet_id'], sot.vip_subnet_id) diff --git a/openstack/tests/unit/network/v2/test_local_ip.py b/openstack/tests/unit/network/v2/test_local_ip.py index 4752665f9..29ab1dacc 100644 --- a/openstack/tests/unit/network/v2/test_local_ip.py +++ b/openstack/tests/unit/network/v2/test_local_ip.py @@ -33,7 +33,6 @@ EXAMPLE = { class TestLocalIP(base.TestCase): - def test_basic(self): sot = local_ip.LocalIP() self.assertEqual('local_ip', sot.resource_key) @@ -45,18 +44,22 @@ class TestLocalIP(base.TestCase): self.assertTrue(sot.allow_delete) self.assertTrue(sot.allow_list) - self.assertDictEqual({"name": "name", - "description": "description", - "project_id": "project_id", - "network_id": "network_id", - "local_port_id": "local_port_id", - "local_ip_address": "local_ip_address", - "ip_mode": "ip_mode", - "sort_key": "sort_key", - "sort_dir": "sort_dir", - "limit": "limit", - "marker": "marker"}, - sot._query_mapping._mapping) + self.assertDictEqual( + { + "name": "name", + "description": "description", + "project_id": "project_id", + "network_id": "network_id", + "local_port_id": "local_port_id", + "local_ip_address": "local_ip_address", + "ip_mode": "ip_mode", + "sort_key": "sort_key", + "sort_dir": "sort_dir", + "limit": "limit", + "marker": "marker", + }, + sot._query_mapping._mapping, + ) def test_make_it(self): sot = local_ip.LocalIP(**EXAMPLE) diff --git a/openstack/tests/unit/network/v2/test_local_ip_association.py b/openstack/tests/unit/network/v2/test_local_ip_association.py index 602b999da..b94da0abe 100644 --- a/openstack/tests/unit/network/v2/test_local_ip_association.py +++ b/openstack/tests/unit/network/v2/test_local_ip_association.py @@ -26,13 +26,13 @@ EXAMPLE = { class TestLocalIP(base.TestCase): - def test_basic(self): sot = local_ip_association.LocalIPAssociation() self.assertEqual('port_association', sot.resource_key) self.assertEqual('port_associations', sot.resources_key) - self.assertEqual('/local_ips/%(local_ip_id)s/port_associations', - sot.base_path) + self.assertEqual( + '/local_ips/%(local_ip_id)s/port_associations', sot.base_path + ) self.assertTrue(sot.allow_create) self.assertTrue(sot.allow_fetch) self.assertTrue(sot.allow_commit) @@ -40,12 +40,15 @@ class TestLocalIP(base.TestCase): self.assertTrue(sot.allow_list) self.assertDictEqual( - {'fixed_port_id': 'fixed_port_id', - 'fixed_ip': 'fixed_ip', - 'host': 'host', - 'limit': 'limit', - 'marker': 'marker'}, - sot._query_mapping._mapping) + { + 'fixed_port_id': 'fixed_port_id', + 'fixed_ip': 'fixed_ip', + 'host': 'host', + 'limit': 'limit', + 'marker': 'marker', + }, + sot._query_mapping._mapping, + ) def test_make_it(self): sot = local_ip_association.LocalIPAssociation(**EXAMPLE) diff --git a/openstack/tests/unit/network/v2/test_metering_label.py b/openstack/tests/unit/network/v2/test_metering_label.py index 2a300346f..be177d6f9 100644 --- a/openstack/tests/unit/network/v2/test_metering_label.py +++ b/openstack/tests/unit/network/v2/test_metering_label.py @@ -25,7 +25,6 @@ EXAMPLE = { class TestMeteringLabel(base.TestCase): - def test_basic(self): sot = metering_label.MeteringLabel() self.assertEqual('metering_label', sot.resource_key) diff --git a/openstack/tests/unit/network/v2/test_metering_label_rule.py b/openstack/tests/unit/network/v2/test_metering_label_rule.py index 95146acaf..fa6340708 100644 --- a/openstack/tests/unit/network/v2/test_metering_label_rule.py +++ b/openstack/tests/unit/network/v2/test_metering_label_rule.py @@ -26,7 +26,6 @@ EXAMPLE = { class TestMeteringLabelRule(base.TestCase): - def test_basic(self): sot = metering_label_rule.MeteringLabelRule() self.assertEqual('metering_label_rule', sot.resource_key) @@ -57,12 +56,16 @@ class TestMeteringLabelRule(base.TestCase): self.assertFalse(sot.is_excluded) self.assertEqual(custom_example['id'], sot.id) self.assertEqual( - custom_example['metering_label_id'], sot.metering_label_id) + custom_example['metering_label_id'], sot.metering_label_id + ) self.assertEqual(custom_example['project_id'], sot.project_id) self.assertEqual( - custom_example['remote_ip_prefix'], sot.remote_ip_prefix) + custom_example['remote_ip_prefix'], sot.remote_ip_prefix + ) self.assertEqual( - custom_example['source_ip_prefix'], sot.source_ip_prefix) + custom_example['source_ip_prefix'], sot.source_ip_prefix + ) self.assertEqual( - custom_example['destination_ip_prefix'], sot.destination_ip_prefix) + custom_example['destination_ip_prefix'], sot.destination_ip_prefix + ) diff --git a/openstack/tests/unit/network/v2/test_ndp_proxy.py b/openstack/tests/unit/network/v2/test_ndp_proxy.py index 4d7d7576e..56ac1aa84 100644 --- a/openstack/tests/unit/network/v2/test_ndp_proxy.py +++ b/openstack/tests/unit/network/v2/test_ndp_proxy.py @@ -26,7 +26,6 @@ EXAMPLE = { class TestNDPProxy(base.TestCase): - def test_basic(self): sot = ndp_proxy.NDPProxy() self.assertEqual('ndp_proxy', sot.resource_key) diff --git a/openstack/tests/unit/network/v2/test_network.py b/openstack/tests/unit/network/v2/test_network.py index 7f9257c65..17ea946e5 100644 --- a/openstack/tests/unit/network/v2/test_network.py +++ b/openstack/tests/unit/network/v2/test_network.py @@ -46,7 +46,6 @@ EXAMPLE = { class TestNetwork(base.TestCase): - def test_basic(self): sot = network.Network() self.assertEqual('network', sot.resource_key) @@ -61,29 +60,34 @@ class TestNetwork(base.TestCase): def test_make_it(self): sot = network.Network(**EXAMPLE) self.assertTrue(sot.is_admin_state_up) - self.assertEqual(EXAMPLE['availability_zone_hints'], - sot.availability_zone_hints) - self.assertEqual(EXAMPLE['availability_zones'], - sot.availability_zones) + self.assertEqual( + EXAMPLE['availability_zone_hints'], sot.availability_zone_hints + ) + self.assertEqual(EXAMPLE['availability_zones'], sot.availability_zones) self.assertEqual(EXAMPLE['created_at'], sot.created_at) self.assertEqual(EXAMPLE['description'], sot.description) self.assertEqual(EXAMPLE['dns_domain'], sot.dns_domain) self.assertEqual(EXAMPLE['id'], sot.id) - self.assertEqual(EXAMPLE['ipv4_address_scope'], - sot.ipv4_address_scope_id) - self.assertEqual(EXAMPLE['ipv6_address_scope'], - sot.ipv6_address_scope_id) + self.assertEqual( + EXAMPLE['ipv4_address_scope'], sot.ipv4_address_scope_id + ) + self.assertEqual( + EXAMPLE['ipv6_address_scope'], sot.ipv6_address_scope_id + ) self.assertFalse(sot.is_default) self.assertEqual(EXAMPLE['mtu'], sot.mtu) self.assertEqual(EXAMPLE['name'], sot.name) self.assertTrue(sot.is_port_security_enabled) self.assertEqual(EXAMPLE['project_id'], sot.project_id) - self.assertEqual(EXAMPLE['provider:network_type'], - sot.provider_network_type) - self.assertEqual(EXAMPLE['provider:physical_network'], - sot.provider_physical_network) - self.assertEqual(EXAMPLE['provider:segmentation_id'], - sot.provider_segmentation_id) + self.assertEqual( + EXAMPLE['provider:network_type'], sot.provider_network_type + ) + self.assertEqual( + EXAMPLE['provider:physical_network'], sot.provider_physical_network + ) + self.assertEqual( + EXAMPLE['provider:segmentation_id'], sot.provider_segmentation_id + ) self.assertEqual(EXAMPLE['qos_policy_id'], sot.qos_policy_id) self.assertEqual(EXAMPLE['revision_number'], sot.revision_number) self.assertTrue(sot.is_router_external) @@ -95,31 +99,32 @@ class TestNetwork(base.TestCase): self.assertEqual(EXAMPLE['vlan_transparent'], sot.is_vlan_transparent) self.assertDictEqual( - {'limit': 'limit', - 'marker': 'marker', - 'description': 'description', - 'name': 'name', - 'project_id': 'project_id', - 'status': 'status', - 'ipv4_address_scope_id': 'ipv4_address_scope', - 'ipv6_address_scope_id': 'ipv6_address_scope', - 'is_admin_state_up': 'admin_state_up', - 'is_port_security_enabled': 'port_security_enabled', - 'is_router_external': 'router:external', - 'is_shared': 'shared', - 'provider_network_type': 'provider:network_type', - 'provider_physical_network': 'provider:physical_network', - 'provider_segmentation_id': 'provider:segmentation_id', - 'tags': 'tags', - 'any_tags': 'tags-any', - 'not_tags': 'not-tags', - 'not_any_tags': 'not-tags-any', - }, - sot._query_mapping._mapping) + { + 'limit': 'limit', + 'marker': 'marker', + 'description': 'description', + 'name': 'name', + 'project_id': 'project_id', + 'status': 'status', + 'ipv4_address_scope_id': 'ipv4_address_scope', + 'ipv6_address_scope_id': 'ipv6_address_scope', + 'is_admin_state_up': 'admin_state_up', + 'is_port_security_enabled': 'port_security_enabled', + 'is_router_external': 'router:external', + 'is_shared': 'shared', + 'provider_network_type': 'provider:network_type', + 'provider_physical_network': 'provider:physical_network', + 'provider_segmentation_id': 'provider:segmentation_id', + 'tags': 'tags', + 'any_tags': 'tags-any', + 'not_tags': 'not-tags', + 'not_any_tags': 'not-tags-any', + }, + sot._query_mapping._mapping, + ) class TestDHCPAgentHostingNetwork(base.TestCase): - def test_basic(self): net = network.DHCPAgentHostingNetwork() self.assertEqual('network', net.resource_key) diff --git a/openstack/tests/unit/network/v2/test_network_ip_availability.py b/openstack/tests/unit/network/v2/test_network_ip_availability.py index dcb8ad7b0..0d033ab36 100644 --- a/openstack/tests/unit/network/v2/test_network_ip_availability.py +++ b/openstack/tests/unit/network/v2/test_network_ip_availability.py @@ -27,11 +27,16 @@ EXAMPLE = { EXAMPLE_WITH_OPTIONAL = { 'network_id': IDENTIFIER, 'network_name': 'private', - 'subnet_ip_availability': [{"used_ips": 3, "subnet_id": - "2e4db1d6-ab2d-4bb1-93bb-a003fdbc9b39", - "subnet_name": "private-subnet", - "ip_version": 6, "cidr": "fd91:c3ba:e818::/64", - "total_ips": 18446744073709551614}], + 'subnet_ip_availability': [ + { + "used_ips": 3, + "subnet_id": "2e4db1d6-ab2d-4bb1-93bb-a003fdbc9b39", + "subnet_name": "private-subnet", + "ip_version": 6, + "cidr": "fd91:c3ba:e818::/64", + "total_ips": 18446744073709551614, + } + ], 'project_id': '2', 'total_ips': 1844, 'used_ips': 6, @@ -39,7 +44,6 @@ EXAMPLE_WITH_OPTIONAL = { class TestNetworkIPAvailability(base.TestCase): - def test_basic(self): sot = network_ip_availability.NetworkIPAvailability() self.assertEqual('network_ip_availability', sot.resource_key) @@ -56,20 +60,25 @@ class TestNetworkIPAvailability(base.TestCase): sot = network_ip_availability.NetworkIPAvailability(**EXAMPLE) self.assertEqual(EXAMPLE['network_id'], sot.network_id) self.assertEqual(EXAMPLE['network_name'], sot.network_name) - self.assertEqual(EXAMPLE['subnet_ip_availability'], - sot.subnet_ip_availability) + self.assertEqual( + EXAMPLE['subnet_ip_availability'], sot.subnet_ip_availability + ) self.assertEqual(EXAMPLE['project_id'], sot.project_id) self.assertEqual(EXAMPLE['total_ips'], sot.total_ips) self.assertEqual(EXAMPLE['used_ips'], sot.used_ips) def test_make_it_with_optional(self): sot = network_ip_availability.NetworkIPAvailability( - **EXAMPLE_WITH_OPTIONAL) + **EXAMPLE_WITH_OPTIONAL + ) self.assertEqual(EXAMPLE_WITH_OPTIONAL['network_id'], sot.network_id) - self.assertEqual(EXAMPLE_WITH_OPTIONAL['network_name'], - sot.network_name) - self.assertEqual(EXAMPLE_WITH_OPTIONAL['subnet_ip_availability'], - sot.subnet_ip_availability) + self.assertEqual( + EXAMPLE_WITH_OPTIONAL['network_name'], sot.network_name + ) + self.assertEqual( + EXAMPLE_WITH_OPTIONAL['subnet_ip_availability'], + sot.subnet_ip_availability, + ) self.assertEqual(EXAMPLE_WITH_OPTIONAL['project_id'], sot.project_id) self.assertEqual(EXAMPLE_WITH_OPTIONAL['total_ips'], sot.total_ips) self.assertEqual(EXAMPLE_WITH_OPTIONAL['used_ips'], sot.used_ips) diff --git a/openstack/tests/unit/network/v2/test_network_segment_range.py b/openstack/tests/unit/network/v2/test_network_segment_range.py index 2e32f299d..636ab5995 100644 --- a/openstack/tests/unit/network/v2/test_network_segment_range.py +++ b/openstack/tests/unit/network/v2/test_network_segment_range.py @@ -34,12 +34,12 @@ EXAMPLE = { class TestNetworkSegmentRange(base.TestCase): - def test_basic(self): test_seg_range = network_segment_range.NetworkSegmentRange() self.assertEqual('network_segment_range', test_seg_range.resource_key) - self.assertEqual('network_segment_ranges', - test_seg_range.resources_key) + self.assertEqual( + 'network_segment_ranges', test_seg_range.resources_key + ) self.assertEqual('/network_segment_ranges', test_seg_range.base_path) self.assertTrue(test_seg_range.allow_create) @@ -56,8 +56,9 @@ class TestNetworkSegmentRange(base.TestCase): self.assertEqual(EXAMPLE['shared'], test_seg_range.shared) self.assertEqual(EXAMPLE['project_id'], test_seg_range.project_id) self.assertEqual(EXAMPLE['network_type'], test_seg_range.network_type) - self.assertEqual(EXAMPLE['physical_network'], - test_seg_range.physical_network) + self.assertEqual( + EXAMPLE['physical_network'], test_seg_range.physical_network + ) self.assertEqual(EXAMPLE['minimum'], test_seg_range.minimum) self.assertEqual(EXAMPLE['maximum'], test_seg_range.maximum) self.assertEqual(EXAMPLE['used'], test_seg_range.used) diff --git a/openstack/tests/unit/network/v2/test_pool.py b/openstack/tests/unit/network/v2/test_pool.py index 36098582b..ab9509cd8 100644 --- a/openstack/tests/unit/network/v2/test_pool.py +++ b/openstack/tests/unit/network/v2/test_pool.py @@ -41,7 +41,6 @@ EXAMPLE = { class TestPool(base.TestCase): - def test_basic(self): sot = pool.Pool() self.assertEqual('pool', sot.resource_key) @@ -59,8 +58,9 @@ class TestPool(base.TestCase): self.assertEqual(EXAMPLE['description'], sot.description) self.assertEqual(EXAMPLE['healthmonitor_id'], sot.health_monitor_id) self.assertEqual(EXAMPLE['health_monitors'], sot.health_monitor_ids) - self.assertEqual(EXAMPLE['health_monitor_status'], - sot.health_monitor_status) + self.assertEqual( + EXAMPLE['health_monitor_status'], sot.health_monitor_status + ) self.assertEqual(EXAMPLE['id'], sot.id) self.assertEqual(EXAMPLE['lb_algorithm'], sot.lb_algorithm) self.assertEqual(EXAMPLE['listeners'], sot.listener_ids) @@ -70,8 +70,9 @@ class TestPool(base.TestCase): self.assertEqual(EXAMPLE['project_id'], sot.project_id) self.assertEqual(EXAMPLE['protocol'], sot.protocol) self.assertEqual(EXAMPLE['provider'], sot.provider) - self.assertEqual(EXAMPLE['session_persistence'], - sot.session_persistence) + self.assertEqual( + EXAMPLE['session_persistence'], sot.session_persistence + ) self.assertEqual(EXAMPLE['status'], sot.status) self.assertEqual(EXAMPLE['status_description'], sot.status_description) self.assertEqual(EXAMPLE['subnet_id'], sot.subnet_id) diff --git a/openstack/tests/unit/network/v2/test_pool_member.py b/openstack/tests/unit/network/v2/test_pool_member.py index 478b2fefb..7e836f1ac 100644 --- a/openstack/tests/unit/network/v2/test_pool_member.py +++ b/openstack/tests/unit/network/v2/test_pool_member.py @@ -29,7 +29,6 @@ EXAMPLE = { class TestPoolMember(base.TestCase): - def test_basic(self): sot = pool_member.PoolMember() self.assertEqual('member', sot.resource_key) diff --git a/openstack/tests/unit/network/v2/test_port.py b/openstack/tests/unit/network/v2/test_port.py index e9fc863bf..8e06a9f35 100644 --- a/openstack/tests/unit/network/v2/test_port.py +++ b/openstack/tests/unit/network/v2/test_port.py @@ -45,28 +45,32 @@ EXAMPLE = { 'qos_policy_id': '21', 'propagate_uplink_status': False, 'resource_request': { - 'required': [ - 'CUSTOM_PHYSNET_PUBLIC', 'CUSTOM_VNIC_TYPE_NORMAL'], + 'required': ['CUSTOM_PHYSNET_PUBLIC', 'CUSTOM_VNIC_TYPE_NORMAL'], 'resources': { 'NET_BW_EGR_KILOBIT_PER_SEC': 1, - 'NET_BW_IGR_KILOBIT_PER_SEC': 2}}, + 'NET_BW_IGR_KILOBIT_PER_SEC': 2, + }, + }, 'revision_number': 22, 'security_groups': ['23'], 'status': '25', 'project_id': '26', 'trunk_details': { 'trunk_id': '27', - 'sub_ports': [{ - 'port_id': '28', - 'segmentation_id': 29, - 'segmentation_type': '30', - 'mac_address': '31'}]}, + 'sub_ports': [ + { + 'port_id': '28', + 'segmentation_id': 29, + 'segmentation_type': '30', + 'mac_address': '31', + } + ], + }, 'updated_at': '2016-07-09T12:14:57.233772', } class TestPort(base.TestCase): - def test_basic(self): sot = port.Port() self.assertEqual('port', sot.resource_key) @@ -78,46 +82,51 @@ class TestPort(base.TestCase): self.assertTrue(sot.allow_delete) self.assertTrue(sot.allow_list) - self.assertDictEqual({"binding:host_id": "binding:host_id", - "binding:profile": "binding:profile", - "binding:vif_details": "binding:vif_details", - "binding:vif_type": "binding:vif_type", - "binding:vnic_type": "binding:vnic_type", - "description": "description", - "device_id": "device_id", - "device_owner": "device_owner", - "fields": "fields", - "fixed_ips": "fixed_ips", - "id": "id", - "ip_address": "ip_address", - "mac_address": "mac_address", - "name": "name", - "network_id": "network_id", - "security_groups": "security_groups", - "status": "status", - "subnet_id": "subnet_id", - "is_admin_state_up": "admin_state_up", - "is_port_security_enabled": - "port_security_enabled", - "project_id": "project_id", - "security_group_ids": "security_groups", - "limit": "limit", - "marker": "marker", - "any_tags": "tags-any", - "not_any_tags": "not-tags-any", - "not_tags": "not-tags", - "tags": "tags"}, - sot._query_mapping._mapping) + self.assertDictEqual( + { + "binding:host_id": "binding:host_id", + "binding:profile": "binding:profile", + "binding:vif_details": "binding:vif_details", + "binding:vif_type": "binding:vif_type", + "binding:vnic_type": "binding:vnic_type", + "description": "description", + "device_id": "device_id", + "device_owner": "device_owner", + "fields": "fields", + "fixed_ips": "fixed_ips", + "id": "id", + "ip_address": "ip_address", + "mac_address": "mac_address", + "name": "name", + "network_id": "network_id", + "security_groups": "security_groups", + "status": "status", + "subnet_id": "subnet_id", + "is_admin_state_up": "admin_state_up", + "is_port_security_enabled": "port_security_enabled", + "project_id": "project_id", + "security_group_ids": "security_groups", + "limit": "limit", + "marker": "marker", + "any_tags": "tags-any", + "not_any_tags": "not-tags-any", + "not_tags": "not-tags", + "tags": "tags", + }, + sot._query_mapping._mapping, + ) def test_make_it(self): sot = port.Port(**EXAMPLE) self.assertTrue(sot.is_admin_state_up) - self.assertEqual(EXAMPLE['allowed_address_pairs'], - sot.allowed_address_pairs) + self.assertEqual( + EXAMPLE['allowed_address_pairs'], sot.allowed_address_pairs + ) self.assertEqual(EXAMPLE['binding:host_id'], sot.binding_host_id) self.assertEqual(EXAMPLE['binding:profile'], sot.binding_profile) - self.assertEqual(EXAMPLE['binding:vif_details'], - sot.binding_vif_details) + self.assertEqual( + EXAMPLE['binding:vif_details'], sot.binding_vif_details + ) self.assertEqual(EXAMPLE['binding:vif_type'], sot.binding_vif_type) self.assertEqual(EXAMPLE['binding:vnic_type'], sot.binding_vnic_type) self.assertEqual(EXAMPLE['created_at'], sot.created_at) @@ -136,14 +145,17 @@ class TestPort(base.TestCase): self.assertEqual(EXAMPLE['mac_address'], sot.mac_address) self.assertEqual(EXAMPLE['name'], sot.name) self.assertEqual(EXAMPLE['network_id'], sot.network_id) - self.assertEqual(EXAMPLE['numa_affinity_policy'], - sot.numa_affinity_policy) + self.assertEqual( + EXAMPLE['numa_affinity_policy'], sot.numa_affinity_policy + ) self.assertTrue(sot.is_port_security_enabled) - self.assertEqual(EXAMPLE['qos_network_policy_id'], - sot.qos_network_policy_id) + self.assertEqual( + EXAMPLE['qos_network_policy_id'], sot.qos_network_policy_id + ) self.assertEqual(EXAMPLE['qos_policy_id'], sot.qos_policy_id) - self.assertEqual(EXAMPLE['propagate_uplink_status'], - sot.propagate_uplink_status) + self.assertEqual( + EXAMPLE['propagate_uplink_status'], sot.propagate_uplink_status + ) self.assertEqual(EXAMPLE['resource_request'], sot.resource_request) self.assertEqual(EXAMPLE['revision_number'], sot.revision_number) self.assertEqual(EXAMPLE['security_groups'], sot.security_group_ids) diff --git a/openstack/tests/unit/network/v2/test_port_forwarding.py b/openstack/tests/unit/network/v2/test_port_forwarding.py index 8748cae9e..a95ea9fba 100644 --- a/openstack/tests/unit/network/v2/test_port_forwarding.py +++ b/openstack/tests/unit/network/v2/test_port_forwarding.py @@ -22,39 +22,43 @@ EXAMPLE = { 'internal_port': 80, 'internal_port_id': 'internal-port-uuid', 'external_port': 8080, - 'description': 'description' + 'description': 'description', } class TestFloatingIP(base.TestCase): - def test_basic(self): sot = port_forwarding.PortForwarding() self.assertEqual('port_forwarding', sot.resource_key) self.assertEqual('port_forwardings', sot.resources_key) self.assertEqual( - '/floatingips/%(floatingip_id)s/port_forwardings', - sot.base_path) + '/floatingips/%(floatingip_id)s/port_forwardings', sot.base_path + ) self.assertTrue(sot.allow_create) self.assertTrue(sot.allow_fetch) self.assertTrue(sot.allow_commit) self.assertTrue(sot.allow_delete) self.assertTrue(sot.allow_list) - self.assertDictEqual({'internal_port_id': 'internal_port_id', - 'external_port': 'external_port', - 'limit': 'limit', - 'marker': 'marker', - 'protocol': 'protocol'}, - sot._query_mapping._mapping) + self.assertDictEqual( + { + 'internal_port_id': 'internal_port_id', + 'external_port': 'external_port', + 'limit': 'limit', + 'marker': 'marker', + 'protocol': 'protocol', + }, + sot._query_mapping._mapping, + ) def test_make_it(self): sot = port_forwarding.PortForwarding(**EXAMPLE) self.assertEqual(EXAMPLE['id'], sot.id) self.assertEqual(EXAMPLE['floatingip_id'], sot.floatingip_id) self.assertEqual(EXAMPLE['protocol'], sot.protocol) - self.assertEqual(EXAMPLE['internal_ip_address'], - sot.internal_ip_address) + self.assertEqual( + EXAMPLE['internal_ip_address'], sot.internal_ip_address + ) self.assertEqual(EXAMPLE['internal_port'], sot.internal_port) self.assertEqual(EXAMPLE['internal_port_id'], sot.internal_port_id) self.assertEqual(EXAMPLE['external_port'], sot.external_port) diff --git a/openstack/tests/unit/network/v2/test_proxy.py b/openstack/tests/unit/network/v2/test_proxy.py index 57403f83f..3b5132846 100644 --- a/openstack/tests/unit/network/v2/test_proxy.py +++ b/openstack/tests/unit/network/v2/test_proxy.py @@ -90,9 +90,16 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase): self.proxy = _proxy.Proxy(self.session) def verify_update( - self, test_method, resource_type, base_path=None, *, - method_args=None, method_kwargs=None, - expected_args=None, expected_kwargs=None, expected_result="result", + self, + test_method, + resource_type, + base_path=None, + *, + method_args=None, + method_kwargs=None, + expected_args=None, + expected_kwargs=None, + expected_result="result", mock_method="openstack.network.v2._proxy.Proxy._update", ): super().verify_update( @@ -104,12 +111,19 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase): expected_args=expected_args, expected_kwargs=expected_kwargs, expected_result=expected_result, - mock_method=mock_method) + mock_method=mock_method, + ) def verify_delete( - self, test_method, resource_type, ignore_missing=True, *, - method_args=None, method_kwargs=None, - expected_args=None, expected_kwargs=None, + self, + test_method, + resource_type, + ignore_missing=True, + *, + method_args=None, + method_kwargs=None, + expected_args=None, + expected_kwargs=None, mock_method="openstack.network.v2._proxy.Proxy._delete", ): super().verify_delete( @@ -120,94 +134,105 @@ class TestNetworkProxy(test_proxy_base.TestProxyBase): method_kwargs=method_kwargs, expected_args=expected_args, expected_kwargs=expected_kwargs, - mock_method=mock_method) + mock_method=mock_method, + ) class TestNetworkAddressGroup(TestNetworkProxy): def test_address_group_create_attrs(self): - self.verify_create(self.proxy.create_address_group, - address_group.AddressGroup) + self.verify_create( + self.proxy.create_address_group, address_group.AddressGroup + ) def test_address_group_delete(self): - self.verify_delete(self.proxy.delete_address_group, - address_group.AddressGroup, - False) + self.verify_delete( + self.proxy.delete_address_group, address_group.AddressGroup, False + ) def test_address_group_delete_ignore(self): - self.verify_delete(self.proxy.delete_address_group, - address_group.AddressGroup, - True) + self.verify_delete( + self.proxy.delete_address_group, address_group.AddressGroup, True + ) def test_address_group_find(self): - self.verify_find(self.proxy.find_address_group, - address_group.AddressGroup) + self.verify_find( + self.proxy.find_address_group, address_group.AddressGroup + ) def test_address_group_get(self): - self.verify_get(self.proxy.get_address_group, - address_group.AddressGroup) + self.verify_get( + self.proxy.get_address_group, address_group.AddressGroup + ) def test_address_groups(self): - self.verify_list(self.proxy.address_groups, - address_group.AddressGroup) + self.verify_list(self.proxy.address_groups, address_group.AddressGroup) def test_address_group_update(self): - self.verify_update(self.proxy.update_address_group, - address_group.AddressGroup) + self.verify_update( + self.proxy.update_address_group, address_group.AddressGroup + ) - @mock.patch('openstack.network.v2._proxy.Proxy.' - 'add_addresses_to_address_group') + @mock.patch( + 'openstack.network.v2._proxy.Proxy.' 'add_addresses_to_address_group' + ) def test_add_addresses_to_address_group(self, add_addresses): data = mock.sentinel - self.proxy.add_addresses_to_address_group(address_group.AddressGroup, - data) + self.proxy.add_addresses_to_address_group( + address_group.AddressGroup, data + ) - add_addresses.assert_called_once_with(address_group.AddressGroup, - data) + add_addresses.assert_called_once_with(address_group.AddressGroup, data) - @mock.patch('openstack.network.v2._proxy.Proxy.' - 'remove_addresses_from_address_group') + @mock.patch( + 'openstack.network.v2._proxy.Proxy.' + 'remove_addresses_from_address_group' + ) def test_remove_addresses_from_address_group(self, remove_addresses): data = mock.sentinel self.proxy.remove_addresses_from_address_group( - address_group.AddressGroup, - data) + address_group.AddressGroup, data + ) - remove_addresses.assert_called_once_with(address_group.AddressGroup, - data) + remove_addresses.assert_called_once_with( + address_group.AddressGroup, data + ) class TestNetworkAddressScope(TestNetworkProxy): def test_address_scope_create_attrs(self): - self.verify_create(self.proxy.create_address_scope, - address_scope.AddressScope) + self.verify_create( + self.proxy.create_address_scope, address_scope.AddressScope + ) def test_address_scope_delete(self): - self.verify_delete(self.proxy.delete_address_scope, - address_scope.AddressScope, - False) + self.verify_delete( + self.proxy.delete_address_scope, address_scope.AddressScope, False + ) def test_address_scope_delete_ignore(self): - self.verify_delete(self.proxy.delete_address_scope, - address_scope.AddressScope, - True) + self.verify_delete( + self.proxy.delete_address_scope, address_scope.AddressScope, True + ) def test_address_scope_find(self): - self.verify_find(self.proxy.find_address_scope, - address_scope.AddressScope) + self.verify_find( + self.proxy.find_address_scope, address_scope.AddressScope + ) def test_address_scope_get(self): - self.verify_get(self.proxy.get_address_scope, - address_scope.AddressScope) + self.verify_get( + self.proxy.get_address_scope, address_scope.AddressScope + ) def test_address_scopes(self): - self.verify_list(self.proxy.address_scopes, - address_scope.AddressScope) + self.verify_list(self.proxy.address_scopes, address_scope.AddressScope) def test_address_scope_update(self): - self.verify_update(self.proxy.update_address_scope, - address_scope.AddressScope) + self.verify_update( + self.proxy.update_address_scope, address_scope.AddressScope + ) class TestNetworkAgent(TestNetworkProxy): @@ -227,15 +252,15 @@ class TestNetworkAgent(TestNetworkProxy): class TestNetworkAvailability(TestNetworkProxy): def test_availability_zones(self): self.verify_list( - self.proxy.availability_zones, - availability_zone.AvailabilityZone) + self.proxy.availability_zones, availability_zone.AvailabilityZone + ) def test_dhcp_agent_hosting_networks(self): self.verify_list( self.proxy.dhcp_agent_hosting_networks, network.DHCPAgentHostingNetwork, method_kwargs={'agent': AGENT_ID}, - expected_kwargs={'agent_id': AGENT_ID} + expected_kwargs={'agent_id': AGENT_ID}, ) def test_network_hosting_dhcp_agents(self): @@ -243,7 +268,7 @@ class TestNetworkAvailability(TestNetworkProxy): self.proxy.network_hosting_dhcp_agents, agent.NetworkHostingDHCPAgent, method_kwargs={'network': NETWORK_ID}, - expected_kwargs={'network_id': NETWORK_ID} + expected_kwargs={'network_id': NETWORK_ID}, ) @@ -258,17 +283,29 @@ class TestNetworkExtension(TestNetworkProxy): self.verify_create(self.proxy.create_ip, floating_ip.FloatingIP) def test_floating_ip_delete(self): - self.verify_delete(self.proxy.delete_ip, floating_ip.FloatingIP, - False, expected_kwargs={'if_revision': None}) + self.verify_delete( + self.proxy.delete_ip, + floating_ip.FloatingIP, + False, + expected_kwargs={'if_revision': None}, + ) def test_floating_ip_delete_ignore(self): - self.verify_delete(self.proxy.delete_ip, floating_ip.FloatingIP, - True, expected_kwargs={'if_revision': None}) + self.verify_delete( + self.proxy.delete_ip, + floating_ip.FloatingIP, + True, + expected_kwargs={'if_revision': None}, + ) def test_floating_ip_delete_if_revision(self): - self.verify_delete(self.proxy.delete_ip, floating_ip.FloatingIP, - True, method_kwargs={'if_revision': 42}, - expected_kwargs={'if_revision': 42}) + self.verify_delete( + self.proxy.delete_ip, + floating_ip.FloatingIP, + True, + method_kwargs={'if_revision': 42}, + expected_kwargs={'if_revision': 42}, + ) def test_floating_ip_find(self): self.verify_find(self.proxy.find_ip, floating_ip.FloatingIP) @@ -280,46 +317,60 @@ class TestNetworkExtension(TestNetworkProxy): self.verify_list(self.proxy.ips, floating_ip.FloatingIP) def test_floating_ip_update(self): - self.verify_update(self.proxy.update_ip, floating_ip.FloatingIP, - expected_kwargs={'x': 1, 'y': 2, 'z': 3, - 'if_revision': None}) + self.verify_update( + self.proxy.update_ip, + floating_ip.FloatingIP, + expected_kwargs={'x': 1, 'y': 2, 'z': 3, 'if_revision': None}, + ) def test_floating_ip_update_if_revision(self): - self.verify_update(self.proxy.update_ip, floating_ip.FloatingIP, - method_kwargs={'x': 1, 'y': 2, 'z': 3, - 'if_revision': 42}, - expected_kwargs={'x': 1, 'y': 2, 'z': 3, - 'if_revision': 42}) + self.verify_update( + self.proxy.update_ip, + floating_ip.FloatingIP, + method_kwargs={'x': 1, 'y': 2, 'z': 3, 'if_revision': 42}, + expected_kwargs={'x': 1, 'y': 2, 'z': 3, 'if_revision': 42}, + ) class TestNetworkHealthMonitor(TestNetworkProxy): def test_health_monitor_create_attrs(self): - self.verify_create(self.proxy.create_health_monitor, - health_monitor.HealthMonitor) + self.verify_create( + self.proxy.create_health_monitor, health_monitor.HealthMonitor + ) def test_health_monitor_delete(self): - self.verify_delete(self.proxy.delete_health_monitor, - health_monitor.HealthMonitor, False) + self.verify_delete( + self.proxy.delete_health_monitor, + health_monitor.HealthMonitor, + False, + ) def test_health_monitor_delete_ignore(self): - self.verify_delete(self.proxy.delete_health_monitor, - health_monitor.HealthMonitor, True) + self.verify_delete( + self.proxy.delete_health_monitor, + health_monitor.HealthMonitor, + True, + ) def test_health_monitor_find(self): - self.verify_find(self.proxy.find_health_monitor, - health_monitor.HealthMonitor) + self.verify_find( + self.proxy.find_health_monitor, health_monitor.HealthMonitor + ) def test_health_monitor_get(self): - self.verify_get(self.proxy.get_health_monitor, - health_monitor.HealthMonitor) + self.verify_get( + self.proxy.get_health_monitor, health_monitor.HealthMonitor + ) def test_health_monitors(self): - self.verify_list(self.proxy.health_monitors, - health_monitor.HealthMonitor) + self.verify_list( + self.proxy.health_monitors, health_monitor.HealthMonitor + ) def test_health_monitor_update(self): - self.verify_update(self.proxy.update_health_monitor, - health_monitor.HealthMonitor) + self.verify_update( + self.proxy.update_health_monitor, health_monitor.HealthMonitor + ) class TestNetworkListener(TestNetworkProxy): @@ -327,12 +378,12 @@ class TestNetworkListener(TestNetworkProxy): self.verify_create(self.proxy.create_listener, listener.Listener) def test_listener_delete(self): - self.verify_delete(self.proxy.delete_listener, - listener.Listener, False) + self.verify_delete( + self.proxy.delete_listener, listener.Listener, False + ) def test_listener_delete_ignore(self): - self.verify_delete(self.proxy.delete_listener, - listener.Listener, True) + self.verify_delete(self.proxy.delete_listener, listener.Listener, True) def test_listener_find(self): self.verify_find(self.proxy.find_listener, listener.Listener) @@ -349,90 +400,122 @@ class TestNetworkListener(TestNetworkProxy): class TestNetworkLoadBalancer(TestNetworkProxy): def test_load_balancer_create_attrs(self): - self.verify_create(self.proxy.create_load_balancer, - load_balancer.LoadBalancer) + self.verify_create( + self.proxy.create_load_balancer, load_balancer.LoadBalancer + ) def test_load_balancer_delete(self): - self.verify_delete(self.proxy.delete_load_balancer, - load_balancer.LoadBalancer, False) + self.verify_delete( + self.proxy.delete_load_balancer, load_balancer.LoadBalancer, False + ) def test_load_balancer_delete_ignore(self): - self.verify_delete(self.proxy.delete_load_balancer, - load_balancer.LoadBalancer, True) + self.verify_delete( + self.proxy.delete_load_balancer, load_balancer.LoadBalancer, True + ) def test_load_balancer_find(self): - self.verify_find(self.proxy.find_load_balancer, - load_balancer.LoadBalancer) + self.verify_find( + self.proxy.find_load_balancer, load_balancer.LoadBalancer + ) def test_load_balancer_get(self): - self.verify_get(self.proxy.get_load_balancer, - load_balancer.LoadBalancer) + self.verify_get( + self.proxy.get_load_balancer, load_balancer.LoadBalancer + ) def test_load_balancers(self): - self.verify_list(self.proxy.load_balancers, - load_balancer.LoadBalancer) + self.verify_list(self.proxy.load_balancers, load_balancer.LoadBalancer) def test_load_balancer_update(self): - self.verify_update(self.proxy.update_load_balancer, - load_balancer.LoadBalancer) + self.verify_update( + self.proxy.update_load_balancer, load_balancer.LoadBalancer + ) class TestNetworkMeteringLabel(TestNetworkProxy): def test_metering_label_create_attrs(self): - self.verify_create(self.proxy.create_metering_label, - metering_label.MeteringLabel) + self.verify_create( + self.proxy.create_metering_label, metering_label.MeteringLabel + ) def test_metering_label_delete(self): - self.verify_delete(self.proxy.delete_metering_label, - metering_label.MeteringLabel, False) + self.verify_delete( + self.proxy.delete_metering_label, + metering_label.MeteringLabel, + False, + ) def test_metering_label_delete_ignore(self): - self.verify_delete(self.proxy.delete_metering_label, - metering_label.MeteringLabel, True) + self.verify_delete( + self.proxy.delete_metering_label, + metering_label.MeteringLabel, + True, + ) def test_metering_label_find(self): - self.verify_find(self.proxy.find_metering_label, - metering_label.MeteringLabel) + self.verify_find( + self.proxy.find_metering_label, metering_label.MeteringLabel + ) def test_metering_label_get(self): - self.verify_get(self.proxy.get_metering_label, - metering_label.MeteringLabel) + self.verify_get( + self.proxy.get_metering_label, metering_label.MeteringLabel + ) def test_metering_labels(self): - self.verify_list(self.proxy.metering_labels, - metering_label.MeteringLabel) + self.verify_list( + self.proxy.metering_labels, metering_label.MeteringLabel + ) def test_metering_label_update(self): - self.verify_update(self.proxy.update_metering_label, - metering_label.MeteringLabel) + self.verify_update( + self.proxy.update_metering_label, metering_label.MeteringLabel + ) def test_metering_label_rule_create_attrs(self): - self.verify_create(self.proxy.create_metering_label_rule, - metering_label_rule.MeteringLabelRule) + self.verify_create( + self.proxy.create_metering_label_rule, + metering_label_rule.MeteringLabelRule, + ) def test_metering_label_rule_delete(self): - self.verify_delete(self.proxy.delete_metering_label_rule, - metering_label_rule.MeteringLabelRule, False) + self.verify_delete( + self.proxy.delete_metering_label_rule, + metering_label_rule.MeteringLabelRule, + False, + ) def test_metering_label_rule_delete_ignore(self): - self.verify_delete(self.proxy.delete_metering_label_rule, - metering_label_rule.MeteringLabelRule, True) + self.verify_delete( + self.proxy.delete_metering_label_rule, + metering_label_rule.MeteringLabelRule, + True, + ) def test_metering_label_rule_find(self): - self.verify_find(self.proxy.find_metering_label_rule, - metering_label_rule.MeteringLabelRule) + self.verify_find( + self.proxy.find_metering_label_rule, + metering_label_rule.MeteringLabelRule, + ) def test_metering_label_rule_get(self): - self.verify_get(self.proxy.get_metering_label_rule, - metering_label_rule.MeteringLabelRule) + self.verify_get( + self.proxy.get_metering_label_rule, + metering_label_rule.MeteringLabelRule, + ) def test_metering_label_rules(self): - self.verify_list(self.proxy.metering_label_rules, - metering_label_rule.MeteringLabelRule) + self.verify_list( + self.proxy.metering_label_rules, + metering_label_rule.MeteringLabelRule, + ) def test_metering_label_rule_update(self): - self.verify_update(self.proxy.update_metering_label_rule, - metering_label_rule.MeteringLabelRule) + self.verify_update( + self.proxy.update_metering_label_rule, + metering_label_rule.MeteringLabelRule, + ) class TestNetworkNetwork(TestNetworkProxy): @@ -440,17 +523,29 @@ class TestNetworkNetwork(TestNetworkProxy): self.verify_create(self.proxy.create_network, network.Network) def test_network_delete(self): - self.verify_delete(self.proxy.delete_network, network.Network, False, - expected_kwargs={'if_revision': None}) + self.verify_delete( + self.proxy.delete_network, + network.Network, + False, + expected_kwargs={'if_revision': None}, + ) def test_network_delete_ignore(self): - self.verify_delete(self.proxy.delete_network, network.Network, True, - expected_kwargs={'if_revision': None}) + self.verify_delete( + self.proxy.delete_network, + network.Network, + True, + expected_kwargs={'if_revision': None}, + ) def test_network_delete_if_revision(self): - self.verify_delete(self.proxy.delete_network, network.Network, True, - method_kwargs={'if_revision': 42}, - expected_kwargs={'if_revision': 42}) + self.verify_delete( + self.proxy.delete_network, + network.Network, + True, + method_kwargs={'if_revision': 42}, + expected_kwargs={'if_revision': 42}, + ) def test_network_find(self): self.verify_find(self.proxy.find_network, network.Network) @@ -462,7 +557,8 @@ class TestNetworkNetwork(TestNetworkProxy): method_args=["net1"], method_kwargs={"project_id": "1"}, expected_args=[network.Network, "net1"], - expected_kwargs={"project_id": "1", "ignore_missing": True}) + expected_kwargs={"project_id": "1", "ignore_missing": True}, + ) def test_network_get(self): self.verify_get(self.proxy.get_network, network.Network) @@ -471,16 +567,19 @@ class TestNetworkNetwork(TestNetworkProxy): self.verify_list(self.proxy.networks, network.Network) def test_network_update(self): - self.verify_update(self.proxy.update_network, network.Network, - expected_kwargs={'x': 1, 'y': 2, 'z': 3, - 'if_revision': None}) + self.verify_update( + self.proxy.update_network, + network.Network, + expected_kwargs={'x': 1, 'y': 2, 'z': 3, 'if_revision': None}, + ) def test_network_update_if_revision(self): - self.verify_update(self.proxy.update_network, network.Network, - method_kwargs={'x': 1, 'y': 2, 'z': 3, - 'if_revision': 42}, - expected_kwargs={'x': 1, 'y': 2, 'z': 3, - 'if_revision': 42}) + self.verify_update( + self.proxy.update_network, + network.Network, + method_kwargs={'x': 1, 'y': 2, 'z': 3, 'if_revision': 42}, + expected_kwargs={'x': 1, 'y': 2, 'z': 3, 'if_revision': 42}, + ) class TestNetworkFlavor(TestNetworkProxy): @@ -508,17 +607,29 @@ class TestNetworkLocalIp(TestNetworkProxy): self.verify_create(self.proxy.create_local_ip, local_ip.LocalIP) def test_local_ip_delete(self): - self.verify_delete(self.proxy.delete_local_ip, local_ip.LocalIP, - False, expected_kwargs={'if_revision': None}) + self.verify_delete( + self.proxy.delete_local_ip, + local_ip.LocalIP, + False, + expected_kwargs={'if_revision': None}, + ) def test_local_ip_delete_ignore(self): - self.verify_delete(self.proxy.delete_local_ip, local_ip.LocalIP, - True, expected_kwargs={'if_revision': None}) + self.verify_delete( + self.proxy.delete_local_ip, + local_ip.LocalIP, + True, + expected_kwargs={'if_revision': None}, + ) def test_local_ip_delete_if_revision(self): - self.verify_delete(self.proxy.delete_local_ip, local_ip.LocalIP, - True, method_kwargs={'if_revision': 42}, - expected_kwargs={'if_revision': 42}) + self.verify_delete( + self.proxy.delete_local_ip, + local_ip.LocalIP, + True, + method_kwargs={'if_revision': 42}, + expected_kwargs={'if_revision': 42}, + ) def test_local_ip_find(self): self.verify_find(self.proxy.find_local_ip, local_ip.LocalIP) @@ -530,24 +641,29 @@ class TestNetworkLocalIp(TestNetworkProxy): self.verify_list(self.proxy.local_ips, local_ip.LocalIP) def test_local_ip_update(self): - self.verify_update(self.proxy.update_local_ip, local_ip.LocalIP, - expected_kwargs={'x': 1, 'y': 2, 'z': 3, - 'if_revision': None}) + self.verify_update( + self.proxy.update_local_ip, + local_ip.LocalIP, + expected_kwargs={'x': 1, 'y': 2, 'z': 3, 'if_revision': None}, + ) def test_local_ip_update_if_revision(self): - self.verify_update(self.proxy.update_local_ip, local_ip.LocalIP, - method_kwargs={'x': 1, 'y': 2, 'z': 3, - 'if_revision': 42}, - expected_kwargs={'x': 1, 'y': 2, 'z': 3, - 'if_revision': 42}) + self.verify_update( + self.proxy.update_local_ip, + local_ip.LocalIP, + method_kwargs={'x': 1, 'y': 2, 'z': 3, 'if_revision': 42}, + expected_kwargs={'x': 1, 'y': 2, 'z': 3, 'if_revision': 42}, + ) class TestNetworkLocalIpAssociation(TestNetworkProxy): def test_local_ip_association_create_attrs(self): - self.verify_create(self.proxy.create_local_ip_association, - local_ip_association.LocalIPAssociation, - method_kwargs={'local_ip': LOCAL_IP_ID}, - expected_kwargs={'local_ip_id': LOCAL_IP_ID}) + self.verify_create( + self.proxy.create_local_ip_association, + local_ip_association.LocalIPAssociation, + method_kwargs={'local_ip': LOCAL_IP_ID}, + expected_kwargs={'local_ip_id': LOCAL_IP_ID}, + ) def test_local_ip_association_delete(self): self.verify_delete( @@ -556,8 +672,8 @@ class TestNetworkLocalIpAssociation(TestNetworkProxy): ignore_missing=False, method_args=[LOCAL_IP_ID, "resource_or_id"], expected_args=["resource_or_id"], - expected_kwargs={'if_revision': None, - 'local_ip_id': LOCAL_IP_ID}) + expected_kwargs={'if_revision': None, 'local_ip_id': LOCAL_IP_ID}, + ) def test_local_ip_association_delete_ignore(self): self.verify_delete( @@ -566,8 +682,8 @@ class TestNetworkLocalIpAssociation(TestNetworkProxy): ignore_missing=True, method_args=[LOCAL_IP_ID, "resource_or_id"], expected_args=["resource_or_id"], - expected_kwargs={'if_revision': None, - 'local_ip_id': LOCAL_IP_ID}) + expected_kwargs={'if_revision': None, 'local_ip_id': LOCAL_IP_ID}, + ) def test_local_ip_association_find(self): lip = local_ip.LocalIP.new(id=LOCAL_IP_ID) @@ -578,9 +694,13 @@ class TestNetworkLocalIpAssociation(TestNetworkProxy): method_args=['local_ip_association_id', lip], expected_args=[ local_ip_association.LocalIPAssociation, - 'local_ip_association_id'], + 'local_ip_association_id', + ], expected_kwargs={ - 'ignore_missing': True, 'local_ip_id': LOCAL_IP_ID}) + 'ignore_missing': True, + 'local_ip_id': LOCAL_IP_ID, + }, + ) def test_local_ip_association_get(self): lip = local_ip.LocalIP.new(id=LOCAL_IP_ID) @@ -591,60 +711,80 @@ class TestNetworkLocalIpAssociation(TestNetworkProxy): method_args=['local_ip_association_id', lip], expected_args=[ local_ip_association.LocalIPAssociation, - 'local_ip_association_id'], - expected_kwargs={'local_ip_id': LOCAL_IP_ID}) + 'local_ip_association_id', + ], + expected_kwargs={'local_ip_id': LOCAL_IP_ID}, + ) def test_local_ip_associations(self): - self.verify_list(self.proxy.local_ip_associations, - local_ip_association.LocalIPAssociation, - method_kwargs={'local_ip': LOCAL_IP_ID}, - expected_kwargs={'local_ip_id': LOCAL_IP_ID}) + self.verify_list( + self.proxy.local_ip_associations, + local_ip_association.LocalIPAssociation, + method_kwargs={'local_ip': LOCAL_IP_ID}, + expected_kwargs={'local_ip_id': LOCAL_IP_ID}, + ) class TestNetworkServiceProfile(TestNetworkProxy): def test_service_profile_create_attrs(self): - self.verify_create(self.proxy.create_service_profile, - service_profile.ServiceProfile) + self.verify_create( + self.proxy.create_service_profile, service_profile.ServiceProfile + ) def test_service_profile_delete(self): - self.verify_delete(self.proxy.delete_service_profile, - service_profile.ServiceProfile, True) + self.verify_delete( + self.proxy.delete_service_profile, + service_profile.ServiceProfile, + True, + ) def test_service_profile_find(self): - self.verify_find(self.proxy.find_service_profile, - service_profile.ServiceProfile) + self.verify_find( + self.proxy.find_service_profile, service_profile.ServiceProfile + ) def test_service_profile_get(self): - self.verify_get(self.proxy.get_service_profile, - service_profile.ServiceProfile) + self.verify_get( + self.proxy.get_service_profile, service_profile.ServiceProfile + ) def test_service_profiles(self): - self.verify_list(self.proxy.service_profiles, - service_profile.ServiceProfile) + self.verify_list( + self.proxy.service_profiles, service_profile.ServiceProfile + ) def test_service_profile_update(self): - self.verify_update(self.proxy.update_service_profile, - service_profile.ServiceProfile) + self.verify_update( + self.proxy.update_service_profile, service_profile.ServiceProfile + ) class TestNetworkIpAvailability(TestNetworkProxy): def test_network_ip_availability_find(self): - self.verify_find(self.proxy.find_network_ip_availability, - network_ip_availability.NetworkIPAvailability) + self.verify_find( + self.proxy.find_network_ip_availability, + network_ip_availability.NetworkIPAvailability, + ) def test_network_ip_availability_get(self): - self.verify_get(self.proxy.get_network_ip_availability, - network_ip_availability.NetworkIPAvailability) + self.verify_get( + self.proxy.get_network_ip_availability, + network_ip_availability.NetworkIPAvailability, + ) def test_network_ip_availabilities(self): - self.verify_list(self.proxy.network_ip_availabilities, - network_ip_availability.NetworkIPAvailability) + self.verify_list( + self.proxy.network_ip_availabilities, + network_ip_availability.NetworkIPAvailability, + ) def test_pool_member_create_attrs(self): - self.verify_create(self.proxy.create_pool_member, - pool_member.PoolMember, - method_kwargs={"pool": "test_id"}, - expected_kwargs={"pool_id": "test_id"}) + self.verify_create( + self.proxy.create_pool_member, + pool_member.PoolMember, + method_kwargs={"pool": "test_id"}, + expected_kwargs={"pool_id": "test_id"}, + ) class TestNetworkPoolMember(TestNetworkProxy): @@ -654,7 +794,8 @@ class TestNetworkPoolMember(TestNetworkProxy): pool_member.PoolMember, ignore_missing=False, method_kwargs={"pool": "test_id"}, - expected_kwargs={"pool_id": "test_id"}) + expected_kwargs={"pool_id": "test_id"}, + ) def test_pool_member_delete_ignore(self): self.verify_delete( @@ -662,7 +803,8 @@ class TestNetworkPoolMember(TestNetworkProxy): pool_member.PoolMember, ignore_missing=True, method_kwargs={"pool": "test_id"}, - expected_kwargs={"pool_id": "test_id"}) + expected_kwargs={"pool_id": "test_id"}, + ) def test_pool_member_find(self): self._verify( @@ -670,7 +812,8 @@ class TestNetworkPoolMember(TestNetworkProxy): self.proxy.find_pool_member, method_args=["MEMBER", "POOL"], expected_args=[pool_member.PoolMember, "MEMBER"], - expected_kwargs={"pool_id": "POOL", "ignore_missing": True}) + expected_kwargs={"pool_id": "POOL", "ignore_missing": True}, + ) def test_pool_member_get(self): self._verify( @@ -678,14 +821,17 @@ class TestNetworkPoolMember(TestNetworkProxy): self.proxy.get_pool_member, method_args=["MEMBER", "POOL"], expected_args=[pool_member.PoolMember, "MEMBER"], - expected_kwargs={"pool_id": "POOL"}) + expected_kwargs={"pool_id": "POOL"}, + ) def test_pool_members(self): self.verify_list( - self.proxy.pool_members, pool_member.PoolMember, + self.proxy.pool_members, + pool_member.PoolMember, method_args=["test_id"], expected_args=[], - expected_kwargs={"pool_id": "test_id"}) + expected_kwargs={"pool_id": "test_id"}, + ) def test_pool_member_update(self): self._verify( @@ -693,7 +839,8 @@ class TestNetworkPoolMember(TestNetworkProxy): self.proxy.update_pool_member, method_args=["MEMBER", "POOL"], expected_args=[pool_member.PoolMember, "MEMBER"], - expected_kwargs={"pool_id": "POOL"}) + expected_kwargs={"pool_id": "POOL"}, + ) class TestNetworkPool(TestNetworkProxy): @@ -722,17 +869,29 @@ class TestNetworkPool(TestNetworkProxy): self.verify_create(self.proxy.create_port, port.Port) def test_port_delete(self): - self.verify_delete(self.proxy.delete_port, port.Port, False, - expected_kwargs={'if_revision': None}) + self.verify_delete( + self.proxy.delete_port, + port.Port, + False, + expected_kwargs={'if_revision': None}, + ) def test_port_delete_ignore(self): - self.verify_delete(self.proxy.delete_port, port.Port, True, - expected_kwargs={'if_revision': None}) + self.verify_delete( + self.proxy.delete_port, + port.Port, + True, + expected_kwargs={'if_revision': None}, + ) def test_port_delete_if_revision(self): - self.verify_delete(self.proxy.delete_port, port.Port, True, - method_kwargs={'if_revision': 42}, - expected_kwargs={'if_revision': 42}) + self.verify_delete( + self.proxy.delete_port, + port.Port, + True, + method_kwargs={'if_revision': 42}, + expected_kwargs={'if_revision': 42}, + ) def test_port_find(self): self.verify_find(self.proxy.find_port, port.Port) @@ -744,16 +903,19 @@ class TestNetworkPool(TestNetworkProxy): self.verify_list(self.proxy.ports, port.Port) def test_port_update(self): - self.verify_update(self.proxy.update_port, port.Port, - expected_kwargs={'x': 1, 'y': 2, 'z': 3, - 'if_revision': None}) + self.verify_update( + self.proxy.update_port, + port.Port, + expected_kwargs={'x': 1, 'y': 2, 'z': 3, 'if_revision': None}, + ) def test_port_update_if_revision(self): - self.verify_update(self.proxy.update_port, port.Port, - method_kwargs={'x': 1, 'y': 2, 'z': 3, - 'if_revision': 42}, - expected_kwargs={'x': 1, 'y': 2, 'z': 3, - 'if_revision': 42}) + self.verify_update( + self.proxy.update_port, + port.Port, + method_kwargs={'x': 1, 'y': 2, 'z': 3, 'if_revision': 42}, + expected_kwargs={'x': 1, 'y': 2, 'z': 3, 'if_revision': 42}, + ) @mock.patch('openstack.network.v2._proxy.Proxy._bulk_create') def test_ports_create(self, bc): @@ -770,7 +932,8 @@ class TestNetworkQosBandwidth(TestNetworkProxy): self.proxy.create_qos_bandwidth_limit_rule, qos_bandwidth_limit_rule.QoSBandwidthLimitRule, method_kwargs={'qos_policy': QOS_POLICY_ID}, - expected_kwargs={'qos_policy_id': QOS_POLICY_ID}) + expected_kwargs={'qos_policy_id': QOS_POLICY_ID}, + ) def test_qos_bandwidth_limit_rule_delete(self): self.verify_delete( @@ -779,7 +942,8 @@ class TestNetworkQosBandwidth(TestNetworkProxy): ignore_missing=False, method_args=["resource_or_id", QOS_POLICY_ID], expected_args=["resource_or_id"], - expected_kwargs={'qos_policy_id': QOS_POLICY_ID}) + expected_kwargs={'qos_policy_id': QOS_POLICY_ID}, + ) def test_qos_bandwidth_limit_rule_delete_ignore(self): self.verify_delete( @@ -788,7 +952,8 @@ class TestNetworkQosBandwidth(TestNetworkProxy): ignore_missing=True, method_args=["resource_or_id", QOS_POLICY_ID], expected_args=["resource_or_id"], - expected_kwargs={'qos_policy_id': QOS_POLICY_ID}) + expected_kwargs={'qos_policy_id': QOS_POLICY_ID}, + ) def test_qos_bandwidth_limit_rule_find(self): policy = qos_policy.QoSPolicy.new(id=QOS_POLICY_ID) @@ -798,23 +963,29 @@ class TestNetworkQosBandwidth(TestNetworkProxy): method_args=['rule_id', policy], expected_args=[ qos_bandwidth_limit_rule.QoSBandwidthLimitRule, - 'rule_id'], + 'rule_id', + ], expected_kwargs={ - 'ignore_missing': True, 'qos_policy_id': QOS_POLICY_ID}) + 'ignore_missing': True, + 'qos_policy_id': QOS_POLICY_ID, + }, + ) def test_qos_bandwidth_limit_rule_get(self): self.verify_get( self.proxy.get_qos_bandwidth_limit_rule, qos_bandwidth_limit_rule.QoSBandwidthLimitRule, method_kwargs={'qos_policy': QOS_POLICY_ID}, - expected_kwargs={'qos_policy_id': QOS_POLICY_ID}) + expected_kwargs={'qos_policy_id': QOS_POLICY_ID}, + ) def test_qos_bandwidth_limit_rules(self): self.verify_list( self.proxy.qos_bandwidth_limit_rules, qos_bandwidth_limit_rule.QoSBandwidthLimitRule, method_kwargs={'qos_policy': QOS_POLICY_ID}, - expected_kwargs={'qos_policy_id': QOS_POLICY_ID}) + expected_kwargs={'qos_policy_id': QOS_POLICY_ID}, + ) def test_qos_bandwidth_limit_rule_update(self): policy = qos_policy.QoSPolicy.new(id=QOS_POLICY_ID) @@ -825,8 +996,10 @@ class TestNetworkQosBandwidth(TestNetworkProxy): method_kwargs={'foo': 'bar'}, expected_args=[ qos_bandwidth_limit_rule.QoSBandwidthLimitRule, - 'rule_id'], - expected_kwargs={'qos_policy_id': QOS_POLICY_ID, 'foo': 'bar'}) + 'rule_id', + ], + expected_kwargs={'qos_policy_id': QOS_POLICY_ID, 'foo': 'bar'}, + ) class TestNetworkQosDscpMarking(TestNetworkProxy): @@ -835,7 +1008,8 @@ class TestNetworkQosDscpMarking(TestNetworkProxy): self.proxy.create_qos_dscp_marking_rule, qos_dscp_marking_rule.QoSDSCPMarkingRule, method_kwargs={'qos_policy': QOS_POLICY_ID}, - expected_kwargs={'qos_policy_id': QOS_POLICY_ID}) + expected_kwargs={'qos_policy_id': QOS_POLICY_ID}, + ) def test_qos_dscp_marking_rule_delete(self): self.verify_delete( @@ -844,7 +1018,8 @@ class TestNetworkQosDscpMarking(TestNetworkProxy): ignore_missing=False, method_args=["resource_or_id", QOS_POLICY_ID], expected_args=["resource_or_id"], - expected_kwargs={'qos_policy_id': QOS_POLICY_ID}) + expected_kwargs={'qos_policy_id': QOS_POLICY_ID}, + ) def test_qos_dscp_marking_rule_delete_ignore(self): self.verify_delete( @@ -853,7 +1028,8 @@ class TestNetworkQosDscpMarking(TestNetworkProxy): ignore_missing=True, method_args=["resource_or_id", QOS_POLICY_ID], expected_args=["resource_or_id"], - expected_kwargs={'qos_policy_id': QOS_POLICY_ID}, ) + expected_kwargs={'qos_policy_id': QOS_POLICY_ID}, + ) def test_qos_dscp_marking_rule_find(self): policy = qos_policy.QoSPolicy.new(id=QOS_POLICY_ID) @@ -862,23 +1038,30 @@ class TestNetworkQosDscpMarking(TestNetworkProxy): self.proxy.find_qos_dscp_marking_rule, method_args=['rule_id', policy], expected_args=[ - qos_dscp_marking_rule.QoSDSCPMarkingRule, 'rule_id'], + qos_dscp_marking_rule.QoSDSCPMarkingRule, + 'rule_id', + ], expected_kwargs={ - 'ignore_missing': True, 'qos_policy_id': QOS_POLICY_ID}) + 'ignore_missing': True, + 'qos_policy_id': QOS_POLICY_ID, + }, + ) def test_qos_dscp_marking_rule_get(self): self.verify_get( self.proxy.get_qos_dscp_marking_rule, qos_dscp_marking_rule.QoSDSCPMarkingRule, method_kwargs={'qos_policy': QOS_POLICY_ID}, - expected_kwargs={'qos_policy_id': QOS_POLICY_ID}) + expected_kwargs={'qos_policy_id': QOS_POLICY_ID}, + ) def test_qos_dscp_marking_rules(self): self.verify_list( self.proxy.qos_dscp_marking_rules, qos_dscp_marking_rule.QoSDSCPMarkingRule, method_kwargs={'qos_policy': QOS_POLICY_ID}, - expected_kwargs={'qos_policy_id': QOS_POLICY_ID}) + expected_kwargs={'qos_policy_id': QOS_POLICY_ID}, + ) def test_qos_dscp_marking_rule_update(self): policy = qos_policy.QoSPolicy.new(id=QOS_POLICY_ID) @@ -889,8 +1072,10 @@ class TestNetworkQosDscpMarking(TestNetworkProxy): method_kwargs={'foo': 'bar'}, expected_args=[ qos_dscp_marking_rule.QoSDSCPMarkingRule, - 'rule_id'], - expected_kwargs={'qos_policy_id': QOS_POLICY_ID, 'foo': 'bar'}) + 'rule_id', + ], + expected_kwargs={'qos_policy_id': QOS_POLICY_ID, 'foo': 'bar'}, + ) class TestNetworkQosMinimumBandwidth(TestNetworkProxy): @@ -899,7 +1084,8 @@ class TestNetworkQosMinimumBandwidth(TestNetworkProxy): self.proxy.create_qos_minimum_bandwidth_rule, qos_minimum_bandwidth_rule.QoSMinimumBandwidthRule, method_kwargs={'qos_policy': QOS_POLICY_ID}, - expected_kwargs={'qos_policy_id': QOS_POLICY_ID}) + expected_kwargs={'qos_policy_id': QOS_POLICY_ID}, + ) def test_qos_minimum_bandwidth_rule_delete(self): self.verify_delete( @@ -908,7 +1094,8 @@ class TestNetworkQosMinimumBandwidth(TestNetworkProxy): ignore_missing=False, method_args=["resource_or_id", QOS_POLICY_ID], expected_args=["resource_or_id"], - expected_kwargs={'qos_policy_id': QOS_POLICY_ID}) + expected_kwargs={'qos_policy_id': QOS_POLICY_ID}, + ) def test_qos_minimum_bandwidth_rule_delete_ignore(self): self.verify_delete( @@ -917,7 +1104,8 @@ class TestNetworkQosMinimumBandwidth(TestNetworkProxy): ignore_missing=True, method_args=["resource_or_id", QOS_POLICY_ID], expected_args=["resource_or_id"], - expected_kwargs={'qos_policy_id': QOS_POLICY_ID}) + expected_kwargs={'qos_policy_id': QOS_POLICY_ID}, + ) def test_qos_minimum_bandwidth_rule_find(self): policy = qos_policy.QoSPolicy.new(id=QOS_POLICY_ID) @@ -927,23 +1115,29 @@ class TestNetworkQosMinimumBandwidth(TestNetworkProxy): method_args=['rule_id', policy], expected_args=[ qos_minimum_bandwidth_rule.QoSMinimumBandwidthRule, - 'rule_id'], + 'rule_id', + ], expected_kwargs={ - 'ignore_missing': True, 'qos_policy_id': QOS_POLICY_ID}) + 'ignore_missing': True, + 'qos_policy_id': QOS_POLICY_ID, + }, + ) def test_qos_minimum_bandwidth_rule_get(self): self.verify_get( self.proxy.get_qos_minimum_bandwidth_rule, qos_minimum_bandwidth_rule.QoSMinimumBandwidthRule, method_kwargs={'qos_policy': QOS_POLICY_ID}, - expected_kwargs={'qos_policy_id': QOS_POLICY_ID}) + expected_kwargs={'qos_policy_id': QOS_POLICY_ID}, + ) def test_qos_minimum_bandwidth_rules(self): self.verify_list( self.proxy.qos_minimum_bandwidth_rules, qos_minimum_bandwidth_rule.QoSMinimumBandwidthRule, method_kwargs={'qos_policy': QOS_POLICY_ID}, - expected_kwargs={'qos_policy_id': QOS_POLICY_ID}) + expected_kwargs={'qos_policy_id': QOS_POLICY_ID}, + ) def test_qos_minimum_bandwidth_rule_update(self): policy = qos_policy.QoSPolicy.new(id=QOS_POLICY_ID) @@ -954,9 +1148,10 @@ class TestNetworkQosMinimumBandwidth(TestNetworkProxy): method_kwargs={'foo': 'bar'}, expected_args=[ qos_minimum_bandwidth_rule.QoSMinimumBandwidthRule, - 'rule_id'], - expected_kwargs={ - 'qos_policy_id': QOS_POLICY_ID, 'foo': 'bar'}) + 'rule_id', + ], + expected_kwargs={'qos_policy_id': QOS_POLICY_ID, 'foo': 'bar'}, + ) class TestNetworkQosMinimumPacketRate(TestNetworkProxy): @@ -965,7 +1160,8 @@ class TestNetworkQosMinimumPacketRate(TestNetworkProxy): self.proxy.create_qos_minimum_packet_rate_rule, qos_minimum_packet_rate_rule.QoSMinimumPacketRateRule, method_kwargs={'qos_policy': QOS_POLICY_ID}, - expected_kwargs={'qos_policy_id': QOS_POLICY_ID}) + expected_kwargs={'qos_policy_id': QOS_POLICY_ID}, + ) def test_qos_minimum_packet_rate_rule_delete(self): self.verify_delete( @@ -974,7 +1170,8 @@ class TestNetworkQosMinimumPacketRate(TestNetworkProxy): ignore_missing=False, method_args=["resource_or_id", QOS_POLICY_ID], expected_args=["resource_or_id"], - expected_kwargs={'qos_policy_id': QOS_POLICY_ID}) + expected_kwargs={'qos_policy_id': QOS_POLICY_ID}, + ) def test_qos_minimum_packet_rate_rule_delete_ignore(self): self.verify_delete( @@ -983,7 +1180,8 @@ class TestNetworkQosMinimumPacketRate(TestNetworkProxy): ignore_missing=True, method_args=["resource_or_id", QOS_POLICY_ID], expected_args=["resource_or_id"], - expected_kwargs={'qos_policy_id': QOS_POLICY_ID}) + expected_kwargs={'qos_policy_id': QOS_POLICY_ID}, + ) def test_qos_minimum_packet_rate_rule_find(self): policy = qos_policy.QoSPolicy.new(id=QOS_POLICY_ID) @@ -993,23 +1191,29 @@ class TestNetworkQosMinimumPacketRate(TestNetworkProxy): method_args=['rule_id', policy], expected_args=[ qos_minimum_packet_rate_rule.QoSMinimumPacketRateRule, - 'rule_id'], + 'rule_id', + ], expected_kwargs={ - 'ignore_missing': True, 'qos_policy_id': QOS_POLICY_ID}) + 'ignore_missing': True, + 'qos_policy_id': QOS_POLICY_ID, + }, + ) def test_qos_minimum_packet_rate_rule_get(self): self.verify_get( self.proxy.get_qos_minimum_packet_rate_rule, qos_minimum_packet_rate_rule.QoSMinimumPacketRateRule, method_kwargs={'qos_policy': QOS_POLICY_ID}, - expected_kwargs={'qos_policy_id': QOS_POLICY_ID}) + expected_kwargs={'qos_policy_id': QOS_POLICY_ID}, + ) def test_qos_minimum_packet_rate_rules(self): self.verify_list( self.proxy.qos_minimum_packet_rate_rules, qos_minimum_packet_rate_rule.QoSMinimumPacketRateRule, method_kwargs={'qos_policy': QOS_POLICY_ID}, - expected_kwargs={'qos_policy_id': QOS_POLICY_ID}) + expected_kwargs={'qos_policy_id': QOS_POLICY_ID}, + ) def test_qos_minimum_packet_rate_rule_update(self): policy = qos_policy.QoSPolicy.new(id=QOS_POLICY_ID) @@ -1020,19 +1224,22 @@ class TestNetworkQosMinimumPacketRate(TestNetworkProxy): method_kwargs={'foo': 'bar'}, expected_args=[ qos_minimum_packet_rate_rule.QoSMinimumPacketRateRule, - 'rule_id'], - expected_kwargs={ - 'qos_policy_id': QOS_POLICY_ID, 'foo': 'bar'}) + 'rule_id', + ], + expected_kwargs={'qos_policy_id': QOS_POLICY_ID, 'foo': 'bar'}, + ) class TestNetworkQosRuleType(TestNetworkProxy): def test_qos_rule_type_find(self): - self.verify_find(self.proxy.find_qos_rule_type, - qos_rule_type.QoSRuleType) + self.verify_find( + self.proxy.find_qos_rule_type, qos_rule_type.QoSRuleType + ) def test_qos_rule_type_get(self): - self.verify_get(self.proxy.get_qos_rule_type, - qos_rule_type.QoSRuleType) + self.verify_get( + self.proxy.get_qos_rule_type, qos_rule_type.QoSRuleType + ) def test_qos_rule_types(self): self.verify_list(self.proxy.qos_rule_types, qos_rule_type.QoSRuleType) @@ -1058,8 +1265,8 @@ class TestNetworkQuota(TestNetworkProxy): method_args=['QUOTA_ID'], method_kwargs={'details': True}, expected_args=[quota.QuotaDetails], - expected_kwargs={ - 'project': fake_quota.id, 'requires_id': False}) + expected_kwargs={'project': fake_quota.id, 'requires_id': False}, + ) mock_get.assert_called_once_with(quota.Quota, 'QUOTA_ID') @mock.patch.object(proxy_base.Proxy, "_get_resource") @@ -1071,8 +1278,8 @@ class TestNetworkQuota(TestNetworkProxy): self.proxy.get_quota_default, method_args=['QUOTA_ID'], expected_args=[quota.QuotaDefault], - expected_kwargs={ - 'project': fake_quota.id, 'requires_id': False}) + expected_kwargs={'project': fake_quota.id, 'requires_id': False}, + ) mock_get.assert_called_once_with(quota.Quota, 'QUOTA_ID') def test_quotas(self): @@ -1084,16 +1291,19 @@ class TestNetworkQuota(TestNetworkProxy): class TestNetworkRbacPolicy(TestNetworkProxy): def test_rbac_policy_create_attrs(self): - self.verify_create(self.proxy.create_rbac_policy, - rbac_policy.RBACPolicy) + self.verify_create( + self.proxy.create_rbac_policy, rbac_policy.RBACPolicy + ) def test_rbac_policy_delete(self): - self.verify_delete(self.proxy.delete_rbac_policy, - rbac_policy.RBACPolicy, False) + self.verify_delete( + self.proxy.delete_rbac_policy, rbac_policy.RBACPolicy, False + ) def test_rbac_policy_delete_ignore(self): - self.verify_delete(self.proxy.delete_rbac_policy, - rbac_policy.RBACPolicy, True) + self.verify_delete( + self.proxy.delete_rbac_policy, rbac_policy.RBACPolicy, True + ) def test_rbac_policy_find(self): self.verify_find(self.proxy.find_rbac_policy, rbac_policy.RBACPolicy) @@ -1105,8 +1315,9 @@ class TestNetworkRbacPolicy(TestNetworkProxy): self.verify_list(self.proxy.rbac_policies, rbac_policy.RBACPolicy) def test_rbac_policy_update(self): - self.verify_update(self.proxy.update_rbac_policy, - rbac_policy.RBACPolicy) + self.verify_update( + self.proxy.update_rbac_policy, rbac_policy.RBACPolicy + ) class TestNetworkRouter(TestNetworkProxy): @@ -1114,17 +1325,29 @@ class TestNetworkRouter(TestNetworkProxy): self.verify_create(self.proxy.create_router, router.Router) def test_router_delete(self): - self.verify_delete(self.proxy.delete_router, router.Router, False, - expected_kwargs={'if_revision': None}) + self.verify_delete( + self.proxy.delete_router, + router.Router, + False, + expected_kwargs={'if_revision': None}, + ) def test_router_delete_ignore(self): - self.verify_delete(self.proxy.delete_router, router.Router, True, - expected_kwargs={'if_revision': None}) + self.verify_delete( + self.proxy.delete_router, + router.Router, + True, + expected_kwargs={'if_revision': None}, + ) def test_router_delete_if_revision(self): - self.verify_delete(self.proxy.delete_router, router.Router, True, - method_kwargs={'if_revision': 42}, - expected_kwargs={'if_revision': 42}) + self.verify_delete( + self.proxy.delete_router, + router.Router, + True, + method_kwargs={'if_revision': 42}, + expected_kwargs={'if_revision': 42}, + ) def test_router_find(self): self.verify_find(self.proxy.find_router, router.Router) @@ -1136,21 +1359,25 @@ class TestNetworkRouter(TestNetworkProxy): self.verify_list(self.proxy.routers, router.Router) def test_router_update(self): - self.verify_update(self.proxy.update_router, router.Router, - expected_kwargs={'x': 1, 'y': 2, 'z': 3, - 'if_revision': None}) + self.verify_update( + self.proxy.update_router, + router.Router, + expected_kwargs={'x': 1, 'y': 2, 'z': 3, 'if_revision': None}, + ) def test_router_update_if_revision(self): - self.verify_update(self.proxy.update_router, router.Router, - method_kwargs={'x': 1, 'y': 2, 'z': 3, - 'if_revision': 42}, - expected_kwargs={'x': 1, 'y': 2, 'z': 3, - 'if_revision': 42}) + self.verify_update( + self.proxy.update_router, + router.Router, + method_kwargs={'x': 1, 'y': 2, 'z': 3, 'if_revision': 42}, + expected_kwargs={'x': 1, 'y': 2, 'z': 3, 'if_revision': 42}, + ) @mock.patch.object(proxy_base.Proxy, '_get_resource') @mock.patch.object(router.Router, 'add_interface') - def test_add_interface_to_router_with_port(self, mock_add_interface, - mock_get): + def test_add_interface_to_router_with_port( + self, mock_add_interface, mock_get + ): x_router = router.Router.new(id="ROUTER_ID") mock_get.return_value = x_router @@ -1160,13 +1387,15 @@ class TestNetworkRouter(TestNetworkProxy): method_args=["FAKE_ROUTER"], method_kwargs={"port_id": "PORT"}, expected_args=[self.proxy], - expected_kwargs={"port_id": "PORT"}) + expected_kwargs={"port_id": "PORT"}, + ) mock_get.assert_called_once_with(router.Router, "FAKE_ROUTER") @mock.patch.object(proxy_base.Proxy, '_get_resource') @mock.patch.object(router.Router, 'add_interface') - def test_add_interface_to_router_with_subnet(self, mock_add_interface, - mock_get): + def test_add_interface_to_router_with_subnet( + self, mock_add_interface, mock_get + ): x_router = router.Router.new(id="ROUTER_ID") mock_get.return_value = x_router @@ -1176,13 +1405,15 @@ class TestNetworkRouter(TestNetworkProxy): method_args=["FAKE_ROUTER"], method_kwargs={"subnet_id": "SUBNET"}, expected_args=[self.proxy], - expected_kwargs={"subnet_id": "SUBNET"}) + expected_kwargs={"subnet_id": "SUBNET"}, + ) mock_get.assert_called_once_with(router.Router, "FAKE_ROUTER") @mock.patch.object(proxy_base.Proxy, '_get_resource') @mock.patch.object(router.Router, 'remove_interface') - def test_remove_interface_from_router_with_port(self, mock_remove, - mock_get): + def test_remove_interface_from_router_with_port( + self, mock_remove, mock_get + ): x_router = router.Router.new(id="ROUTER_ID") mock_get.return_value = x_router @@ -1192,13 +1423,15 @@ class TestNetworkRouter(TestNetworkProxy): method_args=["FAKE_ROUTER"], method_kwargs={"port_id": "PORT"}, expected_args=[self.proxy], - expected_kwargs={"port_id": "PORT"}) + expected_kwargs={"port_id": "PORT"}, + ) mock_get.assert_called_once_with(router.Router, "FAKE_ROUTER") @mock.patch.object(proxy_base.Proxy, '_get_resource') @mock.patch.object(router.Router, 'remove_interface') - def test_remove_interface_from_router_with_subnet(self, mock_remove, - mock_get): + def test_remove_interface_from_router_with_subnet( + self, mock_remove, mock_get + ): x_router = router.Router.new(id="ROUTER_ID") mock_get.return_value = x_router @@ -1208,13 +1441,13 @@ class TestNetworkRouter(TestNetworkProxy): method_args=["FAKE_ROUTER"], method_kwargs={"subnet_id": "SUBNET"}, expected_args=[self.proxy], - expected_kwargs={"subnet_id": "SUBNET"}) + expected_kwargs={"subnet_id": "SUBNET"}, + ) mock_get.assert_called_once_with(router.Router, "FAKE_ROUTER") @mock.patch.object(proxy_base.Proxy, '_get_resource') @mock.patch.object(router.Router, 'add_extra_routes') - def test_add_extra_routes_to_router( - self, mock_add_extra_routes, mock_get): + def test_add_extra_routes_to_router(self, mock_add_extra_routes, mock_get): x_router = router.Router.new(id="ROUTER_ID") mock_get.return_value = x_router @@ -1224,13 +1457,15 @@ class TestNetworkRouter(TestNetworkProxy): method_args=["FAKE_ROUTER"], method_kwargs={"body": {"router": {"routes": []}}}, expected_args=[self.proxy], - expected_kwargs={"body": {"router": {"routes": []}}}) + expected_kwargs={"body": {"router": {"routes": []}}}, + ) mock_get.assert_called_once_with(router.Router, "FAKE_ROUTER") @mock.patch.object(proxy_base.Proxy, '_get_resource') @mock.patch.object(router.Router, 'remove_extra_routes') def test_remove_extra_routes_from_router( - self, mock_remove_extra_routes, mock_get): + self, mock_remove_extra_routes, mock_get + ): x_router = router.Router.new(id="ROUTER_ID") mock_get.return_value = x_router @@ -1240,7 +1475,8 @@ class TestNetworkRouter(TestNetworkProxy): method_args=["FAKE_ROUTER"], method_kwargs={"body": {"router": {"routes": []}}}, expected_args=[self.proxy], - expected_kwargs={"body": {"router": {"routes": []}}}) + expected_kwargs={"body": {"router": {"routes": []}}}, + ) mock_get.assert_called_once_with(router.Router, "FAKE_ROUTER") @mock.patch.object(proxy_base.Proxy, '_get_resource') @@ -1255,7 +1491,8 @@ class TestNetworkRouter(TestNetworkProxy): method_args=["FAKE_ROUTER"], method_kwargs={"foo": "bar"}, expected_args=[self.proxy], - expected_kwargs={"foo": "bar"}) + expected_kwargs={"foo": "bar"}, + ) mock_get.assert_called_once_with(router.Router, "FAKE_ROUTER") @mock.patch.object(proxy_base.Proxy, '_get_resource') @@ -1270,7 +1507,8 @@ class TestNetworkRouter(TestNetworkProxy): method_args=["FAKE_ROUTER"], method_kwargs={"foo": "bar"}, expected_args=[self.proxy], - expected_kwargs={"foo": "bar"}) + expected_kwargs={"foo": "bar"}, + ) mock_get.assert_called_once_with(router.Router, "FAKE_ROUTER") def test_router_hosting_l3_agents_list(self): @@ -1292,202 +1530,276 @@ class TestNetworkRouter(TestNetworkProxy): class TestNetworkFirewallGroup(TestNetworkProxy): def test_firewall_group_create_attrs(self): - self.verify_create(self.proxy.create_firewall_group, - firewall_group.FirewallGroup) + self.verify_create( + self.proxy.create_firewall_group, firewall_group.FirewallGroup + ) def test_firewall_group_delete(self): - self.verify_delete(self.proxy.delete_firewall_group, - firewall_group.FirewallGroup, False) + self.verify_delete( + self.proxy.delete_firewall_group, + firewall_group.FirewallGroup, + False, + ) def test_firewall_group_delete_ignore(self): - self.verify_delete(self.proxy.delete_firewall_group, - firewall_group.FirewallGroup, True) + self.verify_delete( + self.proxy.delete_firewall_group, + firewall_group.FirewallGroup, + True, + ) def test_firewall_group_find(self): - self.verify_find(self.proxy.find_firewall_group, - firewall_group.FirewallGroup) + self.verify_find( + self.proxy.find_firewall_group, firewall_group.FirewallGroup + ) def test_firewall_group_get(self): - self.verify_get(self.proxy.get_firewall_group, - firewall_group.FirewallGroup) + self.verify_get( + self.proxy.get_firewall_group, firewall_group.FirewallGroup + ) def test_firewall_groups(self): - self.verify_list(self.proxy.firewall_groups, - firewall_group.FirewallGroup) + self.verify_list( + self.proxy.firewall_groups, firewall_group.FirewallGroup + ) def test_firewall_group_update(self): - self.verify_update(self.proxy.update_firewall_group, - firewall_group.FirewallGroup) + self.verify_update( + self.proxy.update_firewall_group, firewall_group.FirewallGroup + ) class TestNetworkPolicy(TestNetworkProxy): def test_firewall_policy_create_attrs(self): - self.verify_create(self.proxy.create_firewall_policy, - firewall_policy.FirewallPolicy) + self.verify_create( + self.proxy.create_firewall_policy, firewall_policy.FirewallPolicy + ) def test_firewall_policy_delete(self): - self.verify_delete(self.proxy.delete_firewall_policy, - firewall_policy.FirewallPolicy, False) + self.verify_delete( + self.proxy.delete_firewall_policy, + firewall_policy.FirewallPolicy, + False, + ) def test_firewall_policy_delete_ignore(self): - self.verify_delete(self.proxy.delete_firewall_policy, - firewall_policy.FirewallPolicy, True) + self.verify_delete( + self.proxy.delete_firewall_policy, + firewall_policy.FirewallPolicy, + True, + ) def test_firewall_policy_find(self): - self.verify_find(self.proxy.find_firewall_policy, - firewall_policy.FirewallPolicy) + self.verify_find( + self.proxy.find_firewall_policy, firewall_policy.FirewallPolicy + ) def test_firewall_policy_get(self): - self.verify_get(self.proxy.get_firewall_policy, - firewall_policy.FirewallPolicy) + self.verify_get( + self.proxy.get_firewall_policy, firewall_policy.FirewallPolicy + ) def test_firewall_policies(self): - self.verify_list(self.proxy.firewall_policies, - firewall_policy.FirewallPolicy) + self.verify_list( + self.proxy.firewall_policies, firewall_policy.FirewallPolicy + ) def test_firewall_policy_update(self): - self.verify_update(self.proxy.update_firewall_policy, - firewall_policy.FirewallPolicy) + self.verify_update( + self.proxy.update_firewall_policy, firewall_policy.FirewallPolicy + ) class TestNetworkRule(TestNetworkProxy): def test_firewall_rule_create_attrs(self): - self.verify_create(self.proxy.create_firewall_rule, - firewall_rule.FirewallRule) + self.verify_create( + self.proxy.create_firewall_rule, firewall_rule.FirewallRule + ) def test_firewall_rule_delete(self): - self.verify_delete(self.proxy.delete_firewall_rule, - firewall_rule.FirewallRule, False) + self.verify_delete( + self.proxy.delete_firewall_rule, firewall_rule.FirewallRule, False + ) def test_firewall_rule_delete_ignore(self): - self.verify_delete(self.proxy.delete_firewall_rule, - firewall_rule.FirewallRule, True) + self.verify_delete( + self.proxy.delete_firewall_rule, firewall_rule.FirewallRule, True + ) def test_firewall_rule_find(self): - self.verify_find(self.proxy.find_firewall_rule, - firewall_rule.FirewallRule) + self.verify_find( + self.proxy.find_firewall_rule, firewall_rule.FirewallRule + ) def test_firewall_rule_get(self): - self.verify_get(self.proxy.get_firewall_rule, - firewall_rule.FirewallRule) + self.verify_get( + self.proxy.get_firewall_rule, firewall_rule.FirewallRule + ) def test_firewall_rules(self): - self.verify_list(self.proxy.firewall_rules, - firewall_rule.FirewallRule) + self.verify_list(self.proxy.firewall_rules, firewall_rule.FirewallRule) def test_firewall_rule_update(self): - self.verify_update(self.proxy.update_firewall_rule, - firewall_rule.FirewallRule) + self.verify_update( + self.proxy.update_firewall_rule, firewall_rule.FirewallRule + ) class TestNetworkNetworkSegment(TestNetworkProxy): def test_network_segment_range_create_attrs(self): - self.verify_create(self.proxy.create_network_segment_range, - network_segment_range.NetworkSegmentRange) + self.verify_create( + self.proxy.create_network_segment_range, + network_segment_range.NetworkSegmentRange, + ) def test_network_segment_range_delete(self): - self.verify_delete(self.proxy.delete_network_segment_range, - network_segment_range.NetworkSegmentRange, False) + self.verify_delete( + self.proxy.delete_network_segment_range, + network_segment_range.NetworkSegmentRange, + False, + ) def test_network_segment_range_delete_ignore(self): - self.verify_delete(self.proxy.delete_network_segment_range, - network_segment_range.NetworkSegmentRange, True) + self.verify_delete( + self.proxy.delete_network_segment_range, + network_segment_range.NetworkSegmentRange, + True, + ) def test_network_segment_range_find(self): - self.verify_find(self.proxy.find_network_segment_range, - network_segment_range.NetworkSegmentRange) + self.verify_find( + self.proxy.find_network_segment_range, + network_segment_range.NetworkSegmentRange, + ) def test_network_segment_range_get(self): - self.verify_get(self.proxy.get_network_segment_range, - network_segment_range.NetworkSegmentRange) + self.verify_get( + self.proxy.get_network_segment_range, + network_segment_range.NetworkSegmentRange, + ) def test_network_segment_ranges(self): - self.verify_list(self.proxy.network_segment_ranges, - network_segment_range.NetworkSegmentRange) + self.verify_list( + self.proxy.network_segment_ranges, + network_segment_range.NetworkSegmentRange, + ) def test_network_segment_range_update(self): - self.verify_update(self.proxy.update_network_segment_range, - network_segment_range.NetworkSegmentRange) + self.verify_update( + self.proxy.update_network_segment_range, + network_segment_range.NetworkSegmentRange, + ) class TestNetworkSecurityGroup(TestNetworkProxy): def test_security_group_create_attrs(self): - self.verify_create(self.proxy.create_security_group, - security_group.SecurityGroup) + self.verify_create( + self.proxy.create_security_group, security_group.SecurityGroup + ) def test_security_group_delete(self): - self.verify_delete(self.proxy.delete_security_group, - security_group.SecurityGroup, False, - expected_kwargs={'if_revision': None}) + self.verify_delete( + self.proxy.delete_security_group, + security_group.SecurityGroup, + False, + expected_kwargs={'if_revision': None}, + ) def test_security_group_delete_ignore(self): - self.verify_delete(self.proxy.delete_security_group, - security_group.SecurityGroup, True, - expected_kwargs={'if_revision': None}) + self.verify_delete( + self.proxy.delete_security_group, + security_group.SecurityGroup, + True, + expected_kwargs={'if_revision': None}, + ) def test_security_group_delete_if_revision(self): - self.verify_delete(self.proxy.delete_security_group, - security_group.SecurityGroup, True, - method_kwargs={'if_revision': 42}, - expected_kwargs={'if_revision': 42}) + self.verify_delete( + self.proxy.delete_security_group, + security_group.SecurityGroup, + True, + method_kwargs={'if_revision': 42}, + expected_kwargs={'if_revision': 42}, + ) def test_security_group_find(self): - self.verify_find(self.proxy.find_security_group, - security_group.SecurityGroup) + self.verify_find( + self.proxy.find_security_group, security_group.SecurityGroup + ) def test_security_group_get(self): - self.verify_get(self.proxy.get_security_group, - security_group.SecurityGroup) + self.verify_get( + self.proxy.get_security_group, security_group.SecurityGroup + ) def test_security_groups(self): - self.verify_list(self.proxy.security_groups, - security_group.SecurityGroup) + self.verify_list( + self.proxy.security_groups, security_group.SecurityGroup + ) def test_security_group_update(self): - self.verify_update(self.proxy.update_security_group, - security_group.SecurityGroup, - expected_kwargs={'x': 1, 'y': 2, 'z': 3, - 'if_revision': None}) + self.verify_update( + self.proxy.update_security_group, + security_group.SecurityGroup, + expected_kwargs={'x': 1, 'y': 2, 'z': 3, 'if_revision': None}, + ) def test_security_group_update_if_revision(self): - self.verify_update(self.proxy.update_security_group, - security_group.SecurityGroup, - method_kwargs={'x': 1, 'y': 2, 'z': 3, - 'if_revision': 42}, - expected_kwargs={'x': 1, 'y': 2, 'z': 3, - 'if_revision': 42}) + self.verify_update( + self.proxy.update_security_group, + security_group.SecurityGroup, + method_kwargs={'x': 1, 'y': 2, 'z': 3, 'if_revision': 42}, + expected_kwargs={'x': 1, 'y': 2, 'z': 3, 'if_revision': 42}, + ) def test_security_group_rule_create_attrs(self): - self.verify_create(self.proxy.create_security_group_rule, - security_group_rule.SecurityGroupRule) + self.verify_create( + self.proxy.create_security_group_rule, + security_group_rule.SecurityGroupRule, + ) def test_security_group_rule_delete(self): - self.verify_delete(self.proxy.delete_security_group_rule, - security_group_rule.SecurityGroupRule, False, - expected_kwargs={'if_revision': None}) + self.verify_delete( + self.proxy.delete_security_group_rule, + security_group_rule.SecurityGroupRule, + False, + expected_kwargs={'if_revision': None}, + ) def test_security_group_rule_delete_ignore(self): - self.verify_delete(self.proxy.delete_security_group_rule, - security_group_rule.SecurityGroupRule, True, - expected_kwargs={'if_revision': None}) + self.verify_delete( + self.proxy.delete_security_group_rule, + security_group_rule.SecurityGroupRule, + True, + expected_kwargs={'if_revision': None}, + ) def test_security_group_rule_delete_if_revision(self): - self.verify_delete(self.proxy.delete_security_group_rule, - security_group_rule.SecurityGroupRule, True, - method_kwargs={'if_revision': 42}, - expected_kwargs={'if_revision': 42}) + self.verify_delete( + self.proxy.delete_security_group_rule, + security_group_rule.SecurityGroupRule, + True, + method_kwargs={'if_revision': 42}, + expected_kwargs={'if_revision': 42}, + ) def test_security_group_rule_find(self): - self.verify_find(self.proxy.find_security_group_rule, - security_group_rule.SecurityGroupRule) + self.verify_find( + self.proxy.find_security_group_rule, + security_group_rule.SecurityGroupRule, + ) def test_security_group_rule_get(self): - self.verify_get(self.proxy.get_security_group_rule, - security_group_rule.SecurityGroupRule) + self.verify_get( + self.proxy.get_security_group_rule, + security_group_rule.SecurityGroupRule, + ) def test_security_group_rules(self): - self.verify_list(self.proxy.security_group_rules, - security_group_rule.SecurityGroupRule) + self.verify_list( + self.proxy.security_group_rules, + security_group_rule.SecurityGroupRule, + ) @mock.patch('openstack.network.v2._proxy.Proxy._bulk_create') def test_security_group_rules_create(self, bc): @@ -1526,17 +1838,29 @@ class TestNetworkSubnet(TestNetworkProxy): self.verify_create(self.proxy.create_subnet, subnet.Subnet) def test_subnet_delete(self): - self.verify_delete(self.proxy.delete_subnet, subnet.Subnet, False, - expected_kwargs={'if_revision': None}) + self.verify_delete( + self.proxy.delete_subnet, + subnet.Subnet, + False, + expected_kwargs={'if_revision': None}, + ) def test_subnet_delete_ignore(self): - self.verify_delete(self.proxy.delete_subnet, subnet.Subnet, True, - expected_kwargs={'if_revision': None}) + self.verify_delete( + self.proxy.delete_subnet, + subnet.Subnet, + True, + expected_kwargs={'if_revision': None}, + ) def test_subnet_delete_if_revision(self): - self.verify_delete(self.proxy.delete_subnet, subnet.Subnet, True, - method_kwargs={'if_revision': 42}, - expected_kwargs={'if_revision': 42}) + self.verify_delete( + self.proxy.delete_subnet, + subnet.Subnet, + True, + method_kwargs={'if_revision': 42}, + expected_kwargs={'if_revision': 42}, + ) def test_subnet_find(self): self.verify_find(self.proxy.find_subnet, subnet.Subnet) @@ -1548,203 +1872,231 @@ class TestNetworkSubnet(TestNetworkProxy): self.verify_list(self.proxy.subnets, subnet.Subnet) def test_subnet_update(self): - self.verify_update(self.proxy.update_subnet, subnet.Subnet, - expected_kwargs={'x': 1, 'y': 2, 'z': 3, - 'if_revision': None}) + self.verify_update( + self.proxy.update_subnet, + subnet.Subnet, + expected_kwargs={'x': 1, 'y': 2, 'z': 3, 'if_revision': None}, + ) def test_subnet_pool_create_attrs(self): - self.verify_create(self.proxy.create_subnet_pool, - subnet_pool.SubnetPool) + self.verify_create( + self.proxy.create_subnet_pool, subnet_pool.SubnetPool + ) def test_subnet_pool_delete(self): - self.verify_delete(self.proxy.delete_subnet_pool, - subnet_pool.SubnetPool, False) + self.verify_delete( + self.proxy.delete_subnet_pool, subnet_pool.SubnetPool, False + ) def test_subnet_pool_delete_ignore(self): - self.verify_delete(self.proxy.delete_subnet_pool, - subnet_pool.SubnetPool, True) + self.verify_delete( + self.proxy.delete_subnet_pool, subnet_pool.SubnetPool, True + ) def test_subnet_pool_find(self): - self.verify_find(self.proxy.find_subnet_pool, - subnet_pool.SubnetPool) + self.verify_find(self.proxy.find_subnet_pool, subnet_pool.SubnetPool) def test_subnet_pool_get(self): - self.verify_get(self.proxy.get_subnet_pool, - subnet_pool.SubnetPool) + self.verify_get(self.proxy.get_subnet_pool, subnet_pool.SubnetPool) def test_subnet_pools(self): - self.verify_list(self.proxy.subnet_pools, - subnet_pool.SubnetPool) + self.verify_list(self.proxy.subnet_pools, subnet_pool.SubnetPool) def test_subnet_pool_update(self): - self.verify_update(self.proxy.update_subnet_pool, - subnet_pool.SubnetPool) + self.verify_update( + self.proxy.update_subnet_pool, subnet_pool.SubnetPool + ) class TestNetworkVpnEndpointGroup(TestNetworkProxy): def test_vpn_endpoint_group_create_attrs(self): self.verify_create( self.proxy.create_vpn_endpoint_group, - vpn_endpoint_group.VpnEndpointGroup) + vpn_endpoint_group.VpnEndpointGroup, + ) def test_vpn_endpoint_group_delete(self): self.verify_delete( self.proxy.delete_vpn_endpoint_group, - vpn_endpoint_group.VpnEndpointGroup, False) + vpn_endpoint_group.VpnEndpointGroup, + False, + ) def test_vpn_endpoint_group_delete_ignore(self): self.verify_delete( self.proxy.delete_vpn_endpoint_group, - vpn_endpoint_group.VpnEndpointGroup, True) + vpn_endpoint_group.VpnEndpointGroup, + True, + ) def test_vpn_endpoint_group_find(self): self.verify_find( self.proxy.find_vpn_endpoint_group, - vpn_endpoint_group.VpnEndpointGroup) + vpn_endpoint_group.VpnEndpointGroup, + ) def test_vpn_endpoint_group_get(self): self.verify_get( self.proxy.get_vpn_endpoint_group, - vpn_endpoint_group.VpnEndpointGroup) + vpn_endpoint_group.VpnEndpointGroup, + ) def test_vpn_endpoint_groups(self): self.verify_list( - self.proxy.vpn_endpoint_groups, - vpn_endpoint_group.VpnEndpointGroup) + self.proxy.vpn_endpoint_groups, vpn_endpoint_group.VpnEndpointGroup + ) def test_vpn_endpoint_group_update(self): self.verify_update( self.proxy.update_vpn_endpoint_group, - vpn_endpoint_group.VpnEndpointGroup) + vpn_endpoint_group.VpnEndpointGroup, + ) class TestNetworkVpnSiteConnection(TestNetworkProxy): def test_ipsec_site_connection_create_attrs(self): self.verify_create( self.proxy.create_vpn_ipsec_site_connection, - vpn_ipsec_site_connection.VpnIPSecSiteConnection) + vpn_ipsec_site_connection.VpnIPSecSiteConnection, + ) def test_ipsec_site_connection_delete(self): self.verify_delete( self.proxy.delete_vpn_ipsec_site_connection, - vpn_ipsec_site_connection.VpnIPSecSiteConnection, False) + vpn_ipsec_site_connection.VpnIPSecSiteConnection, + False, + ) def test_ipsec_site_connection_delete_ignore(self): self.verify_delete( self.proxy.delete_vpn_ipsec_site_connection, - vpn_ipsec_site_connection.VpnIPSecSiteConnection, True) + vpn_ipsec_site_connection.VpnIPSecSiteConnection, + True, + ) def test_ipsec_site_connection_find(self): self.verify_find( self.proxy.find_vpn_ipsec_site_connection, - vpn_ipsec_site_connection.VpnIPSecSiteConnection) + vpn_ipsec_site_connection.VpnIPSecSiteConnection, + ) def test_ipsec_site_connection_get(self): self.verify_get( self.proxy.get_vpn_ipsec_site_connection, - vpn_ipsec_site_connection.VpnIPSecSiteConnection) + vpn_ipsec_site_connection.VpnIPSecSiteConnection, + ) def test_ipsec_site_connections(self): self.verify_list( self.proxy.vpn_ipsec_site_connections, - vpn_ipsec_site_connection.VpnIPSecSiteConnection) + vpn_ipsec_site_connection.VpnIPSecSiteConnection, + ) def test_ipsec_site_connection_update(self): self.verify_update( self.proxy.update_vpn_ipsec_site_connection, - vpn_ipsec_site_connection.VpnIPSecSiteConnection) + vpn_ipsec_site_connection.VpnIPSecSiteConnection, + ) class TestNetworkVpnIkePolicy(TestNetworkProxy): def test_ike_policy_create_attrs(self): self.verify_create( - self.proxy.create_vpn_ike_policy, - vpn_ike_policy.VpnIkePolicy) + self.proxy.create_vpn_ike_policy, vpn_ike_policy.VpnIkePolicy + ) def test_ike_policy_delete(self): self.verify_delete( self.proxy.delete_vpn_ike_policy, - vpn_ike_policy.VpnIkePolicy, False) + vpn_ike_policy.VpnIkePolicy, + False, + ) def test_ike_policy_delete_ignore(self): self.verify_delete( - self.proxy.delete_vpn_ike_policy, - vpn_ike_policy.VpnIkePolicy, True) + self.proxy.delete_vpn_ike_policy, vpn_ike_policy.VpnIkePolicy, True + ) def test_ike_policy_find(self): self.verify_find( - self.proxy.find_vpn_ike_policy, - vpn_ike_policy.VpnIkePolicy) + self.proxy.find_vpn_ike_policy, vpn_ike_policy.VpnIkePolicy + ) def test_ike_policy_get(self): self.verify_get( - self.proxy.get_vpn_ike_policy, - vpn_ike_policy.VpnIkePolicy) + self.proxy.get_vpn_ike_policy, vpn_ike_policy.VpnIkePolicy + ) def test_ike_policies(self): self.verify_list( - self.proxy.vpn_ike_policies, - vpn_ike_policy.VpnIkePolicy) + self.proxy.vpn_ike_policies, vpn_ike_policy.VpnIkePolicy + ) def test_ike_policy_update(self): self.verify_update( - self.proxy.update_vpn_ike_policy, - vpn_ike_policy.VpnIkePolicy) + self.proxy.update_vpn_ike_policy, vpn_ike_policy.VpnIkePolicy + ) class TestNetworkVpnIpsecPolicy(TestNetworkProxy): def test_ipsec_policy_create_attrs(self): self.verify_create( - self.proxy.create_vpn_ipsec_policy, - vpn_ipsec_policy.VpnIpsecPolicy) + self.proxy.create_vpn_ipsec_policy, vpn_ipsec_policy.VpnIpsecPolicy + ) def test_ipsec_policy_delete(self): self.verify_delete( self.proxy.delete_vpn_ipsec_policy, - vpn_ipsec_policy.VpnIpsecPolicy, False) + vpn_ipsec_policy.VpnIpsecPolicy, + False, + ) def test_ipsec_policy_delete_ignore(self): self.verify_delete( self.proxy.delete_vpn_ipsec_policy, - vpn_ipsec_policy.VpnIpsecPolicy, True) + vpn_ipsec_policy.VpnIpsecPolicy, + True, + ) def test_ipsec_policy_find(self): self.verify_find( - self.proxy.find_vpn_ipsec_policy, - vpn_ipsec_policy.VpnIpsecPolicy) + self.proxy.find_vpn_ipsec_policy, vpn_ipsec_policy.VpnIpsecPolicy + ) def test_ipsec_policy_get(self): self.verify_get( - self.proxy.get_vpn_ipsec_policy, - vpn_ipsec_policy.VpnIpsecPolicy) + self.proxy.get_vpn_ipsec_policy, vpn_ipsec_policy.VpnIpsecPolicy + ) def test_ipsec_policies(self): self.verify_list( - self.proxy.vpn_ipsec_policies, - vpn_ipsec_policy.VpnIpsecPolicy) + self.proxy.vpn_ipsec_policies, vpn_ipsec_policy.VpnIpsecPolicy + ) def test_ipsec_policy_update(self): self.verify_update( - self.proxy.update_vpn_ipsec_policy, - vpn_ipsec_policy.VpnIpsecPolicy) + self.proxy.update_vpn_ipsec_policy, vpn_ipsec_policy.VpnIpsecPolicy + ) class TestNetworkVpnService(TestNetworkProxy): def test_vpn_service_create_attrs(self): - self.verify_create(self.proxy.create_vpn_service, - vpn_service.VpnService) + self.verify_create( + self.proxy.create_vpn_service, vpn_service.VpnService + ) def test_vpn_service_delete(self): - self.verify_delete(self.proxy.delete_vpn_service, - vpn_service.VpnService, False) + self.verify_delete( + self.proxy.delete_vpn_service, vpn_service.VpnService, False + ) def test_vpn_service_delete_ignore(self): - self.verify_delete(self.proxy.delete_vpn_service, - vpn_service.VpnService, True) + self.verify_delete( + self.proxy.delete_vpn_service, vpn_service.VpnService, True + ) def test_vpn_service_find(self): - self.verify_find(self.proxy.find_vpn_service, - vpn_service.VpnService) + self.verify_find(self.proxy.find_vpn_service, vpn_service.VpnService) def test_vpn_service_get(self): self.verify_get(self.proxy.get_vpn_service, vpn_service.VpnService) @@ -1753,38 +2105,50 @@ class TestNetworkVpnService(TestNetworkProxy): self.verify_list(self.proxy.vpn_services, vpn_service.VpnService) def test_vpn_service_update(self): - self.verify_update(self.proxy.update_vpn_service, - vpn_service.VpnService) + self.verify_update( + self.proxy.update_vpn_service, vpn_service.VpnService + ) class TestNetworkServiceProvider(TestNetworkProxy): def test_service_provider(self): - self.verify_list(self.proxy.service_providers, - service_provider.ServiceProvider) + self.verify_list( + self.proxy.service_providers, service_provider.ServiceProvider + ) class TestNetworkAutoAllocatedTopology(TestNetworkProxy): def test_auto_allocated_topology_get(self): - self.verify_get(self.proxy.get_auto_allocated_topology, - auto_allocated_topology.AutoAllocatedTopology) + self.verify_get( + self.proxy.get_auto_allocated_topology, + auto_allocated_topology.AutoAllocatedTopology, + ) def test_auto_allocated_topology_delete(self): - self.verify_delete(self.proxy.delete_auto_allocated_topology, - auto_allocated_topology.AutoAllocatedTopology, - False) + self.verify_delete( + self.proxy.delete_auto_allocated_topology, + auto_allocated_topology.AutoAllocatedTopology, + False, + ) def test_auto_allocated_topology_delete_ignore(self): - self.verify_delete(self.proxy.delete_auto_allocated_topology, - auto_allocated_topology.AutoAllocatedTopology, - True) + self.verify_delete( + self.proxy.delete_auto_allocated_topology, + auto_allocated_topology.AutoAllocatedTopology, + True, + ) def test_validate_topology(self): - self.verify_get(self.proxy.validate_auto_allocated_topology, - auto_allocated_topology.ValidateTopology, - method_args=[mock.sentinel.project_id], - expected_args=[], - expected_kwargs={"project": mock.sentinel.project_id, - "requires_id": False}) + self.verify_get( + self.proxy.validate_auto_allocated_topology, + auto_allocated_topology.ValidateTopology, + method_args=[mock.sentinel.project_id], + expected_args=[], + expected_kwargs={ + "project": mock.sentinel.project_id, + "requires_id": False, + }, + ) class TestNetworkTags(TestNetworkProxy): @@ -1795,23 +2159,29 @@ class TestNetworkTags(TestNetworkProxy): self.proxy.set_tags, method_args=[x_network, ['TAG1', 'TAG2']], expected_args=[self.proxy, ['TAG1', 'TAG2']], - expected_result=mock.sentinel.result_set_tags) + expected_result=mock.sentinel.result_set_tags, + ) @mock.patch('openstack.network.v2.network.Network.set_tags') def test_set_tags_resource_without_tag_suport(self, mock_set_tags): no_tag_resource = object() - self.assertRaises(exceptions.InvalidRequest, - self.proxy.set_tags, - no_tag_resource, ['TAG1', 'TAG2']) + self.assertRaises( + exceptions.InvalidRequest, + self.proxy.set_tags, + no_tag_resource, + ['TAG1', 'TAG2'], + ) self.assertEqual(0, mock_set_tags.call_count) class TestNetworkFloatingIp(TestNetworkProxy): def test_create_floating_ip_port_forwarding(self): - self.verify_create(self.proxy.create_floating_ip_port_forwarding, - port_forwarding.PortForwarding, - method_kwargs={'floating_ip': FIP_ID}, - expected_kwargs={'floatingip_id': FIP_ID}) + self.verify_create( + self.proxy.create_floating_ip_port_forwarding, + port_forwarding.PortForwarding, + method_kwargs={'floating_ip': FIP_ID}, + expected_kwargs={'floatingip_id': FIP_ID}, + ) def test_delete_floating_ip_port_forwarding(self): self.verify_delete( @@ -1820,7 +2190,8 @@ class TestNetworkFloatingIp(TestNetworkProxy): ignore_missing=False, method_args=[FIP_ID, "resource_or_id"], expected_args=["resource_or_id"], - expected_kwargs={'floatingip_id': FIP_ID}) + expected_kwargs={'floatingip_id': FIP_ID}, + ) def test_delete_floating_ip_port_forwarding_ignore(self): self.verify_delete( @@ -1829,7 +2200,8 @@ class TestNetworkFloatingIp(TestNetworkProxy): ignore_missing=True, method_args=[FIP_ID, "resource_or_id"], expected_args=["resource_or_id"], - expected_kwargs={'floatingip_id': FIP_ID}) + expected_kwargs={'floatingip_id': FIP_ID}, + ) def test_find_floating_ip_port_forwarding(self): fip = floating_ip.FloatingIP.new(id=FIP_ID) @@ -1839,9 +2211,10 @@ class TestNetworkFloatingIp(TestNetworkProxy): method_args=[fip, 'port_forwarding_id'], expected_args=[ port_forwarding.PortForwarding, - 'port_forwarding_id'], - expected_kwargs={ - 'ignore_missing': True, 'floatingip_id': FIP_ID}) + 'port_forwarding_id', + ], + expected_kwargs={'ignore_missing': True, 'floatingip_id': FIP_ID}, + ) def test_get_floating_ip_port_forwarding(self): fip = floating_ip.FloatingIP.new(id=FIP_ID) @@ -1851,14 +2224,18 @@ class TestNetworkFloatingIp(TestNetworkProxy): method_args=[fip, 'port_forwarding_id'], expected_args=[ port_forwarding.PortForwarding, - 'port_forwarding_id'], - expected_kwargs={'floatingip_id': FIP_ID}) + 'port_forwarding_id', + ], + expected_kwargs={'floatingip_id': FIP_ID}, + ) def test_floating_ip_port_forwardings(self): - self.verify_list(self.proxy.floating_ip_port_forwardings, - port_forwarding.PortForwarding, - method_kwargs={'floating_ip': FIP_ID}, - expected_kwargs={'floatingip_id': FIP_ID}) + self.verify_list( + self.proxy.floating_ip_port_forwardings, + port_forwarding.PortForwarding, + method_kwargs={'floating_ip': FIP_ID}, + expected_kwargs={'floatingip_id': FIP_ID}, + ) def test_update_floating_ip_port_forwarding(self): fip = floating_ip.FloatingIP.new(id=FIP_ID) @@ -1869,14 +2246,18 @@ class TestNetworkFloatingIp(TestNetworkProxy): method_kwargs={'foo': 'bar'}, expected_args=[ port_forwarding.PortForwarding, - 'port_forwarding_id'], - expected_kwargs={'floatingip_id': FIP_ID, 'foo': 'bar'}) + 'port_forwarding_id', + ], + expected_kwargs={'floatingip_id': FIP_ID, 'foo': 'bar'}, + ) def test_create_l3_conntrack_helper(self): - self.verify_create(self.proxy.create_conntrack_helper, - l3_conntrack_helper.ConntrackHelper, - method_kwargs={'router': ROUTER_ID}, - expected_kwargs={'router_id': ROUTER_ID}) + self.verify_create( + self.proxy.create_conntrack_helper, + l3_conntrack_helper.ConntrackHelper, + method_kwargs={'router': ROUTER_ID}, + expected_kwargs={'router_id': ROUTER_ID}, + ) def test_delete_l3_conntrack_helper(self): r = router.Router.new(id=ROUTER_ID) @@ -1886,7 +2267,8 @@ class TestNetworkFloatingIp(TestNetworkProxy): ignore_missing=False, method_args=['resource_or_id', r], expected_args=['resource_or_id'], - expected_kwargs={'router_id': ROUTER_ID},) + expected_kwargs={'router_id': ROUTER_ID}, + ) def test_delete_l3_conntrack_helper_ignore(self): r = router.Router.new(id=ROUTER_ID) @@ -1896,7 +2278,8 @@ class TestNetworkFloatingIp(TestNetworkProxy): ignore_missing=True, method_args=['resource_or_id', r], expected_args=['resource_or_id'], - expected_kwargs={'router_id': ROUTER_ID},) + expected_kwargs={'router_id': ROUTER_ID}, + ) def test_get_l3_conntrack_helper(self): r = router.Router.new(id=ROUTER_ID) @@ -1906,15 +2289,19 @@ class TestNetworkFloatingIp(TestNetworkProxy): method_args=['conntrack_helper_id', r], expected_args=[ l3_conntrack_helper.ConntrackHelper, - 'conntrack_helper_id'], - expected_kwargs={'router_id': ROUTER_ID}) + 'conntrack_helper_id', + ], + expected_kwargs={'router_id': ROUTER_ID}, + ) def test_l3_conntrack_helpers(self): - self.verify_list(self.proxy.conntrack_helpers, - l3_conntrack_helper.ConntrackHelper, - method_args=[ROUTER_ID], - expected_args=[], - expected_kwargs={'router_id': ROUTER_ID}) + self.verify_list( + self.proxy.conntrack_helpers, + l3_conntrack_helper.ConntrackHelper, + method_args=[ROUTER_ID], + expected_args=[], + expected_kwargs={'router_id': ROUTER_ID}, + ) def test_update_l3_conntrack_helper(self): r = router.Router.new(id=ROUTER_ID) @@ -1925,8 +2312,10 @@ class TestNetworkFloatingIp(TestNetworkProxy): method_kwargs={'foo': 'bar'}, expected_args=[ l3_conntrack_helper.ConntrackHelper, - 'conntrack_helper_id'], - expected_kwargs={'router_id': ROUTER_ID, 'foo': 'bar'}) + 'conntrack_helper_id', + ], + expected_kwargs={'router_id': ROUTER_ID, 'foo': 'bar'}, + ) class TestNetworkNDPProxy(TestNetworkProxy): @@ -1934,12 +2323,14 @@ class TestNetworkNDPProxy(TestNetworkProxy): self.verify_create(self.proxy.create_ndp_proxy, ndp_proxy.NDPProxy) def test_ndp_proxy_delete(self): - self.verify_delete(self.proxy.delete_ndp_proxy, ndp_proxy.NDPProxy, - False) + self.verify_delete( + self.proxy.delete_ndp_proxy, ndp_proxy.NDPProxy, False + ) def test_ndp_proxy_delete_ignore(self): - self.verify_delete(self.proxy.delete_ndp_proxy, ndp_proxy.NDPProxy, - True) + self.verify_delete( + self.proxy.delete_ndp_proxy, ndp_proxy.NDPProxy, True + ) def test_ndp_proxy_find(self): self.verify_find(self.proxy.find_ndp_proxy, ndp_proxy.NDPProxy) @@ -1955,18 +2346,20 @@ class TestNetworkNDPProxy(TestNetworkProxy): class TestNetworkBGP(TestNetworkProxy): - def test_bgp_speaker_create(self): - self.verify_create(self.proxy.create_bgp_speaker, - bgp_speaker.BgpSpeaker) + self.verify_create( + self.proxy.create_bgp_speaker, bgp_speaker.BgpSpeaker + ) def test_bgp_speaker_delete(self): - self.verify_delete(self.proxy.delete_bgp_speaker, - bgp_speaker.BgpSpeaker, False) + self.verify_delete( + self.proxy.delete_bgp_speaker, bgp_speaker.BgpSpeaker, False + ) def test_bgp_speaker_delete_ignore(self): - self.verify_delete(self.proxy.delete_bgp_speaker, - bgp_speaker.BgpSpeaker, True) + self.verify_delete( + self.proxy.delete_bgp_speaker, bgp_speaker.BgpSpeaker, True + ) def test_bgp_speaker_find(self): self.verify_find(self.proxy.find_bgp_speaker, bgp_speaker.BgpSpeaker) @@ -1978,15 +2371,15 @@ class TestNetworkBGP(TestNetworkProxy): self.verify_list(self.proxy.bgp_speakers, bgp_speaker.BgpSpeaker) def test_bgp_speaker_update(self): - self.verify_update(self.proxy.update_bgp_speaker, - bgp_speaker.BgpSpeaker) + self.verify_update( + self.proxy.update_bgp_speaker, bgp_speaker.BgpSpeaker + ) def test_bgp_peer_create(self): self.verify_create(self.proxy.create_bgp_peer, bgp_peer.BgpPeer) def test_bgp_peer_delete(self): - self.verify_delete(self.proxy.delete_bgp_peer, - bgp_peer.BgpPeer, False) + self.verify_delete(self.proxy.delete_bgp_peer, bgp_peer.BgpPeer, False) def test_bgp_peer_delete_ignore(self): self.verify_delete(self.proxy.delete_bgp_peer, bgp_peer.BgpPeer, True) @@ -2013,12 +2406,10 @@ class TestNetworkBGPVPN(TestNetworkProxy): self.verify_create(self.proxy.create_bgpvpn, bgpvpn.BgpVpn) def test_bgpvpn_delete(self): - self.verify_delete(self.proxy.delete_bgpvpn, - bgpvpn.BgpVpn, False) + self.verify_delete(self.proxy.delete_bgpvpn, bgpvpn.BgpVpn, False) def test_bgpvpn_delete_ignore(self): - self.verify_delete(self.proxy.delete_bgpvpn, - bgpvpn.BgpVpn, True) + self.verify_delete(self.proxy.delete_bgpvpn, bgpvpn.BgpVpn, True) def test_bgpvpn_find(self): self.verify_find(self.proxy.find_bgpvpn, bgpvpn.BgpVpn) @@ -2037,7 +2428,7 @@ class TestNetworkBGPVPN(TestNetworkProxy): self.proxy.create_bgpvpn_network_association, bgpvpn_network_association.BgpVpnNetworkAssociation, method_kwargs={'bgpvpn': BGPVPN_ID}, - expected_kwargs={'bgpvpn_id': BGPVPN_ID} + expected_kwargs={'bgpvpn_id': BGPVPN_ID}, ) def test_bgpvpn_network_association_delete(self): @@ -2047,8 +2438,7 @@ class TestNetworkBGPVPN(TestNetworkProxy): False, method_args=[BGPVPN_ID, self.NETWORK_ASSOCIATION], expected_args=[self.NETWORK_ASSOCIATION], - expected_kwargs={'ignore_missing': False, - 'bgpvpn_id': BGPVPN_ID} + expected_kwargs={'ignore_missing': False, 'bgpvpn_id': BGPVPN_ID}, ) def test_bgpvpn_network_association_delete_ignore(self): @@ -2058,8 +2448,7 @@ class TestNetworkBGPVPN(TestNetworkProxy): True, method_args=[BGPVPN_ID, self.NETWORK_ASSOCIATION], expected_args=[self.NETWORK_ASSOCIATION], - expected_kwargs={'ignore_missing': True, - 'bgpvpn_id': BGPVPN_ID} + expected_kwargs={'ignore_missing': True, 'bgpvpn_id': BGPVPN_ID}, ) def test_bgpvpn_network_association_get(self): @@ -2068,16 +2457,18 @@ class TestNetworkBGPVPN(TestNetworkProxy): bgpvpn_network_association.BgpVpnNetworkAssociation, method_args=[BGPVPN_ID, self.NETWORK_ASSOCIATION], expected_args=[self.NETWORK_ASSOCIATION], - expected_kwargs={'bgpvpn_id': BGPVPN_ID} + expected_kwargs={'bgpvpn_id': BGPVPN_ID}, ) def test_bgpvpn_network_associations(self): self.verify_list( self.proxy.bgpvpn_network_associations, bgpvpn_network_association.BgpVpnNetworkAssociation, - method_args=[BGPVPN_ID, ], + method_args=[ + BGPVPN_ID, + ], expected_args=[], - expected_kwargs={'bgpvpn_id': BGPVPN_ID} + expected_kwargs={'bgpvpn_id': BGPVPN_ID}, ) def test_bgpvpn_port_association_create(self): @@ -2085,7 +2476,7 @@ class TestNetworkBGPVPN(TestNetworkProxy): self.proxy.create_bgpvpn_port_association, bgpvpn_port_association.BgpVpnPortAssociation, method_kwargs={'bgpvpn': BGPVPN_ID}, - expected_kwargs={'bgpvpn_id': BGPVPN_ID} + expected_kwargs={'bgpvpn_id': BGPVPN_ID}, ) def test_bgpvpn_port_association_delete(self): @@ -2095,8 +2486,7 @@ class TestNetworkBGPVPN(TestNetworkProxy): False, method_args=[BGPVPN_ID, self.PORT_ASSOCIATION], expected_args=[self.PORT_ASSOCIATION], - expected_kwargs={'ignore_missing': False, - 'bgpvpn_id': BGPVPN_ID} + expected_kwargs={'ignore_missing': False, 'bgpvpn_id': BGPVPN_ID}, ) def test_bgpvpn_port_association_delete_ignore(self): @@ -2106,8 +2496,7 @@ class TestNetworkBGPVPN(TestNetworkProxy): True, method_args=[BGPVPN_ID, self.PORT_ASSOCIATION], expected_args=[self.PORT_ASSOCIATION], - expected_kwargs={'ignore_missing': True, - 'bgpvpn_id': BGPVPN_ID} + expected_kwargs={'ignore_missing': True, 'bgpvpn_id': BGPVPN_ID}, ) def test_bgpvpn_port_association_find(self): @@ -2117,8 +2506,7 @@ class TestNetworkBGPVPN(TestNetworkProxy): method_args=[BGPVPN_ID], expected_args=['resource_name'], method_kwargs={'ignore_missing': True}, - expected_kwargs={'ignore_missing': True, - 'bgpvpn_id': BGPVPN_ID}, + expected_kwargs={'ignore_missing': True, 'bgpvpn_id': BGPVPN_ID}, ) def test_bgpvpn_port_association_get(self): @@ -2127,16 +2515,18 @@ class TestNetworkBGPVPN(TestNetworkProxy): bgpvpn_port_association.BgpVpnPortAssociation, method_args=[BGPVPN_ID, self.PORT_ASSOCIATION], expected_args=[self.PORT_ASSOCIATION], - expected_kwargs={'bgpvpn_id': BGPVPN_ID} + expected_kwargs={'bgpvpn_id': BGPVPN_ID}, ) def test_bgpvpn_port_associations(self): self.verify_list( self.proxy.bgpvpn_port_associations, bgpvpn_port_association.BgpVpnPortAssociation, - method_args=[BGPVPN_ID, ], + method_args=[ + BGPVPN_ID, + ], expected_args=[], - expected_kwargs={'bgpvpn_id': BGPVPN_ID} + expected_kwargs={'bgpvpn_id': BGPVPN_ID}, ) def test_bgpvpn_port_association_update(self): @@ -2146,7 +2536,7 @@ class TestNetworkBGPVPN(TestNetworkProxy): method_args=[BGPVPN_ID, self.PORT_ASSOCIATION], method_kwargs={}, expected_args=[self.PORT_ASSOCIATION], - expected_kwargs={'bgpvpn_id': BGPVPN_ID} + expected_kwargs={'bgpvpn_id': BGPVPN_ID}, ) def test_bgpvpn_router_association_create(self): @@ -2154,7 +2544,7 @@ class TestNetworkBGPVPN(TestNetworkProxy): self.proxy.create_bgpvpn_router_association, bgpvpn_router_association.BgpVpnRouterAssociation, method_kwargs={'bgpvpn': BGPVPN_ID}, - expected_kwargs={'bgpvpn_id': BGPVPN_ID} + expected_kwargs={'bgpvpn_id': BGPVPN_ID}, ) def test_bgpvpn_router_association_delete(self): @@ -2164,8 +2554,7 @@ class TestNetworkBGPVPN(TestNetworkProxy): False, method_args=[BGPVPN_ID, self.ROUTER_ASSOCIATION], expected_args=[self.ROUTER_ASSOCIATION], - expected_kwargs={'ignore_missing': False, - 'bgpvpn_id': BGPVPN_ID} + expected_kwargs={'ignore_missing': False, 'bgpvpn_id': BGPVPN_ID}, ) def test_bgpvpn_router_association_delete_ignore(self): @@ -2175,8 +2564,7 @@ class TestNetworkBGPVPN(TestNetworkProxy): True, method_args=[BGPVPN_ID, self.ROUTER_ASSOCIATION], expected_args=[self.ROUTER_ASSOCIATION], - expected_kwargs={'ignore_missing': True, - 'bgpvpn_id': BGPVPN_ID} + expected_kwargs={'ignore_missing': True, 'bgpvpn_id': BGPVPN_ID}, ) def test_bgpvpn_router_association_get(self): @@ -2185,16 +2573,18 @@ class TestNetworkBGPVPN(TestNetworkProxy): bgpvpn_router_association.BgpVpnRouterAssociation, method_args=[BGPVPN_ID, self.ROUTER_ASSOCIATION], expected_args=[self.ROUTER_ASSOCIATION], - expected_kwargs={'bgpvpn_id': BGPVPN_ID} + expected_kwargs={'bgpvpn_id': BGPVPN_ID}, ) def test_bgpvpn_router_associations(self): self.verify_list( self.proxy.bgpvpn_router_associations, bgpvpn_router_association.BgpVpnRouterAssociation, - method_args=[BGPVPN_ID, ], + method_args=[ + BGPVPN_ID, + ], expected_args=[], - expected_kwargs={'bgpvpn_id': BGPVPN_ID} + expected_kwargs={'bgpvpn_id': BGPVPN_ID}, ) def test_bgpvpn_router_association_update(self): @@ -2204,5 +2594,5 @@ class TestNetworkBGPVPN(TestNetworkProxy): method_args=[BGPVPN_ID, self.ROUTER_ASSOCIATION], method_kwargs={}, expected_args=[self.ROUTER_ASSOCIATION], - expected_kwargs={'bgpvpn_id': BGPVPN_ID} + expected_kwargs={'bgpvpn_id': BGPVPN_ID}, ) diff --git a/openstack/tests/unit/network/v2/test_qos_bandwidth_limit_rule.py b/openstack/tests/unit/network/v2/test_qos_bandwidth_limit_rule.py index 581004e10..bb3c59e49 100644 --- a/openstack/tests/unit/network/v2/test_qos_bandwidth_limit_rule.py +++ b/openstack/tests/unit/network/v2/test_qos_bandwidth_limit_rule.py @@ -26,14 +26,14 @@ EXAMPLE = { class TestQoSBandwidthLimitRule(base.TestCase): - def test_basic(self): sot = qos_bandwidth_limit_rule.QoSBandwidthLimitRule() self.assertEqual('bandwidth_limit_rule', sot.resource_key) self.assertEqual('bandwidth_limit_rules', sot.resources_key) self.assertEqual( '/qos/policies/%(qos_policy_id)s/bandwidth_limit_rules', - sot.base_path) + sot.base_path, + ) self.assertTrue(sot.allow_create) self.assertTrue(sot.allow_fetch) self.assertTrue(sot.allow_commit) diff --git a/openstack/tests/unit/network/v2/test_qos_dscp_marking_rule.py b/openstack/tests/unit/network/v2/test_qos_dscp_marking_rule.py index 02a71a2e4..0df8a59fa 100644 --- a/openstack/tests/unit/network/v2/test_qos_dscp_marking_rule.py +++ b/openstack/tests/unit/network/v2/test_qos_dscp_marking_rule.py @@ -24,13 +24,13 @@ EXAMPLE = { class TestQoSDSCPMarkingRule(base.TestCase): - def test_basic(self): sot = qos_dscp_marking_rule.QoSDSCPMarkingRule() self.assertEqual('dscp_marking_rule', sot.resource_key) self.assertEqual('dscp_marking_rules', sot.resources_key) - self.assertEqual('/qos/policies/%(qos_policy_id)s/dscp_marking_rules', - sot.base_path) + self.assertEqual( + '/qos/policies/%(qos_policy_id)s/dscp_marking_rules', sot.base_path + ) self.assertTrue(sot.allow_create) self.assertTrue(sot.allow_fetch) self.assertTrue(sot.allow_commit) diff --git a/openstack/tests/unit/network/v2/test_qos_minimum_bandwidth_rule.py b/openstack/tests/unit/network/v2/test_qos_minimum_bandwidth_rule.py index b42335bd7..6e725cee9 100644 --- a/openstack/tests/unit/network/v2/test_qos_minimum_bandwidth_rule.py +++ b/openstack/tests/unit/network/v2/test_qos_minimum_bandwidth_rule.py @@ -25,14 +25,14 @@ EXAMPLE = { class TestQoSMinimumBandwidthRule(base.TestCase): - def test_basic(self): sot = qos_minimum_bandwidth_rule.QoSMinimumBandwidthRule() self.assertEqual('minimum_bandwidth_rule', sot.resource_key) self.assertEqual('minimum_bandwidth_rules', sot.resources_key) self.assertEqual( '/qos/policies/%(qos_policy_id)s/minimum_bandwidth_rules', - sot.base_path) + sot.base_path, + ) self.assertTrue(sot.allow_create) self.assertTrue(sot.allow_fetch) self.assertTrue(sot.allow_commit) diff --git a/openstack/tests/unit/network/v2/test_qos_minimum_packet_rate_rule.py b/openstack/tests/unit/network/v2/test_qos_minimum_packet_rate_rule.py index ebf430957..9ae6d3bea 100644 --- a/openstack/tests/unit/network/v2/test_qos_minimum_packet_rate_rule.py +++ b/openstack/tests/unit/network/v2/test_qos_minimum_packet_rate_rule.py @@ -25,14 +25,14 @@ EXAMPLE = { class TestQoSMinimumPacketRateRule(base.TestCase): - def test_basic(self): sot = qos_minimum_packet_rate_rule.QoSMinimumPacketRateRule() self.assertEqual('minimum_packet_rate_rule', sot.resource_key) self.assertEqual('minimum_packet_rate_rules', sot.resources_key) self.assertEqual( '/qos/policies/%(qos_policy_id)s/minimum_packet_rate_rules', - sot.base_path) + sot.base_path, + ) self.assertTrue(sot.allow_create) self.assertTrue(sot.allow_fetch) self.assertTrue(sot.allow_commit) diff --git a/openstack/tests/unit/network/v2/test_qos_policy.py b/openstack/tests/unit/network/v2/test_qos_policy.py index 3908ebf4f..2cb22999b 100644 --- a/openstack/tests/unit/network/v2/test_qos_policy.py +++ b/openstack/tests/unit/network/v2/test_qos_policy.py @@ -24,12 +24,11 @@ EXAMPLE = { 'project_id': '2', 'rules': [uuid.uuid4().hex], 'is_default': False, - 'tags': ['3'] + 'tags': ['3'], } class TestQoSPolicy(base.TestCase): - def test_basic(self): sot = qos_policy.QoSPolicy() self.assertEqual('policy', sot.resource_key) diff --git a/openstack/tests/unit/network/v2/test_qos_rule_type.py b/openstack/tests/unit/network/v2/test_qos_rule_type.py index 994eaa939..81faa977d 100644 --- a/openstack/tests/unit/network/v2/test_qos_rule_type.py +++ b/openstack/tests/unit/network/v2/test_qos_rule_type.py @@ -16,27 +16,32 @@ from openstack.tests.unit import base EXAMPLE = { 'type': 'bandwidth_limit', - 'drivers': [{ - 'name': 'openvswitch', - 'supported_parameters': [{ - 'parameter_values': {'start': 0, 'end': 2147483647}, - 'parameter_type': 'range', - 'parameter_name': 'max_kbps' - }, { - 'parameter_values': ['ingress', 'egress'], - 'parameter_type': 'choices', - 'parameter_name': 'direction' - }, { - 'parameter_values': {'start': 0, 'end': 2147483647}, - 'parameter_type': 'range', - 'parameter_name': 'max_burst_kbps' - }] - }] + 'drivers': [ + { + 'name': 'openvswitch', + 'supported_parameters': [ + { + 'parameter_values': {'start': 0, 'end': 2147483647}, + 'parameter_type': 'range', + 'parameter_name': 'max_kbps', + }, + { + 'parameter_values': ['ingress', 'egress'], + 'parameter_type': 'choices', + 'parameter_name': 'direction', + }, + { + 'parameter_values': {'start': 0, 'end': 2147483647}, + 'parameter_type': 'range', + 'parameter_name': 'max_burst_kbps', + }, + ], + } + ], } class TestQoSRuleType(base.TestCase): - def test_basic(self): sot = qos_rule_type.QoSRuleType() self.assertEqual('rule_type', sot.resource_key) @@ -47,14 +52,17 @@ class TestQoSRuleType(base.TestCase): self.assertFalse(sot.allow_commit) self.assertFalse(sot.allow_delete) self.assertTrue(sot.allow_list) - self.assertEqual({'type': 'type', - 'drivers': 'drivers', - 'all_rules': 'all_rules', - 'all_supported': 'all_supported', - 'limit': 'limit', - 'marker': 'marker', - }, - sot._query_mapping._mapping) + self.assertEqual( + { + 'type': 'type', + 'drivers': 'drivers', + 'all_rules': 'all_rules', + 'all_supported': 'all_supported', + 'limit': 'limit', + 'marker': 'marker', + }, + sot._query_mapping._mapping, + ) def test_make_it(self): sot = qos_rule_type.QoSRuleType(**EXAMPLE) diff --git a/openstack/tests/unit/network/v2/test_quota.py b/openstack/tests/unit/network/v2/test_quota.py index e114a5b08..ed0f66877 100644 --- a/openstack/tests/unit/network/v2/test_quota.py +++ b/openstack/tests/unit/network/v2/test_quota.py @@ -37,7 +37,6 @@ EXAMPLE = { class TestQuota(base.TestCase): - def test_basic(self): sot = quota.Quota() self.assertEqual('quota', sot.resource_key) @@ -58,8 +57,9 @@ class TestQuota(base.TestCase): self.assertEqual(EXAMPLE['router'], sot.routers) self.assertEqual(EXAMPLE['subnet'], sot.subnets) self.assertEqual(EXAMPLE['subnetpool'], sot.subnet_pools) - self.assertEqual(EXAMPLE['security_group_rule'], - sot.security_group_rules) + self.assertEqual( + EXAMPLE['security_group_rule'], sot.security_group_rules + ) self.assertEqual(EXAMPLE['security_group'], sot.security_groups) self.assertEqual(EXAMPLE['rbac_policy'], sot.rbac_policies) self.assertEqual(EXAMPLE['healthmonitor'], sot.health_monitors) @@ -79,12 +79,10 @@ class TestQuota(base.TestCase): my_project_id = 'my-tenant-id' body = {'project_id': my_project_id, 'network': 12345} quota_obj = quota.Quota(**body) - self.assertEqual(my_project_id, - resource.Resource._get_id(quota_obj)) + self.assertEqual(my_project_id, resource.Resource._get_id(quota_obj)) class TestQuotaDefault(base.TestCase): - def test_basic(self): sot = quota.QuotaDefault() self.assertEqual('quota', sot.resource_key) @@ -105,8 +103,9 @@ class TestQuotaDefault(base.TestCase): self.assertEqual(EXAMPLE['router'], sot.routers) self.assertEqual(EXAMPLE['subnet'], sot.subnets) self.assertEqual(EXAMPLE['subnetpool'], sot.subnet_pools) - self.assertEqual(EXAMPLE['security_group_rule'], - sot.security_group_rules) + self.assertEqual( + EXAMPLE['security_group_rule'], sot.security_group_rules + ) self.assertEqual(EXAMPLE['security_group'], sot.security_groups) self.assertEqual(EXAMPLE['rbac_policy'], sot.rbac_policies) self.assertEqual(EXAMPLE['healthmonitor'], sot.health_monitors) diff --git a/openstack/tests/unit/network/v2/test_rbac_policy.py b/openstack/tests/unit/network/v2/test_rbac_policy.py index fa8aadae0..3c625f48e 100644 --- a/openstack/tests/unit/network/v2/test_rbac_policy.py +++ b/openstack/tests/unit/network/v2/test_rbac_policy.py @@ -25,7 +25,6 @@ EXAMPLE = { class TestRBACPolicy(base.TestCase): - def test_basic(self): sot = rbac_policy.RBACPolicy() self.assertEqual('rbac_policy', sot.resource_key) @@ -47,7 +46,8 @@ class TestRBACPolicy(base.TestCase): 'limit': 'limit', 'marker': 'marker', }, - sot._query_mapping._mapping) + sot._query_mapping._mapping, + ) def test_make_it(self): sot = rbac_policy.RBACPolicy(**EXAMPLE) diff --git a/openstack/tests/unit/network/v2/test_router.py b/openstack/tests/unit/network/v2/test_router.py index 5f4dc3c53..b3e23b6ef 100644 --- a/openstack/tests/unit/network/v2/test_router.py +++ b/openstack/tests/unit/network/v2/test_router.py @@ -48,22 +48,18 @@ EXAMPLE_WITH_OPTIONAL = { 'external_gateway_info': { 'network_id': '1', 'enable_snat': True, - 'external_fixed_ips': [] + 'external_fixed_ips': [], }, 'ha': True, 'id': IDENTIFIER, 'name': 'router1', - 'routes': [{ - 'nexthop': '172.24.4.20', - 'destination': '10.0.3.1/24' - }], + 'routes': [{'nexthop': '172.24.4.20', 'destination': '10.0.3.1/24'}], 'status': 'ACTIVE', 'project_id': '2', } class TestRouter(base.TestCase): - def test_basic(self): sot = router.Router() self.assertEqual('router', sot.resource_key) @@ -78,16 +74,17 @@ class TestRouter(base.TestCase): def test_make_it(self): sot = router.Router(**EXAMPLE) self.assertTrue(sot.is_admin_state_up) - self.assertEqual(EXAMPLE['availability_zone_hints'], - sot.availability_zone_hints) - self.assertEqual(EXAMPLE['availability_zones'], - sot.availability_zones) + self.assertEqual( + EXAMPLE['availability_zone_hints'], sot.availability_zone_hints + ) + self.assertEqual(EXAMPLE['availability_zones'], sot.availability_zones) self.assertEqual(EXAMPLE['created_at'], sot.created_at) self.assertEqual(EXAMPLE['description'], sot.description) self.assertTrue(sot.enable_ndp_proxy) self.assertFalse(sot.is_distributed) - self.assertEqual(EXAMPLE['external_gateway_info'], - sot.external_gateway_info) + self.assertEqual( + EXAMPLE['external_gateway_info'], sot.external_gateway_info + ) self.assertEqual(EXAMPLE['flavor_id'], sot.flavor_id) self.assertFalse(sot.is_ha) self.assertEqual(EXAMPLE['id'], sot.id) @@ -101,15 +98,19 @@ class TestRouter(base.TestCase): def test_make_it_with_optional(self): sot = router.Router(**EXAMPLE_WITH_OPTIONAL) self.assertFalse(sot.is_admin_state_up) - self.assertEqual(EXAMPLE_WITH_OPTIONAL['availability_zone_hints'], - sot.availability_zone_hints) - self.assertEqual(EXAMPLE_WITH_OPTIONAL['availability_zones'], - sot.availability_zones) - self.assertEqual(EXAMPLE_WITH_OPTIONAL['description'], - sot.description) + self.assertEqual( + EXAMPLE_WITH_OPTIONAL['availability_zone_hints'], + sot.availability_zone_hints, + ) + self.assertEqual( + EXAMPLE_WITH_OPTIONAL['availability_zones'], sot.availability_zones + ) + self.assertEqual(EXAMPLE_WITH_OPTIONAL['description'], sot.description) self.assertTrue(sot.is_distributed) - self.assertEqual(EXAMPLE_WITH_OPTIONAL['external_gateway_info'], - sot.external_gateway_info) + self.assertEqual( + EXAMPLE_WITH_OPTIONAL['external_gateway_info'], + sot.external_gateway_info, + ) self.assertTrue(sot.is_ha) self.assertEqual(EXAMPLE_WITH_OPTIONAL['id'], sot.id) self.assertEqual(EXAMPLE_WITH_OPTIONAL['name'], sot.name) @@ -130,8 +131,7 @@ class TestRouter(base.TestCase): self.assertEqual(response.body, sot.add_interface(sess, **body)) url = 'routers/IDENTIFIER/add_router_interface' - sess.put.assert_called_with(url, - json=body) + sess.put.assert_called_with(url, json=body) def test_add_interface_port(self): # Add port to a router @@ -147,8 +147,7 @@ class TestRouter(base.TestCase): self.assertEqual(response.body, sot.add_interface(sess, **body)) url = 'routers/IDENTIFIER/add_router_interface' - sess.put.assert_called_with(url, - json=body) + sess.put.assert_called_with(url, json=body) def test_remove_interface_subnet(self): # Remove subnet from a router @@ -163,8 +162,7 @@ class TestRouter(base.TestCase): self.assertEqual(response.body, sot.remove_interface(sess, **body)) url = 'routers/IDENTIFIER/remove_router_interface' - sess.put.assert_called_with(url, - json=body) + sess.put.assert_called_with(url, json=body) def test_remove_interface_port(self): # Remove port from a router @@ -179,8 +177,7 @@ class TestRouter(base.TestCase): self.assertEqual(response.body, sot.remove_interface(sess, **body)) url = 'routers/IDENTIFIER/remove_router_interface' - sess.put.assert_called_with(url, - json=body) + sess.put.assert_called_with(url, json=body) def test_add_interface_4xx(self): # Neutron may return 4xx, we have to raise if that happens @@ -259,8 +256,7 @@ class TestRouter(base.TestCase): self.assertEqual(response.body, sot.add_gateway(sess, **body)) url = 'routers/IDENTIFIER/add_gateway_router' - sess.put.assert_called_with(url, - json=body) + sess.put.assert_called_with(url, json=body) def test_remove_router_gateway(self): # Remove gateway to a router @@ -274,12 +270,10 @@ class TestRouter(base.TestCase): self.assertEqual(response.body, sot.remove_gateway(sess, **body)) url = 'routers/IDENTIFIER/remove_gateway_router' - sess.put.assert_called_with(url, - json=body) + sess.put.assert_called_with(url, json=body) class TestL3AgentRouters(base.TestCase): - def test_basic(self): sot = router.L3AgentRouter() self.assertEqual('router', sot.resource_key) diff --git a/openstack/tests/unit/network/v2/test_security_group.py b/openstack/tests/unit/network/v2/test_security_group.py index 13ff1b4ee..3512b9a06 100644 --- a/openstack/tests/unit/network/v2/test_security_group.py +++ b/openstack/tests/unit/network/v2/test_security_group.py @@ -21,8 +21,7 @@ RULES = [ "direction": "egress", "remote_ip_prefix": None, "protocol": None, - "ethertype": - "IPv6", + "ethertype": "IPv6", "project_id": "4", "port_range_max": None, "port_range_min": None, @@ -60,12 +59,11 @@ EXAMPLE = { 'project_id': '4', 'project_id': '4', 'updated_at': '2016-10-14T12:16:57.233772', - 'tags': ['5'] + 'tags': ['5'], } class TestSecurityGroup(base.TestCase): - def test_basic(self): sot = security_group.SecurityGroup() self.assertEqual('security_group', sot.resource_key) @@ -77,24 +75,27 @@ class TestSecurityGroup(base.TestCase): self.assertTrue(sot.allow_delete) self.assertTrue(sot.allow_list) - self.assertDictEqual({'any_tags': 'tags-any', - 'description': 'description', - 'fields': 'fields', - 'id': 'id', - 'limit': 'limit', - 'marker': 'marker', - 'name': 'name', - 'not_any_tags': 'not-tags-any', - 'not_tags': 'not-tags', - 'tenant_id': 'tenant_id', - 'revision_number': 'revision_number', - 'sort_dir': 'sort_dir', - 'sort_key': 'sort_key', - 'tags': 'tags', - 'project_id': 'project_id', - 'stateful': 'stateful', - }, - sot._query_mapping._mapping) + self.assertDictEqual( + { + 'any_tags': 'tags-any', + 'description': 'description', + 'fields': 'fields', + 'id': 'id', + 'limit': 'limit', + 'marker': 'marker', + 'name': 'name', + 'not_any_tags': 'not-tags-any', + 'not_tags': 'not-tags', + 'tenant_id': 'tenant_id', + 'revision_number': 'revision_number', + 'sort_dir': 'sort_dir', + 'sort_key': 'sort_key', + 'tags': 'tags', + 'project_id': 'project_id', + 'stateful': 'stateful', + }, + sot._query_mapping._mapping, + ) def test_make_it(self): sot = security_group.SecurityGroup(**EXAMPLE) @@ -103,8 +104,9 @@ class TestSecurityGroup(base.TestCase): self.assertEqual(EXAMPLE['id'], sot.id) self.assertEqual(EXAMPLE['name'], sot.name) self.assertEqual(EXAMPLE['revision_number'], sot.revision_number) - self.assertEqual(EXAMPLE['security_group_rules'], - sot.security_group_rules) + self.assertEqual( + EXAMPLE['security_group_rules'], sot.security_group_rules + ) self.assertEqual(dict, type(sot.security_group_rules[0])) self.assertEqual(EXAMPLE['project_id'], sot.project_id) self.assertEqual(EXAMPLE['project_id'], sot.project_id) diff --git a/openstack/tests/unit/network/v2/test_security_group_rule.py b/openstack/tests/unit/network/v2/test_security_group_rule.py index eca85dfeb..c9e82c80a 100644 --- a/openstack/tests/unit/network/v2/test_security_group_rule.py +++ b/openstack/tests/unit/network/v2/test_security_group_rule.py @@ -31,12 +31,11 @@ EXAMPLE = { 'project_id': '11', 'project_id': '11', 'updated_at': '12', - 'remote_address_group_id': '13' + 'remote_address_group_id': '13', } class TestSecurityGroupRule(base.TestCase): - def test_basic(self): sot = security_group_rule.SecurityGroupRule() self.assertEqual('security_group_rule', sot.resource_key) @@ -48,31 +47,33 @@ class TestSecurityGroupRule(base.TestCase): self.assertTrue(sot.allow_delete) self.assertTrue(sot.allow_list) - self.assertDictEqual({'any_tags': 'tags-any', - 'description': 'description', - 'direction': 'direction', - 'id': 'id', - 'ether_type': 'ethertype', - 'limit': 'limit', - 'marker': 'marker', - 'not_any_tags': 'not-tags-any', - 'not_tags': 'not-tags', - 'port_range_max': 'port_range_max', - 'port_range_min': 'port_range_min', - 'tenant_id': 'tenant_id', - 'protocol': 'protocol', - 'remote_group_id': 'remote_group_id', - 'remote_address_group_id': - 'remote_address_group_id', - 'remote_ip_prefix': 'remote_ip_prefix', - 'revision_number': 'revision_number', - 'security_group_id': 'security_group_id', - 'sort_dir': 'sort_dir', - 'sort_key': 'sort_key', - 'tags': 'tags', - 'project_id': 'project_id' - }, - sot._query_mapping._mapping) + self.assertDictEqual( + { + 'any_tags': 'tags-any', + 'description': 'description', + 'direction': 'direction', + 'id': 'id', + 'ether_type': 'ethertype', + 'limit': 'limit', + 'marker': 'marker', + 'not_any_tags': 'not-tags-any', + 'not_tags': 'not-tags', + 'port_range_max': 'port_range_max', + 'port_range_min': 'port_range_min', + 'tenant_id': 'tenant_id', + 'protocol': 'protocol', + 'remote_group_id': 'remote_group_id', + 'remote_address_group_id': 'remote_address_group_id', + 'remote_ip_prefix': 'remote_ip_prefix', + 'revision_number': 'revision_number', + 'security_group_id': 'security_group_id', + 'sort_dir': 'sort_dir', + 'sort_key': 'sort_key', + 'tags': 'tags', + 'project_id': 'project_id', + }, + sot._query_mapping._mapping, + ) def test_make_it(self): sot = security_group_rule.SecurityGroupRule(**EXAMPLE) @@ -85,8 +86,9 @@ class TestSecurityGroupRule(base.TestCase): self.assertEqual(EXAMPLE['port_range_min'], sot.port_range_min) self.assertEqual(EXAMPLE['protocol'], sot.protocol) self.assertEqual(EXAMPLE['remote_group_id'], sot.remote_group_id) - self.assertEqual(EXAMPLE['remote_address_group_id'], - sot.remote_address_group_id) + self.assertEqual( + EXAMPLE['remote_address_group_id'], sot.remote_address_group_id + ) self.assertEqual(EXAMPLE['remote_ip_prefix'], sot.remote_ip_prefix) self.assertEqual(EXAMPLE['revision_number'], sot.revision_number) self.assertEqual(EXAMPLE['security_group_id'], sot.security_group_id) diff --git a/openstack/tests/unit/network/v2/test_segment.py b/openstack/tests/unit/network/v2/test_segment.py index 4130f6650..329151f84 100644 --- a/openstack/tests/unit/network/v2/test_segment.py +++ b/openstack/tests/unit/network/v2/test_segment.py @@ -27,7 +27,6 @@ EXAMPLE = { class TestSegment(base.TestCase): - def test_basic(self): sot = segment.Segment() self.assertEqual('segment', sot.resource_key) diff --git a/openstack/tests/unit/network/v2/test_service_profile.py b/openstack/tests/unit/network/v2/test_service_profile.py index bd877c45b..f213c17f1 100644 --- a/openstack/tests/unit/network/v2/test_service_profile.py +++ b/openstack/tests/unit/network/v2/test_service_profile.py @@ -46,14 +46,20 @@ class TestServiceProfile(base.TestCase): def test_make_it_with_optional(self): service_profiles = service_profile.ServiceProfile( - **EXAMPLE_WITH_OPTIONAL) - self.assertEqual(EXAMPLE_WITH_OPTIONAL['description'], - service_profiles.description) - self.assertEqual(EXAMPLE_WITH_OPTIONAL['driver'], - service_profiles.driver) - self.assertEqual(EXAMPLE_WITH_OPTIONAL['enabled'], - service_profiles.is_enabled) - self.assertEqual(EXAMPLE_WITH_OPTIONAL['metainfo'], - service_profiles.meta_info) - self.assertEqual(EXAMPLE_WITH_OPTIONAL['project_id'], - service_profiles.project_id) + **EXAMPLE_WITH_OPTIONAL + ) + self.assertEqual( + EXAMPLE_WITH_OPTIONAL['description'], service_profiles.description + ) + self.assertEqual( + EXAMPLE_WITH_OPTIONAL['driver'], service_profiles.driver + ) + self.assertEqual( + EXAMPLE_WITH_OPTIONAL['enabled'], service_profiles.is_enabled + ) + self.assertEqual( + EXAMPLE_WITH_OPTIONAL['metainfo'], service_profiles.meta_info + ) + self.assertEqual( + EXAMPLE_WITH_OPTIONAL['project_id'], service_profiles.project_id + ) diff --git a/openstack/tests/unit/network/v2/test_service_provider.py b/openstack/tests/unit/network/v2/test_service_provider.py index ad578bff9..aa90903a4 100644 --- a/openstack/tests/unit/network/v2/test_service_provider.py +++ b/openstack/tests/unit/network/v2/test_service_provider.py @@ -23,7 +23,6 @@ EXAMPLE = { class TestServiceProvider(base.TestCase): - def test_basic(self): sot = service_provider.ServiceProvider() diff --git a/openstack/tests/unit/network/v2/test_subnet.py b/openstack/tests/unit/network/v2/test_subnet.py index 1a9b216f2..ae4bbf977 100644 --- a/openstack/tests/unit/network/v2/test_subnet.py +++ b/openstack/tests/unit/network/v2/test_subnet.py @@ -42,7 +42,6 @@ EXAMPLE = { class TestSubnet(base.TestCase): - def test_basic(self): sot = subnet.Subnet() self.assertEqual('subnet', sot.resource_key) diff --git a/openstack/tests/unit/network/v2/test_subnet_pool.py b/openstack/tests/unit/network/v2/test_subnet_pool.py index 81dea5c1e..8d04f500e 100644 --- a/openstack/tests/unit/network/v2/test_subnet_pool.py +++ b/openstack/tests/unit/network/v2/test_subnet_pool.py @@ -36,7 +36,6 @@ EXAMPLE = { class TestSubnetpool(base.TestCase): - def test_basic(self): sot = subnet_pool.SubnetPool() self.assertEqual('subnetpool', sot.resource_key) @@ -52,8 +51,9 @@ class TestSubnetpool(base.TestCase): sot = subnet_pool.SubnetPool(**EXAMPLE) self.assertEqual(EXAMPLE['address_scope_id'], sot.address_scope_id) self.assertEqual(EXAMPLE['created_at'], sot.created_at) - self.assertEqual(EXAMPLE['default_prefixlen'], - sot.default_prefix_length) + self.assertEqual( + EXAMPLE['default_prefixlen'], sot.default_prefix_length + ) self.assertEqual(EXAMPLE['default_quota'], sot.default_quota) self.assertEqual(EXAMPLE['description'], sot.description) self.assertEqual(EXAMPLE['id'], sot.id) diff --git a/openstack/tests/unit/network/v2/test_tap_flow.py b/openstack/tests/unit/network/v2/test_tap_flow.py index fdeaeaffb..1eb382a6d 100644 --- a/openstack/tests/unit/network/v2/test_tap_flow.py +++ b/openstack/tests/unit/network/v2/test_tap_flow.py @@ -20,12 +20,11 @@ EXAMPLE = { 'source_port': '1234', 'tap_service_id': '4321', 'id': IDENTIFIER, - 'project_id': '42' + 'project_id': '42', } class TestTapFlow(base.TestCase): - def test_basic(self): sot = tap_flow.TapFlow() self.assertEqual('tap_flow', sot.resource_key) @@ -46,11 +45,13 @@ class TestTapFlow(base.TestCase): self.assertEqual(EXAMPLE['project_id'], sot.project_id) self.assertDictEqual( - {'limit': 'limit', - 'marker': 'marker', - 'name': 'name', - 'project_id': 'project_id', - 'sort_key': 'sort_key', - 'sort_dir': 'sort_dir', - }, - sot._query_mapping._mapping) + { + 'limit': 'limit', + 'marker': 'marker', + 'name': 'name', + 'project_id': 'project_id', + 'sort_key': 'sort_key', + 'sort_dir': 'sort_dir', + }, + sot._query_mapping._mapping, + ) diff --git a/openstack/tests/unit/network/v2/test_tap_service.py b/openstack/tests/unit/network/v2/test_tap_service.py index 1892ffa50..b20da6f24 100644 --- a/openstack/tests/unit/network/v2/test_tap_service.py +++ b/openstack/tests/unit/network/v2/test_tap_service.py @@ -19,12 +19,11 @@ EXAMPLE = { 'name': 'my_tap_service', 'port_id': '1234', 'id': IDENTIFIER, - 'project_id': '42' + 'project_id': '42', } class TestTapService(base.TestCase): - def test_basic(self): sot = tap_service.TapService() self.assertEqual('tap_service', sot.resource_key) @@ -44,11 +43,13 @@ class TestTapService(base.TestCase): self.assertEqual(EXAMPLE['project_id'], sot.project_id) self.assertDictEqual( - {'limit': 'limit', - 'marker': 'marker', - 'name': 'name', - 'project_id': 'project_id', - 'sort_key': 'sort_key', - 'sort_dir': 'sort_dir', - }, - sot._query_mapping._mapping) + { + 'limit': 'limit', + 'marker': 'marker', + 'name': 'name', + 'project_id': 'project_id', + 'sort_key': 'sort_key', + 'sort_dir': 'sort_dir', + }, + sot._query_mapping._mapping, + ) diff --git a/openstack/tests/unit/network/v2/test_trunk.py b/openstack/tests/unit/network/v2/test_trunk.py index 5f509c675..3842668a3 100644 --- a/openstack/tests/unit/network/v2/test_trunk.py +++ b/openstack/tests/unit/network/v2/test_trunk.py @@ -26,17 +26,17 @@ EXAMPLE = { 'admin_state_up': True, 'port_id': 'fake_port_id', 'status': 'ACTIVE', - 'sub_ports': [{ - 'port_id': 'subport_port_id', - 'segmentation_id': 1234, - 'segmentation_type': 'vlan' - }] - + 'sub_ports': [ + { + 'port_id': 'subport_port_id', + 'segmentation_id': 1234, + 'segmentation_type': 'vlan', + } + ], } class TestTrunk(base.TestCase): - def test_basic(self): sot = trunk.Trunk() self.assertEqual('trunk', sot.resource_key) @@ -71,8 +71,13 @@ class TestTrunk(base.TestCase): response.headers = {'content-type': 'application/json'} sess = mock.Mock() sess.put = mock.Mock(return_value=response) - subports = [{'port_id': 'abc', 'segmentation_id': '123', - 'segmentation_type': 'vlan'}] + subports = [ + { + 'port_id': 'abc', + 'segmentation_id': '123', + 'segmentation_type': 'vlan', + } + ] with testtools.ExpectedException(exceptions.ResourceNotFound, msg): sot.add_subports(sess, subports) @@ -88,7 +93,12 @@ class TestTrunk(base.TestCase): response.headers = {'content-type': 'application/json'} sess = mock.Mock() sess.put = mock.Mock(return_value=response) - subports = [{'port_id': 'abc', 'segmentation_id': '123', - 'segmentation_type': 'vlan'}] + subports = [ + { + 'port_id': 'abc', + 'segmentation_id': '123', + 'segmentation_type': 'vlan', + } + ] with testtools.ExpectedException(exceptions.ResourceNotFound, msg): sot.delete_subports(sess, subports) diff --git a/openstack/tests/unit/network/v2/test_vpn_endpoint_group.py b/openstack/tests/unit/network/v2/test_vpn_endpoint_group.py index 4c98666c9..f5a658810 100644 --- a/openstack/tests/unit/network/v2/test_vpn_endpoint_group.py +++ b/openstack/tests/unit/network/v2/test_vpn_endpoint_group.py @@ -19,18 +19,14 @@ EXAMPLE = { "description": "", "project_id": "4ad57e7ce0b24fca8f12b9834d91079d", "tenant_id": "4ad57e7ce0b24fca8f12b9834d91079d", - "endpoints": [ - "10.2.0.0/24", - "10.3.0.0/24" - ], + "endpoints": ["10.2.0.0/24", "10.3.0.0/24"], "type": "cidr", "id": "6ecd9cf3-ca64-46c7-863f-f2eb1b9e838a", - "name": "peers" + "name": "peers", } class TestVpnEndpointGroup(base.TestCase): - def test_basic(self): sot = vpn_endpoint_group.VpnEndpointGroup() self.assertEqual('endpoint_group', sot.resource_key) @@ -61,4 +57,5 @@ class TestVpnEndpointGroup(base.TestCase): 'tenant_id': 'tenant_id', 'type': 'endpoint_type', }, - sot._query_mapping._mapping) + sot._query_mapping._mapping, + ) diff --git a/openstack/tests/unit/network/v2/test_vpn_ikepolicy.py b/openstack/tests/unit/network/v2/test_vpn_ikepolicy.py index b88271ac0..a52164478 100644 --- a/openstack/tests/unit/network/v2/test_vpn_ikepolicy.py +++ b/openstack/tests/unit/network/v2/test_vpn_ikepolicy.py @@ -25,12 +25,11 @@ EXAMPLE = { "project_id": "7", "phase1_negotiation_mode": "8", "units": "9", - "value": 10 + "value": 10, } class TestVpnIkePolicy(base.TestCase): - def test_basic(self): sot = vpn_ike_policy.VpnIkePolicy() self.assertEqual('ikepolicy', sot.resource_key) @@ -46,14 +45,16 @@ class TestVpnIkePolicy(base.TestCase): sot = vpn_ike_policy.VpnIkePolicy(**EXAMPLE) self.assertEqual(EXAMPLE['auth_algorithm'], sot.auth_algorithm) self.assertEqual(EXAMPLE['description'], sot.description) - self.assertEqual(EXAMPLE['encryption_algorithm'], - sot.encryption_algorithm) + self.assertEqual( + EXAMPLE['encryption_algorithm'], sot.encryption_algorithm + ) self.assertEqual(EXAMPLE['ike_version'], sot.ike_version) self.assertEqual(EXAMPLE['lifetime'], sot.lifetime) self.assertEqual(EXAMPLE['name'], sot.name) self.assertEqual(EXAMPLE['pfs'], sot.pfs) self.assertEqual(EXAMPLE['project_id'], sot.project_id) - self.assertEqual(EXAMPLE['phase1_negotiation_mode'], - sot.phase1_negotiation_mode) + self.assertEqual( + EXAMPLE['phase1_negotiation_mode'], sot.phase1_negotiation_mode + ) self.assertEqual(EXAMPLE['units'], sot.units) self.assertEqual(EXAMPLE['value'], sot.value) diff --git a/openstack/tests/unit/network/v2/test_vpn_ipsec_site_connection.py b/openstack/tests/unit/network/v2/test_vpn_ipsec_site_connection.py index 48e406e55..459f9e5f0 100644 --- a/openstack/tests/unit/network/v2/test_vpn_ipsec_site_connection.py +++ b/openstack/tests/unit/network/v2/test_vpn_ipsec_site_connection.py @@ -37,12 +37,11 @@ EXAMPLE = { "dpd": {'a': 5}, "timeout": 16, "action": "17", - "local_id": "18" + "local_id": "18", } class TestVpnIPSecSiteConnection(base.TestCase): - def test_basic(self): sot = vpn_ipsec_site_connection.VpnIPSecSiteConnection() self.assertEqual('ipsec_site_connection', sot.resource_key) diff --git a/openstack/tests/unit/network/v2/test_vpn_ipsecpolicy.py b/openstack/tests/unit/network/v2/test_vpn_ipsecpolicy.py index fd6f7c88e..0d945d085 100644 --- a/openstack/tests/unit/network/v2/test_vpn_ipsecpolicy.py +++ b/openstack/tests/unit/network/v2/test_vpn_ipsecpolicy.py @@ -23,12 +23,11 @@ EXAMPLE = { "pfs": "6", "project_id": "7", "units": "9", - "value": 10 + "value": 10, } class TestVpnIpsecPolicy(base.TestCase): - def test_basic(self): sot = vpn_ipsec_policy.VpnIpsecPolicy() self.assertEqual('ipsecpolicy', sot.resource_key) @@ -44,8 +43,9 @@ class TestVpnIpsecPolicy(base.TestCase): sot = vpn_ipsec_policy.VpnIpsecPolicy(**EXAMPLE) self.assertEqual(EXAMPLE['auth_algorithm'], sot.auth_algorithm) self.assertEqual(EXAMPLE['description'], sot.description) - self.assertEqual(EXAMPLE['encryption_algorithm'], - sot.encryption_algorithm) + self.assertEqual( + EXAMPLE['encryption_algorithm'], sot.encryption_algorithm + ) self.assertEqual(EXAMPLE['lifetime'], sot.lifetime) self.assertEqual(EXAMPLE['name'], sot.name) self.assertEqual(EXAMPLE['pfs'], sot.pfs) @@ -65,4 +65,5 @@ class TestVpnIpsecPolicy(base.TestCase): 'project_id': 'project_id', 'phase1_negotiation_mode': 'phase1_negotiation_mode', }, - sot._query_mapping._mapping) + sot._query_mapping._mapping, + ) diff --git a/openstack/tests/unit/network/v2/test_vpn_service.py b/openstack/tests/unit/network/v2/test_vpn_service.py index 8b4c29236..72b69d3f0 100644 --- a/openstack/tests/unit/network/v2/test_vpn_service.py +++ b/openstack/tests/unit/network/v2/test_vpn_service.py @@ -30,7 +30,6 @@ EXAMPLE = { class TestVpnService(base.TestCase): - def test_basic(self): sot = vpn_service.VpnService() self.assertEqual('vpnservice', sot.resource_key) @@ -69,4 +68,5 @@ class TestVpnService(base.TestCase): 'subnet_id': 'subnet_id', 'is_admin_state_up': 'admin_state_up', }, - sot._query_mapping._mapping) + sot._query_mapping._mapping, + ) diff --git a/tox.ini b/tox.ini index 24ec06df8..13a0c3a3b 100644 --- a/tox.ini +++ b/tox.ini @@ -129,11 +129,12 @@ application-import-names = openstack # if they fix ALL of the occurances of one and only one of them. # E203 Black will put spaces after colons in list comprehensions # H238 New Style Classes are the default in Python3 +# H301 Black will put commas after imports that can't fit on one line # H4 Are about docstrings and there's just a huge pile of pre-existing issues. # W503 Is supposed to be off by default but in the latest pycodestyle isn't. # Also, both openstacksdk and Donald Knuth disagree with the rule. Line # breaks should occur before the binary operator for readability. -ignore = E203, H238, H4, W503 +ignore = E203, H301, H238, H4, W503 import-order-style = pep8 show-source = True exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build,openstack/_services_mixin.py