From 697c934933c9d5edcb2d9392a7626f2676d67ed7 Mon Sep 17 00:00:00 2001 From: Kevin Benton Date: Fri, 24 Apr 2015 06:52:21 -0700 Subject: [PATCH] Add missing interface to populate subnets method Change Ib46f685d72eb61ecbaa2869e28fb173cd6d49552 introduced and optimization to defer the lookup of interface subnet info until all of the router interfaces were collected. However, it didn't add the DVR SNAT interface to the list of interfaces to populate subnet info so it broke DVR. This patch corrects the behavior by adding the DVR SNAT interface to the list of ports that need subnet info populated. Change-Id: I32054ff00bf6992c5dedd21735b6d2afd15c5fb3 --- neutron/db/l3_dvr_db.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/neutron/db/l3_dvr_db.py b/neutron/db/l3_dvr_db.py index 2374361a5..241fa85a3 100644 --- a/neutron/db/l3_dvr_db.py +++ b/neutron/db/l3_dvr_db.py @@ -459,6 +459,8 @@ class L3_NAT_with_dvr_db_mixin(l3_db.L3_NAT_db_mixin, ports_to_populate.append(router['gw_port']) if router.get(l3_const.FLOATINGIP_AGENT_INTF_KEY): ports_to_populate += router[l3_const.FLOATINGIP_AGENT_INTF_KEY] + if router.get(SNAT_ROUTER_INTF_KEY): + ports_to_populate += router[SNAT_ROUTER_INTF_KEY] ports_to_populate += interfaces self._populate_subnets_for_ports(context, ports_to_populate) self._process_interfaces(routers_dict, interfaces) -- 2.45.2