cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Devdeep Singh <devdeep.si...@citrix.com>
Subject RE: [2/2] git commit: refs/heads/master - CLOUDSTACK-416: Add XCP 1.6.x as supported hypervisor
Date Tue, 26 Feb 2013 08:46:05 GMT
Hi Rohit,

You may also have to update the processConnect function in XcpServerDiscoverer.java when you
are enabling xcp1.6. Can you check that?

Regards,
Devdeep

> -----Original Message-----
> From: bhaisaab@apache.org [mailto:bhaisaab@apache.org]
> Sent: Tuesday, February 26, 2013 1:59 PM
> To: cloudstack-commits@incubator.apache.org
> Subject: [2/2] git commit: refs/heads/master - CLOUDSTACK-416: Add XCP
> 1.6.x as supported hypervisor
> 
> Updated Branches:
>   refs/heads/master d37ed18c3 -> 43183893b
> 
> 
> CLOUDSTACK-416: Add XCP 1.6.x as supported hypervisor
> 
> Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
> 
> 
> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
> Commit: http://git-wip-us.apache.org/repos/asf/incubator-
> cloudstack/commit/43183893
> Tree: http://git-wip-us.apache.org/repos/asf/incubator-
> cloudstack/tree/43183893
> Diff: http://git-wip-us.apache.org/repos/asf/incubator-
> cloudstack/diff/43183893
> 
> Branch: refs/heads/master
> Commit: 43183893bd4c2f16d7762ae808dd3f04cadf62c8
> Parents: 755ddc5
> Author: Rohit Yadav <bhaisaab@apache.org>
> Authored: Tue Feb 26 13:55:43 2013 +0530
> Committer: Rohit Yadav <bhaisaab@apache.org>
> Committed: Tue Feb 26 13:55:43 2013 +0530
> 
> ----------------------------------------------------------------------
>  .../xen/discoverer/XcpServerDiscoverer.java        |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> ----------------------------------------------------------------------
> 
> 
> http://git-wip-us.apache.org/repos/asf/incubator-
> cloudstack/blob/43183893/plugins/hypervisors/xen/src/com/cloud/hypervis
> or/xen/discoverer/XcpServerDiscoverer.java
> ----------------------------------------------------------------------
> diff --git
> a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpSer
> verDiscoverer.java
> b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpSer
> verDiscoverer.java
> index c2f4923..7944e86 100755
> ---
> a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpSer
> verDiscoverer.java
> +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/Xc
> +++ pServerDiscoverer.java
> @@ -427,8 +427,8 @@ public class XcpServerDiscoverer extends
> DiscovererBase implements Discoverer, L
>      		prodVersion = prodVersion.trim();
>      	}
> 
> -    	if(prodBrand.equals("XCP") && (prodVersion.equals("1.0.0") ||
> prodVersion.equals("1.1.0") || prodVersion.equals("5.6.100") ||
> prodVersion.startsWith("1.4") ))
> -    		return new XcpServerResource();
> +        if(prodBrand.equals("XCP") && (prodVersion.equals("1.0.0") ||
> prodVersion.equals("1.1.0") || prodVersion.equals("5.6.100") ||
> prodVersion.startsWith("1.4") || prodVersion.startsWith("1.6")))
> +            return new XcpServerResource();
> 
>      	if(prodBrand.equals("XenServer") && prodVersion.equals("5.6.0"))
>      		return new XenServer56Resource(); @@ -455,7 +455,7 @@
> public class XcpServerDiscoverer extends DiscovererBase implements
> Discoverer, L
>      		return new XcpOssResource();
>      	}
> 
> -        String msg = "Only support XCP 1.0.0, 1.1.0, 1.5 beta; XenServer 5.6,
> XenServer 5.6 FP1, XenServer 5.6 SP2, Xenserver 6.0, 6.0.2, 6.1.0 but this one
> is " + prodBrand + " " + prodVersion;
> +        String msg = "Only support XCP 1.0.0, 1.1.0, 1.4.x, 1.5 beta,
> + 1.6.x; XenServer 5.6,  XenServer 5.6 FP1, XenServer 5.6 SP2, Xenserver
> + 6.0, 6.0.2, 6.1.0 but this one is " + prodBrand + " " + prodVersion;
> 
> 	_alertMgr.sendAlert(AlertManager.ALERT_TYPE_HOST, dcId, podId,
> msg, msg);
>      	s_logger.debug(msg);
>      	throw new RuntimeException(msg);


Mime
View raw message