Updated Branches: refs/heads/vmware-storage-motion c6d7a751b -> 07d5271d0
CLOUDSTACK-2701 - Enable storage migration for VMware resources Sending command MigrateWithStorageCommand to source host instead of target host for the case of migration of VM within cluster. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/07d5271d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/07d5271d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/07d5271d Branch: refs/heads/vmware-storage-motion Commit: 07d5271d041f288debbe8c9e391aa64d1c894b9b Parents: c6d7a75 Author: Sateesh Chodapuneedi <sate...@apache.org> Authored: Mon May 27 22:58:11 2013 +0530 Committer: Sateesh Chodapuneedi <sate...@apache.org> Committed: Mon May 27 22:58:11 2013 +0530 ---------------------------------------------------------------------- .../motion/VmwareStorageMotionStrategy.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/07d5271d/plugins/hypervisors/vmware/src/org/apache/cloudstack/storage/motion/VmwareStorageMotionStrategy.java ---------------------------------------------------------------------- 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 1678a04..c32d3d5 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 @@ -172,8 +172,8 @@ public class VmwareStorageMotionStrategy implements DataMotionStrategy { volumeToFilerto.put(volumeTo, filerTo); } - MigrateWithStorageCommand command = new MigrateWithStorageCommand(to, volumeToFilerto); - MigrateWithStorageAnswer answer = (MigrateWithStorageAnswer) agentMgr.send(destHost.getId(), command); + MigrateWithStorageCommand command = new MigrateWithStorageCommand(to, volumeToFilerto, destHost.getGuid()); + MigrateWithStorageAnswer answer = (MigrateWithStorageAnswer) agentMgr.send(srcHost.getId(), command); if (answer == null) { s_logger.error("Migration with storage of vm " + vm + " failed."); throw new CloudRuntimeException("Error while migrating the vm " + vm + " to host " + destHost);