Merge "Delete routers that are requested but not reported as active"

diff --cc neutron/agent/l3_agent.py
Simple merge

diff --cc neutron/tests/unit/test_l3_agent.py
index 6ccb64778cba4bdc29b824d95ce49b8e35492875,25d11845da356214283009ace2d693548ec9886f..d1dffffb4cb187ea2c3be502387eef6ba5f1fca2
--- 1/neutron/tests/unit/test_l3_agent.py
--- 2/neutron/tests/unit/test_l3_agent.py
+++ b/neutron/tests/unit/test_l3_agent.py
@@@ -892,20 -867,9 +892,9 @@@ class TestBasicRouterOperations(base.Ba
          self.mock_driver.unplug.assert_called_with(
              stale_devnames[0],
              bridge="br-ex",
 -            namespace=ri.ns_name(),
 +            namespace=ri.ns_name,
              prefix=l3_agent.EXTERNAL_DEV_PREFIX)
  
-     def test_routers_with_admin_state_down(self):
-         agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
-         self.plugin_api.get_external_network_id.return_value = None
- 
-         routers = [
-             {'id': _uuid(),
-              'admin_state_up': False,
-              'external_gateway_info': {}}]
-         agent._process_routers(routers)
-         self.assertNotIn(routers[0]['id'], agent.router_info)
- 
      def test_router_deleted(self):
          agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
          agent.router_deleted(None, FAKE_ID)