Re-merging code for generating system-usages to get around bzr merge braindeadness.

1 files changed, 94 insertions, 0 deletions

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 923feaa59..d0e9cdf95 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -50,10 +50,12 @@ from nova import flags
 from nova import log as logging
 from nova import manager
 from nova import network
+from nova import notifier
 from nova import rpc
 from nova import utils
 from nova import volume
 from nova.compute import power_state
+from nova.notifier import api as notifier_api
 from nova.virt import driver
 
 
@@ -275,6 +277,21 @@ class ComputeManager(manager.SchedulerDependentManager):
 
         self._update_launched_at(context, instance_id)
         self._update_state(context, instance_id)
+        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_id=instance_ref['image_id'])
+        notifier_api.notify('compute.%s' % self.host,
+                            'compute.instance.create',
+                            notifier_api.INFO,
+                            usage_info)
 
     @exception.wrap_exception
     @checks_instance_lock
@@ -327,6 +344,21 @@ class ComputeManager(manager.SchedulerDependentManager):
 
         # TODO(ja): should we keep it in a terminated state for a bit?
         self.db.instance_destroy(context, instance_id)
+        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_id=instance_ref['image_id'])
+        notifier_api.notify('compute.%s' % self.host,
+                            'compute.instance.delete',
+                            notifier_api.INFO,
+                            usage_info)
 
     @exception.wrap_exception
     @checks_instance_lock
@@ -354,6 +386,21 @@ class ComputeManager(manager.SchedulerDependentManager):
         self._update_image_id(context, instance_id, image_id)
         self._update_launched_at(context, instance_id)
         self._update_state(context, instance_id)
+        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_id=image_id)
+        notifier_api.notify('compute.%s' % self.host,
+                            'compute.instance.rebuild',
+                            notifier_api.INFO,
+                            usage_info)
 
     @exception.wrap_exception
     @checks_instance_lock
@@ -501,6 +548,21 @@ class ComputeManager(manager.SchedulerDependentManager):
         context = context.elevated()
         instance_ref = self.db.instance_get(context, instance_id)
         self.driver.destroy(instance_ref)
+        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_id=instance_ref['image_id'])
+        notifier_api.notify('compute.%s' % self.host,
+                            'compute.instance.resize.confirm',
+                            notifier_api.INFO,
+                            usage_info)
 
     @exception.wrap_exception
     @checks_instance_lock
@@ -548,6 +610,21 @@ class ComputeManager(manager.SchedulerDependentManager):
         self.driver.revert_resize(instance_ref)
         self.db.migration_update(context, migration_id,
                 {'status': 'reverted'})
+        usage_info = dict(
+              tenant_id=instance_ref['project_id'],
+              user_id=instance_ref['user_id'],
+              instance_id=instance_ref['id'],
+              instance_type=instance_type['name'],
+              instance_type_id=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_id=instance_ref['image_id'])
+        notifier_api.notify('compute.%s' % self.host,
+                            'compute.instance.resize.revert',
+                            notifier_api.INFO,
+                            usage_info)
 
     @exception.wrap_exception
     @checks_instance_lock
@@ -584,6 +661,23 @@ class ComputeManager(manager.SchedulerDependentManager):
                        'migration_id': migration_ref['id'],
                        'instance_id': instance_id, },
                 })
+        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'],
+              new_instance_type=instance_type['name'],
+              new_instance_type_id=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_id=instance_ref['image_id'])
+        notifier_api.notify('compute.%s' % self.host,
+                            'compute.instance.resize.prep',
+                            notifier_api.INFO,
+                            usage_info)
 
     @exception.wrap_exception
     @checks_instance_lock