From d73b1c5e6b45db7db33a1dfc91fe3d6e3aaf1f12 Mon Sep 17 00:00:00 2001 From: Andrew Melton Date: Tue, 23 Jul 2013 11:10:37 -0400 Subject: [PATCH] Sets storage_conn in CollectorService. Fixes bug 1204133 Storage_conn was not being set when the CollectorService was instantiated, thus enabling event storage would cause exceptions when trying to store the event. Change-Id: Ie7f84e1c266239cf7052fd5aba55577a257d2b1b --- ceilometer/collector/service.py | 1 + tests/collector/test_service.py | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/ceilometer/collector/service.py b/ceilometer/collector/service.py index 3c646d86..f920a4f3 100644 --- a/ceilometer/collector/service.py +++ b/ceilometer/collector/service.py @@ -114,6 +114,7 @@ class CollectorService(rpc_service.Service): def __init__(self, host, topic, manager=None): super(CollectorService, self).__init__(host, topic, manager) + self.storage_conn = storage.get_connection(cfg.CONF) def start(self): super(CollectorService, self).start() diff --git a/tests/collector/test_service.py b/tests/collector/test_service.py index 9882fe47..a0fb18c4 100644 --- a/tests/collector/test_service.py +++ b/tests/collector/test_service.py @@ -127,6 +127,10 @@ class TestUDPCollectorService(TestCollector): resource_metadata={}, )._asdict()) + def test_service_has_storage_conn(self): + srv = service.UDPCollectorService() + self.assertIsNotNone(srv.storage_conn) + def test_udp_receive(self): self.srv.storage_conn = self.mox.CreateMock(base.Connection) self.counter['source'] = 'mysource' @@ -175,6 +179,11 @@ class TestCollectorService(TestCollector): self.srv = service.CollectorService('the-host', 'the-topic') self.ctx = None + def test_service_has_storage_conn(self): + # Test an unmocked default CollectorService + srv = service.CollectorService('the-host', 'the-topic') + self.assertIsNotNone(srv.storage_conn) + @patch('ceilometer.pipeline.setup_pipeline', MagicMock()) def test_init_host(self): # If we try to create a real RPC connection, init_host() never