diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-08-09 12:46:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-08-09 12:46:45 +0000 |
| commit | 9e330726ce6409088f7cbf50f4c76622c2f1732f (patch) | |
| tree | 29fb4cb02f527cc8643504aa0f68f6bcaa245ebf | |
| parent | 9e8a989b2a9e4e7780cc476ac754465c7e8b5a0e (diff) | |
| parent | e8bf783d6aec35a694db491c8df580db54fa4de0 (diff) | |
| download | python-ceilometerclient-1.0.3.tar.gz | |
Merge "Add support for new alarm repeat_actions attribute"1.0.3
| -rw-r--r-- | ceilometerclient/tests/v2/test_alarms.py | 1 | ||||
| -rw-r--r-- | ceilometerclient/v2/alarms.py | 1 | ||||
| -rw-r--r-- | ceilometerclient/v2/shell.py | 10 |
3 files changed, 11 insertions, 1 deletions
diff --git a/ceilometerclient/tests/v2/test_alarms.py b/ceilometerclient/tests/v2/test_alarms.py index f01d3bd..b0c22f4 100644 --- a/ceilometerclient/tests/v2/test_alarms.py +++ b/ceilometerclient/tests/v2/test_alarms.py @@ -41,6 +41,7 @@ AN_ALARM = {u'alarm_actions': [u'http://site:8000/alarm'], u'project_id': u'project-id', u'state_timestamp': u'2013-05-09T13:41:23.085000', u'comparison_operator': 'gt', + u'repeat_actions': False, u'name': 'SwiftObjectAlarm'} CREATE_ALARM = copy.deepcopy(AN_ALARM) del CREATE_ALARM['timestamp'] diff --git a/ceilometerclient/v2/alarms.py b/ceilometerclient/v2/alarms.py index 41c17aa..dde7430 100644 --- a/ceilometerclient/v2/alarms.py +++ b/ceilometerclient/v2/alarms.py @@ -33,6 +33,7 @@ UPDATABLE_ATTRIBUTES = [ 'alarm_actions', 'ok_actions', 'insufficient_data_actions', + 'repeat_actions', 'matching_metadata', ] CREATION_ATTRIBUTES = UPDATABLE_ATTRIBUTES + ['name', 'project_id', 'user_id'] diff --git a/ceilometerclient/v2/shell.py b/ceilometerclient/v2/shell.py index 1ea3e52..3659988 100644 --- a/ceilometerclient/v2/shell.py +++ b/ceilometerclient/v2/shell.py @@ -148,7 +148,7 @@ def _display_alarm(alarm): 'evaluation_periods', 'threshold', 'comparison_operator', 'state', 'enabled', 'alarm_id', 'user_id', 'project_id', 'alarm_actions', 'ok_actions', 'insufficient_data_actions', - 'matching_metadata'] + 'repeat_actions', 'matching_metadata'] data = dict([(f, getattr(alarm, f, '')) for f in fields]) utils.print_dict(data, wrap=72) @@ -205,6 +205,10 @@ def do_alarm_show(cc, args={}): metavar='<Webhook URL>', action='append', default=None, help=('URL to invoke when state transitions to unkown. ' 'May be used multiple times.')) +@utils.arg('--repeat-actions', dest='repeat_actions', metavar='{True|False}', + type=utils.string_to_bool, default=False, + help=('True if actions should be repeatedly notified ' + 'while alarm remains in target state')) @utils.arg('--matching-metadata', dest='matching_metadata', metavar='<Matching Metadata>', action='append', default=None, help=('A meter should match this resource metadata (key=value) ' @@ -249,6 +253,10 @@ def do_alarm_create(cc, args={}): metavar='<Webhook URL>', action='append', default=None, help=('URL to invoke when state transitions to unkown. ' 'May be used multiple times.')) +@utils.arg('--repeat-actions', dest='repeat_actions', + metavar='{True|False}', type=utils.string_to_bool, + help=('True if actions should be repeatedly notified ' + 'while alarm remains in target state')) @utils.arg('--matching-metadata', dest='matching_metadata', metavar='<Matching Metadata>', action='append', default=None, help=('A meter should match this resource metadata (key=value) ' |