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 EA960103EA for ; Fri, 4 Apr 2014 06:56:52 +0000 (UTC) Received: (qmail 87079 invoked by uid 500); 4 Apr 2014 06:56:52 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 86862 invoked by uid 500); 4 Apr 2014 06:56:50 -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 86853 invoked by uid 99); 4 Apr 2014 06:56:48 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Apr 2014 06:56:48 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D59B494A05A; Fri, 4 Apr 2014 06:56:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sanjaytripathi@apache.org To: commits@cloudstack.apache.org Message-Id: <855f80b84c704bebbec53dbadc87e760@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 60c58c5 Date: Fri, 4 Apr 2014 06:56:47 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/master 3666df4d3 -> 60c58c5ca CLOUDSTACK-6339: Getting exception while adding XenServer625 host. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/60c58c5c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/60c58c5c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/60c58c5c Branch: refs/heads/master Commit: 60c58c5cacdc961ddac85679a90f7f13e6adc4a3 Parents: 3666df4 Author: Sanjay Tripathi Authored: Fri Apr 4 12:30:33 2014 +0530 Committer: Sanjay Tripathi Committed: Fri Apr 4 12:30:33 2014 +0530 ---------------------------------------------------------------------- .../hypervisor/xen/discoverer/XcpServerDiscoverer.java | 2 +- .../hypervisor/xen/resource/Xenserver625Resource.java | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/60c58c5c/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java index 55eca07..2c49709 100755 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java @@ -589,7 +589,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L resource = XenServer610Resource.class.getName(); } else if (prodBrand.equals("XenServer") && prodVersion.equals("6.2.0")) { String hotfix = details.get("XS620HotFix"); - if (hotfix != null && hotfix.equalsIgnoreCase(XenserverConfigs.XSHasHotFix62ESP1004)) { + if (hotfix != null && hotfix.equalsIgnoreCase(XenserverConfigs.XSHotFix62ESP1004)) { resource = Xenserver625Resource.class.getName(); } else if (hotfix != null && hotfix.equalsIgnoreCase(XenserverConfigs.XSHotFix62ESP1)){ resource = XenServer620SP1Resource.class.getName(); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/60c58c5c/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/Xenserver625Resource.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/Xenserver625Resource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/Xenserver625Resource.java index b1442de..388e3cf 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/Xenserver625Resource.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/Xenserver625Resource.java @@ -21,6 +21,7 @@ package com.cloud.hypervisor.xen.resource; import java.io.File; import java.util.ArrayList; import java.util.List; +import java.util.Map; import javax.ejb.Local; @@ -32,7 +33,9 @@ import com.xensource.xenapi.Types; import com.xensource.xenapi.VM; import org.apache.cloudstack.hypervisor.xenserver.XenServerResourceNewBase; +import org.apache.cloudstack.hypervisor.xenserver.XenserverConfigs; +import com.cloud.agent.api.StartupRoutingCommand; import com.cloud.resource.ServerResource; import com.cloud.storage.resource.StorageSubsystemCommandHandler; import com.cloud.storage.resource.StorageSubsystemCommandHandlerBase; @@ -67,6 +70,14 @@ public class Xenserver625Resource extends XenServerResourceNewBase { } @Override + protected void fillHostInfo(Connection conn, StartupRoutingCommand cmd) { + super.fillHostInfo(conn, cmd); + Map details = cmd.getHostDetails(); + details.put("XS620HotFix", XenserverConfigs.XSHotFix62ESP1004); + cmd.setHostDetails(details); + } + + @Override public long getStaticMax(String os, boolean b, long dynamicMinRam, long dynamicMaxRam){ long recommendedValue = CitrixHelper.getXenServer625StaticMax(os, b); if(recommendedValue == 0){