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

bug 11675: fixed error messages

This commit is contained in:
Abhinandan Prateek 2011-10-11 17:23:12 +05:30 committed by root
parent 4a3b4d21c3
commit ff5dfdbf68
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -402,7 +402,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L
}
}
String msg = "Only support XCP 1.0.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, XenServer 5.6 FP1 and XenServer 5.6 SP2, but this one is " + prodBrand + " " + prodVersion;
_alertMgr.sendAlert(AlertManager.ALERT_TYPE_HOST, dcId, podId, msg, msg);
s_logger.debug(msg);
throw new RuntimeException(msg);
@ -529,7 +529,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L
String prodBrand = details.get("product_brand").trim();
String prodVersion = details.get("product_version").trim();
if(prodBrand.equals("XCP") && prodVersion.equals("1.0.0")) {
if(prodBrand.equals("XCP") && (prodVersion.equals("1.0.0") || prodVersion.equals("1.1.0"))) {
resource = XcpServerResource.class.getName();
} else if(prodBrand.equals("XenServer") && prodVersion.equals("5.6.0")) {
resource = XenServer56Resource.class.getName();
@ -542,7 +542,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L
}
}
if( resource == null ){
String msg = "Only support XCP 1.0.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, XenServer 5.6 FP1 and XenServer 5.6 SP2, but this one is " + prodBrand + " " + prodVersion;
s_logger.debug(msg);
throw new RuntimeException(msg);
}