From 51996094ff2cb7d275507779bc8ed108dd8057e4 Mon Sep 17 00:00:00 2001 From: Sateesh Chodapuneedi Date: Thu, 30 May 2013 16:47:54 +0530 Subject: [PATCH] CLOUDSTACK-2701 - Enable storage migration for VMware resources Whitespace cleanup Signed-off-by: Sateesh Chodapuneedi CLOUDSTACK-2701 - Enable storage migration for VMware resources Removing injections which are not required in Vmware Manager --- .../cloud/hypervisor/vmware/manager/VmwareManagerImpl.java | 3 --- .../storage/motion/VmwareStorageMotionStrategy.java | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java index 9013d312a72..78b7582ca89 100755 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java @@ -159,9 +159,6 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw @Inject VmwareDatacenterDao _vmwareDcDao; @Inject VmwareDatacenterZoneMapDao _vmwareDcZoneMapDao; @Inject LegacyZoneDao _legacyZoneDao; - @Inject VMInstanceDao _vmDao; - @Inject VolumeDao _volDao; - @Inject DataStoreManager dataStoreMgr; String _mountParent; StorageLayer _storage; diff --git a/plugins/hypervisors/vmware/src/org/apache/cloudstack/storage/motion/VmwareStorageMotionStrategy.java b/plugins/hypervisors/vmware/src/org/apache/cloudstack/storage/motion/VmwareStorageMotionStrategy.java index c32d3d5abb7..11be609bcf7 100644 --- a/plugins/hypervisors/vmware/src/org/apache/cloudstack/storage/motion/VmwareStorageMotionStrategy.java +++ b/plugins/hypervisors/vmware/src/org/apache/cloudstack/storage/motion/VmwareStorageMotionStrategy.java @@ -133,8 +133,8 @@ public class VmwareStorageMotionStrategy implements DataMotionStrategy { } // Migration across cluster needs to be done in three phases. - // 1. Send a migrate command to source resource to initiate migration - // Run validations against target!! + // 1. Send a migrate command to source resource to initiate migration + // Run validations against target!! // 2. Complete the process. Update the volume details. MigrateWithStorageCommand migrateWithStorageCmd = new MigrateWithStorageCommand(to, volumeToFilerto, destHost.getGuid()); MigrateWithStorageAnswer migrateWithStorageAnswer = (MigrateWithStorageAnswer) agentMgr.send(