You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by li...@apache.org on 2013/07/11 06:48:02 UTC
git commit: updated refs/heads/master-6-17-stable to b560369
Updated Branches:
refs/heads/master-6-17-stable b4cd6f097 -> b560369b3
CLOUDSTACK-3423. Publish 'VM.UPGRADE' usage event every time the service offering of a VM is upgraded.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b560369b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b560369b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b560369b
Branch: refs/heads/master-6-17-stable
Commit: b560369b31000a06ca5d0665d67d65845cd29bce
Parents: b4cd6f0
Author: Likitha Shetty <li...@citrix.com>
Authored: Thu Jul 11 10:03:57 2013 +0530
Committer: Likitha Shetty <li...@citrix.com>
Committed: Thu Jul 11 10:07:02 2013 +0530
----------------------------------------------------------------------
server/src/com/cloud/vm/UserVmManagerImpl.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b560369b/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 5b2b283..3a695f3 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -819,6 +819,10 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use
_resourceLimitMgr.decrementResourceCount(caller.getAccountId(), ResourceType.memory, new Long (currentMemory - newMemory));
}
+ // Generate usage event for VM upgrade
+ UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VM_UPGRADE, vmInstance.getAccountId(), vmInstance.getDataCenterId(), vmInstance.getId(), vmInstance.getHostName(),
+ vmInstance.getServiceOfferingId(), vmInstance.getTemplateId(), vmInstance.getHypervisorType().toString(), VirtualMachine.class.getName(), vmInstance.getUuid());
+
return _vmDao.findById(vmInstance.getId());
}