openstack/aodh
Code Issues Proposed changes

Merge "Fix the Alarm documentation of Web API V2"

Browse Source
This commit is contained in:
Jenkins
2014-01-24 10:28:32 +00:00
committed by Gerrit Code Review
parent 6b6ee587bc 7b0f1c8779
commit ab632fe536
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ceilometer/api/controllers/v2.py
View File

@@ -1191,7 +1191,9 @@ class Alarm(_Base):
"""Representation of an alarm.
.. note::
combination_rule and threshold_rule are mutually exclusive.
combination_rule and threshold_rule are mutually exclusive. The *type*
of the alarm should be set to *threshold* or *combination* and the
appropriate rule should be filled.
"""
alarm_id = wtypes.text
@@ -1305,9 +1307,9 @@ class Alarm(_Base):
return cls(alarm_id=None,
name="SwiftObjectAlarm",
description="An alarm",
type='threshold',
type='combination',
threshold_rule=None,
combination_rule=None,
combination_rule=AlarmCombinationRule.sample(),
user_id="c96c887c216949acbdfbd8b494863567",
project_id="c96c887c216949acbdfbd8b494863567",
enabled=True,