Remove all_routers argument from _process_routers

There is no code left that passes True to this argument.  It is dead
code and it should be removed.

Change-Id: I55f71a5c0b96e530e45f2a6463978e8611cbc537

diff --git a/neutron/agent/l3_agent.py b/neutron/agent/l3_agent.py
index 9f117635bb480168656adf127f6a0a698d44469d..4e052a373d2ec5f7067a5a5ea204699d81a314c8 100644 (file)
--- a/neutron/agent/l3_agent.py
+++ b/neutron/agent/l3_agent.py
@@ -1781,7 +1781,7 @@ class L3NATAgent(firewall_l3_agent.FWaaSL3AgentRpcCallback,
         LOG.debug(_('Got router added to agent :%r'), payload)
         self.routers_updated(context, payload)
 
-    def _process_routers(self, routers, all_routers=False):
+    def _process_routers(self, routers):
         pool = eventlet.GreenPool()
         if (self.conf.external_network_bridge and
             not ip_lib.device_exists(self.conf.external_network_bridge)):
@@ -1795,11 +1795,8 @@ class L3NATAgent(firewall_l3_agent.FWaaSL3AgentRpcCallback,
         # routers which should be removed.
         # If routers are from server side notification, we seek them
         # from subset of incoming routers and ones we have now.
-        if all_routers:
-            prev_router_ids = set(self.router_info)
-        else:
-            prev_router_ids = set(self.router_info) & set(
-                [router['id'] for router in routers])
+        prev_router_ids = set(self.router_info) & set(
+            [router['id'] for router in routers])
         cur_router_ids = set()
         for r in routers:
             # If namespaces are disabled, only process the router associated

diff --git a/neutron/services/vpn/agent.py b/neutron/services/vpn/agent.py
index 284e02aacd63026e081f1b1dc0cfb8a42efc9e67..12e969df9b504d0cbd53215c67c474eecb329d92 100644 (file)
--- a/neutron/services/vpn/agent.py
+++ b/neutron/services/vpn/agent.py
@@ -130,13 +130,13 @@ class VPNAgent(l3_agent.L3NATAgentWithStateReport):
         for device in self.devices:
             device.destroy_router(router_id)
 
-    def _process_routers(self, routers, all_routers=False):
+    def _process_routers(self, routers):
         """Router sync event.
 
         This method overwrites parent class method.
         :param routers: list of routers
         """
-        super(VPNAgent, self)._process_routers(routers, all_routers)
+        super(VPNAgent, self)._process_routers(routers)
         for device in self.devices:
             device.sync(self.context, routers)
 

diff --git a/neutron/tests/unit/services/vpn/test_vpn_agent.py b/neutron/tests/unit/services/vpn/test_vpn_agent.py
index f360dfaa1fb9b511254a070f47041894fad4c61e..4cde577d236fdb8a01ba81c356ce340b9c5eb19d 100644 (file)
--- a/neutron/tests/unit/services/vpn/test_vpn_agent.py
+++ b/neutron/tests/unit/services/vpn/test_vpn_agent.py
@@ -193,5 +193,5 @@ class TestVPNAgent(base.BaseTestCase):
 
         device = mock.Mock()
         self.agent.devices = [device]
-        self.agent._process_routers(routers, False)
+        self.agent._process_routers(routers)
         device.sync.assert_called_once_with(mock.ANY, routers)