From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 7 Apr 2014 21:06:06 +0000 (+0000)
Subject: Merge "Delete routers that are requested but not reported as active"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=26857d5bde72b19d789ed5caa2ea4b6f6750676b;p=openstack-build%2Fneutron-build.git

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

26857d5bde72b19d789ed5caa2ea4b6f6750676b
diff --cc neutron/tests/unit/test_l3_agent.py
index 6ccb64778,25d11845d..d1dffffb4
--- a/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)