openstack
/
neutron
Code Issues Proposed changes

Merge "Log tenant ports if subnet could not be deleted"

This commit is contained in:
Jenkins 2015-03-03 18:44:22 +00:00 committed by Gerrit Code Review
parent 453cbf4d62 c17faaad2b
commit eed37d0d60
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
neutron/db/db_base_plugin_v2.py
View File

@ -1248,9 +1248,12 @@ class NeutronDbPluginV2(neutron_plugin_base_v2.NeutronPluginBaseV2,
# the isolation level is set to READ COMMITTED allocations made
# concurrently will be returned by this query
if not is_auto_addr_subnet:
if self._subnet_check_ip_allocations(context, id):
LOG.debug("Found IP allocations on subnet %s, "
"cannot delete", id)
alloc = self._subnet_check_ip_allocations(context, id)
if alloc:
LOG.info(_LI("Found IP allocation %(alloc)s on subnet "
"%(subnet)s, cannot delete"),
{'alloc': alloc,
'subnet': id})
raise n_exc.SubnetInUse(subnet_id=id)
context.session.delete(subnet)