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
Related-Bug: #1310460
(cherry picked from commit 7811c8a8ff
)
This commit is contained in:
parent
fa41abfda9
commit
96e580deb9
@ -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):
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user