x/vmware-nsx
Code Issues Proposed changes

Merge "Prevent stale DHCP directories for dhcp agent nodes"

Browse Source
This commit is contained in:
Jenkins
2013-09-14 03:24:58 +00:00
committed by Gerrit Code Review
parent 932e5b5c82 eea6218e42
commit 6519728486
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -288,14 +288,9 @@ class Dnsmasq(DhcpLocalProcess):
confs_dir = os.path.abspath(os.path.normpath(conf.dhcp_confs))
class FakeNetwork:
def __init__(self, net_id):
self.id = net_id
return [
c for c in os.listdir(confs_dir)
if (uuidutils.is_uuid_like(c) and
cls(conf, FakeNetwork(c), root_helper).active)
if uuidutils.is_uuid_like(c)
]
def spawn_process(self):

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

@@ -940,7 +940,8 @@ tag:tag1,249,%s,%s""".lstrip() % (fake_v6,
result = dhcp.Dnsmasq.existing_dhcp_networks(self.conf, 'sudo')
mock_listdir.assert_called_once_with(path)
self.assertEqual(['aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'],
self.assertEqual(['aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa',
'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb'],
result)
def _check_version(self, cmd_out, expected_value):