Merge "Sets storage_conn in CollectorService."

openstack · Jul 24, 2013 · a4b1b54 · a4b1b54
2 parents 3589de7 + d73b1c5
commit a4b1b54
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git 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
@@ -127,6 +127,10 @@ def setUp(self):
             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 @@ def setUp(self):
         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