From a67728b312fbf3a4e6e7f7fb3914a45d22997dbf Mon Sep 17 00:00:00 2001 From: Nitin Mehta Date: Wed, 22 May 2013 15:30:53 +0530 Subject: [PATCH] CLOUDSTACK-2567 - check for ! dmcEnabled. --- .../cloud/hypervisor/xen/resource/CitrixResourceBase.java | 4 ++-- .../hypervisor/xen/resource/XenServer56FP1Resource.java | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) 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 d08aaecb171..4680fde9980 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); 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 78ad2361b07..54aeef5a022 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; } }