openstack/aodh
Code Issues Proposed changes

Merge "api: record severity change in alarm history"

Browse Source
This commit is contained in:
Jenkins 2015-05-06 20:07:01 +00:00 committed by Gerrit Code Review
commit 62727d8b0f
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -522,8 +522,6 @@ class AlarmController(rest.RestController):
else:
data.state_timestamp = alarm_in.state_timestamp
alarm_in.severity = data.severity
# make sure alarms are unique by name per project.
if alarm_in.name != data.name:
alarms = list(self.conn.get_alarms(name=data.name,

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

@ -2178,6 +2178,20 @@ class TestAlarms(v2.FunctionalTest,
history = self._get_alarm_history(alarm)
self.assertEqual(1, len(history))
def test_record_alarm_history_severity(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'])
def test_get_recorded_alarm_history_on_create(self):
new_alarm = {
'name': 'new_alarm',