diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-03 06:00:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-03 06:00:05 +0000 |
| commit | c3e81ad7c817c7b8491a393d921184f25ae11318 (patch) | |
| tree | cb4ffa30b08dc5fcdd8af13cb805a9a6109d61ff | |
| parent | 585d13988e0aca74abb6512ef878ead85e88b03b (diff) | |
| parent | e9d76d460634702a627ad3a13fa37d9992772c4b (diff) | |
| download | python-ceilometerclient-c3e81ad7c817c7b8491a393d921184f25ae11318.tar.gz | |
Merge "Add alarm severity in alarm-history output"
| -rw-r--r-- | ceilometerclient/tests/unit/v2/test_shell.py | 1 | ||||
| -rw-r--r-- | ceilometerclient/v2/shell.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ceilometerclient/tests/unit/v2/test_shell.py b/ceilometerclient/tests/unit/v2/test_shell.py index c4a61a8..6cc5985 100644 --- a/ceilometerclient/tests/unit/v2/test_shell.py +++ b/ceilometerclient/tests/unit/v2/test_shell.py @@ -80,6 +80,7 @@ class ShellAlarmHistoryCommandTest(utils.BaseTestCase): '"ok_actions": [], ' '"project_id": "57d04f24d0824b78b1ea9bcecedbda8f", ' '"type": "combination", ' + '"severity": "low", ' '"description": "Combined state of alarms ' '062cc907-3a9f-4867-ab3b-fa83212b39f7"}') ALARM_HISTORY = [{'on_behalf_of': '57d04f24d0824b78b1ea9bcecedbda8f', diff --git a/ceilometerclient/v2/shell.py b/ceilometerclient/v2/shell.py index 7b0e89e..d0256c9 100644 --- a/ceilometerclient/v2/shell.py +++ b/ceilometerclient/v2/shell.py @@ -353,7 +353,7 @@ def alarm_change_detail_formatter(change): if change.type == 'state transition': fields.append('state: %s' % detail['state']) elif change.type == 'creation' or change.type == 'deletion': - for k in ['name', 'description', 'type', 'rule']: + for k in ['name', 'description', 'type', 'rule', 'severity']: if k == 'rule': fields.append('rule: %s' % _display_rule(detail['type'], detail[k])) |