summaryrefslogtreecommitdiffstats
path: root/bin/instance-usage-audit
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2011-08-31 21:55:12 -0700
committerVishvananda Ishaya <vishvananda@gmail.com>2011-08-31 21:55:12 -0700
commit6180df0663cbb1b0ff4464f9d66d6acd0a64f5bd (patch)
treecee2f971dd886529f65a6502115d501c18da7fc4 /bin/instance-usage-audit
parent642c9ceb1bae9fa5ba008cb69c47f449ea173c3a (diff)
parente0e98075fc520428033e7ebd11eb68d37a4ca5c8 (diff)
downloadnova-6180df0663cbb1b0ff4464f9d66d6acd0a64f5bd.tar.gz
nova-6180df0663cbb1b0ff4464f9d66d6acd0a64f5bd.tar.xz
nova-6180df0663cbb1b0ff4464f9d66d6acd0a64f5bd.zip
merge trunk, fix tests
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,