diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-02-09 10:09:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-02-09 10:09:23 +0000 |
| commit | 43061608f222eee90860c9449a1a57f661f400b2 (patch) | |
| tree | a509d9e5865dcf04ee3e627a65fd743977a60ac0 | |
| parent | 750c97f9adcfdab827cc2daf2a13d95e3f03a469 (diff) | |
| parent | a51d3f469b409d882842b07badf552182d271b79 (diff) | |
| download | python-ceilometerclient-43061608f222eee90860c9449a1a57f661f400b2.tar.gz | |
Merge "Don't enforce a kind of alarm rules"
| -rw-r--r-- | ceilometerclient/v2/alarms.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ceilometerclient/v2/alarms.py b/ceilometerclient/v2/alarms.py index 238fe41..18cdbb0 100644 --- a/ceilometerclient/v2/alarms.py +++ b/ceilometerclient/v2/alarms.py @@ -32,8 +32,6 @@ UPDATABLE_ATTRIBUTES = [ 'ok_actions', 'insufficient_data_actions', 'repeat_actions', - 'threshold_rule', - 'combination_rule', ] CREATION_ATTRIBUTES = UPDATABLE_ATTRIBUTES + ['project_id', 'user_id', 'time_constraints'] @@ -151,7 +149,8 @@ class AlarmManager(base.Manager): def create(self, **kwargs): self._compat_legacy_alarm_kwargs(kwargs, create=True) new = dict((key, value) for (key, value) in kwargs.items() - if key in CREATION_ATTRIBUTES) + if (key in CREATION_ATTRIBUTES + or key.endswith('_rule'))) return self._create(self._path(), new) def update(self, alarm_id, **kwargs): @@ -163,7 +162,8 @@ class AlarmManager(base.Manager): updated['time_constraints'] = self._merge_time_constraints( updated.get('time_constraints', []), kwargs) kwargs = dict((k, v) for k, v in kwargs.items() - if k in updated and k in UPDATABLE_ATTRIBUTES) + if k in updated and (k in UPDATABLE_ATTRIBUTES + or k.endswith('_rule'))) utils.merge_nested_dict(updated, kwargs, depth=1) return self._update(self._path(alarm_id), updated) |