summaryrefslogtreecommitdiffstats
path: root/bin/instance-usage-audit
diff options
context:
space:
mode:
authorBrian Waldon <brian.waldon@rackspace.com>2011-09-01 11:08:41 -0400
committerBrian Waldon <brian.waldon@rackspace.com>2011-09-01 11:08:41 -0400
commit9b3a6c8cda99290f0b7aff740faec0e8544aafe0 (patch)
tree394ba57ffeca1f07303b1a0f261ca0742864524e /bin/instance-usage-audit
parent1c6d74a08dbb5b472e85e3d3a1fe2b3b8b9b89e3 (diff)
parent17de95f0c2b6431a4ae5bf39beb4d3cee2f843b2 (diff)
downloadnova-9b3a6c8cda99290f0b7aff740faec0e8544aafe0.tar.gz
nova-9b3a6c8cda99290f0b7aff740faec0e8544aafe0.tar.xz
nova-9b3a6c8cda99290f0b7aff740faec0e8544aafe0.zip
merging trunk
Diffstat (limited to 'bin/instance-usage-audit')
-rwxr-xr-xbin/instance-usage-audit5
1 files changed, 2 insertions, 3 deletions
diff --git a/bin/instance-usage-audit b/bin/instance-usage-audit
index a06c6b1b3..7ce5732e7 100755
--- a/bin/instance-usage-audit
+++ b/bin/instance-usage-audit
@@ -102,9 +102,8 @@ if __name__ == '__main__':
logging.setup()
begin, end = time_period(FLAGS.instance_usage_audit_period)
print "Creating usages for %s until %s" % (str(begin), str(end))
- instances = db.instance_get_active_by_window(context.get_admin_context(),
- begin,
- end)
+ ctxt = context.get_admin_context()
+ instances = db.instance_get_active_by_window_joined(ctxt, begin, end)
print "%s instances" % len(instances)
for instance_ref in instances:
usage_info = utils.usage_from_instance(instance_ref,