summaryrefslogtreecommitdiffstats
path: root/bin/instance-usage-audit
diff options
context:
space:
mode:
authorTushar Patil <tushar.vitthal.patil@gmail.com>2011-09-15 10:43:42 -0700
committerTushar Patil <tushar.vitthal.patil@gmail.com>2011-09-15 10:43:42 -0700
commitf8d751de0aef0b7b6afc9a2f0d8c427de24bb3a6 (patch)
tree94f17f2ece7297cace3e5a42a400e0410bd5b0c6 /bin/instance-usage-audit
parent5579ade405ce3318d4a5d33e68e39ee76c80b27c (diff)
parentc3654d48f8278d96003bf1d7d3a4bcbe2354f0b5 (diff)
downloadnova-f8d751de0aef0b7b6afc9a2f0d8c427de24bb3a6.tar.gz
nova-f8d751de0aef0b7b6afc9a2f0d8c427de24bb3a6.tar.xz
nova-f8d751de0aef0b7b6afc9a2f0d8c427de24bb3a6.zip
Merged from trunk and resolved conflicts
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,