openstack
/
neutron
Code Issues Proposed changes

Wrong key router.interface reported by ceilometer 

Ceilometer with MongoDB doesn't accept the key with dot.

The dot in 'router.interface' should be replaced with '_',
which is also the standard implementation of other keys in neutron.

Change-Id: If7fcf7658db9ee2d7d1248bb0b016b4389c32c77
Closes-Bug: #1310460
This commit is contained in:
Li Ma 2014-04-25 00:24:57 -07:00
parent 1f4df4e528
commit 7811c8a8ff
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

@ -446,7 +446,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,
@ -520,7 +520,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

@ -670,7 +670,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)