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/92eb84c3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/92eb84c3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/92eb84c3 Branch: refs/heads/ldapplugin Commit: 92eb84c3e0785b5773259aad202a1cde2c51b385 Parents: 75041b9 Author: Prachi Damle <[email protected]> Authored: Wed Aug 28 14:06:07 2013 -0700 Committer: Prachi Damle <[email protected]> Committed: Wed Aug 28 17:03:21 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/92eb84c3/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 7a6fb80..07d193e 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -1075,10 +1075,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.
