openstack/aodh
Code Issues Proposed changes

update database dispatcher to use events db

Browse Source 
inadvertently left out of previous patch. this patch ensures events
are written to event connection and not metering connection.

Change-Id: Ibcc4a27492f357fc3a6defb812bb22dc34c422c9
This commit is contained in:
gordon chung
2014-10-09 10:49:32 -04:00
parent 6ed5229dd1
commit dc2b44da29
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ceilometer/dispatcher/database.py
View File

@@ -38,7 +38,8 @@ class DatabaseDispatcher(dispatcher.Base):
""" """
def __init__(self, conf): def __init__(self, conf):
super(DatabaseDispatcher, self).__init__(conf) super(DatabaseDispatcher, self).__init__(conf)
self.storage_conn = storage.get_connection_from_config(conf) self.meter_conn = storage.get_connection_from_config(conf, 'metering')
self.event_conn = storage.get_connection_from_config(conf, 'event')
def record_metering_data(self, data): def record_metering_data(self, data):
# We may have receive only one counter on the wire # We may have receive only one counter on the wire
@@ -63,7 +64,7 @@ class DatabaseDispatcher(dispatcher.Base):
if meter.get('timestamp'): if meter.get('timestamp'):
ts = timeutils.parse_isotime(meter['timestamp']) ts = timeutils.parse_isotime(meter['timestamp'])
meter['timestamp'] = timeutils.normalize_time(ts) meter['timestamp'] = timeutils.normalize_time(ts)
self.storage_conn.record_metering_data(meter) self.meter_conn.record_metering_data(meter)
except Exception as err: except Exception as err:
LOG.exception(_('Failed to record metering data: %s'), LOG.exception(_('Failed to record metering data: %s'),
err) err)
@@ -76,4 +77,4 @@ class DatabaseDispatcher(dispatcher.Base):
if not isinstance(events, list): if not isinstance(events, list):
events = [events] events = [events]
return self.storage_conn.record_events(events) return self.event_conn.record_events(events)

21
ceilometer/tests/dispatcher/test_db.py
View File

@@ -15,12 +15,14 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import datetime import datetime
import uuid
import mock import mock
from oslo.config import fixture as fixture_config from oslo.config import fixture as fixture_config
from oslotest import base from oslotest import base
from ceilometer.dispatcher import database from ceilometer.dispatcher import database
from ceilometer.event.storage import models as event_models
from ceilometer.publisher import utils from ceilometer.publisher import utils
@@ -33,6 +35,15 @@ class TestDispatcherDB(base.BaseTestCase):
self.dispatcher = database.DatabaseDispatcher(self.CONF) self.dispatcher = database.DatabaseDispatcher(self.CONF)
self.ctx = None self.ctx = None
def test_event_conn(self):
event = event_models.Event(uuid.uuid4(), 'test',
datetime.datetime(2012, 7, 2, 13, 53, 40),
[])
with mock.patch.object(self.dispatcher.event_conn,
'record_events') as record_events:
self.dispatcher.record_events(event)
self.assertTrue(record_events.called)
def test_valid_message(self): def test_valid_message(self):
msg = {'counter_name': 'test', msg = {'counter_name': 'test',
'resource_id': self.id(), 'resource_id': self.id(),
@@ -43,7 +54,7 @@ class TestDispatcherDB(base.BaseTestCase):
self.CONF.publisher.metering_secret, self.CONF.publisher.metering_secret,
) )
with mock.patch.object(self.dispatcher.storage_conn, with mock.patch.object(self.dispatcher.meter_conn,
'record_metering_data') as record_metering_data: 'record_metering_data') as record_metering_data:
self.dispatcher.record_metering_data(msg) self.dispatcher.record_metering_data(msg)
@@ -62,11 +73,11 @@ class TestDispatcherDB(base.BaseTestCase):
def record_metering_data(self, data): def record_metering_data(self, data):
self.called = True self.called = True
self.dispatcher.storage_conn = ErrorConnection() self.dispatcher.meter_conn = ErrorConnection()
self.dispatcher.record_metering_data(msg) self.dispatcher.record_metering_data(msg)
if self.dispatcher.storage_conn.called: if self.dispatcher.meter_conn.called:
self.fail('Should not have called the storage connection') self.fail('Should not have called the storage connection')
def test_timestamp_conversion(self): def test_timestamp_conversion(self):
@@ -83,7 +94,7 @@ class TestDispatcherDB(base.BaseTestCase):
expected = msg.copy() expected = msg.copy()
expected['timestamp'] = datetime.datetime(2012, 7, 2, 13, 53, 40) expected['timestamp'] = datetime.datetime(2012, 7, 2, 13, 53, 40)
with mock.patch.object(self.dispatcher.storage_conn, with mock.patch.object(self.dispatcher.meter_conn,
'record_metering_data') as record_metering_data: 'record_metering_data') as record_metering_data:
self.dispatcher.record_metering_data(msg) self.dispatcher.record_metering_data(msg)
@@ -104,7 +115,7 @@ class TestDispatcherDB(base.BaseTestCase):
expected['timestamp'] = datetime.datetime(2012, 9, 30, 23, expected['timestamp'] = datetime.datetime(2012, 9, 30, 23,
31, 50, 262000) 31, 50, 262000)
with mock.patch.object(self.dispatcher.storage_conn, with mock.patch.object(self.dispatcher.meter_conn,
'record_metering_data') as record_metering_data: 'record_metering_data') as record_metering_data:
self.dispatcher.record_metering_data(msg) self.dispatcher.record_metering_data(msg)