Resolved merge conflicts
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3df5571d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3df5571d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3df5571d Branch: refs/heads/master Commit: 3df5571d2e0ccf58e9cb8b22b357bbeccc981dfb Parents: de2bd96 Author: Alex Huang <[email protected]> Authored: Mon Aug 12 20:15:24 2013 -0700 Committer: Alex Huang <[email protected]> Committed: Mon Aug 12 20:15:24 2013 -0700 ---------------------------------------------------------------------- client/tomcatconf/applicationContext.xml.in | 7 +- .../service/VolumeOrchestrationService.java | 7 + engine/orchestration/pom.xml | 5 + .../orchestration/VolumeOrchestrator.java | 2542 +++--------------- .../src/com/cloud/resource/ResourceManager.java | 5 +- .../com/cloud/resource/ResourceManagerImpl.java | 7 +- .../com/cloud/storage/StorageManagerImpl.java | 1 + .../cloud/resource/MockResourceManagerImpl.java | 16 +- 8 files changed, 438 insertions(+), 2152 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3df5571d/client/tomcatconf/applicationContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/applicationContext.xml.in b/client/tomcatconf/applicationContext.xml.in index 26cd047..64a88f7 100644 --- a/client/tomcatconf/applicationContext.xml.in +++ b/client/tomcatconf/applicationContext.xml.in @@ -709,7 +709,9 @@ <property name="Planners" value="#{deploymentPlanners.Adapters}" /> </bean> - <bean id="storageManagerImpl" class="com.cloud.storage.StorageManagerImpl"> + <bean id="storageManagerImpl" class="com.cloud.storage.StorageManagerImpl"/> + + <bean id="volumeOrchestrator" class="org.apache.cloudstack.engine.orchestration.VolumeOrchestrator"> <property name="StoragePoolAllocators" value="#{storagePoolAllocators.Adapters}" /> </bean> @@ -852,8 +854,7 @@ <bean id="domainManagerImpl" class="com.cloud.user.DomainManagerImpl" /> <bean id="downloadMonitorImpl" class="com.cloud.storage.download.DownloadMonitorImpl" /> <bean id="lBHealthCheckManagerImpl" class="com.cloud.network.lb.LBHealthCheckManagerImpl" /> - - <bean id="volumeManagerImpl" class="com.cloud.storage.VolumeManagerImpl" /> + <bean id="volumeApiServiceImpl" class="com.cloud.storage.VolumeApiServiceImpl"/> <bean id="ApplicationLoadBalancerService" class="org.apache.cloudstack.network.lb.ApplicationLoadBalancerManagerImpl" /> <bean id="InternalLoadBalancerVMManager" class="org.apache.cloudstack.network.lb.InternalLoadBalancerVMManagerImpl" /> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3df5571d/engine/api/src/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java ---------------------------------------------------------------------- diff --git a/engine/api/src/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java b/engine/api/src/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java index 091bc92..5ba9faf 100644 --- a/engine/api/src/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java +++ b/engine/api/src/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java @@ -43,6 +43,13 @@ import com.cloud.vm.DiskProfile; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; +/** + * VolumeOrchestrationService is a PURE orchestration service on CloudStack + * volumes. It does not understand resource limits, ACL, action events, or + * anything that has to do with the self-service portion of CloudStack. Its + * job is to carry out any orchestration needed among the physical components + * to provision volumes. + */ public interface VolumeOrchestrationService { VolumeInfo moveVolume(VolumeInfo volume, long destPoolDcId, Long destPoolPodId, Long destPoolClusterId, HypervisorType dataDiskHyperType) throws ConcurrentOperationException; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3df5571d/engine/orchestration/pom.xml ---------------------------------------------------------------------- diff --git a/engine/orchestration/pom.xml b/engine/orchestration/pom.xml index 49e24a6..4f8e5d7 100755 --- a/engine/orchestration/pom.xml +++ b/engine/orchestration/pom.xml @@ -35,6 +35,11 @@ </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> + <artifactId>cloud-engine-schema</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-framework-ipc</artifactId> <version>${project.version}</version> </dependency>
