openstack
/
ceilometer
Code Issues Proposed changes

handle list payloads in notifications 

when processing notifications, the assumption is the payload is
always a dict. the odd cases, it's not. we should ignore these
cases.

Change-Id: I8e24d0c0ba42a67f2877051c683358a411f19e48
Closes-Bug: #1484972
This commit is contained in:
gordon chung 2015-08-14 11:28:54 -04:00
parent 30901d6e21
commit c17b294aa9
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ceilometer/sample.py
View File

@ -83,7 +83,8 @@ class Sample(object):
def from_notification(cls, name, type, volume, unit,
user_id, project_id, resource_id,
message, source=None):
metadata = copy.copy(message['payload'])
metadata = (copy.copy(message['payload'])
if isinstance(message['payload'], dict) else {})
metadata['event_type'] = message['event_type']
metadata['host'] = message['publisher_id']
return cls(name=name,

30
ceilometer/tests/unit/test_sample.py
View File

@ -36,3 +36,33 @@ class TestSample(base.BaseTestCase):
'resource_id: 1ca738a1-c49c-4401-8346-5c60ebdb03f4, '
'timestamp: 2014-10-29 14:12:15.485877>')
self.assertEqual(expected, str(self.SAMPLE))
def test_sample_from_notifications_list(self):
msg = {
'event_type': u'sample.create',
'timestamp': u'2015-06-1909: 19: 35.786893',
'payload': [{u'counter_name': u'instance100'}],
'priority': 'info',
'publisher_id': u'ceilometer.api',
'message_id': u'939823de-c242-45a2-a399-083f4d6a8c3e'
}
s = sample.Sample.from_notification(
'sample', 'type', 1.0, '%', 'user', 'project', 'res', msg)
expected = {'event_type': msg['event_type'],
'host': msg['publisher_id']}
self.assertEqual(expected, s.resource_metadata)
def test_sample_from_notifications_dict(self):
msg = {
'event_type': u'sample.create',
'timestamp': u'2015-06-1909: 19: 35.786893',
'payload': {u'counter_name': u'instance100'},
'priority': 'info',
'publisher_id': u'ceilometer.api',
'message_id': u'939823de-c242-45a2-a399-083f4d6a8c3e'
}
s = sample.Sample.from_notification(
'sample', 'type', 1.0, '%', 'user', 'project', 'res', msg)
msg['payload']['event_type'] = msg['event_type']
msg['payload']['host'] = msg['publisher_id']
self.assertEqual(msg['payload'], s.resource_metadata)