Merge "l3_ha_mode: call bulk _populate_mtu_and_subnets_for_ports" into stable/newton

This commit is contained in:
Jenkins 2017-06-06 23:27:39 +00:00 committed by Gerrit Code Review
commit 96fbfe743a
1 changed files with 4 additions and 1 deletions

View File

@ -724,10 +724,13 @@ class L3_HA_NAT_db_mixin(l3_dvr_db.L3_NAT_with_dvr_db_mixin,
router[constants.HA_INTERFACE_KEY] = port_dict
router[n_const.HA_ROUTER_STATE_KEY] = binding.state
interfaces = []
for router in routers_dict.values():
interface = router.get(constants.HA_INTERFACE_KEY)
if interface:
self._populate_mtu_and_subnets_for_ports(context, [interface])
interfaces.append(interface)
self._populate_mtu_and_subnets_for_ports(context, interfaces)
# If this is a DVR+HA router, but the agent is question is in 'dvr'
# mode (as opposed to 'dvr_snat'), then we want to always return it