diff --git a/ceilometer/compute/manager.py b/ceilometer/compute/manager.py index b354734f1..ec1c1e805 100644 --- a/ceilometer/compute/manager.py +++ b/ceilometer/compute/manager.py @@ -20,6 +20,7 @@ import pkg_resources from nova import manager +from ceilometer.openstack.common import cfg from ceilometer.openstack.common import log from ceilometer import publish @@ -65,7 +66,10 @@ class AgentManager(manager.Manager): LOG.info('polling %s', name) for c in pollster.get_counters(self, instance): LOG.info('COUNTER: %s', c) - publish.publish_counter(context, c) + publish.publish_counter(context, c, + cfg.CONF.metering_topic, + cfg.CONF.metering_secret, + ) except Exception as err: LOG.warning('Continuing after error from %s for %s: %s', name, instance.name, err) diff --git a/tests/compute/test_manager.py b/tests/compute/test_manager.py index 2756ce3fd..177012578 100644 --- a/tests/compute/test_manager.py +++ b/tests/compute/test_manager.py @@ -25,6 +25,8 @@ from ceilometer import counter from ceilometer import publish from ceilometer.tests import base +from ceilometer.openstack.common import cfg + def test_load_plugins(): mgr = manager.AgentManager() @@ -55,8 +57,8 @@ class TestRunTasks(base.TestCase): self.counters.append((manager, instance)) return [self.test_data] - def faux_notify(self, context, msg): - self.notifications.append(msg) + def faux_notify(self, context, msg, topic, secret): + self.notifications.append((msg, topic, secret)) def setUp(self): super(TestRunTasks, self).setUp() @@ -82,5 +84,8 @@ class TestRunTasks(base.TestCase): assert self.Pollster.counters[0][1] is self.instance def test_notifications(self): - assert self.notifications[0] is self.Pollster.test_data - assert len(self.notifications) == 1 + actual = self.notifications + assert actual == [(self.Pollster.test_data, + cfg.CONF.metering_topic, + cfg.CONF.metering_secret, + )] diff --git a/tests/test_publish.py b/tests/test_publish.py index 0d92f4219..ceb76ba99 100644 --- a/tests/test_publish.py +++ b/tests/test_publish.py @@ -53,7 +53,8 @@ class TestPublish(base.TestCase): publish.publish_counter(None, self.test_data, 'metering', - 'not-so-secret') + 'not-so-secret', + ) def test_notify(self): assert len(self.notifications) == 2