openstack/heat
Code Issues Proposed changes

heat DB : make watch_data_get_all work with no watch ID

Browse Source 
Align watch_data_get_all with other "all" methods, and
return all watch data without requiring an ID.  We may
also need by_id and by_name variants but this is more
consistent and makes things easier for cloudwatch.

Change-Id: I09c90278349efc769ab7c719f686a1fd854b425a
Signed-off-by: Steven Hardy <shardy@redhat.com>
This commit is contained in:
Steven Hardy 2012-08-22 20:14:11 +01:00
parent 9b14adc222
commit bb6e0b11c6
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
heat/db/api.py
View File

@ -163,8 +163,8 @@ def watch_data_create(context, values):
return IMPL.watch_data_create(context, values)
def watch_data_get_all(context, watch_id):
return IMPL.watch_data_get_all(context, watch_id)
def watch_data_get_all(context):
return IMPL.watch_data_get_all(context)
def watch_data_delete(context, watch_name):

6
heat/db/sqlalchemy/api.py
View File

@ -298,10 +298,8 @@ def watch_data_create(context, values):
return obj_ref
def watch_data_get_all(context, watch_id):
# get dataset ordered by creation_at (most recient first)
results = model_query(context, models.WatchData).\
filter_by(watch_rule_id=watch_id).all()
def watch_data_get_all(context):
results = model_query(context, models.WatchData).all()
return results