Refactored usage generation

1 files changed, 3 insertions, 13 deletions

diff --git a/bin/instance-usage-audit b/bin/instance-usage-audit
index 1fa2c2186..a06c6b1b3 100755
--- a/bin/instance-usage-audit
+++ b/bin/instance-usage-audit
@@ -107,19 +107,9 @@ if __name__ == '__main__':
                                                  end)
     print "%s instances" % len(instances)
     for instance_ref in instances:
-        usage_info = dict(
-              tenant_id=instance_ref['project_id'],
-              user_id=instance_ref['user_id'],
-              instance_id=instance_ref['id'],
-              instance_type=instance_ref['instance_type']['name'],
-              instance_type_id=instance_ref['instance_type_id'],
-              display_name=instance_ref['display_name'],
-              created_at=str(instance_ref['created_at']),
-              launched_at=str(instance_ref['launched_at']) \
-                          if instance_ref['launched_at'] else '',
-              image_ref=instance_ref['image_ref'],
-              audit_period_begining=str(begin),
-              audit_period_ending=str(end))
+        usage_info = utils.usage_from_instance(instance_ref,
+                              audit_period_begining=str(begin),
+                              audit_period_ending=str(end))
         notifier_api.notify('compute.%s' % FLAGS.host,
                             'compute.instance.exists',
                             notifier_api.INFO,