From: Li Ma <skywalker.nick@gmail.com>
Date: Fri, 25 Apr 2014 07:24:57 +0000 (-0700)
Subject: Wrong key router.interface reported by ceilometer
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=7811c8a8ffce78dc14815203858854c450f1c8f6;p=openstack-build%2Fneutron-build.git

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
---

diff --git a/neutron/db/l3_db.py b/neutron/db/l3_db.py
index a1d4c6d13..beebaee87 100644
--- a/neutron/db/l3_db.py
+++ b/neutron/db/l3_db.py
@@ -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):
diff --git a/neutron/tests/unit/test_l3_plugin.py b/neutron/tests/unit/test_l3_plugin.py
index 25be9cddc..23ea42d50 100644
--- a/neutron/tests/unit/test_l3_plugin.py
+++ b/neutron/tests/unit/test_l3_plugin.py
@@ -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)