From 9837cba9f1d84920fab856ec215886e615e70d2d Mon Sep 17 00:00:00 2001
From: kishan <kishan@cloud.com>
Date: Wed, 22 Dec 2010 20:26:34 +0530
Subject: [PATCH] bug 7504: Add usage events for VM destroy and stop during
 account delete

---
 server/src/com/cloud/vm/UserVmManagerImpl.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index f952c5276dd..c520f4dd438 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -1109,6 +1109,8 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
         if (!destroy(vm)) {
         	return false;
         }
+        UsageEventVO usageEvent = new UsageEventVO(EventTypes.EVENT_VM_DESTROY, vm.getAccountId(), vm.getDataCenterId(), vm.getId(), vm.getName(), vm.getServiceOfferingId(), vm.getTemplateId(), null);
+        _usageEventDao.persist(usageEvent);
         cleanNetworkRules(userId, vmId);
         
         // Mark the VM's disks as destroyed
@@ -1388,6 +1390,9 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
         }
         _eventDao.persist(event);
 
+        UsageEventVO usageEvent = new UsageEventVO(EventTypes.EVENT_VM_STOP, vm.getAccountId(), vm.getDataCenterId(), vm.getId(), vm.getName(), vm.getServiceOfferingId(), vm.getTemplateId(), null);
+        _usageEventDao.persist(usageEvent);
+        
         if (_storageMgr.unshare(vm, null) == null) {
             s_logger.warn("Unable to set share to false for " + vm.toString());
         }