Updated Branches: refs/heads/4.2-forward 0ef6084d2 -> b24e9a6dd
CLOUDSTACK-4528: [Vmware] new mapping vmware datacenter cloudstack zone - Virtual Router host migration across cluster FAIL Changes: - listHosts within same cluster for migration of system and router VMs Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/52f46830 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/52f46830 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/52f46830 Branch: refs/heads/4.2-forward Commit: 52f4683099e03e16916dfdf741f2d5544491aaad Parents: 0ef6084 Author: Prachi Damle <pra...@cloud.com> Authored: Wed Aug 28 14:06:07 2013 -0700 Committer: Prachi Damle <pra...@cloud.com> Committed: Wed Aug 28 15:55:24 2013 -0700 ---------------------------------------------------------------------- server/src/com/cloud/server/ManagementServerImpl.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/52f46830/server/src/com/cloud/server/ManagementServerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index b20bf48..3341c05 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -1090,10 +1090,13 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe // Check if the vm can be migrated with storage. boolean canMigrateWithStorage = false; - HypervisorCapabilitiesVO capabilities = _hypervisorCapabilitiesDao.findByHypervisorTypeAndVersion( - srcHost.getHypervisorType(), srcHost.getHypervisorVersion()); - if (capabilities != null) { - canMigrateWithStorage = capabilities.isStorageMotionSupported(); + + if (vm.getType() == VirtualMachine.Type.User) { + HypervisorCapabilitiesVO capabilities = _hypervisorCapabilitiesDao.findByHypervisorTypeAndVersion( + srcHost.getHypervisorType(), srcHost.getHypervisorVersion()); + if (capabilities != null) { + canMigrateWithStorage = capabilities.isStorageMotionSupported(); + } } // Check if the vm is using any disks on local storage.
