From eb1c94febaead1affa8ba00cc174ef13fa0a6c71 Mon Sep 17 00:00:00 2001 From: Abhinandan Prateek Date: Fri, 10 Aug 2012 19:17:44 +0530 Subject: [PATCH] bug CS-15868: enable tampa pre-release --- .../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 7e596320c35..395468d70b9 100755 --- a/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java +++ b/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java @@ -415,7 +415,7 @@ 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.equals("6.0.9")) + if (prodBrand.equals("XenServer") && prodVersion.startsWith("6.0.9")) return new XenServer602Resource(); if(prodBrand.equals("XenServer") && prodVersion.equals("5.6.100")) { @@ -563,7 +563,7 @@ 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.equals("6.0.9")) { + } 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();