diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-14 20:14:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-14 20:14:37 +0000 |
| commit | 0d0c376d09d85a0eabeb8c9258349d1e63a5cdf0 (patch) | |
| tree | 5105a2fd68a393b1f2f4057af3b17e0ba75a42c5 | |
| parent | c3666cb0dc6a14090bdbdd546599f59fc59fa543 (diff) | |
| parent | b28eda57223e492924edb731e24c2e4f64cc0de5 (diff) | |
| download | neutron-0d0c376d09d85a0eabeb8c9258349d1e63a5cdf0.tar.gz | |
Merge "Remove two sets that are not referenced" into proposed/juno2014.2.rc32014.2proposed/juno
| -rw-r--r-- | neutron/agent/l3_agent.py | 10 | ||||
| -rw-r--r-- | neutron/tests/unit/test_l3_agent.py | 19 |
2 files changed, 0 insertions, 29 deletions
diff --git a/neutron/agent/l3_agent.py b/neutron/agent/l3_agent.py index b3c63eefb7..ff8ad47dbc 100644 --- a/neutron/agent/l3_agent.py +++ b/neutron/agent/l3_agent.py @@ -523,8 +523,6 @@ class L3NATAgent(firewall_l3_agent.FWaaSL3AgentRpcCallback, self.context = context.get_admin_context_without_session() self.plugin_rpc = L3PluginApi(topics.L3PLUGIN, host) self.fullsync = True - self.updated_routers = set() - self.removed_routers = set() self.sync_progress = False # Get the list of service plugins from Neutron Server @@ -1843,12 +1841,6 @@ class L3NATAgent(firewall_l3_agent.FWaaSL3AgentRpcCallback, while True: pool.spawn_n(self._process_router_update) - def _process_router_delete(self): - current_removed_routers = list(self.removed_routers) - for router_id in current_removed_routers: - self._router_removed(router_id) - self.removed_routers.remove(router_id) - def _router_ids(self): if not self.conf.use_namespaces: return [self.conf.router_id] @@ -1874,8 +1866,6 @@ class L3NATAgent(firewall_l3_agent.FWaaSL3AgentRpcCallback, try: router_ids = self._router_ids() - self.updated_routers.clear() - self.removed_routers.clear() timestamp = timeutils.utcnow() routers = self.plugin_rpc.get_routers( context, router_ids) diff --git a/neutron/tests/unit/test_l3_agent.py b/neutron/tests/unit/test_l3_agent.py index 3d2d33c52d..8de7922d21 100644 --- a/neutron/tests/unit/test_l3_agent.py +++ b/neutron/tests/unit/test_l3_agent.py @@ -1765,25 +1765,6 @@ vrrp_instance VR_1 { agent.router_added_to_agent(None, [FAKE_ID]) agent._queue.add.assert_called_once() - def test_process_router_delete(self): - agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) - ex_gw_port = {'id': _uuid(), - 'network_id': _uuid(), - 'fixed_ips': [{'ip_address': '19.4.4.4', - 'subnet_id': _uuid()}], - 'subnet': {'cidr': '19.4.4.0/24', - 'gateway_ip': '19.4.4.1'}} - router = { - 'id': _uuid(), - 'enable_snat': True, - 'routes': [], - 'gw_port': ex_gw_port} - router['distributed'] = False - agent._router_added(router['id'], router) - agent.router_deleted(None, router['id']) - agent._process_router_delete() - self.assertFalse(list(agent.removed_routers)) - def test_destroy_fip_namespace(self): class FakeDev(object): def __init__(self, name): |