openstack
/
neutron
Code Issues Proposed changes

Merge "DHCP: fix default dns search name"

This commit is contained in:
Zuul 2019-02-07 20:30:07 +00:00 committed by Gerrit Code Review
parent 4db4adbefb 7fdd6adc7a
commit 5a11d490dc
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,7 +130,8 @@ class DhcpBase(object):
version=None, plugin=None):
self.conf = conf
self.network = network
self.dns_domain = self.network.get('dns_domain', self.conf.dns_domain)
self.dns_domain = (self.network.get('dns_domain') or
self.conf.dns_domain)
self.process_monitor = process_monitor
self.device_manager = DeviceManager(self.conf, plugin)
self.version = version

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

@ -463,10 +463,10 @@ class FakeV4SubnetAgentWithNoDnsProvided(FakeV4Subnet):
class FakeNetworkBase(object):
dns_domain = 'openstacklocal'
dns_domain = ''
def get(self, attr, default=None):
return getattr(self, attr) or default
def get(self, attr):
return getattr(self, attr)
class FakeV4MultipleAgentsWithoutDnsProvided(FakeNetworkBase):
@ -1366,6 +1366,11 @@ class TestDnsmasq(TestBase):
self.safe.assert_has_calls([mock.call(exp_host_name, exp_host_data),
mock.call(exp_addn_name, exp_addn_data)])
def test_spawn_with_dns_domain_default(self):
network = FakeDualNetwork()
self._test_spawn(
['--conf-file=', '--domain=openstacklocal'], network=network)
def test_spawn_with_dns_domain_conf(self):
self.conf.set_override('dns_domain', 'starwars.local')
network = FakeDualNetwork(domain=None)