openstack
/
heat
Code Issues Proposed changes

Fix legacy alarm matching_metadata broken by recent fix. 

The prefix was being computed incorrectly because meter_name is now
being stripped from kwargs. This patch computes the prefix before
kwargs is modified.

Change-Id: I858dd430a4ce4be5cda41b3dd7faa76b8fdf2cfe
Closes-Bug: #1383521
This commit is contained in:
Bill Arnold 2014-10-21 11:30:42 -04:00
parent 6931b69b52
commit bd3078e678
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
heat/engine/resources/ceilometer/alarm.py
View File

@ -221,6 +221,11 @@ class CeilometerAlarm(resource.Resource):
kwargs = actions_to_urls(stack, properties)
kwargs['type'] = 'threshold'
if kwargs.get(self.METER_NAME) in NOVA_METERS:
prefix = 'user_metadata.'
else:
prefix = 'metering.'
rule = {}
for field in ['period', 'evaluation_periods', 'threshold',
'statistic', 'comparison_operator', 'meter_name']:
@ -230,11 +235,6 @@ class CeilometerAlarm(resource.Resource):
mmd = properties.get(self.MATCHING_METADATA) or {}
query = properties.get(self.QUERY) or []
if kwargs.get(self.METER_NAME) in NOVA_METERS:
prefix = 'user_metadata.'
else:
prefix = 'metering.'
# make sure the matching_metadata appears in the query like this:
# {field: metadata.$prefix.x, ...}
for m_k, m_v in six.iteritems(mmd):

18
heat/tests/test_ceilometer_alarm.py
View File

@ -321,6 +321,24 @@ class CeilometerAlarmTest(common.HeatTestCase):
self.m.VerifyAll()
def test_alarm_metadata_prefix(self):
t = template_format.parse(alarm_template)
properties = t['Resources']['MEMAlarmHigh']['Properties']
# Test for bug/1383521, where meter_name is in NOVA_METERS
properties[alarm.CeilometerAlarm.METER_NAME] = 'memory.usage'
properties['matching_metadata'] =\
{'metadata.user_metadata.groupname': 'foo'}
self.stack = self.create_stack(template=json.dumps(t))
rsrc = self.stack['MEMAlarmHigh']
rsrc.properties.data = rsrc.cfn_to_ceilometer(self.stack, properties)
self.assertIsNone(rsrc.properties.data.get('matching_metadata'))
query = rsrc.properties.data['threshold_rule']['query']
expected_query = [{'field': u'metadata.user_metadata.groupname',
'value': u'foo', 'op': 'eq'}]
self.assertEqual(expected_query, query)
def test_mem_alarm_high_correct_matching_metadata(self):
t = template_format.parse(alarm_template)
properties = t['Resources']['MEMAlarmHigh']['Properties']