From: Carl Baldwin Date: Thu, 9 Jul 2015 21:26:49 +0000 (+0000) Subject: Remove self.snat_ports, a dvr thing, from router base class X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1cccb37817dfe865610716012deb2f0f3209a58e;p=openstack-build%2Fneutron-build.git Remove self.snat_ports, a dvr thing, from router base class This was overlooked in splitting out dvr code from the router base class. It is dvr only. Also, it doesn't need to be an instance variable and was not use consistently. Change-Id: I0eff381c1613e3824c8da0f0ccba65dd3e884cbf --- diff --git a/neutron/agent/l3/dvr_edge_router.py b/neutron/agent/l3/dvr_edge_router.py index 8804be42f..d54015d05 100644 --- a/neutron/agent/l3/dvr_edge_router.py +++ b/neutron/agent/l3/dvr_edge_router.py @@ -93,7 +93,8 @@ class DvrEdgeRouter(dvr_local_router.DvrLocalRouter): if not self.ex_gw_port: return - sn_port = self._map_internal_interfaces(port, self.snat_ports) + snat_ports = self.get_snat_interfaces() + sn_port = self._map_internal_interfaces(port, snat_ports) if not sn_port: return diff --git a/neutron/agent/l3/dvr_local_router.py b/neutron/agent/l3/dvr_local_router.py index ca72d0d95..21cc3877b 100755 --- a/neutron/agent/l3/dvr_local_router.py +++ b/neutron/agent/l3/dvr_local_router.py @@ -317,7 +317,8 @@ class DvrLocalRouter(router.RouterInfo): if not self.ex_gw_port: return - sn_port = self._map_internal_interfaces(port, self.snat_ports) + snat_ports = self.get_snat_interfaces() + sn_port = self._map_internal_interfaces(port, snat_ports) if not sn_port: return diff --git a/neutron/agent/l3/router_info.py b/neutron/agent/l3/router_info.py index 978f2f8c8..8bf08f6af 100644 --- a/neutron/agent/l3/router_info.py +++ b/neutron/agent/l3/router_info.py @@ -633,6 +633,4 @@ class RouterInfo(object): # Update ex_gw_port and enable_snat on the router info cache self.ex_gw_port = self.get_ex_gw_port() - self.snat_ports = self.router.get( - l3_constants.SNAT_ROUTER_INTF_KEY, []) self.enable_snat = self.router.get('enable_snat')