summaryrefslogtreecommitdiffstats
path: root/bin/instance-usage-audit
diff options
context:
space:
mode:
authorNaveed Massjouni <naveedm9@gmail.com>2011-09-02 01:39:31 -0400
committerNaveed Massjouni <naveedm9@gmail.com>2011-09-02 01:39:31 -0400
commitc5ad2b155a2ad7d7aefea316362cc354d0cf4cf3 (patch)
treeb54c26c6445ddf9d051e9afaa59f5aa2774f2fc8 /bin/instance-usage-audit
parent4f72f6c0fb88baaa680e5dd7973a2b1aa9bd6aaf (diff)
parentd80dc5bbbd1781bd33d9f69b608014e9cc2e41a3 (diff)
downloadnova-c5ad2b155a2ad7d7aefea316362cc354d0cf4cf3.tar.gz
nova-c5ad2b155a2ad7d7aefea316362cc354d0cf4cf3.tar.xz
nova-c5ad2b155a2ad7d7aefea316362cc354d0cf4cf3.zip
Merge from 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,