incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wid...@apache.org
Subject [29/36] git commit: refs/heads/qemu-img - CLOUDSTACK-416: Add XCP 1.6.x in XcpServerDiscoverer.java processConnect
Date Tue, 26 Feb 2013 14:14:12 GMT
CLOUDSTACK-416: Add XCP 1.6.x in XcpServerDiscoverer.java processConnect

Thanks to Devdeep for pointing this out.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit c7935a9ab69ae941270d60d22e812e86b5e9c896)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/8cb5c00c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/8cb5c00c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/8cb5c00c

Branch: refs/heads/qemu-img
Commit: 8cb5c00c260ad4444b5b5a495d51a238a7699cd5
Parents: da7c0b1
Author: Rohit Yadav <bhaisaab@apache.org>
Authored: Tue Feb 26 15:34:55 2013 +0530
Committer: Rohit Yadav <bhaisaab@apache.org>
Committed: Tue Feb 26 15:37:58 2013 +0530

----------------------------------------------------------------------
 .../xen/discoverer/XcpServerDiscoverer.java        |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8cb5c00c/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 7944e86..89bc1cf 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
@@ -583,7 +583,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") || prodVersion.equals("1.1.0")
|| prodVersion.equals("5.6.100")  || prodVersion.startsWith("1.4"))) {
+        if(prodBrand.equals("XCP") && (prodVersion.equals("1.0.0") || prodVersion.equals("1.1.0")
|| prodVersion.equals("5.6.100")  || prodVersion.startsWith("1.4") || prodVersion.startsWith("1.6")))
{
             resource = XcpServerResource.class.getName();
         } else if(prodBrand.equals("XenServer") && prodVersion.equals("5.6.0")) {
             resource = XenServer56Resource.class.getName();
@@ -605,7 +605,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, 6.1.0 but this one is " + prodBrand + " " + prodVersion;
+            String msg = "Only support XCP 1.0.0, 1.1.0, 1.4.x, 1.5 beta, 1.6.x; XenServer
5.6, 5.6 FP1, 5.6 SP2 and Xenserver 6.0 , 6.0.2, 6.1.0 but this one is " + prodBrand + " "
+ prodVersion;
             s_logger.debug(msg);
             throw new RuntimeException(msg);
         }


Mime
View raw message