summaryrefslogtreecommitdiffstats
path: root/bin/instance-usage-audit
diff options
context:
space:
mode:
authorDan Wendlandt <dan@nicira.com>2011-09-07 14:27:06 -0700
committerDan Wendlandt <dan@nicira.com>2011-09-07 14:27:06 -0700
commit0f5eb3f888de5f6eb23f968fa5a2270d2a350bcc (patch)
tree0ee3f8a60147da042b0b14db350a320228876fa6 /bin/instance-usage-audit
parente5e3b306985a3b1fdd8a971f48b76eaf8f923f21 (diff)
parent3e0698e3b57c9f73a359340f51c2797d8adc669a (diff)
downloadnova-0f5eb3f888de5f6eb23f968fa5a2270d2a350bcc.tar.gz
nova-0f5eb3f888de5f6eb23f968fa5a2270d2a350bcc.tar.xz
nova-0f5eb3f888de5f6eb23f968fa5a2270d2a350bcc.zip
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,