You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by se...@apache.org on 2014/06/07 10:50:56 UTC
[16/16] git commit: updated refs/heads/master to a8212d9
Cleanup of Xen and XenServer terms. Cloned xen plugin creating a xenserver plugin, then removed xen plugin
Signed-off-by: Tim Mackey <tm...@gmail.com>
Signed-off-by: Sebastien Goasguen <ru...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a8212d9e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a8212d9e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a8212d9e
Branch: refs/heads/master
Commit: a8212d9ef458dd7ac64b021e6fa33fcf64b3cce0
Parents: 303e6ff
Author: Tim Mackey <tm...@gmail>
Authored: Thu Apr 10 15:57:24 2014 -0400
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Sat Jun 7 04:50:23 2014 -0400
----------------------------------------------------------------------
.../org/apache/cloudstack/api/ApiConstants.java | 2 +-
.../command/admin/usage/AddTrafficTypeCmd.java | 2 +-
.../admin/usage/UpdateTrafficTypeCmd.java | 2 +-
.../api/response/TrafficTypeResponse.java | 2 +-
.../bridge/service/core/ec2/EC2Engine.java | 6 +-
.../classes/resources/messages.properties | 2 +-
.../classes/resources/messages_fr_FR.properties | 2 +-
.../classes/resources/messages_it_IT.properties | 2 +-
.../classes/resources/messages_ja_JP.properties | 2 +-
.../classes/resources/messages_ko_KR.properties | 2 +-
.../classes/resources/messages_nb_NO.properties | 2 +-
.../classes/resources/messages_nl_NL.properties | 2 +-
.../classes/resources/messages_pt_BR.properties | 2 +-
.../classes/resources/messages_ru_RU.properties | 2 +-
.../classes/resources/messages_zh_CN.properties | 2 +-
client/pom.xml | 2 +-
client/tomcatconf/applicationContext.xml.in | 2 +-
.../dao/PhysicalNetworkTrafficTypeVO.java | 2 +-
engine/storage/integration-test/pom.xml | 2 +-
.../test/DirectAgentManagerSimpleImpl.java | 2 +-
.../storage/test/DirectAgentTest.java | 6 +-
.../storage/test/EndpointSelectorTest.java | 4 +-
.../cloudstack/storage/test/SnapshotTest.java | 6 +-
.../storage/test/SnapshotTestWithFakeData.java | 2 +-
.../storage/test/VolumeServiceTest.java | 6 +-
.../cloudstack/storage/test/VolumeTest.java | 6 +-
.../test/resources/component.xml | 2 +-
.../endpoint/DefaultEndPointSelector.java | 2 +-
engine/storage/storage.ucls | 16 +-
.../hypervisors/xen/findbugsExcludeFilter.xml | 31 -
plugins/hypervisors/xen/pom.xml | 44 -
.../xenserver-compute/module.properties | 18 -
.../spring-xenserver-compute-context.xml | 28 -
.../xenserver-discoverer/module.properties | 18 -
.../spring-xenserver-discoverer-context.xml | 25 -
.../xen/src/com/cloud/ha/XenServerFencer.java | 129 -
.../src/com/cloud/hypervisor/XenServerGuru.java | 160 -
.../xen/discoverer/XcpServerDiscoverer.java | 726 --
.../hypervisor/xen/resource/CitrixHelper.java | 2404 ------
.../xen/resource/CitrixResourceBase.java | 7563 ------------------
.../hypervisor/xen/resource/XcpOssResource.java | 195 -
.../xen/resource/XcpServer16Resource.java | 32 -
.../xen/resource/XcpServerResource.java | 160 -
.../xen/resource/XenServer56FP1Resource.java | 168 -
.../xen/resource/XenServer56Resource.java | 330 -
.../xen/resource/XenServer56SP2Resource.java | 89 -
.../xen/resource/XenServer600Resource.java | 87 -
.../xen/resource/XenServer602Resource.java | 64 -
.../xen/resource/XenServer610Resource.java | 437 -
.../xen/resource/XenServer620Resource.java | 108 -
.../xen/resource/XenServer620SP1Resource.java | 199 -
.../xen/resource/XenServerConnectionPool.java | 509 --
.../xen/resource/XenServerPoolVms.java | 90 -
.../xen/resource/XenServerStorageProcessor.java | 1699 ----
.../xen/resource/Xenserver625Resource.java | 161 -
.../resource/Xenserver625StorageProcessor.java | 937 ---
.../xenserver/XenServerResourceNewBase.java | 342 -
.../hypervisor/xenserver/XenserverConfigs.java | 25 -
.../motion/XenServerStorageMotionStrategy.java | 249 -
.../test/com/cloud/ha/XenServerFencerTest.java | 39 -
.../xen/resource/CitrixResourceBaseTest.java | 190 -
.../xenserver/findbugsExcludeFilter.xml | 31 +
plugins/hypervisors/xenserver/pom.xml | 44 +
.../xenserver-compute/module.properties | 18 +
.../spring-xenserver-compute-context.xml | 28 +
.../xenserver-discoverer/module.properties | 18 +
.../spring-xenserver-discoverer-context.xml | 25 +
.../src/com/cloud/ha/XenServerFencer.java | 129 +
.../src/com/cloud/hypervisor/XenServerGuru.java | 160 +
.../discoverer/XcpServerDiscoverer.java | 726 ++
.../xenserver/resource/CitrixHelper.java | 2404 ++++++
.../xenserver/resource/CitrixResourceBase.java | 7563 ++++++++++++++++++
.../xenserver/resource/XcpOssResource.java | 195 +
.../xenserver/resource/XcpServer16Resource.java | 32 +
.../xenserver/resource/XcpServerResource.java | 160 +
.../resource/XenServer56FP1Resource.java | 168 +
.../xenserver/resource/XenServer56Resource.java | 330 +
.../resource/XenServer56SP2Resource.java | 89 +
.../resource/XenServer600Resource.java | 87 +
.../resource/XenServer602Resource.java | 64 +
.../resource/XenServer610Resource.java | 437 +
.../resource/XenServer620Resource.java | 108 +
.../resource/XenServer620SP1Resource.java | 199 +
.../resource/XenServerConnectionPool.java | 509 ++
.../xenserver/resource/XenServerPoolVms.java | 90 +
.../resource/XenServerStorageProcessor.java | 1699 ++++
.../resource/Xenserver625Resource.java | 161 +
.../resource/Xenserver625StorageProcessor.java | 937 +++
.../xenserver/XenServerResourceNewBase.java | 342 +
.../hypervisor/xenserver/XenserverConfigs.java | 25 +
.../motion/XenServerStorageMotionStrategy.java | 249 +
.../test/com/cloud/ha/XenServerFencerTest.java | 39 +
.../resource/CitrixResourceBaseTest.java | 190 +
.../resources/components-example.xml | 2 +-
.../network-elements/juniper-contrail/pom.xml | 2 +-
plugins/pom.xml | 2 +-
scripts/installer/windows/client.wxs | 6 +-
scripts/vm/hypervisor/xenserver/cloudlog | 2 +-
.../allocator/impl/FirstFitAllocator.java | 2 +-
server/src/com/cloud/configuration/Config.java | 32 +-
.../configuration/ConfigurationManagerImpl.java | 12 +-
.../com/cloud/network/NetworkServiceImpl.java | 8 +-
.../router/VirtualNetworkApplianceManager.java | 2 +-
.../src/com/cloud/resource/DiscovererBase.java | 4 +-
.../cloud/server/ConfigurationServerImpl.java | 18 +-
.../com/cloud/template/TemplateAdapterBase.java | 2 +-
server/src/com/cloud/test/PodZoneConfig.java | 10 +-
server/test/async-job-component.xml | 2 +-
setup/db/create-schema.sql | 2 +-
setup/db/db/schema-440to450-cleanup.sql | 11 +
setup/db/db/schema-440to450.sql | 3 +
setup/db/server-setup.sql | 2 +-
tools/appliance/README.md | 2 +-
tools/appliance/build.sh | 6 +-
tools/devcloud/devcloud-advanced.cfg | 6 +-
.../devcloud/devcloud-advanced_internal-mgt.cfg | 6 +-
tools/marvin/marvin/misc/build/configure.py | 16 +-
tools/marvin/marvin/misc/build/hudson.sh | 4 +-
ui/dictionary.jsp | 2 +-
ui/scripts/docs.js | 2 +-
ui/scripts/system.js | 34 +-
ui/scripts/templates.js | 2 +-
122 files changed, 17412 insertions(+), 17398 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8212d9e/api/src/org/apache/cloudstack/api/ApiConstants.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/ApiConstants.java b/api/src/org/apache/cloudstack/api/ApiConstants.java
index 6131031..ae5d6f0 100755
--- a/api/src/org/apache/cloudstack/api/ApiConstants.java
+++ b/api/src/org/apache/cloudstack/api/ApiConstants.java
@@ -377,7 +377,7 @@ public class ApiConstants {
public static final String SECURITY_GROUP_EANBLED = "securitygroupenabled";
public static final String LOCAL_STORAGE_ENABLED = "localstorageenabled";
public static final String GUEST_IP_TYPE = "guestiptype";
- public static final String XEN_NETWORK_LABEL = "xennetworklabel";
+ public static final String XENSERVER_NETWORK_LABEL = "xenservernetworklabel";
public static final String KVM_NETWORK_LABEL = "kvmnetworklabel";
public static final String VMWARE_NETWORK_LABEL = "vmwarenetworklabel";
public static final String HYPERV_NETWORK_LABEL = "hypervnetworklabel";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8212d9e/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
index a71d5bb..5f1188e 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
@@ -55,7 +55,7 @@ public class AddTrafficTypeCmd extends BaseAsyncCreateCmd {
@Parameter(name = ApiConstants.TRAFFIC_TYPE, type = CommandType.STRING, required = true, description = "the trafficType to be added to the physical network")
private String trafficType;
- @Parameter(name = ApiConstants.XEN_NETWORK_LABEL,
+ @Parameter(name = ApiConstants.XENSERVER_NETWORK_LABEL,
type = CommandType.STRING,
description = "The network name label of the physical device dedicated to this traffic on a XenServer host")
private String xenLabel;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8212d9e/api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java
index 3de8905..68a9431 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java
@@ -45,7 +45,7 @@ public class UpdateTrafficTypeCmd extends BaseAsyncCmd {
@Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = TrafficTypeResponse.class, required = true, description = "traffic type id")
private Long id;
- @Parameter(name = ApiConstants.XEN_NETWORK_LABEL,
+ @Parameter(name = ApiConstants.XENSERVER_NETWORK_LABEL,
type = CommandType.STRING,
description = "The network name label of the physical device dedicated to this traffic on a XenServer host")
private String xenLabel;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8212d9e/api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java b/api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java
index 69dd062..84ed2e6 100644
--- a/api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java
@@ -40,7 +40,7 @@ public class TrafficTypeResponse extends BaseResponse {
@Param(description = "the physical network this belongs to")
private String physicalNetworkId;
- @SerializedName(ApiConstants.XEN_NETWORK_LABEL)
+ @SerializedName(ApiConstants.XENSERVER_NETWORK_LABEL)
@Param(description = "The network name label of the physical device dedicated to this traffic on a XenServer host")
private String xenNetworkLabel;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8212d9e/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
index cd20214..efca95c 100644
--- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
+++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
@@ -2007,9 +2007,9 @@ public class EC2Engine extends ManagerBase {
ec2Image.setState(temp.getIsReady() ? "available" : "pending");
ec2Image.setDomainId(temp.getDomainId());
if (temp.getHyperVisor().equalsIgnoreCase("xenserver"))
- ec2Image.setHypervisor("xen");
+ ec2Image.setHypervisor("xenserver");
else if (temp.getHyperVisor().equalsIgnoreCase("ovm"))
- ec2Image.setHypervisor("ovm"); // valid values for hypervisor is 'ovm' and 'xen'
+ ec2Image.setHypervisor("ovm"); // valid values for hypervisor is 'ovm' and 'xenserver'
else
ec2Image.setHypervisor("");
if (temp.getDisplayText() == null)
@@ -2614,7 +2614,7 @@ public class EC2Engine extends ManagerBase {
*/
private String mapToAmazonHypervisorType(String hypervisor) {
if (hypervisor.equalsIgnoreCase("Xenserver"))
- return ("xen");
+ return ("xenserver");
else if (hypervisor.equalsIgnoreCase("Ovm"))
return ("ovm");
else
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8212d9e/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index e700d5d..b504a18 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -1258,7 +1258,7 @@ label.weekly=Weekly
label.welcome.cloud.console=Welcome to Management Console
label.welcome=Welcome
label.what.is.cloudstack=What is CloudStack&\#8482?
-label.xen.traffic.label=XenServer traffic label
+label.xenserver.traffic.label=XenServer traffic label
label.yes=Yes
label.zone.details=Zone details
label.zone.id=Zone ID
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8212d9e/client/WEB-INF/classes/resources/messages_fr_FR.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_fr_FR.properties b/client/WEB-INF/classes/resources/messages_fr_FR.properties
index 3dc7e9c..490f8e4 100644
--- a/client/WEB-INF/classes/resources/messages_fr_FR.properties
+++ b/client/WEB-INF/classes/resources/messages_fr_FR.properties
@@ -1476,7 +1476,7 @@ label.welcome.cloud.console=Bienvenue dans la Console d\\'Administration
label.what.is.cloudstack=Qu\\'est-ce-que CloudStack&\#8482; ?
label.xenserver.tools.version.61.plus=XenServer Tools Version 6.1\\+
label.Xenserver.Tools.Version61plus=XenServer Tools Version 6.1\\+
-label.xen.traffic.label=Libell\u00e9 trafic XenServer
+label.xenserver.traffic.label=Libell\u00e9 trafic XenServer
label.yes=Oui
label.zone.dedicated=Zone d\u00e9di\u00e9e
label.zone.details=D\u00e9tails de la zone
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8212d9e/client/WEB-INF/classes/resources/messages_it_IT.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_it_IT.properties b/client/WEB-INF/classes/resources/messages_it_IT.properties
index fc0e420..dc2dbbe 100644
--- a/client/WEB-INF/classes/resources/messages_it_IT.properties
+++ b/client/WEB-INF/classes/resources/messages_it_IT.properties
@@ -621,7 +621,7 @@ label.vsmctrlvlanid=VLAN ID di Controllo
label.vsmpktvlanid=VLAN ID del Pacchetto
label.vsmstoragevlanid=VLAN ID di Storage
label.what.is.cloudstack=Che cosa \u00e8 CloudStack&\#8482?
-label.xen.traffic.label=Etichetta del traffico via XenServer
+label.xenserver.traffic.label=Etichetta del traffico via XenServer
label.yes=S\u00ec
label.zone.details=Dettagli della Zona
label.zone.name=Nome Zona
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8212d9e/client/WEB-INF/classes/resources/messages_ja_JP.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_ja_JP.properties b/client/WEB-INF/classes/resources/messages_ja_JP.properties
index b3aeeea..6926f30 100644
--- a/client/WEB-INF/classes/resources/messages_ja_JP.properties
+++ b/client/WEB-INF/classes/resources/messages_ja_JP.properties
@@ -1453,7 +1453,7 @@ label.welcome=\u3088\u3046\u3053\u305d
label.what.is.cloudstack=CloudStack&\#8482; \u306b\u3064\u3044\u3066
label.xenserver.tools.version.61.plus=XenServer Tools Version 6.1 \u4ee5\u964d
label.Xenserver.Tools.Version61plus=XenServer Tools Version 6.1 \u4ee5\u964d
-label.xen.traffic.label=XenServer \u306e\u30c8\u30e9\u30d5\u30a3\u30c3\u30af \u30e9\u30d9\u30eb
+label.xenserver.traffic.label=XenServer \u306e\u30c8\u30e9\u30d5\u30a3\u30c3\u30af \u30e9\u30d9\u30eb
label.yes=\u306f\u3044
label.zone.dedicated=\u5c02\u7528\u30be\u30fc\u30f3
label.zone.details=\u30be\u30fc\u30f3\u306e\u8a73\u7d30
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8212d9e/client/WEB-INF/classes/resources/messages_ko_KR.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_ko_KR.properties b/client/WEB-INF/classes/resources/messages_ko_KR.properties
index fcd86bb..e343540 100644
--- a/client/WEB-INF/classes/resources/messages_ko_KR.properties
+++ b/client/WEB-INF/classes/resources/messages_ko_KR.properties
@@ -1133,7 +1133,7 @@ label.weekly=\ub9e4\uc8fc
label.welcome.cloud.console=\uad00\ub9ac \ucf58\uc194\uc5d0 \uc624\uc2e0\uac83\uc744 \ud658\uc601\ud569\ub2c8\ub2e4\!
label.welcome=\uc5b4\uc11c \uc624\uc2ed\uc2dc\uc624
label.what.is.cloudstack=CloudStack\u2122 \uc815\ubcf4
-label.xen.traffic.label=XenServer \ud2b8\ub798\ud53d \ub77c\ubca8
+label.xenserver.traffic.label=XenServer \ud2b8\ub798\ud53d \ub77c\ubca8
label.yes=\uc608
label.zone.details=Zone \uc0c1\uc138
label.zone.id=Zone ID
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8212d9e/client/WEB-INF/classes/resources/messages_nb_NO.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_nb_NO.properties b/client/WEB-INF/classes/resources/messages_nb_NO.properties
index c169112..c5818b5 100644
--- a/client/WEB-INF/classes/resources/messages_nb_NO.properties
+++ b/client/WEB-INF/classes/resources/messages_nb_NO.properties
@@ -921,7 +921,7 @@ label.weekly=Ukentlig
label.welcome.cloud.console=Velkommen til administrasjonskonsollet
label.welcome=Velkommen
label.what.is.cloudstack=Hva er CloudStack&\#8482?
-label.xen.traffic.label=XenServer trafikketikett
+label.xenserver.traffic.label=XenServer trafikketikett
label.yes=Ja
label.zone.details=Sonedetaljer
label.zone.id=Sone ID
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8212d9e/client/WEB-INF/classes/resources/messages_nl_NL.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_nl_NL.properties b/client/WEB-INF/classes/resources/messages_nl_NL.properties
index d1f5426..5dace30 100644
--- a/client/WEB-INF/classes/resources/messages_nl_NL.properties
+++ b/client/WEB-INF/classes/resources/messages_nl_NL.properties
@@ -1246,7 +1246,7 @@ label.weekly=Wekelijks
label.welcome.cloud.console=Welkom op de Management Console
label.welcome=Welkom
label.what.is.cloudstack=Wat is CloudStack&\#8482?
-label.xen.traffic.label=XenServer verkeerslabel
+label.xenserver.traffic.label=XenServer verkeerslabel
label.yes=Ja
label.zone.details=Zone details
label.zone.id=Zone ID
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8212d9e/client/WEB-INF/classes/resources/messages_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_pt_BR.properties b/client/WEB-INF/classes/resources/messages_pt_BR.properties
index 2d8182a..cb56db1 100644
--- a/client/WEB-INF/classes/resources/messages_pt_BR.properties
+++ b/client/WEB-INF/classes/resources/messages_pt_BR.properties
@@ -1248,7 +1248,7 @@ label.weekly=Semanal
label.welcome=Bem-Vindo
label.welcome.cloud.console=Painel de Controle
label.what.is.cloudstack=O que \u00e9 o CloudStack&\#8482?
-label.xen.traffic.label=Etiqueta de tr\u00e1fego XenServer
+label.xenserver.traffic.label=Etiqueta de tr\u00e1fego XenServer
label.yes=Sim
label.zone.details=Detalhes de zona
label.zone.id=ID da Zona
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8212d9e/client/WEB-INF/classes/resources/messages_ru_RU.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_ru_RU.properties b/client/WEB-INF/classes/resources/messages_ru_RU.properties
index cd3d639..303b6d4 100644
--- a/client/WEB-INF/classes/resources/messages_ru_RU.properties
+++ b/client/WEB-INF/classes/resources/messages_ru_RU.properties
@@ -1203,7 +1203,7 @@ label.weekly=\u0415\u0436\u0435\u043d\u0435\u0434\u0435\u043b\u044c\u043d\u043e
label.welcome.cloud.console=\u0414\u043e\u0431\u0440\u043e \u043f\u043e\u0436\u0430\u043b\u043e\u0432\u0430\u0442\u044c \u043d\u0430 \u043f\u0430\u043d\u0435\u043b\u044c \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f
label.welcome=\u0414\u043e\u0431\u0440\u043e \u043f\u043e\u0436\u0430\u043b\u043e\u0432\u0430\u0442\u044c
label.what.is.cloudstack=\u0427\u0442\u043e \u0442\u0430\u043a\u043e\u0435 CloudStack?
-label.xen.traffic.label=\u041c\u0435\u0442\u043a\u0430 \u0442\u0440\u0430\u0444\u0438\u043a\u0430 XenServer
+label.xenserver.traffic.label=\u041c\u0435\u0442\u043a\u0430 \u0442\u0440\u0430\u0444\u0438\u043a\u0430 XenServer
label.yes=\u0414\u0430
label.zone.details=\u041f\u043e\u0434\u0440\u043e\u0431\u043d\u043e\u0441\u0442\u0438 \u0437\u043e\u043d\u044b
label.zone.id=ID \u0437\u043e\u043d\u044b
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8212d9e/client/WEB-INF/classes/resources/messages_zh_CN.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages_zh_CN.properties b/client/WEB-INF/classes/resources/messages_zh_CN.properties
index 8ad96b5..3ae42cd 100644
--- a/client/WEB-INF/classes/resources/messages_zh_CN.properties
+++ b/client/WEB-INF/classes/resources/messages_zh_CN.properties
@@ -1453,7 +1453,7 @@ label.welcome=\u6b22\u8fce
label.what.is.cloudstack=\u4ec0\u4e48\u662f CloudStack&\#8482?
label.xenserver.tools.version.61.plus=XenServer Tools \u7248\u672c 6.1\\+
label.Xenserver.Tools.Version61plus=XenServer Tools \u7248\u672c 6.1\\+
-label.xen.traffic.label=XenServer \u6d41\u91cf\u6807\u7b7e
+label.xenserver.traffic.label=XenServer \u6d41\u91cf\u6807\u7b7e
label.yes=\u662f
label.zone.dedicated=\u8d44\u6e90\u57df\u5df2\u4e13\u7528
label.zone.details=\u533a\u57df\u8be6\u60c5
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8212d9e/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 2fb5586..4d1c118 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -147,7 +147,7 @@
</dependency>
<dependency>
<groupId>org.apache.cloudstack</groupId>
- <artifactId>cloud-plugin-hypervisor-xen</artifactId>
+ <artifactId>cloud-plugin-hypervisor-xenserver</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8212d9e/client/tomcatconf/applicationContext.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/applicationContext.xml.in b/client/tomcatconf/applicationContext.xml.in
index da242b3..37cb3dd 100644
--- a/client/tomcatconf/applicationContext.xml.in
+++ b/client/tomcatconf/applicationContext.xml.in
@@ -528,7 +528,7 @@
<!--
Discovers
-->
- <bean id="XcpServerDiscoverer" class="com.cloud.hypervisor.xen.discoverer.XcpServerDiscoverer">
+ <bean id="XcpServerDiscoverer" class="com.cloud.hypervisor.xenserver.discoverer.XcpServerDiscoverer">
<property name="name" value="XCP Agent"/>
</bean>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8212d9e/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeVO.java b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeVO.java
index 395a4e3..3fe9881 100644
--- a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeVO.java
+++ b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeVO.java
@@ -48,7 +48,7 @@ public class PhysicalNetworkTrafficTypeVO implements PhysicalNetworkTrafficType
@Enumerated(value = EnumType.STRING)
TrafficType trafficType;
- @Column(name = "xen_network_label")
+ @Column(name = "xenserver_network_label")
private String xenNetworkLabel;
@Column(name = "kvm_network_label")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8212d9e/engine/storage/integration-test/pom.xml
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/pom.xml b/engine/storage/integration-test/pom.xml
index 892a7c9..912bafe 100644
--- a/engine/storage/integration-test/pom.xml
+++ b/engine/storage/integration-test/pom.xml
@@ -58,7 +58,7 @@
</dependency>
<dependency>
<groupId>org.apache.cloudstack</groupId>
- <artifactId>cloud-plugin-hypervisor-xen</artifactId>
+ <artifactId>cloud-plugin-hypervisor-xenserver</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8212d9e/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java
index 5151629..b34b697 100644
--- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java
+++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java
@@ -52,7 +52,7 @@ import com.cloud.host.dao.HostDao;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
import com.cloud.hypervisor.vmware.VmwareServerDiscoverer;
-import com.cloud.hypervisor.xen.resource.XcpOssResource;
+import com.cloud.hypervisor.xenserver.resource.XcpOssResource;
import com.cloud.resource.ServerResource;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.exception.CloudRuntimeException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8212d9e/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java
index 71c7c8d..196132b 100644
--- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java
+++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java
@@ -85,17 +85,17 @@ public class DirectAgentTest extends CloudStackTestNGBase {
HostPodVO pod = new HostPodVO(UUID.randomUUID().toString(), dc.getId(), getHostGateway(), getHostCidr(), 8, "test");
pod = podDao.persist(pod);
- // create xen cluster
+ // create xenserver cluster
ClusterVO cluster = new ClusterVO(dc.getId(), pod.getId(), "devcloud cluster");
cluster.setHypervisorType(HypervisorType.XenServer.toString());
cluster.setClusterType(ClusterType.CloudManaged);
cluster.setManagedState(ManagedState.Managed);
cluster = clusterDao.persist(cluster);
clusterId = cluster.getId();
- // create xen host
+ // create xenserver host
host = new HostVO(getHostGuid());
- host.setName("devcloud xen host");
+ host.setName("devcloud xenserver host");
host.setType(Host.Type.Routing);
host.setHypervisorType(HypervisorType.XenServer);
host.setPrivateIpAddress(getHostIp());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8212d9e/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/EndpointSelectorTest.java
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/EndpointSelectorTest.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/EndpointSelectorTest.java
index b841bf2..f81b8fe 100644
--- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/EndpointSelectorTest.java
+++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/EndpointSelectorTest.java
@@ -158,7 +158,7 @@ public class EndpointSelectorTest {
HostPodVO pod = new HostPodVO(UUID.randomUUID().toString(), dc.getId(), "10.223.0.1", "10.233.2.2/25", 8, "test");
pod = podDao.persist(pod);
podId = pod.getId();
- // create xen cluster
+ // create xenserver cluster
ClusterVO cluster = new ClusterVO(dc.getId(), pod.getId(), "devcloud cluster");
cluster.setHypervisorType(Hypervisor.HypervisorType.XenServer.toString());
cluster.setClusterType(Cluster.ClusterType.CloudManaged);
@@ -230,7 +230,7 @@ public class EndpointSelectorTest {
public HostVO createHost(Hypervisor.HypervisorType hypervisorType) {
String uuid = UUID.randomUUID().toString();
HostVO host = new HostVO(uuid);
- host.setName("devcloud xen host");
+ host.setName("devcloud xenserver host");
host.setType(Host.Type.Routing);
host.setPrivateIpAddress(uuid);
host.setDataCenterId(dcId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8212d9e/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java
index cac6ea2..1b5746d 100644
--- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java
+++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java
@@ -191,17 +191,17 @@ public class SnapshotTest extends CloudStackTestNGBase {
HostPodVO pod = new HostPodVO(UUID.randomUUID().toString(), dc.getId(), this.getHostGateway(), this.getHostCidr(), 8, "test");
pod = podDao.persist(pod);
podId = pod.getId();
- // create xen cluster
+ // create xenserver cluster
ClusterVO cluster = new ClusterVO(dc.getId(), pod.getId(), "devcloud cluster");
cluster.setHypervisorType(this.getHypervisor().toString());
cluster.setClusterType(ClusterType.CloudManaged);
cluster.setManagedState(ManagedState.Managed);
cluster = clusterDao.persist(cluster);
clusterId = cluster.getId();
- // create xen host
+ // create xenserver host
host = new HostVO(this.getHostGuid());
- host.setName("devcloud xen host");
+ host.setName("devcloud xenserver host");
host.setType(Host.Type.Routing);
host.setPrivateIpAddress(this.getHostIp());
host.setDataCenterId(dc.getId());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8212d9e/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTestWithFakeData.java
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTestWithFakeData.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTestWithFakeData.java
index fcac783..8c7b06d 100644
--- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTestWithFakeData.java
+++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTestWithFakeData.java
@@ -157,7 +157,7 @@ public class SnapshotTestWithFakeData {
HostPodVO pod = new HostPodVO(UUID.randomUUID().toString(), dc.getId(), "10.223.0.1", "10.233.2.2/25", 8, "test");
pod = podDao.persist(pod);
podId = pod.getId();
- // create xen cluster
+ // create xenserver cluster
ClusterVO cluster = new ClusterVO(dc.getId(), pod.getId(), "devcloud cluster");
cluster.setHypervisorType(Hypervisor.HypervisorType.XenServer.toString());
cluster.setClusterType(Cluster.ClusterType.CloudManaged);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8212d9e/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeServiceTest.java
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeServiceTest.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeServiceTest.java
index 5fe1d39..0fc6f59 100644
--- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeServiceTest.java
+++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeServiceTest.java
@@ -148,17 +148,17 @@ public class VolumeServiceTest extends CloudStackTestNGBase {
HostPodVO pod = new HostPodVO(UUID.randomUUID().toString(), dc.getId(), this.getHostGateway(), this.getHostCidr(), 8, "test");
pod = podDao.persist(pod);
podId = pod.getId();
- // create xen cluster
+ // create xenserver cluster
ClusterVO cluster = new ClusterVO(dc.getId(), pod.getId(), "devcloud cluster");
cluster.setHypervisorType(HypervisorType.XenServer.toString());
cluster.setClusterType(ClusterType.CloudManaged);
cluster.setManagedState(ManagedState.Managed);
cluster = clusterDao.persist(cluster);
clusterId = cluster.getId();
- // create xen host
+ // create xenserver host
host = new HostVO(this.getHostGuid());
- host.setName("devcloud xen host");
+ host.setName("devcloud xenserver host");
host.setType(Host.Type.Routing);
host.setPrivateIpAddress(this.getHostIp());
host.setDataCenterId(dc.getId());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8212d9e/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTest.java
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTest.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTest.java
index 4a6151d..c274d76 100644
--- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTest.java
+++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTest.java
@@ -167,17 +167,17 @@ public class VolumeTest extends CloudStackTestNGBase {
HostPodVO pod = new HostPodVO(UUID.randomUUID().toString(), dc.getId(), this.getHostGateway(), this.getHostCidr(), 8, "test");
pod = podDao.persist(pod);
podId = pod.getId();
- // create xen cluster
+ // create xenserver cluster
ClusterVO cluster = new ClusterVO(dc.getId(), pod.getId(), "devcloud cluster");
cluster.setHypervisorType(this.getHypervisor().toString());
cluster.setClusterType(ClusterType.CloudManaged);
cluster.setManagedState(ManagedState.Managed);
cluster = clusterDao.persist(cluster);
clusterId = cluster.getId();
- // create xen host
+ // create xenserver host
host = new HostVO(this.getHostGuid());
- host.setName("devcloud xen host");
+ host.setName("devcloud xenserver host");
host.setType(Host.Type.Routing);
host.setPrivateIpAddress(this.getHostIp());
host.setDataCenterId(dc.getId());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8212d9e/engine/storage/integration-test/test/resources/component.xml
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/test/resources/component.xml b/engine/storage/integration-test/test/resources/component.xml
index d7fe903..0981841 100644
--- a/engine/storage/integration-test/test/resources/component.xml
+++ b/engine/storage/integration-test/test/resources/component.xml
@@ -109,7 +109,7 @@
</bean>
- <bean id="XcpServerDiscoverer" class="com.cloud.hypervisor.xen.discoverer.XcpServerDiscoverer">
+ <bean id="XcpServerDiscoverer" class="com.cloud.hypervisor.xenserver.discoverer.XcpServerDiscoverer">
<property name="name" value="XCP Agent"/>
</bean>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8212d9e/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
----------------------------------------------------------------------
diff --git a/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java b/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
index 304f959..f06b43e 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
@@ -150,7 +150,7 @@ public class DefaultEndPointSelector implements EndPointSelector {
}
protected EndPoint findEndPointForImageMove(DataStore srcStore, DataStore destStore) {
- // find any xen/kvm host in the scope
+ // find any xenserver/kvm host in the scope
Scope srcScope = srcStore.getScope();
Scope destScope = destStore.getScope();
Scope selectedScope = null;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8212d9e/engine/storage/storage.ucls
----------------------------------------------------------------------
diff --git a/engine/storage/storage.ucls b/engine/storage/storage.ucls
index 4de955d..197432e 100644
--- a/engine/storage/storage.ucls
+++ b/engine/storage/storage.ucls
@@ -70,9 +70,9 @@
</display>
</interface>
<class id="6" corner="BOTTOM_RIGHT" language="java"
- name="org.apache.cloudstack.storage.datastore.configurator.xen.XenNfsConfigurator"
+ name="org.apache.cloudstack.storage.datastore.configurator.xenserver.XenNfsConfigurator"
project="cloud-engine-storage-volume"
- file="/cloud-engine-storage-volume/src/org/apache/cloudstack/storage/datastore/configurator/xen/XenNfsConfigurator.java"
+ file="/cloud-engine-storage-volume/src/org/apache/cloudstack/storage/datastore/configurator/xenserver/XenNfsConfigurator.java"
binary="false">
<position height="-1" width="-1" x="1482" y="448"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" visibility="true">
@@ -81,9 +81,9 @@
</display>
</class>
<class id="7" corner="BOTTOM_RIGHT" language="java"
- name="org.apache.cloudstack.storage.datastore.configurator.xen.AbstractXenConfigurator"
+ name="org.apache.cloudstack.storage.datastore.configurator.xenserver.AbstractXenConfigurator"
project="cloud-engine-storage-volume"
- file="/cloud-engine-storage-volume/src/org/apache/cloudstack/storage/datastore/configurator/xen/AbstractXenConfigurator.java"
+ file="/cloud-engine-storage-volume/src/org/apache/cloudstack/storage/datastore/configurator/xenserver/AbstractXenConfigurator.java"
binary="false">
<position height="-1" width="-1" x="1536" y="278"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" visibility="true">
@@ -134,9 +134,9 @@
</display>
</class>
<class id="12" corner="BOTTOM_RIGHT" language="java"
- name="org.apache.cloudstack.storage.datastore.lifecycle.DefaultXenPrimaryDataStoreLifeCycle"
+ name="org.apache.cloudstack.storage.datastore.lifecycle.DefaultXenServerPrimaryDataStoreLifeCycle"
project="cloud-engine-storage-volume"
- file="/cloud-engine-storage-volume/src/org/apache/cloudstack/storage/datastore/lifecycle/DefaultXenPrimaryDataStoreLifeCycle.java"
+ file="/cloud-engine-storage-volume/src/org/apache/cloudstack/storage/datastore/lifecycle/DefaultXenServerPrimaryDataStoreLifeCycle.java"
binary="false">
<position height="-1" width="-1" x="724" y="1502"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" visibility="true">
@@ -156,9 +156,9 @@
</display>
</class>
<class id="14" corner="BOTTOM_RIGHT" language="java"
- name="org.apache.cloudstack.storage.datastore.configurator.xen.XenIscsiConfigurator"
+ name="org.apache.cloudstack.storage.datastore.configurator.xenserver.XenServerIscsiConfigurator"
project="cloud-engine-storage-volume"
- file="/cloud-engine-storage-volume/src/org/apache/cloudstack/storage/datastore/configurator/xen/XenIscsiConfigurator.java"
+ file="/cloud-engine-storage-volume/src/org/apache/cloudstack/storage/datastore/configurator/xenserver/XenServerIscsiConfigurator.java"
binary="false">
<position height="-1" width="-1" x="1817" y="450"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" visibility="true">
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8212d9e/plugins/hypervisors/xen/findbugsExcludeFilter.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/findbugsExcludeFilter.xml b/plugins/hypervisors/xen/findbugsExcludeFilter.xml
deleted file mode 100644
index b341889..0000000
--- a/plugins/hypervisors/xen/findbugsExcludeFilter.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<FindBugsFilter>
-
- <!-- Match all XYZ violations. -->
- <Match>
- <Class name="CitrixResourceBase" />
- <Method name="getStatsRawXML" />
- <Bug pattern="DM_DEFAULT_ENCODING" />
- </Match>
-
-</FindBugsFilter>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8212d9e/plugins/hypervisors/xen/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/pom.xml b/plugins/hypervisors/xen/pom.xml
deleted file mode 100644
index 0204157..0000000
--- a/plugins/hypervisors/xen/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
- license agreements. See the NOTICE file distributed with this work for additional
- information regarding copyright ownership. The ASF licenses this file to
- you under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
- language governing permissions and limitations under the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>cloud-plugin-hypervisor-xen</artifactId>
- <name>Apache CloudStack Plugin - Hypervisor Xen</name>
- <parent>
- <groupId>org.apache.cloudstack</groupId>
- <artifactId>cloudstack-plugins</artifactId>
- <version>4.5.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <dependencies>
- <dependency>
- <groupId>org.apache.cloudstack</groupId>
- <artifactId>cloud-engine-storage</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cloudstack</groupId>
- <artifactId>cloud-plugin-network-ovs</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>net.java.dev.vcc.thirdparty</groupId>
- <artifactId>xen-api</artifactId>
- <version>${cs.xapi.version}</version>
- </dependency>
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8212d9e/plugins/hypervisors/xen/resources/META-INF/cloudstack/xenserver-compute/module.properties
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/resources/META-INF/cloudstack/xenserver-compute/module.properties b/plugins/hypervisors/xen/resources/META-INF/cloudstack/xenserver-compute/module.properties
deleted file mode 100644
index c6c91f6..0000000
--- a/plugins/hypervisors/xen/resources/META-INF/cloudstack/xenserver-compute/module.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-name=xenserver-compute
-parent=compute
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8212d9e/plugins/hypervisors/xen/resources/META-INF/cloudstack/xenserver-compute/spring-xenserver-compute-context.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/resources/META-INF/cloudstack/xenserver-compute/spring-xenserver-compute-context.xml b/plugins/hypervisors/xen/resources/META-INF/cloudstack/xenserver-compute/spring-xenserver-compute-context.xml
deleted file mode 100644
index e024ad8..0000000
--- a/plugins/hypervisors/xen/resources/META-INF/cloudstack/xenserver-compute/spring-xenserver-compute-context.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
- license agreements. See the NOTICE file distributed with this work for additional
- information regarding copyright ownership. The ASF licenses this file to
- you under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
- language governing permissions and limitations under the License. -->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
- xmlns:aop="http://www.springframework.org/schema/aop"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
- http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd">
-
- <bean id="XenServerFencer" class="com.cloud.ha.XenServerFencer">
- <property name="name" value="XenServerFenceBuilder" />
- </bean>
-
- <bean id="XenServerGuru" class="com.cloud.hypervisor.XenServerGuru">
- <property name="name" value="XenServerGuru" />
- </bean>
-
-</beans>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8212d9e/plugins/hypervisors/xen/resources/META-INF/cloudstack/xenserver-discoverer/module.properties
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/resources/META-INF/cloudstack/xenserver-discoverer/module.properties b/plugins/hypervisors/xen/resources/META-INF/cloudstack/xenserver-discoverer/module.properties
deleted file mode 100644
index 10d0ecd..0000000
--- a/plugins/hypervisors/xen/resources/META-INF/cloudstack/xenserver-discoverer/module.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-name=xenserver-discoverer
-parent=discoverer
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8212d9e/plugins/hypervisors/xen/resources/META-INF/cloudstack/xenserver-discoverer/spring-xenserver-discoverer-context.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/resources/META-INF/cloudstack/xenserver-discoverer/spring-xenserver-discoverer-context.xml b/plugins/hypervisors/xen/resources/META-INF/cloudstack/xenserver-discoverer/spring-xenserver-discoverer-context.xml
deleted file mode 100644
index c301007..0000000
--- a/plugins/hypervisors/xen/resources/META-INF/cloudstack/xenserver-discoverer/spring-xenserver-discoverer-context.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
- license agreements. See the NOTICE file distributed with this work for additional
- information regarding copyright ownership. The ASF licenses this file to
- you under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
- language governing permissions and limitations under the License. -->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
- xmlns:aop="http://www.springframework.org/schema/aop"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
- http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd">
-
- <bean id="XcpServerDiscoverer"
- class="com.cloud.hypervisor.xen.discoverer.XcpServerDiscoverer">
- <property name="name" value="XCP Agent" />
- </bean>
-
-</beans>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8212d9e/plugins/hypervisors/xen/src/com/cloud/ha/XenServerFencer.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/ha/XenServerFencer.java b/plugins/hypervisors/xen/src/com/cloud/ha/XenServerFencer.java
deleted file mode 100755
index 28cba2b..0000000
--- a/plugins/hypervisors/xen/src/com/cloud/ha/XenServerFencer.java
+++ /dev/null
@@ -1,129 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.ha;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.ejb.Local;
-import javax.inject.Inject;
-import javax.naming.ConfigurationException;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.agent.AgentManager;
-import com.cloud.agent.api.Answer;
-import com.cloud.agent.api.FenceAnswer;
-import com.cloud.agent.api.FenceCommand;
-import com.cloud.exception.AgentUnavailableException;
-import com.cloud.exception.OperationTimedoutException;
-import com.cloud.host.Host;
-import com.cloud.host.HostVO;
-import com.cloud.host.Status;
-import com.cloud.host.dao.HostDao;
-import com.cloud.hypervisor.Hypervisor.HypervisorType;
-import com.cloud.resource.ResourceManager;
-import com.cloud.utils.component.AdapterBase;
-import com.cloud.vm.VirtualMachine;
-
-@Local(value = FenceBuilder.class)
-public class XenServerFencer extends AdapterBase implements FenceBuilder {
- private static final Logger s_logger = Logger.getLogger(XenServerFencer.class);
-
- @Inject
- HostDao _hostDao;
- @Inject
- AgentManager _agentMgr;
- @Inject
- ResourceManager _resourceMgr;
-
- @Override
- public Boolean fenceOff(VirtualMachine vm, Host host) {
- if (host.getHypervisorType() != HypervisorType.XenServer) {
- s_logger.debug("Don't know how to fence non XenServer hosts " + host.getHypervisorType());
- return null;
- }
-
- List<HostVO> hosts = _resourceMgr.listAllHostsInCluster(host.getClusterId());
- FenceCommand fence = new FenceCommand(vm, host);
-
- for (HostVO h : hosts) {
- if (h.getHypervisorType() == HypervisorType.XenServer) {
- if (h.getStatus() != Status.Up) {
- continue;
- }
- if (h.getId() == host.getId()) {
- continue;
- }
- FenceAnswer answer;
- try {
- Answer ans = _agentMgr.send(h.getId(), fence);
- if (!(ans instanceof FenceAnswer)) {
- s_logger.debug("Answer is not fenceanswer. Result = " + ans.getResult() + "; Details = " + ans.getDetails());
- continue;
- }
- answer = (FenceAnswer)ans;
- } catch (AgentUnavailableException e) {
- if (s_logger.isDebugEnabled()) {
- s_logger.debug("Moving on to the next host because " + h.toString() + " is unavailable");
- }
- continue;
- } catch (OperationTimedoutException e) {
- if (s_logger.isDebugEnabled()) {
- s_logger.debug("Moving on to the next host because " + h.toString() + " is unavailable");
- }
- continue;
- }
- if (answer != null && answer.getResult()) {
- return true;
- }
- }
- }
-
- if (s_logger.isDebugEnabled()) {
- s_logger.debug("Unable to fence off " + vm.toString() + " on " + host.toString());
- }
-
- return false;
- }
-
- public XenServerFencer() {
- super();
- }
-
- @Override
- public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
- _name = name;
- return true;
- }
-
- @Override
- public String getName() {
- return _name;
- }
-
- @Override
- public boolean start() {
- return true;
- }
-
- @Override
- public boolean stop() {
- return true;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8212d9e/plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java
deleted file mode 100644
index 89e4ab5..0000000
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java
+++ /dev/null
@@ -1,160 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.hypervisor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.ejb.Local;
-import javax.inject.Inject;
-
-import com.cloud.agent.api.Command;
-import com.cloud.agent.api.to.DataObjectType;
-import com.cloud.agent.api.to.DataStoreTO;
-import com.cloud.agent.api.to.DataTO;
-import com.cloud.agent.api.to.DiskTO;
-import com.cloud.agent.api.to.NfsTO;
-import com.cloud.agent.api.to.VirtualMachineTO;
-import com.cloud.host.HostVO;
-import com.cloud.host.dao.HostDao;
-import com.cloud.hypervisor.Hypervisor.HypervisorType;
-import com.cloud.storage.GuestOSVO;
-import com.cloud.storage.VolumeVO;
-import com.cloud.storage.dao.GuestOSDao;
-import com.cloud.storage.dao.VolumeDao;
-import com.cloud.template.VirtualMachineTemplate.BootloaderType;
-import com.cloud.utils.Pair;
-import com.cloud.vm.VirtualMachine;
-import com.cloud.vm.VirtualMachineProfile;
-
-import org.apache.cloudstack.hypervisor.xenserver.XenserverConfigs;
-import org.apache.cloudstack.engine.subsystem.api.storage.EndPoint;
-import org.apache.cloudstack.engine.subsystem.api.storage.EndPointSelector;
-import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory;
-import org.apache.cloudstack.engine.subsystem.api.storage.ZoneScope;
-import org.apache.cloudstack.storage.command.CopyCommand;
-import org.apache.cloudstack.storage.command.DettachCommand;
-import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
-import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
-
-@Local(value = HypervisorGuru.class)
-public class XenServerGuru extends HypervisorGuruBase implements HypervisorGuru {
- @Inject
- GuestOSDao _guestOsDao;
- @Inject
- EndPointSelector endPointSelector;
- @Inject
- HostDao hostDao;
- @Inject
- VolumeDao _volumeDao;
- @Inject
- PrimaryDataStoreDao _storagePoolDao;
- @Inject
- VolumeDataFactory _volFactory;
-
- protected XenServerGuru() {
- super();
- }
-
- @Override
- public HypervisorType getHypervisorType() {
- return HypervisorType.XenServer;
- }
-
- @Override
- public VirtualMachineTO implement(VirtualMachineProfile vm) {
- BootloaderType bt = BootloaderType.PyGrub;
- if (vm.getBootLoaderType() == BootloaderType.CD) {
- bt = vm.getBootLoaderType();
- }
- VirtualMachineTO to = toVirtualMachineTO(vm);
- to.setBootloader(bt);
-
- // Determine the VM's OS description
- GuestOSVO guestOS = _guestOsDao.findById(vm.getVirtualMachine().getGuestOSId());
- to.setOs(guestOS.getDisplayName());
-
- return to;
- }
-
- @Override
- public boolean trackVmHostChange() {
- return true;
- }
-
- @Override
- public List<Command> finalizeExpungeVolumes(VirtualMachine vm) {
- List<Command> commands = new ArrayList<Command>();
-
- List<VolumeVO> volumes = _volumeDao.findByInstance(vm.getId());
-
- // it's OK in this case to send a detach command to the host for a root volume as this
- // will simply lead to the SR that supports the root volume being removed
- if (volumes != null) {
- for (VolumeVO volume : volumes) {
- StoragePoolVO storagePool = _storagePoolDao.findById(volume.getPoolId());
-
- // storagePool should be null if we are expunging a volume that was never
- // attached to a VM that was started (the "trick" for storagePool to be null
- // is that none of the VMs this volume may have been attached to were ever started,
- // so the volume was never assigned to a storage pool)
- if (storagePool != null && storagePool.isManaged()) {
- DataTO volTO = _volFactory.getVolume(volume.getId()).getTO();
- DiskTO disk = new DiskTO(volTO, volume.getDeviceId(), volume.getPath(), volume.getVolumeType());
-
- DettachCommand cmd = new DettachCommand(disk, vm.getInstanceName());
-
- cmd.setManaged(true);
-
- cmd.setStorageHost(storagePool.getHostAddress());
- cmd.setStoragePort(storagePool.getPort());
-
- cmd.set_iScsiName(volume.get_iScsiName());
-
- commands.add(cmd);
- }
- }
- }
-
- return commands;
- }
-
- @Override
- public Pair<Boolean, Long> getCommandHostDelegation(long hostId, Command cmd) {
- if (cmd instanceof CopyCommand) {
- CopyCommand cpyCommand = (CopyCommand)cmd;
- DataTO srcData = cpyCommand.getSrcTO();
- DataTO destData = cpyCommand.getDestTO();
-
- if (srcData.getObjectType() == DataObjectType.SNAPSHOT && destData.getObjectType() == DataObjectType.TEMPLATE) {
- DataStoreTO srcStore = srcData.getDataStore();
- DataStoreTO destStore = destData.getDataStore();
- if (srcStore instanceof NfsTO && destStore instanceof NfsTO) {
- HostVO host = hostDao.findById(hostId);
- EndPoint ep = endPointSelector.selectHypervisorHost(new ZoneScope(host.getDataCenterId()));
- host = hostDao.findById(ep.getId());
- hostDao.loadDetails(host);
- String snapshotHotFixVersion = host.getDetail(XenserverConfigs.XS620HotFix);
- if (snapshotHotFixVersion != null && snapshotHotFixVersion.equalsIgnoreCase(XenserverConfigs.XSHotFix62ESP1004)) {
- return new Pair<Boolean, Long>(Boolean.TRUE, new Long(ep.getId()));
- }
- }
- }
- }
- return new Pair<Boolean, Long>(Boolean.FALSE, new Long(hostId));
- }
-}