openstack
/
neutron
Code Issues Proposed changes

Merge "Ensure dnsmasq is down before enabling it in restart method" into stable/rocky

This commit is contained in:
Zuul 2019-02-13 18:53:04 +00:00 committed by Gerrit Code Review
parent 82c9792cd9 0465269554
commit 04203b6a4f
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,12 +141,12 @@ class DhcpBase(object):
"""Enables DHCP for this network."""
@abc.abstractmethod
def disable(self, retain_port=False):
def disable(self, retain_port=False, block=False):
"""Disable dhcp for this network."""
def restart(self):
"""Restart the dhcp service for the network."""
self.disable(retain_port=True)
self.disable(retain_port=True, block=True)
self.enable()
@abc.abstractproperty
@ -234,10 +234,13 @@ class DhcpLocalProcess(DhcpBase):
pid_file=self.get_conf_file_name('pid'),
run_as_root=True)
def disable(self, retain_port=False):
def disable(self, retain_port=False, block=False):
"""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()
pm = self._get_process_manager()
pm.disable()
if block:
common_utils.wait_until_true(lambda: not pm.active)
if not retain_port:
self._destroy_namespace_and_port()
self._remove_config_files()

6
neutron/tests/unit/agent/linux/test_dhcp.py
View File

@ -1070,8 +1070,8 @@ class TestDhcpBase(TestBase):
def enable(self):
self.called.append('enable')
def disable(self, retain_port=False):
self.called.append('disable %s' % retain_port)
def disable(self, retain_port=False, block=False):
self.called.append('disable %s %s' % (retain_port, block))
def reload_allocations(self):
pass
@ -1082,7 +1082,7 @@ class TestDhcpBase(TestBase):
c = SubClass()
c.restart()
self.assertEqual(c.called, ['disable True', 'enable'])
self.assertEqual(c.called, ['disable True True', 'enable'])
class TestDhcpLocalProcess(TestBase):