openstack
/
neutron
Code Issues Proposed changes

Merge "Fix l3 agent to not create already deleted router"

This commit is contained in:
Jenkins 2015-06-23 08:16:03 +00:00 committed by Gerrit Code Review
parent 4d734cbbcd 74b0c53da5
commit 364e7bb4f0
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
neutron/agent/l3/agent.py
View File

@ -445,7 +445,8 @@ class L3NATAgent(firewall_l3_agent.FWaaSL3AgentRpcCallback,
def _process_router_update(self):
for rp, update in self._queue.each_update_to_next_router():
LOG.debug("Starting router update for %s", update.id)
LOG.debug("Starting router update for %s, action %s, priority %s",
update.id, update.action, update.priority)
router = update.router
if update.action != queue.DELETE_ROUTER and not router:
try:
@ -468,6 +469,12 @@ class L3NATAgent(firewall_l3_agent.FWaaSL3AgentRpcCallback,
# one router by sticking the update at the end of the queue
# at a lower priority.
self.fullsync = True
else:
# need to update timestamp of removed router in case
# there are older events for the same router in the
# processing queue (like events from fullsync) in order to
# prevent deleted router re-creation
rp.fetched_and_processed(update.timestamp)
continue
try:

17
neutron/tests/unit/agent/l3/test_agent.py
View File

@ -1707,6 +1707,23 @@ class TestBasicRouterOperations(BasicRouterOperationsFramework):
agent._process_router_update()
self.assertTrue(agent.fullsync)
def test_process_routers_update_router_deleted(self):
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
agent._queue = mock.Mock()
update = mock.Mock()
update.router = None
update.action = 1 # ROUTER_DELETED
router_info = mock.MagicMock()
agent.router_info[update.id] = router_info
router_processor = mock.Mock()
agent._queue.each_update_to_next_router.side_effect = [
[(router_processor, update)]]
agent._process_router_update()
router_info.delete.assert_called_once_with(agent)
self.assertFalse(agent.router_info)
router_processor.fetched_and_processed.assert_called_once_with(
update.timestamp)
def test_process_router_if_compatible_with_no_ext_net_in_conf(self):
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
self.plugin_api.get_external_network_id.return_value = 'aaa'