apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 11:52:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'xen_tests_fix'

Browse Source 
This closes #293
This commit is contained in:
wilderrodrigues 2015-05-23 17:17:22 +02:00
commit d7854791b2
69 changed files with 74 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
View File

@ -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
}
}
}
}
}

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixAttachIsoCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixAttachIsoCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixAttachVolumeCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixAttachVolumeCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCheckConsoleProxyLoadCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckConsoleProxyLoadCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCheckHealthCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckHealthCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCheckNetworkCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckNetworkCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCheckOnHostCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckOnHostCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCheckSshCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckSshCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCheckVirtualMachineCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCheckVirtualMachineCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCleanupNetworkRulesCmdWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCleanupNetworkRulesCmdWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixClusterVMMetaDataSyncCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixClusterVMMetaDataSyncCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixConsoleProxyLoadCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixConsoleProxyLoadCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCreateCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCreateCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCreateStoragePoolCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCreateStoragePoolCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixCreateVMSnapshotCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixCreateVMSnapshotCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixDeleteStoragePoolCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixDeleteStoragePoolCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixDeleteVMSnapshotCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixDeleteVMSnapshotCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixDestroyCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixDestroyCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixGetHostStatsCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetHostStatsCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixGetStorageStatsCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetStorageStatsCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixGetVmDiskStatsCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetVmDiskStatsCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixGetVmStatsCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetVmStatsCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixGetVncPortCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixGetVncPortCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixMaintainCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixMaintainCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixMigrateCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixMigrateCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixModifySshKeysCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixModifySshKeysCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixModifyStoragePoolCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixModifyStoragePoolCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixNetworkElementCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixNetworkElementCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixNetworkRulesSystemVmCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixNetworkRulesSystemVmCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixNetworkRulesVmSecondaryIpCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixNetworkRulesVmSecondaryIpCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsCreateGreTunnelCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsCreateGreTunnelCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsCreateTunnelCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsCreateTunnelCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsDeleteFlowCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsDeleteFlowCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsDestroyBridgeCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsDestroyBridgeCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsDestroyTunnelCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsDestroyTunnelCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsFetchInterfaceCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsFetchInterfaceCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsSetTagAndFlowCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsSetTagAndFlowCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsSetupBridgeCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsSetupBridgeCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsVpcPhysicalTopologyConfigCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsVpcPhysicalTopologyConfigCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixOvsVpcRoutingPolicyConfigCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixOvsVpcRoutingPolicyConfigCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixPerformanceMonitorCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPerformanceMonitorCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixPingTestCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPingTestCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixPlugNicCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPlugNicCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixPrepareForMigrationCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPrepareForMigrationCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixPrimaryStorageDownloadCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPrimaryStorageDownloadCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixPvlanSetupCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixPvlanSetupCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixReadyCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixReadyCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixRebootCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixRebootCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixRebootRouterCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixRebootRouterCommandWrapper.java
View File

@ -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;

6
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixRequestWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixRequestWrapper.java
View File

@ -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<Class<? extends CommandWrapper>> baseSet = baseWrappers.getSubTypesOf(CommandWrapper.class);
@ -121,4 +121,4 @@ public class CitrixRequestWrapper extends RequestWrapper {
return commandWrapper.execute(command, serverResource);
}
}
}

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixResizeVolumeCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixResizeVolumeCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixRevertToVMSnapshotCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixRevertToVMSnapshotCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixScaleVmCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixScaleVmCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixSecurityGroupRulesCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixSecurityGroupRulesCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixSetupCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixSetupCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixStartCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixStartCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixStopCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixStopCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixStorageSubSystemCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixStorageSubSystemCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixUnPlugNicCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixUnPlugNicCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixUpdateHostPasswordCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixUpdateHostPasswordCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixUpgradeSnapshotCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixUpgradeSnapshotCommandWrapper.java
View File

@ -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;

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixWatchConsoleProxyLoadCommandWrapper.java → plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/wrapper/citrix/CitrixWatchConsoleProxyLoadCommandWrapper.java
View File

@ -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;

5
plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/CitrixRequestWrapperTest.java
View File

@ -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;
}
}
}

2
plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XcpServerWrapperTest.java
View File

@ -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;

2
plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer56FP1WrapperTest.java
View File

@ -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;

2
plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer56WrapperTest.java
View File

@ -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;

2
plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer610WrapperTest.java
View File

@ -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;

2
plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer620SP1WrapperTest.java
View File

@ -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;

2
plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/wrapper/XenServer620WrapperTest.java
View File

@ -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;