openstack/deb-ceilometer
Code Issues Proposed changes

Merge "Update alarm history only if change in alarm property"

Browse Source
This commit is contained in:
Jenkins 2015-07-03 09:10:44 +00:00 committed by Gerrit Code Review
commit 1116249c51
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceilometer/api/controllers/v2/alarms.py
View File

@ -459,6 +459,8 @@ class AlarmController(rest.RestController):
def _record_change(self, data, now, on_behalf_of=None, type=None):
if not cfg.CONF.alarm.record_history:
return
if not data:
return
type = type or alarm_models.AlarmChange.RULE_CHANGE
scrubbed_data = utils.stringify_timestamps(data)
detail = json.dumps(scrubbed_data)

22
ceilometer/tests/api/v2/test_alarm_scenarios.py
View File

@ -2182,6 +2182,28 @@ class TestAlarms(v2.FunctionalTest,
history[0]['detail'])
self.assertEqual('low', new_alarm['severity'])
def test_redundant_update_alarm_property_no_history_change(self):
alarm = self._get_alarm('a')
history = self._get_alarm_history(alarm)
self.assertEqual([], history)
self.assertEqual('critical', alarm['severity'])
self._update_alarm(alarm, dict(severity='low'))
new_alarm = self._get_alarm('a')
history = self._get_alarm_history(alarm)
self.assertEqual(1, len(history))
self.assertEqual(jsonutils.dumps({'severity': 'low'}),
history[0]['detail'])
self.assertEqual('low', new_alarm['severity'])
self._update_alarm(alarm, dict(severity='low'))
updated_alarm = self._get_alarm('a')
updated_history = self._get_alarm_history(updated_alarm)
self.assertEqual(1, len(updated_history))
self.assertEqual(jsonutils.dumps({'severity': 'low'}),
updated_history[0]['detail'])
self.assertEqual(history, updated_history)
def test_get_recorded_alarm_history_on_create(self):
new_alarm = {
'name': 'new_alarm',