summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRohit Jaiswal <rohit.jaiswal@hp.com>2015-06-24 18:01:06 +0000
committerRohit Jaiswal <rohit.jaiswal@hp.com>2015-06-24 18:47:41 +0000
commite9d76d460634702a627ad3a13fa37d9992772c4b (patch)
treeac3e0b9fccb4d160804a6f7e07617c17f3bbf15f
parent7e4d2edc970a555b982d7081a95c6a1ada6d58de (diff)
downloadpython-ceilometerclient-e9d76d460634702a627ad3a13fa37d9992772c4b.tar.gz
Add alarm severity in alarm-history output
Info about alarm's severity is missing from the detail column for creation and deletion type of alarm-history call. This fix adds that. Change-Id: I669126596ef7391530e7822c2807ffca7c6a1de1 Closes-Bug: 1468295
-rw-r--r--ceilometerclient/tests/unit/v2/test_shell.py1
-rw-r--r--ceilometerclient/v2/shell.py2
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]))