openstack
/
astara
Code Issues Proposed changes

Merge "Properly limit router driver event processing"

This commit is contained in:
Jenkins 2016-03-17 02:39:32 +00:00 committed by Gerrit Code Review
parent d11cc791e6 d55ffba180
commit f4361d459d
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
astara/drivers/router.py
View File

@ -68,12 +68,16 @@ _ROUTER_INTERFACE_NOTIFICATIONS = set([
])
_ROUTER_INTERESTING_NOTIFICATIONS = set([
'router.change.end',
'subnet.create.end',
'subnet.change.end',
'subnet.delete.end',
'port.create.end',
'port.change.end',
'port.delete.end',
'floatingip.create.end',
'floatingip.change.end',
'floatingip.delete.end'
])
@ -283,8 +287,6 @@ class Router(BaseDriver):
router_id = payload.get('router.interface', {}).get('id')
elif event_type in _ROUTER_INTERESTING_NOTIFICATIONS:
crud = event.UPDATE
elif event_type.endswith('.end'):
crud = event.UPDATE
else:
LOG.debug('Not processing event: %s' % event_type)
return

13
astara/test/unit/drivers/test_router.py
View File

@ -294,19 +294,6 @@ class RouterDriverTest(base.RugTestBase):
)
self._test_notification(notification, payload, e)
def test_process_notification_arbitrary_end_event(self):
payload = {'router': {'id': 'fake_router_id'}}
r = event.Resource(
driver=router.Router.RESOURCE_NAME,
id='fake_router_id',
tenant_id='fake_tenant_id')
e = event.Event(
resource=r,
crud=event.UPDATE,
body=payload,
)
self._test_notification('foo.bar.end', payload, e)
def test_process_notification_not_subscribed(self):
payload = {'router': {'id': 'fake_router_id'}}
self._test_notification('whocares.about.this', payload, None)