|
|
|
@ -656,9 +656,14 @@ class TestBasicRouterOperations(base.BaseTestCase):
|
|
|
|
|
|
|
|
|
|
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) |
|
|
|
|
|
|
|
|
|
pm = self.external_process.return_value |
|
|
|
|
pm.reset_mock() |
|
|
|
|
|
|
|
|
|
agent._destroy_router_namespace = mock.MagicMock() |
|
|
|
|
agent._destroy_router_namespaces() |
|
|
|
|
|
|
|
|
|
self.assertEqual(pm.disable.call_count, 2) |
|
|
|
|
|
|
|
|
|
self.assertEqual(agent._destroy_router_namespace.call_count, 2) |
|
|
|
|
|
|
|
|
|
def test_destroy_namespace_with_router_id(self): |
|
|
|
@ -677,11 +682,27 @@ class TestBasicRouterOperations(base.BaseTestCase):
|
|
|
|
|
|
|
|
|
|
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) |
|
|
|
|
|
|
|
|
|
pm = self.external_process.return_value |
|
|
|
|
pm.reset_mock() |
|
|
|
|
|
|
|
|
|
agent._destroy_router_namespace = mock.MagicMock() |
|
|
|
|
agent._destroy_router_namespaces(self.conf.router_id) |
|
|
|
|
|
|
|
|
|
self.assertEqual(pm.disable.call_count, 1) |
|
|
|
|
|
|
|
|
|
self.assertEqual(agent._destroy_router_namespace.call_count, 1) |
|
|
|
|
|
|
|
|
|
def test_destroy_router_namespace_skips_ns_removal(self): |
|
|
|
|
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) |
|
|
|
|
agent._destroy_router_namespace("fakens") |
|
|
|
|
self.assertEqual(self.mock_ip.netns.delete.call_count, 0) |
|
|
|
|
|
|
|
|
|
def test_destroy_router_namespace_removes_ns(self): |
|
|
|
|
self.conf.set_override('router_delete_namespaces', True) |
|
|
|
|
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) |
|
|
|
|
agent._destroy_router_namespace("fakens") |
|
|
|
|
self.mock_ip.netns.delete.assert_called_once_with("fakens") |
|
|
|
|
|
|
|
|
|
def _configure_metadata_proxy(self, enableflag=True): |
|
|
|
|
if not enableflag: |
|
|
|
|
self.conf.set_override('enable_metadata_proxy', False) |
|
|
|
|