etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 14224: adding 6.0.2

This commit is contained in:
abhi 2012-03-09 18:38:40 +05:30
parent 14e2dd67bc
commit 87a32a4866
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
View File

@ -557,7 +557,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L
resource = XcpServerResource.class.getName();
} else if(prodBrand.equals("XenServer") && prodVersion.equals("5.6.0")) {
resource = XenServer56Resource.class.getName();
} else if(prodBrand.equals("XenServer") && prodVersion.equals("6.0.0")) {
} else if(prodBrand.equals("XenServer") && prodVersion.startsWith("6.0")) {
resource = XenServer600Resource.class.getName();
} else if(prodBrand.equals("XenServer") && prodVersion.equals("5.6.100")) {
String prodVersionTextShort = details.get("product_version_text_short").trim();
@ -568,7 +568,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L
}
}
if( resource == null ){
String msg = "Only support XCP 1.0.0, XCP 1.1.0, XenServer 5.6, XenServer 5.6 FP1 and XenServer 5.6 SP2, but this one is " + prodBrand + " " + prodVersion;
String msg = "Only support XCP 1.0.0, XCP 1.1.0, XenServer 5.6, 5.6 FP1, 5.6 SP2 and Xenserver 6.0 but this one is " + prodBrand + " " + prodVersion;
s_logger.debug(msg);
throw new RuntimeException(msg);
}