Merge "Fix a typo in log exception in the metering agent"

neutron/services/metering/agents/metering_agent.py

@@ -175,9 +175,13 @@ class MeteringAgent(MeteringPluginRpc, manager.Manager):
     def _invoke_driver(self, context, meterings, func_name):
         try:
             return getattr(self.metering_driver, func_name)(context, meterings)
-        except RuntimeError:
+        except AttributeError:
             LOG.exception(_("Driver %(driver)s does not implement %(func)s"),
-                          {'driver': cfg.CONF.metering_driver,
+                          {'driver': self.conf.driver,
+                           'func': func_name})
+        except RuntimeError:
+            LOG.exception(_("Driver %(driver)s:%(func)s runtime error"),
+                          {'driver': self.conf.driver,
                            'func': func_name})
 
     @periodic_task.periodic_task(run_immediately=True)

neutron/tests/unit/services/metering/test_metering_agent.py

@@ -132,3 +132,39 @@ class TestMeteringOperations(base.BaseTestCase):
         self.assertEqual(self.driver.remove_router.call_count, 1)
 
         self.agent._add_metering_info.assert_called_with(label_id, 44, 222)
+
+
+class TestMeteringDriver(base.BaseTestCase):
+    def setUp(self):
+        super(TestMeteringDriver, self).setUp()
+        cfg.CONF.register_opts(metering_agent.MeteringAgent.Opts)
+        config.register_root_helper(cfg.CONF)
+
+        self.noop_driver = ('neutron.services.metering.drivers.noop.'
+                            'noop_driver.NoopMeteringDriver')
+        cfg.CONF.set_override('driver', self.noop_driver)
+
+        self.agent = metering_agent.MeteringAgent('my agent', cfg.CONF)
+        self.driver = mock.Mock()
+        self.agent.metering_driver = self.driver
+
+        self.addCleanup(mock.patch.stopall)
+
+    def test_add_metering_label_with_bad_driver_impl(self):
+        del self.driver.add_metering_label
+
+        with mock.patch.object(metering_agent, 'LOG') as log:
+            self.agent.add_metering_label(None, ROUTERS)
+            log.exception.assert_called_with(mock.ANY,
+                                             {'driver': self.noop_driver,
+                                              'func': 'add_metering_label'})
+
+    def test_add_metering_label_runtime_error(self):
+        self.driver.add_metering_label.side_effect = RuntimeError
+
+        with mock.patch.object(metering_agent, 'LOG') as log:
+            self.agent.add_metering_label(None, ROUTERS)
+            log.exception.assert_called_with(mock.ANY,
+                                             {'driver': self.noop_driver,
+                                              'func':
+                                              'add_metering_label'})