diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-09-08 11:32:11 -0400 |
|---|---|---|
| committer | Brian Waldon <brian.waldon@rackspace.com> | 2011-09-08 11:32:11 -0400 |
| commit | 6cbbdb909443a33c2af8ddd73b861cd41201fa0b (patch) | |
| tree | 1cbfd4f00a075bee39a5992ff9b190b6dbaeea6e | |
| parent | bb3b61b61dc4b45fba4bdab7ead69af239eac40a (diff) | |
| download | nova-6cbbdb909443a33c2af8ddd73b861cd41201fa0b.tar.gz nova-6cbbdb909443a33c2af8ddd73b861cd41201fa0b.tar.xz nova-6cbbdb909443a33c2af8ddd73b861cd41201fa0b.zip | |
adding can_read_deleted back to db api
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 523258841..1730b4ddb 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -1277,6 +1277,10 @@ def instance_get_all_by_filters(context, filters): changes_since = filters['changes-since'] query_prefix = query_prefix.\ filter(models.Instance.updated_at > changes_since) + else: + # filter out deleted instances if no changes-since filter provided + query_prefix = query_prefix.\ + filter_by(deleted=can_read_deleted(context)) if not context.is_admin: # If we're not admin context, add appropriate filter.. |