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 8804be42f295501f82adcf3df3e7502ffbcf2923..d54015d050f1556f5e80c62a8165b24cd2a52fbf 100644 (file)
--- 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 ca72d0d95c5479bf68426e74af3991d735cbc085..21cc3877bdef8d123808d8fe5a82ed1dec41f923 100755 (executable)
--- 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 978f2f8c8a34334357124633c44db5e4bb1b89c7..8bf08f6af314c9d6ec0bb465989ff57774b6d8aa 100644 (file)
--- 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')