openstack/deb-python-ceilometerclient
Code Issues Proposed changes

Merge "Don't enforce a kind of alarm rules"

Browse Source
This commit is contained in:
Jenkins
2015-02-09 10:09:23 +00:00
committed by Gerrit Code Review
parent 750c97f9ad a51d3f469b
commit 43061608f2
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ceilometerclient/v2/alarms.py
View File

@@ -32,8 +32,6 @@ UPDATABLE_ATTRIBUTES = [
'ok_actions', 'ok_actions',
'insufficient_data_actions', 'insufficient_data_actions',
'repeat_actions', 'repeat_actions',
'threshold_rule',
'combination_rule',
] ]
CREATION_ATTRIBUTES = UPDATABLE_ATTRIBUTES + ['project_id', 'user_id', CREATION_ATTRIBUTES = UPDATABLE_ATTRIBUTES + ['project_id', 'user_id',
'time_constraints'] 'time_constraints']
@@ -151,7 +149,8 @@ class AlarmManager(base.Manager):
def create(self, **kwargs): def create(self, **kwargs):
self._compat_legacy_alarm_kwargs(kwargs, create=True) self._compat_legacy_alarm_kwargs(kwargs, create=True)
new = dict((key, value) for (key, value) in kwargs.items() 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) return self._create(self._path(), new)
def update(self, alarm_id, **kwargs): def update(self, alarm_id, **kwargs):
@@ -163,7 +162,8 @@ class AlarmManager(base.Manager):
updated['time_constraints'] = self._merge_time_constraints( updated['time_constraints'] = self._merge_time_constraints(
updated.get('time_constraints', []), kwargs) updated.get('time_constraints', []), kwargs)
kwargs = dict((k, v) for k, v in kwargs.items() 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) utils.merge_nested_dict(updated, kwargs, depth=1)
return self._update(self._path(alarm_id), updated) return self._update(self._path(alarm_id), updated)