openstack/neutron
Code Issues Proposed changes

Merge "Ensure that update_fip_statuses gets called"

Browse Source
This commit is contained in:
Jenkins 2015-07-23 10:10:24 +00:00 committed by Gerrit Code Review
commit c2eee235bc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
neutron/agent/l3/router_info.py
View File

@ -582,13 +582,12 @@ class RouterInfo(object):
interface_name)
def process_external(self, agent):
fip_statuses = {}
existing_floating_ips = self.floating_ips
try:
with self.iptables_manager.defer_apply():
ex_gw_port = self.get_ex_gw_port()
self._process_external_gateway(ex_gw_port)
# TODO(Carl) Return after setting existing_floating_ips and
# still call update_fip_statuses?
if not ex_gw_port:
return
@ -606,8 +605,9 @@ class RouterInfo(object):
# All floating IPs must be put in error state
LOG.exception(e)
fip_statuses = self.put_fips_in_error_state()
agent.update_fip_statuses(self, existing_floating_ips, fip_statuses)
finally:
agent.update_fip_statuses(
self, existing_floating_ips, fip_statuses)
@common_utils.exception_logger()
def process(self, agent):