You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ap...@apache.org on 2012/08/23 09:02:34 UTC
git commit: enable tampa pre-release
Updated Branches:
refs/heads/master cebd9444b -> 879d62d88
enable tampa pre-release
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/879d62d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/879d62d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/879d62d8
Branch: refs/heads/master
Commit: 879d62d881b10aabe021fca597f52ca9bef68ba3
Parents: cebd944
Author: Abhinandan Prateek <ap...@apache.org>
Authored: Thu Aug 23 12:32:10 2012 +0530
Committer: Abhinandan Prateek <ap...@apache.org>
Committed: Thu Aug 23 12:32:10 2012 +0530
----------------------------------------------------------------------
.../xen/discoverer/XcpServerDiscoverer.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/879d62d8/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 4fd202b..b13730c 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
@@ -432,6 +432,9 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L
if (prodBrand.equals("XenServer") && prodVersion.equals("6.0.2"))
return new XenServer602Resource();
+
+ if (prodBrand.equals("XenServer") && prodVersion.startsWith("6.0.9"))
+ return new XenServer602Resource();
if(prodBrand.equals("XenServer") && prodVersion.equals("5.6.100")) {
String prodVersionTextShort = record.softwareVersion.get("product_version_text_short").trim();
@@ -446,7 +449,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 but this one is " + prodBrand + " " + prodVersion;
+ 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.0.9 but this one is " + prodBrand + " " + prodVersion;
_alertMgr.sendAlert(AlertManager.ALERT_TYPE_HOST, dcId, podId, msg, msg);
s_logger.debug(msg);
throw new RuntimeException(msg);
@@ -582,6 +585,8 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L
resource = XenServer600Resource.class.getName();
} else if (prodBrand.equals("XenServer") && prodVersion.equals("6.0.2")) {
resource = XenServer602Resource.class.getName();
+ } else if (prodBrand.equals("XenServer") && prodVersion.startsWith("6.0.9")) {
+ resource = XenServer602Resource.class.getName();
} else if(prodBrand.equals("XenServer") && prodVersion.equals("5.6.100")) {
String prodVersionTextShort = details.get("product_version_text_short").trim();
if("5.6 SP2".equals(prodVersionTextShort)) {
@@ -594,7 +599,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L
}
if( resource == null ){
- String msg = "Only support XCP 1.0.0, 1.1.0, 1.5 beta; XenServer 5.6, 5.6 FP1, 5.6 SP2 and Xenserver 6.0 , 6.0.2 but this one is " + prodBrand + " " + prodVersion;
+ String msg = "Only support XCP 1.0.0, 1.1.0, 1.5 beta; XenServer 5.6, 5.6 FP1, 5.6 SP2 and Xenserver 6.0 , 6.0.2, 6.0.9 but this one is " + prodBrand + " " + prodVersion;
s_logger.debug(msg);
throw new RuntimeException(msg);
}