openstack
/
neutron
Code Issues Proposed changes

Merge "Fix dhcp config dir removed too soon"

This commit is contained in:
Jenkins 2015-03-09 20:05:21 +00:00 committed by Gerrit Code Review
parent 96716b5f4e c2a768bab7
commit 982698b489
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
neutron/agent/linux/dhcp.py
View File

@ -219,10 +219,9 @@ class DhcpLocalProcess(DhcpBase):
"""Disable DHCP for this network by killing the local process."""
self.process_monitor.unregister(self.network.id, DNSMASQ_SERVICE_NAME)
self._get_process_manager().disable()
self._remove_config_files()
if not retain_port:
self._destroy_namespace_and_port()
self._remove_config_files()
def _destroy_namespace_and_port(self):
try:

24
neutron/tests/unit/test_linux_dhcp.py
View File

@ -622,6 +622,7 @@ class TestBase(base.BaseTestCase):
self.makedirs = mock.patch('os.makedirs').start()
self.isdir = mock.patch('os.path.isdir').start()
self.isdir.return_value = False
self.rmtree = mock.patch('shutil.rmtree').start()
self.external_process = mock.patch(
'neutron.agent.linux.external_process.ProcessManager').start()
@ -775,6 +776,18 @@ class TestDhcpLocalProcess(TestBase):
ip.return_value.netns.delete.assert_called_with('qdhcp-ns')
def test_disable_config_dir_removed_after_destroy(self):
parent = mock.MagicMock()
parent.attach_mock(self.rmtree, 'rmtree')
parent.attach_mock(self.mock_mgr, 'DeviceManager')
lp = LocalChild(self.conf, FakeDualNetwork())
lp.disable(retain_port=False)
expected = [mock.call.DeviceManager().destroy(mock.ANY, mock.ANY),
mock.call.rmtree(mock.ANY, ignore_errors=True)]
parent.assert_has_calls(expected)
def test_get_interface_name(self):
with mock.patch('__builtin__.open') as mock_open:
mock_open.return_value.__enter__ = lambda s: s
@ -1352,13 +1365,10 @@ class TestDnsmasq(TestBase):
net = FakeV4Network()
path = '/opt/data/neutron/dhcp'
self.conf.dhcp_confs = path
with mock.patch('shutil.rmtree') as rmtree:
lp = LocalChild(self.conf, net)
lp._remove_config_files()
rmtree.assert_called_once_with(os.path.join(path, net.id),
ignore_errors=True)
lp = LocalChild(self.conf, net)
lp._remove_config_files()
self.rmtree.assert_called_once_with(os.path.join(path, net.id),
ignore_errors=True)
def test_existing_dhcp_networks(self):
path = '/opt/data/neutron/dhcp'