summaryrefslogtreecommitdiffstats
path: root/bin/instance-usage-audit
diff options
context:
space:
mode:
authorAnthony Young <sleepsonthefloor@gmail.com>2011-08-31 19:28:57 -0700
committerAnthony Young <sleepsonthefloor@gmail.com>2011-08-31 19:28:57 -0700
commitb4b03e0beb873a0f4853f0da6a64b9bb388d73e8 (patch)
tree71e65f654dde873c4c50e91f29764867d3a55866 /bin/instance-usage-audit
parentced3ea3e8d7cf02f988d968d6078182815226719 (diff)
parente0e98075fc520428033e7ebd11eb68d37a4ca5c8 (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,