cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tall...@apache.org
Subject [34/60] [abbrv] git commit: updated refs/heads/marvin to 0e223d6
Date Tue, 08 Apr 2014 12:25:49 GMT
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/marvin
Commit: 60c58c5cacdc961ddac85679a90f7f13e6adc4a3
Parents: 3666df4
Author: Sanjay Tripathi <sanjay.tripathi@citrix.com>
Authored: Fri Apr 4 12:30:33 2014 +0530
Committer: Sanjay Tripathi <sanjay.tripathi@citrix.com>
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<String, String> 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){


Mime
View raw message