From: Kevin Benton Date: Tue, 18 Nov 2014 16:34:56 +0000 (-0800) Subject: Prevent an iteration through ports on IPv6 slaac X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=3e1d3a786500510be7338ce9e5c81e8daccfeb40;p=openstack-build%2Fneutron-build.git Prevent an iteration through ports on IPv6 slaac A recent change[1] allowed subnets to be deleted even if they had active IPv6 SLAAC allocations on them. The updated check was inefficient because it would check every port in the subnet even if the subnet was a SLAAC subnet. This patch just shortcuts out that check. 1. I281f5a1553248e09174dc49d0a42aef4b5c44bee Change-Id: I2c35495b3642c644e4758f28ccddcc076139ec3b (cherry picked from commit b3a44c2d5d8ca85bcc5ccffc76d2a959e373e5d4) --- diff --git a/neutron/plugins/ml2/plugin.py b/neutron/plugins/ml2/plugin.py index fe3a6face..26d2c98a3 100644 --- a/neutron/plugins/ml2/plugin.py +++ b/neutron/plugins/ml2/plugin.py @@ -725,11 +725,9 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2, filter_by(network_id=subnet['network_id']). with_lockmode('update').all()) LOG.debug(_("Ports to auto-deallocate: %s"), allocated) - only_auto_del = all(not a.port_id or - a.ports.device_owner in db_base_plugin_v2. - AUTO_DELETE_PORT_OWNERS or - ipv6_utils.is_slaac_subnet(subnet) - for a in allocated) + only_auto_del = ipv6_utils.is_slaac_subnet(subnet) or all( + not a.port_id or a.ports.device_owner in db_base_plugin_v2. + AUTO_DELETE_PORT_OWNERS for a in allocated) if not only_auto_del: LOG.debug(_("Tenant-owned ports exist")) raise exc.SubnetInUse(subnet_id=id)