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

1 files changed, 4 insertions, 1 deletions

diff --git a/neutron/db/l3_hamode_db.py b/neutron/db/l3_hamode_db.py
index f395801..f6f3ae2 100644
--- a/neutron/db/l3_hamode_db.py
+++ b/neutron/db/l3_hamode_db.py
@@ -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