You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by an...@apache.org on 2014/08/19 02:35:20 UTC
[3/3] git commit: updated refs/heads/master to 81c5e18
clean up XenServer resource code
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/81c5e184
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/81c5e184
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/81c5e184
Branch: refs/heads/master
Commit: 81c5e184ba998a6ccd75dfffad32cbe5dbc8c2ec
Parents: 097b2d7
Author: Anthony Xu <an...@citrix.com>
Authored: Mon Aug 18 17:24:12 2014 -0700
Committer: Anthony Xu <an...@citrix.com>
Committed: Mon Aug 18 17:25:10 2014 -0700
----------------------------------------------------------------------
.../discoverer/XcpServerDiscoverer.java | 9 +-
.../xenserver/resource/CitrixHelper.java | 2501 ++----------------
.../xenserver/resource/CitrixResourceBase.java | 39 +-
.../xenserver/resource/XcpOssResource.java | 6 +-
.../xenserver/resource/XcpServer16Resource.java | 39 -
.../xenserver/resource/XcpServerResource.java | 9 -
.../resource/XenServer56FP1Resource.java | 45 -
.../xenserver/resource/XenServer56Resource.java | 13 -
.../resource/XenServer56SP2Resource.java | 45 -
.../resource/XenServer600Resource.java | 44 -
.../resource/XenServer602Resource.java | 75 -
.../resource/XenServer610Resource.java | 46 +-
.../resource/XenServer620Resource.java | 43 -
.../resource/XenServer620SP1Resource.java | 42 -
.../resource/Xenserver625Resource.java | 43 -
setup/db/db/schema-441to450.sql | 4 +-
16 files changed, 207 insertions(+), 2796 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/81c5e184/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java
index 0193d5e..0450e3b 100755
--- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java
+++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java
@@ -45,13 +45,11 @@ import com.cloud.hypervisor.Hypervisor;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.hypervisor.xenserver.resource.CitrixResourceBase;
import com.cloud.hypervisor.xenserver.resource.XcpOssResource;
-import com.cloud.hypervisor.xenserver.resource.XcpServer16Resource;
import com.cloud.hypervisor.xenserver.resource.XcpServerResource;
import com.cloud.hypervisor.xenserver.resource.XenServer56FP1Resource;
import com.cloud.hypervisor.xenserver.resource.XenServer56Resource;
import com.cloud.hypervisor.xenserver.resource.XenServer56SP2Resource;
import com.cloud.hypervisor.xenserver.resource.XenServer600Resource;
-import com.cloud.hypervisor.xenserver.resource.XenServer602Resource;
import com.cloud.hypervisor.xenserver.resource.XenServer610Resource;
import com.cloud.hypervisor.xenserver.resource.XenServer620Resource;
import com.cloud.hypervisor.xenserver.resource.XenServer620SP1Resource;
@@ -399,17 +397,16 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L
protected CitrixResourceBase createServerResource(String prodBrand, String prodVersion, String prodVersionTextShort, String hotfix) {
// Xen Cloud Platform group of hypervisors
- 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"))) {
return new XcpServerResource();
- } else if (prodBrand.equals("XCP") && prodVersion.startsWith("1.6")) {
- return new XcpServer16Resource();
} // Citrix Xenserver group of hypervisors
else if (prodBrand.equals("XenServer") && prodVersion.equals("5.6.0"))
return new XenServer56Resource();
else if (prodBrand.equals("XenServer") && prodVersion.equals("6.0.0"))
return new XenServer600Resource();
else if (prodBrand.equals("XenServer") && prodVersion.equals("6.0.2"))
- return new XenServer602Resource();
+ return new XenServer600Resource();
else if (prodBrand.equals("XenServer") && prodVersion.equals("6.1.0"))
return new XenServer610Resource();
else if (prodBrand.equals("XenServer") && prodVersion.equals("6.4.94"))