openstack/deb-aodh
Code Issues Proposed changes

fix use of source value in mongdb driver

Browse Source 
Change-Id: I00b3c1c8af7b154516fea4ddb3f588ce2df5e46c
Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
This commit is contained in:
Doug Hellmann
2012-07-26 15:39:57 -04:00
parent 2fe0a3c3ef
commit ab1437fbbc
2 changed files with 54 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ceilometer/storage/impl_mongodb.py
View File

@@ -230,6 +230,7 @@ class Connection(base.Connection):
# last updated.
'timestamp': timestamp,
'metadata': data['resource_metadata'],
'source': data['source'],
},
'$addToSet': {'meter': {'counter_name': data['counter_name'],
'counter_type': data['counter_type'],
@@ -248,20 +249,24 @@ class Connection(base.Connection):
:param source: Optional source filter.
"""
q = {}
if source is not None:
q['source'] = source
return self.db.user.distinct('_id')
q = {'source': source,
}
return self.db.user.find(q).distinct('_id')
else:
return self.db.user.distinct('_id')
def get_projects(self, source=None):
"""Return an iterable of project id strings.
:param source: Optional source filter.
"""
q = {}
if source is not None:
q['source'] = source
return self.db.project.distinct('_id')
q = {'source': source,
}
return self.db.project.find(q).distinct('_id')
else:
return self.db.project.distinct('_id')
def get_resources(self, user=None, project=None, source=None):
"""Return an iterable of dictionaries containing resource information.