x/distil
Code Issues Proposed changes

use normal member lookup for resource_id, tenant_id

Browse Source
This commit is contained in:
Chris Forbes 2014-03-21 16:04:23 +13:00
parent cf5b014757
commit db271dcb33
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
artifice/database.py
View File

@ -31,11 +31,10 @@ class Database(object):
in a resource, for all the resources given""" in a resource, for all the resources given"""
for resource in usage: for resource in usage:
resource_id = resource.resource_id
tenant_id = resource.tenant_id
try: try:
for service, volume in resource.usage().iteritems(): for service, volume in resource.usage().iteritems():
resource_id = resource.get("resource_id")
tenant_id = resource.get("tenant_id")
# Have we seen this resource before? # Have we seen this resource before?
query = self.session.query(Resource).\ query = self.session.query(Resource).\
filter(Resource.id == resource_id, filter(Resource.id == resource_id,