From 64eb2dfcb1bc9b8353cebb9b5a0bafd37c311e82 Mon Sep 17 00:00:00 2001 From: abhi Date: Fri, 9 Mar 2012 17:34:27 +0530 Subject: [PATCH] bug 14224: allowing Xenserver 6.0.2, with the assumption that the same patches and guest os type will work as with 6.0 --- .../cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java b/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java index 70af6c5b47a..1b1316263cb 100755 --- a/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java +++ b/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java @@ -413,7 +413,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L if(prodBrand.equals("XenServer") && prodVersion.equals("5.6.0")) return new XenServer56Resource(); - if(prodBrand.equals("XenServer") && prodVersion.equals("6.0.0")) + if(prodBrand.equals("XenServer") && prodVersion.startsWith("6.0")) return new XenServer600Resource(); if(prodBrand.equals("XenServer") && prodVersion.equals("5.6.100")) { @@ -425,7 +425,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L } } - 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, XenServer 5.6 FP1, XenServer 5.6 SP2, Xenserver 6.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);