summaryrefslogtreecommitdiffstats
path: root/bin/instance-usage-audit
diff options
context:
space:
mode:
authorChuck Short <zulcss@ubuntu.com>2011-09-09 20:48:53 -0400
committerChuck Short <zulcss@ubuntu.com>2011-09-09 20:48:53 -0400
commit965e510e7c3d66efd8d806418ca6a5c2f1c5b94e (patch)
treec2c9594f2168bdf2d99bc7b2bd81ce6455f363b2 /bin/instance-usage-audit
parentc3cb1d38ca4a6f3308503c79e13e3e8688143163 (diff)
parent717f73909ac6ec71b9a9b0234585c862d909d2a0 (diff)
Merge 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,