openstack
/
neutron
Code Issues Proposed changes

Merge "Wrong key router.interface reported by ceilometer" into stable/icehouse

This commit is contained in:
Jenkins 2014-06-15 03:22:28 +00:00 committed by Gerrit Code Review
parent ec8ae9698f 96e580deb9
commit 1bbae9d8ce
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/db/l3_db.py
View File

@ -366,7 +366,7 @@ class L3_NAT_db_mixin(l3.RouterPluginBase):
notifier_api.publisher_id('network'),
'router.interface.create',
notifier_api.CONF.default_notification_level,
{'router.interface': info})
{'router_interface': info})
return info
def _confirm_router_interface_not_in_use(self, context, router_id,
@ -440,7 +440,7 @@ class L3_NAT_db_mixin(l3.RouterPluginBase):
notifier_api.publisher_id('network'),
'router.interface.delete',
notifier_api.CONF.default_notification_level,
{'router.interface': info})
{'router_interface': info})
return info
def _get_floatingip(self, context, id):

2
neutron/tests/unit/test_l3_plugin.py
View File

@ -640,7 +640,7 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
for n in test_notifier.NOTIFICATIONS:
if n['event_type'].startswith('router.interface.'):
payload = n['payload']['router.interface']
payload = n['payload']['router_interface']
self.assertIn('id', payload)
self.assertEqual(payload['id'], r['router']['id'])
self.assertIn('tenant_id', payload)