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 6DC40D503 for ; Wed, 22 May 2013 10:06:11 +0000 (UTC) Received: (qmail 82227 invoked by uid 500); 22 May 2013 10:06:11 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 82024 invoked by uid 500); 22 May 2013 10:06:10 -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 81987 invoked by uid 99); 22 May 2013 10:06:10 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 May 2013 10:06:10 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 655B5892D49; Wed, 22 May 2013 10:06:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: nitin@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to a67728b Date: Wed, 22 May 2013 10:06:09 +0000 (UTC) Updated Branches: refs/heads/master 4e0907964 -> a67728b31 CLOUDSTACK-2567 - check for ! dmcEnabled. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a67728b3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a67728b3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a67728b3 Branch: refs/heads/master Commit: a67728b312fbf3a4e6e7f7fb3914a45d22997dbf Parents: 4e09079 Author: Nitin Mehta Authored: Wed May 22 15:30:53 2013 +0530 Committer: Nitin Mehta Committed: Wed May 22 15:31:18 2013 +0530 ---------------------------------------------------------------------- .../xen/resource/CitrixResourceBase.java | 4 ++-- .../xen/resource/XenServer56FP1Resource.java | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a67728b3/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java index d08aaec..4680fde 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java @@ -661,8 +661,8 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe Set vms = VM.getByNameLabel(conn, vmName); Host host = Host.getByUuid(conn, _host.uuid); - // If DMC is not enable then dont execute this command. - if (isDmcEnabled(conn, host)) { + // If DMC is not enable then don't execute this command. + if (!isDmcEnabled(conn, host)) { String msg = "Unable to scale the vm: " + vmName + " as DMC - Dynamic memory control is not enabled for the XenServer:" + _host.uuid + " ,check your license and hypervisor version."; s_logger.info(msg); return new ScaleVmAnswer(cmd, false, msg); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a67728b3/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56FP1Resource.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56FP1Resource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56FP1Resource.java index 78ad236..54aeef5 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56FP1Resource.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56FP1Resource.java @@ -244,6 +244,9 @@ public class XenServer56FP1Resource extends XenServer56Resource { protected boolean isDmcEnabled(Connection conn, Host host) throws XenAPIException, XmlRpcException { Map hostParams = new HashMap(); hostParams = host.getLicenseParams(conn); - return hostParams.get("restrict_dmc").equalsIgnoreCase("false"); + + Boolean isDmcEnabled = hostParams.get("restrict_dmc").equalsIgnoreCase("false"); + + return isDmcEnabled; } }