Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A1BF3C093 for ; Thu, 11 Jul 2013 04:41:26 +0000 (UTC) Received: (qmail 44392 invoked by uid 500); 11 Jul 2013 04:41:26 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 44375 invoked by uid 500); 11 Jul 2013 04:41:20 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 44368 invoked by uid 99); 11 Jul 2013 04:41:19 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Jul 2013 04:41:19 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D269C88CDED; Thu, 11 Jul 2013 04:41:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: likithas@apache.org To: commits@cloudstack.apache.org Message-Id: <86afa3f4e41e457ba19ad49245e70848@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.2 to 8eac039 Date: Thu, 11 Jul 2013 04:41:18 +0000 (UTC) Updated Branches: refs/heads/4.2 4d4bd8a26 -> 8eac039d8 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/8eac039d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8eac039d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8eac039d Branch: refs/heads/4.2 Commit: 8eac039d868c1dd2e56c27c6d9cb8e0715295818 Parents: 4d4bd8a Author: Likitha Shetty Authored: Thu Jul 11 10:03:57 2013 +0530 Committer: Likitha Shetty Committed: Thu Jul 11 10:05:08 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/8eac039d/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 0486071..53b4b6e 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -818,6 +818,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()); }