openstack/neutron
Code Issues Proposed changes

Merge "Do a quick FIP check on port delete"

Browse Source
This commit is contained in:
Zuul 2021-06-22 13:45:51 +00:00 committed by Gerrit Code Review
commit c62915d8d7
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
neutron/db/l3_db.py
View File

@ -1619,6 +1619,10 @@ class L3_NAT_dbonly_mixin(l3.RouterPluginBase,
@return: set of router-ids that require notification updates @return: set of router-ids that require notification updates
""" """
with db_api.CONTEXT_WRITER.using(context): with db_api.CONTEXT_WRITER.using(context):
if not l3_obj.FloatingIP.objects_exist(
context, fixed_port_id=port_id):
return []
floating_ip_objs = l3_obj.FloatingIP.get_objects( floating_ip_objs = l3_obj.FloatingIP.get_objects(
context, fixed_port_id=port_id) context, fixed_port_id=port_id)
router_ids = {fip.router_id for fip in floating_ip_objs} router_ids = {fip.router_id for fip in floating_ip_objs}
@ -1663,7 +1667,11 @@ class L3_NAT_dbonly_mixin(l3.RouterPluginBase,
def _get_floatingips_by_port_id(self, context, port_id): def _get_floatingips_by_port_id(self, context, port_id):
"""Helper function to retrieve the fips associated with a port_id.""" """Helper function to retrieve the fips associated with a port_id."""
return l3_obj.FloatingIP.get_objects(context, fixed_port_id=port_id) if l3_obj.FloatingIP.objects_exist(context, fixed_port_id=port_id):
return l3_obj.FloatingIP.get_objects(
context, fixed_port_id=port_id)
else:
return []
def _build_routers_list(self, context, routers, gw_ports): def _build_routers_list(self, context, routers, gw_ports):
"""Subclasses can override this to add extra gateway info""" """Subclasses can override this to add extra gateway info"""