From 79d24ae218889b36674f2c064701638b3f2c5e29 Mon Sep 17 00:00:00 2001 From: Rafael da Fonseca Date: Sat, 23 May 2015 16:14:09 +0200 Subject: [PATCH] Fix xenserver tests for travis --- .../hypervisor/xenserver/resource/CitrixResourceBase.java | 4 ++-- .../wrapper/{ => citrix}/CitrixAttachIsoCommandWrapper.java | 2 +- .../{ => citrix}/CitrixAttachVolumeCommandWrapper.java | 2 +- .../CitrixCheckConsoleProxyLoadCommandWrapper.java | 2 +- .../{ => citrix}/CitrixCheckHealthCommandWrapper.java | 2 +- .../{ => citrix}/CitrixCheckNetworkCommandWrapper.java | 2 +- .../{ => citrix}/CitrixCheckOnHostCommandWrapper.java | 2 +- .../wrapper/{ => citrix}/CitrixCheckSshCommandWrapper.java | 2 +- .../CitrixCheckVirtualMachineCommandWrapper.java | 2 +- .../{ => citrix}/CitrixCleanupNetworkRulesCmdWrapper.java | 2 +- .../CitrixClusterVMMetaDataSyncCommandWrapper.java | 2 +- .../{ => citrix}/CitrixConsoleProxyLoadCommandWrapper.java | 2 +- .../wrapper/{ => citrix}/CitrixCreateCommandWrapper.java | 2 +- .../{ => citrix}/CitrixCreateStoragePoolCommandWrapper.java | 2 +- .../{ => citrix}/CitrixCreateVMSnapshotCommandWrapper.java | 2 +- .../{ => citrix}/CitrixDeleteStoragePoolCommandWrapper.java | 2 +- .../{ => citrix}/CitrixDeleteVMSnapshotCommandWrapper.java | 2 +- .../wrapper/{ => citrix}/CitrixDestroyCommandWrapper.java | 2 +- .../{ => citrix}/CitrixGetHostStatsCommandWrapper.java | 2 +- .../{ => citrix}/CitrixGetStorageStatsCommandWrapper.java | 2 +- .../{ => citrix}/CitrixGetVmDiskStatsCommandWrapper.java | 2 +- .../{ => citrix}/CitrixGetVmStatsCommandWrapper.java | 2 +- .../{ => citrix}/CitrixGetVncPortCommandWrapper.java | 2 +- .../wrapper/{ => citrix}/CitrixMaintainCommandWrapper.java | 2 +- .../wrapper/{ => citrix}/CitrixMigrateCommandWrapper.java | 2 +- .../{ => citrix}/CitrixModifySshKeysCommandWrapper.java | 2 +- .../{ => citrix}/CitrixModifyStoragePoolCommandWrapper.java | 2 +- .../{ => citrix}/CitrixNetworkElementCommandWrapper.java | 2 +- .../CitrixNetworkRulesSystemVmCommandWrapper.java | 2 +- .../CitrixNetworkRulesVmSecondaryIpCommandWrapper.java | 2 +- .../CitrixOvsCreateGreTunnelCommandWrapper.java | 2 +- .../{ => citrix}/CitrixOvsCreateTunnelCommandWrapper.java | 2 +- .../{ => citrix}/CitrixOvsDeleteFlowCommandWrapper.java | 2 +- .../{ => citrix}/CitrixOvsDestroyBridgeCommandWrapper.java | 2 +- .../{ => citrix}/CitrixOvsDestroyTunnelCommandWrapper.java | 2 +- .../{ => citrix}/CitrixOvsFetchInterfaceCommandWrapper.java | 2 +- .../{ => citrix}/CitrixOvsSetTagAndFlowCommandWrapper.java | 2 +- .../{ => citrix}/CitrixOvsSetupBridgeCommandWrapper.java | 2 +- .../CitrixOvsVpcPhysicalTopologyConfigCommandWrapper.java | 2 +- .../CitrixOvsVpcRoutingPolicyConfigCommandWrapper.java | 2 +- .../CitrixPerformanceMonitorCommandWrapper.java | 2 +- .../wrapper/{ => citrix}/CitrixPingTestCommandWrapper.java | 2 +- .../wrapper/{ => citrix}/CitrixPlugNicCommandWrapper.java | 2 +- .../CitrixPrepareForMigrationCommandWrapper.java | 2 +- .../CitrixPrimaryStorageDownloadCommandWrapper.java | 2 +- .../{ => citrix}/CitrixPvlanSetupCommandWrapper.java | 2 +- .../wrapper/{ => citrix}/CitrixReadyCommandWrapper.java | 2 +- .../wrapper/{ => citrix}/CitrixRebootCommandWrapper.java | 2 +- .../{ => citrix}/CitrixRebootRouterCommandWrapper.java | 2 +- .../resource/wrapper/{ => citrix}/CitrixRequestWrapper.java | 6 +++--- .../{ => citrix}/CitrixResizeVolumeCommandWrapper.java | 2 +- .../CitrixRevertToVMSnapshotCommandWrapper.java | 2 +- .../wrapper/{ => citrix}/CitrixScaleVmCommandWrapper.java | 2 +- .../CitrixSecurityGroupRulesCommandWrapper.java | 2 +- .../wrapper/{ => citrix}/CitrixSetupCommandWrapper.java | 2 +- .../wrapper/{ => citrix}/CitrixStartCommandWrapper.java | 2 +- .../wrapper/{ => citrix}/CitrixStopCommandWrapper.java | 2 +- .../{ => citrix}/CitrixStorageSubSystemCommandWrapper.java | 2 +- .../wrapper/{ => citrix}/CitrixUnPlugNicCommandWrapper.java | 2 +- .../CitrixUpdateHostPasswordCommandWrapper.java | 2 +- .../{ => citrix}/CitrixUpgradeSnapshotCommandWrapper.java | 2 +- .../CitrixWatchConsoleProxyLoadCommandWrapper.java | 2 +- .../resource/wrapper/CitrixRequestWrapperTest.java | 5 +++-- .../xenserver/resource/wrapper/XcpServerWrapperTest.java | 2 +- .../resource/wrapper/XenServer56FP1WrapperTest.java | 2 +- .../xenserver/resource/wrapper/XenServer56WrapperTest.java | 2 +- .../xenserver/resource/wrapper/XenServer610WrapperTest.java | 2 +- .../resource/wrapper/XenServer620SP1WrapperTest.java | 2 +- .../xenserver/resource/wrapper/XenServer620WrapperTest.java | 2 +- 69 files changed, 74 insertions(+), 73 deletions(-) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixAttachIsoCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixAttachVolumeCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixCheckConsoleProxyLoadCommandWrapper.java (96%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixCheckHealthCommandWrapper.java (95%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixCheckNetworkCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixCheckOnHostCommandWrapper.java (95%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixCheckSshCommandWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixCheckVirtualMachineCommandWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixCleanupNetworkRulesCmdWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixClusterVMMetaDataSyncCommandWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixConsoleProxyLoadCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixCreateCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixCreateStoragePoolCommandWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixCreateVMSnapshotCommandWrapper.java (99%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixDeleteStoragePoolCommandWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixDeleteVMSnapshotCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixDestroyCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixGetHostStatsCommandWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixGetStorageStatsCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixGetVmDiskStatsCommandWrapper.java (95%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixGetVmStatsCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixGetVncPortCommandWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixMaintainCommandWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixMigrateCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixModifySshKeysCommandWrapper.java (95%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixModifyStoragePoolCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixNetworkElementCommandWrapper.java (96%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixNetworkRulesSystemVmCommandWrapper.java (96%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixNetworkRulesVmSecondaryIpCommandWrapper.java (96%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixOvsCreateGreTunnelCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixOvsCreateTunnelCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixOvsDeleteFlowCommandWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixOvsDestroyBridgeCommandWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixOvsDestroyTunnelCommandWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixOvsFetchInterfaceCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixOvsSetTagAndFlowCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixOvsSetupBridgeCommandWrapper.java (96%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixOvsVpcPhysicalTopologyConfigCommandWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixOvsVpcRoutingPolicyConfigCommandWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixPerformanceMonitorCommandWrapper.java (96%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixPingTestCommandWrapper.java (96%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixPlugNicCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixPrepareForMigrationCommandWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixPrimaryStorageDownloadCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixPvlanSetupCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixReadyCommandWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixRebootCommandWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixRebootRouterCommandWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixRequestWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixResizeVolumeCommandWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixRevertToVMSnapshotCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixScaleVmCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixSecurityGroupRulesCommandWrapper.java (98%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixSetupCommandWrapper.java (99%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixStartCommandWrapper.java (99%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixStopCommandWrapper.java (99%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixStorageSubSystemCommandWrapper.java (96%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixUnPlugNicCommandWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixUpdateHostPasswordCommandWrapper.java (95%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixUpgradeSnapshotCommandWrapper.java (97%) rename plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/{ => citrix}/CitrixWatchConsoleProxyLoadCommandWrapper.java (96%) diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java index 6aaaf0e737b..720fca27433 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java @@ -98,7 +98,7 @@ import com.cloud.agent.resource.virtualnetwork.VirtualRoutingResource; import com.cloud.exception.InternalErrorException; import com.cloud.host.Host.Type; import com.cloud.hypervisor.Hypervisor.HypervisorType; -import com.cloud.hypervisor.xenserver.resource.wrapper.CitrixRequestWrapper; +import com.cloud.hypervisor.xenserver.resource.wrapper.citrix.CitrixRequestWrapper; import com.cloud.network.Networks; import com.cloud.network.Networks.BroadcastDomainType; import com.cloud.network.Networks.TrafficType; @@ -4940,4 +4940,4 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe } } } -} \ No newline at end of file +} diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixAttachIsoCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixAttachIsoCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixAttachIsoCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixAttachIsoCommandWrapper.java index 22fc1ac9219..aa84b837ebd 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixAttachIsoCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixAttachIsoCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import java.util.Set; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixAttachVolumeCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixAttachVolumeCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixAttachVolumeCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixAttachVolumeCommandWrapper.java index 37d28b740c3..9a1afa0bc16 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixAttachVolumeCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixAttachVolumeCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import java.util.Set; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCheckConsoleProxyLoadCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckConsoleProxyLoadCommandWrapper.java similarity index 96% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCheckConsoleProxyLoadCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckConsoleProxyLoadCommandWrapper.java index 83f5a802371..f48f8785f50 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCheckConsoleProxyLoadCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckConsoleProxyLoadCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import com.cloud.agent.api.Answer; import com.cloud.agent.api.Command; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCheckHealthCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckHealthCommandWrapper.java similarity index 95% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCheckHealthCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckHealthCommandWrapper.java index 4e36ab7991e..577fbc19a73 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCheckHealthCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckHealthCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import com.cloud.agent.api.Answer; import com.cloud.agent.api.CheckHealthAnswer; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCheckNetworkCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckNetworkCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCheckNetworkCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckNetworkCommandWrapper.java index ca55ab6f74d..04189b5b5b8 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCheckNetworkCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckNetworkCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import java.util.List; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCheckOnHostCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckOnHostCommandWrapper.java similarity index 95% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCheckOnHostCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckOnHostCommandWrapper.java index ffe11951d18..e8a0affbcab 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCheckOnHostCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckOnHostCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import com.cloud.agent.api.Answer; import com.cloud.agent.api.CheckOnHostAnswer; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCheckSshCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckSshCommandWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCheckSshCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckSshCommandWrapper.java index 64a4a3f335e..605340f0854 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCheckSshCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckSshCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import org.apache.log4j.Logger; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCheckVirtualMachineCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckVirtualMachineCommandWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCheckVirtualMachineCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckVirtualMachineCommandWrapper.java index a1954f42b80..4fbd15ba3c2 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCheckVirtualMachineCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckVirtualMachineCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import org.apache.log4j.Logger; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCleanupNetworkRulesCmdWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCleanupNetworkRulesCmdWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCleanupNetworkRulesCmdWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCleanupNetworkRulesCmdWrapper.java index 4b2d5d3ba31..8be398932d0 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCleanupNetworkRulesCmdWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCleanupNetworkRulesCmdWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import org.apache.log4j.Logger; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixClusterVMMetaDataSyncCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixClusterVMMetaDataSyncCommandWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixClusterVMMetaDataSyncCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixClusterVMMetaDataSyncCommandWrapper.java index 84bbf984e70..e601bb6ad54 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixClusterVMMetaDataSyncCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixClusterVMMetaDataSyncCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import java.util.HashMap; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixConsoleProxyLoadCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixConsoleProxyLoadCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixConsoleProxyLoadCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixConsoleProxyLoadCommandWrapper.java index 4e71b0e1237..d3f694aae3c 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixConsoleProxyLoadCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixConsoleProxyLoadCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import java.io.BufferedReader; import java.io.IOException; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCreateCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCreateCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCreateCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCreateCommandWrapper.java index c658fd9685e..81dabffcd30 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCreateCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCreateCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import java.util.HashMap; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCreateStoragePoolCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCreateStoragePoolCommandWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCreateStoragePoolCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCreateStoragePoolCommandWrapper.java index 309859736b7..c74cb1a67d0 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCreateStoragePoolCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCreateStoragePoolCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import org.apache.log4j.Logger; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCreateVMSnapshotCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCreateVMSnapshotCommandWrapper.java similarity index 99% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCreateVMSnapshotCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCreateVMSnapshotCommandWrapper.java index 4b8d616bf9f..0456686b452 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCreateVMSnapshotCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCreateVMSnapshotCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import java.util.LinkedHashSet; import java.util.List; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixDeleteStoragePoolCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixDeleteStoragePoolCommandWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixDeleteStoragePoolCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixDeleteStoragePoolCommandWrapper.java index 6d2054b64de..83d518e3195 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixDeleteStoragePoolCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixDeleteStoragePoolCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import org.apache.log4j.Logger; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixDeleteVMSnapshotCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixDeleteVMSnapshotCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixDeleteVMSnapshotCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixDeleteVMSnapshotCommandWrapper.java index 4f9d57ab4e7..fb00205d7fd 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixDeleteVMSnapshotCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixDeleteVMSnapshotCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import java.util.ArrayList; import java.util.List; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixDestroyCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixDestroyCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixDestroyCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixDestroyCommandWrapper.java index 15f9f1c7602..2b7df86789e 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixDestroyCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixDestroyCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import java.util.Set; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixGetHostStatsCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetHostStatsCommandWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixGetHostStatsCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetHostStatsCommandWrapper.java index 02c3770ba86..a50737f37ff 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixGetHostStatsCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetHostStatsCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import org.apache.log4j.Logger; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixGetStorageStatsCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetStorageStatsCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixGetStorageStatsCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetStorageStatsCommandWrapper.java index 8726141029e..404531a1d17 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixGetStorageStatsCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetStorageStatsCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import java.util.Set; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixGetVmDiskStatsCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetVmDiskStatsCommandWrapper.java similarity index 95% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixGetVmDiskStatsCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetVmDiskStatsCommandWrapper.java index 18e05c47e55..958d48fc7ec 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixGetVmDiskStatsCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetVmDiskStatsCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import com.cloud.agent.api.Answer; import com.cloud.agent.api.GetVmDiskStatsAnswer; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixGetVmStatsCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetVmStatsCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixGetVmStatsCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetVmStatsCommandWrapper.java index 5dce256dd2d..43aefb8f8c8 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixGetVmStatsCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetVmStatsCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import java.util.ArrayList; import java.util.HashMap; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixGetVncPortCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetVncPortCommandWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixGetVncPortCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetVncPortCommandWrapper.java index d57ab573168..a432088a7d7 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixGetVncPortCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetVncPortCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import java.util.Set; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixMaintainCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixMaintainCommandWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixMaintainCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixMaintainCommandWrapper.java index 8b56e9b9585..86f05eec5e0 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixMaintainCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixMaintainCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import java.util.Iterator; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixMigrateCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixMigrateCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixMigrateCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixMigrateCommandWrapper.java index a4265ddd9ca..a8d2d22c889 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixMigrateCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixMigrateCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import java.util.Set; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixModifySshKeysCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixModifySshKeysCommandWrapper.java similarity index 95% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixModifySshKeysCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixModifySshKeysCommandWrapper.java index f44307425bb..012e8b7c0a0 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixModifySshKeysCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixModifySshKeysCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import com.cloud.agent.api.Answer; import com.cloud.agent.api.ModifySshKeysCommand; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixModifyStoragePoolCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixModifyStoragePoolCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixModifyStoragePoolCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixModifyStoragePoolCommandWrapper.java index 64848a408ed..3d51493512e 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixModifyStoragePoolCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixModifyStoragePoolCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import java.util.HashMap; import java.util.Map; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixNetworkElementCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixNetworkElementCommandWrapper.java similarity index 96% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixNetworkElementCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixNetworkElementCommandWrapper.java index d59dca35992..c06124cbb84 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixNetworkElementCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixNetworkElementCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import com.cloud.agent.api.Answer; import com.cloud.agent.api.routing.NetworkElementCommand; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixNetworkRulesSystemVmCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixNetworkRulesSystemVmCommandWrapper.java similarity index 96% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixNetworkRulesSystemVmCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixNetworkRulesSystemVmCommandWrapper.java index 3c2f5efc219..462dbfead74 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixNetworkRulesSystemVmCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixNetworkRulesSystemVmCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import com.cloud.agent.api.Answer; import com.cloud.agent.api.NetworkRulesSystemVmCommand; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixNetworkRulesVmSecondaryIpCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixNetworkRulesVmSecondaryIpCommandWrapper.java similarity index 96% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixNetworkRulesVmSecondaryIpCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixNetworkRulesVmSecondaryIpCommandWrapper.java index f19771f91bf..4ebc8210378 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixNetworkRulesVmSecondaryIpCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixNetworkRulesVmSecondaryIpCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import com.cloud.agent.api.Answer; import com.cloud.agent.api.NetworkRulesVmSecondaryIpCommand; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsCreateGreTunnelCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsCreateGreTunnelCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsCreateGreTunnelCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsCreateGreTunnelCommandWrapper.java index 93d6208c2f1..31c1a9b64d9 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsCreateGreTunnelCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsCreateGreTunnelCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import org.apache.log4j.Logger; import org.apache.xmlrpc.XmlRpcException; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsCreateTunnelCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsCreateTunnelCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsCreateTunnelCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsCreateTunnelCommandWrapper.java index 14d57d874c8..2929bb468c3 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsCreateTunnelCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsCreateTunnelCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import org.apache.log4j.Logger; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsDeleteFlowCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsDeleteFlowCommandWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsDeleteFlowCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsDeleteFlowCommandWrapper.java index 8c782ee508b..c2037319d1a 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsDeleteFlowCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsDeleteFlowCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import org.apache.log4j.Logger; import org.apache.xmlrpc.XmlRpcException; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsDestroyBridgeCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsDestroyBridgeCommandWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsDestroyBridgeCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsDestroyBridgeCommandWrapper.java index 62739fb644b..09067ba72f5 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsDestroyBridgeCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsDestroyBridgeCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import org.apache.log4j.Logger; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsDestroyTunnelCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsDestroyTunnelCommandWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsDestroyTunnelCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsDestroyTunnelCommandWrapper.java index 543c2f5b320..391f31b870a 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsDestroyTunnelCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsDestroyTunnelCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import org.apache.log4j.Logger; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsFetchInterfaceCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsFetchInterfaceCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsFetchInterfaceCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsFetchInterfaceCommandWrapper.java index 8be62dbd5ba..ff42c5de30d 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsFetchInterfaceCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsFetchInterfaceCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import org.apache.log4j.Logger; import org.apache.xmlrpc.XmlRpcException; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsSetTagAndFlowCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsSetTagAndFlowCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsSetTagAndFlowCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsSetTagAndFlowCommandWrapper.java index 087453daec0..5e47c76a428 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsSetTagAndFlowCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsSetTagAndFlowCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import org.apache.log4j.Logger; import org.apache.xmlrpc.XmlRpcException; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsSetupBridgeCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsSetupBridgeCommandWrapper.java similarity index 96% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsSetupBridgeCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsSetupBridgeCommandWrapper.java index 20c6abc3d53..89b0d92edf1 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsSetupBridgeCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsSetupBridgeCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import org.apache.log4j.Logger; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsVpcPhysicalTopologyConfigCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsVpcPhysicalTopologyConfigCommandWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsVpcPhysicalTopologyConfigCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsVpcPhysicalTopologyConfigCommandWrapper.java index 4b0a66dbca6..3d2b986a913 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsVpcPhysicalTopologyConfigCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsVpcPhysicalTopologyConfigCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import org.apache.log4j.Logger; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsVpcRoutingPolicyConfigCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsVpcRoutingPolicyConfigCommandWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsVpcRoutingPolicyConfigCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsVpcRoutingPolicyConfigCommandWrapper.java index de29dc63acc..ea854562d67 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsVpcRoutingPolicyConfigCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsVpcRoutingPolicyConfigCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import org.apache.log4j.Logger; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixPerformanceMonitorCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPerformanceMonitorCommandWrapper.java similarity index 96% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixPerformanceMonitorCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPerformanceMonitorCommandWrapper.java index e3f51ce0346..58abeb5652c 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixPerformanceMonitorCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPerformanceMonitorCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import com.cloud.agent.api.Answer; import com.cloud.agent.api.PerformanceMonitorAnswer; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixPingTestCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPingTestCommandWrapper.java similarity index 96% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixPingTestCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPingTestCommandWrapper.java index caf0242552b..9cd2dff3f58 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixPingTestCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPingTestCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import com.cloud.agent.api.Answer; import com.cloud.agent.api.PingTestCommand; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixPlugNicCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPlugNicCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixPlugNicCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPlugNicCommandWrapper.java index b233baca21b..a75b4e5bd1b 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixPlugNicCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPlugNicCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import java.util.Set; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixPrepareForMigrationCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPrepareForMigrationCommandWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixPrepareForMigrationCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPrepareForMigrationCommandWrapper.java index fde2155394f..eb89c1135ab 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixPrepareForMigrationCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPrepareForMigrationCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import org.apache.log4j.Logger; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixPrimaryStorageDownloadCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPrimaryStorageDownloadCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixPrimaryStorageDownloadCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPrimaryStorageDownloadCommandWrapper.java index 22eca930f65..39ea92cf347 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixPrimaryStorageDownloadCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPrimaryStorageDownloadCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import java.net.URI; import java.util.HashMap; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixPvlanSetupCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPvlanSetupCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixPvlanSetupCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPvlanSetupCommandWrapper.java index 8b7c1749ac1..198c6fb37c3 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixPvlanSetupCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPvlanSetupCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import org.apache.log4j.Logger; import org.apache.xmlrpc.XmlRpcException; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixReadyCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixReadyCommandWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixReadyCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixReadyCommandWrapper.java index 708ea56bd8a..d2bc4ffef69 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixReadyCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixReadyCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import java.util.Set; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixRebootCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixRebootCommandWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixRebootCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixRebootCommandWrapper.java index cc27528b579..2e408eef214 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixRebootCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixRebootCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import java.util.Set; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixRebootRouterCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixRebootRouterCommandWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixRebootRouterCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixRebootRouterCommandWrapper.java index 182048c5839..11a382ddb9a 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixRebootRouterCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixRebootRouterCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import com.cloud.agent.api.Answer; import com.cloud.agent.api.RebootCommand; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixRequestWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixRequestWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixRequestWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixRequestWrapper.java index 8dabaf24440..a26ea67fce0 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixRequestWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixRequestWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import java.util.Hashtable; import java.util.Set; @@ -44,7 +44,7 @@ public class CitrixRequestWrapper extends RequestWrapper { instance = new CitrixRequestWrapper(); } - Reflections baseWrappers = new Reflections("com.cloud.hypervisor.xenserver.resource.wrapper"); + Reflections baseWrappers = new Reflections("com.cloud.hypervisor.xenserver.resource.wrapper.citrix"); @SuppressWarnings("rawtypes") Set> baseSet = baseWrappers.getSubTypesOf(CommandWrapper.class); @@ -121,4 +121,4 @@ public class CitrixRequestWrapper extends RequestWrapper { return commandWrapper.execute(command, serverResource); } -} \ No newline at end of file +} diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixResizeVolumeCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixResizeVolumeCommandWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixResizeVolumeCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixResizeVolumeCommandWrapper.java index 25f350f0c2c..e7a54261eee 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixResizeVolumeCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixResizeVolumeCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import org.apache.log4j.Logger; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixRevertToVMSnapshotCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixRevertToVMSnapshotCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixRevertToVMSnapshotCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixRevertToVMSnapshotCommandWrapper.java index def4df73c65..4522d85c57b 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixRevertToVMSnapshotCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixRevertToVMSnapshotCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import java.util.HashMap; import java.util.List; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixScaleVmCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixScaleVmCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixScaleVmCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixScaleVmCommandWrapper.java index d21bcbd5d65..989857034c0 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixScaleVmCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixScaleVmCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import java.util.Iterator; import java.util.Set; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixSecurityGroupRulesCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixSecurityGroupRulesCommandWrapper.java similarity index 98% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixSecurityGroupRulesCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixSecurityGroupRulesCommandWrapper.java index 793a5641b17..ce39ecfc818 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixSecurityGroupRulesCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixSecurityGroupRulesCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import org.apache.log4j.Logger; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixSetupCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixSetupCommandWrapper.java similarity index 99% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixSetupCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixSetupCommandWrapper.java index 3ff0dfe6a90..63416ed03f5 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixSetupCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixSetupCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import java.util.Map; import java.util.Set; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixStartCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixStartCommandWrapper.java similarity index 99% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixStartCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixStartCommandWrapper.java index 27f8474ae30..62c3f562184 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixStartCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixStartCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import java.util.HashMap; import java.util.List; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixStopCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixStopCommandWrapper.java similarity index 99% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixStopCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixStopCommandWrapper.java index 8310cd8ea56..41aad8306f7 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixStopCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixStopCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import java.util.ArrayList; import java.util.HashMap; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixStorageSubSystemCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixStorageSubSystemCommandWrapper.java similarity index 96% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixStorageSubSystemCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixStorageSubSystemCommandWrapper.java index c14818ed620..21700121dfc 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixStorageSubSystemCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixStorageSubSystemCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import org.apache.cloudstack.storage.command.StorageSubSystemCommand; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixUnPlugNicCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixUnPlugNicCommandWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixUnPlugNicCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixUnPlugNicCommandWrapper.java index 639cfb0334a..5fbd7705088 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixUnPlugNicCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixUnPlugNicCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import java.util.Set; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixUpdateHostPasswordCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixUpdateHostPasswordCommandWrapper.java similarity index 95% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixUpdateHostPasswordCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixUpdateHostPasswordCommandWrapper.java index c5654fd74cb..6c11a187398 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixUpdateHostPasswordCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixUpdateHostPasswordCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import com.cloud.agent.api.Answer; import com.cloud.agent.api.UpdateHostPasswordCommand; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixUpgradeSnapshotCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixUpgradeSnapshotCommandWrapper.java similarity index 97% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixUpgradeSnapshotCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixUpgradeSnapshotCommandWrapper.java index c23ba1b9936..a15893870b1 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixUpgradeSnapshotCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixUpgradeSnapshotCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import java.net.URI; diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixWatchConsoleProxyLoadCommandWrapper.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixWatchConsoleProxyLoadCommandWrapper.java similarity index 96% rename from plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixWatchConsoleProxyLoadCommandWrapper.java rename to plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixWatchConsoleProxyLoadCommandWrapper.java index 74ca0ddf653..eb2790ddb2a 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixWatchConsoleProxyLoadCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixWatchConsoleProxyLoadCommandWrapper.java @@ -17,7 +17,7 @@ // under the License. // -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import com.cloud.agent.api.Answer; import com.cloud.agent.api.Command; diff --git a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixRequestWrapperTest.java b/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixRequestWrapperTest.java index 8d66c6597a4..b40e42bd20b 100644 --- a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixRequestWrapperTest.java +++ b/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixRequestWrapperTest.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -138,6 +138,7 @@ import com.xensource.xenapi.Pool; import com.xensource.xenapi.Types.BadServerResponse; import com.xensource.xenapi.Types.XenAPIException; + @RunWith(MockitoJUnitRunner.class) public class CitrixRequestWrapperTest { @@ -1838,4 +1839,4 @@ class NotAValidCommand extends Command { return false; } -} \ No newline at end of file +} diff --git a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XcpServerWrapperTest.java b/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XcpServerWrapperTest.java index 358d670c11e..304d4cd4960 100644 --- a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XcpServerWrapperTest.java +++ b/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XcpServerWrapperTest.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer56FP1WrapperTest.java b/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer56FP1WrapperTest.java index c2d2131b8c7..8333f3c9fee 100644 --- a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer56FP1WrapperTest.java +++ b/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer56FP1WrapperTest.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer56WrapperTest.java b/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer56WrapperTest.java index c5bb73aeb7a..57f4d825543 100644 --- a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer56WrapperTest.java +++ b/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer56WrapperTest.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer610WrapperTest.java b/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer610WrapperTest.java index 0a539e970d3..bf8099b154d 100644 --- a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer610WrapperTest.java +++ b/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer610WrapperTest.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer620SP1WrapperTest.java b/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer620SP1WrapperTest.java index 67795fe93cd..48d97177066 100644 --- a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer620SP1WrapperTest.java +++ b/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer620SP1WrapperTest.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer620WrapperTest.java b/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer620WrapperTest.java index 3954dc48efb..60435581ba1 100644 --- a/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer620WrapperTest.java +++ b/plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer620WrapperTest.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.hypervisor.xenserver.resource.wrapper; +package com.cloud.hypervisor.xenserver.resource.wrapper.citrix; import static org.junit.Assert.assertTrue;