x/vmware-nsx
Code Issues Proposed changes

Merge "Prevent an iteration through ports on IPv6 slaac"

Browse Source
This commit is contained in:
Jenkins
2014-11-21 09:32:25 +00:00
committed by Gerrit Code Review
parent a6a464b9dd 1da47b617c
commit 60d1af44d9
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
neutron/plugins/ml2/plugin.py
View File

@@ -728,11 +728,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)