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 D706410D9A for ; Thu, 28 Nov 2013 10:29:19 +0000 (UTC) Received: (qmail 66731 invoked by uid 500); 28 Nov 2013 10:29:19 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 66642 invoked by uid 500); 28 Nov 2013 10:29:18 -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 66633 invoked by uid 99); 28 Nov 2013 10:29:17 -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, 28 Nov 2013 10:29:17 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7263590F7CA; Thu, 28 Nov 2013 10:29:17 +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: <37a0e44e787a44cbbdb8cfae0ba4bb76@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 6bda273 Date: Thu, 28 Nov 2013 10:29:17 +0000 (UTC) Updated Branches: refs/heads/master 81c07f179 -> 6bda2739c CLOUDSTACK-5302. listHosts API response - value of cpuallocated is always 0% Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6bda2739 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6bda2739 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6bda2739 Branch: refs/heads/master Commit: 6bda2739c82724db6510d8a593ccc0a5f8e8b992 Parents: 81c07f1 Author: Likitha Shetty Authored: Thu Nov 28 15:40:05 2013 +0530 Committer: Likitha Shetty Committed: Thu Nov 28 15:52:42 2013 +0530 ---------------------------------------------------------------------- server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6bda2739/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java index 3112702..1b95d9b 100644 --- a/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java @@ -109,7 +109,7 @@ public class HostJoinDaoImpl extends GenericDaoBase implements if (details.contains(HostDetails.all) || details.contains(HostDetails.capacity)) { // set allocated capacities Long mem = host.getMemReservedCapacity() + host.getMemUsedCapacity(); - Long cpu = host.getCpuReservedCapacity() + host.getCpuReservedCapacity(); + Long cpu = host.getCpuReservedCapacity() + host.getCpuUsedCapacity(); hostResponse.setMemoryAllocated(mem); hostResponse.setMemoryTotal(host.getTotalMemory());