x/vmware-nsx
Code Issues Proposed changes

Merge "Change to improve dhcp-agent sync_state"

Browse Source
This commit is contained in:
Jenkins 2013-12-06 03:42:29 +00:00 committed by Gerrit Code Review
commit 61b1c9120c
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/agent/dhcp_agent.py
View File

@ -164,6 +164,8 @@ class DhcpAgent(manager.Manager):
for network in active_networks:
pool.spawn_n(self.safe_configure_dhcp_for_network, network)
pool.waitall()
LOG.info(_('Synchronizing state complete'))
except Exception:
self.needs_resync = True

16
neutron/tests/unit/test_dhcp_agent.py
View File

@ -276,6 +276,22 @@ class TestDhcpAgent(base.BaseTestCase):
def test_sync_state_disabled_net(self):
self._test_sync_state_helper(['b'], ['a'])
def test_sync_state_waitall(self):
class mockNetwork():
id = '0'
admin_state_up = True
subnets = []
def __init__(self, id):
self.id = id
with mock.patch.object(dhcp_agent.eventlet.GreenPool, 'waitall') as w:
active_networks = [mockNetwork('1'), mockNetwork('2'),
mockNetwork('3'), mockNetwork('4'),
mockNetwork('5')]
known_networks = ['1', '2', '3', '4', '5']
self._test_sync_state_helper(known_networks, active_networks)
w.assert_called_once_with()
def test_sync_state_plugin_error(self):
with mock.patch(DHCP_PLUGIN) as plug:
mock_plugin = mock.Mock()