Updated Branches: refs/heads/master 7bccc3e13 -> 5552d2687
simulator supports migration Add simultor to the seemingly strict filter which should happen within the hypervisor resource and not the virtualmachine :/ Signed-off-by: Prasanna Santhanam <[email protected]> (cherry picked from commit 3d4d350dbe9728d3de42e4ee7a6ad06c6e10fced) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/34e751fb Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/34e751fb Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/34e751fb Branch: refs/heads/master Commit: 34e751fb8dbacfb016fb6149cb8d63db384f6976 Parents: 7bccc3e Author: Prasanna Santhanam <[email protected]> Authored: Tue Jul 30 11:16:04 2013 +0530 Committer: Prasanna Santhanam <[email protected]> Committed: Tue Jul 30 11:25:14 2013 +0530 ---------------------------------------------------------------------- server/src/com/cloud/vm/UserVmManagerImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/34e751fb/server/src/com/cloud/vm/UserVmManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 6eb510c..227a785 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -3801,7 +3801,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir if (!vm.getHypervisorType().equals(HypervisorType.XenServer) && !vm.getHypervisorType().equals(HypervisorType.VMware) && !vm.getHypervisorType().equals(HypervisorType.KVM) - && !vm.getHypervisorType().equals(HypervisorType.Ovm)) { + && !vm.getHypervisorType().equals(HypervisorType.Ovm) + && !vm.getHypervisorType().equals(HypervisorType.Simulator)) { if (s_logger.isDebugEnabled()) { s_logger.debug(vm + " is not XenServer/VMware/KVM/Ovm, cannot migrate this VM."); @@ -4116,7 +4117,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir if (!vm.getHypervisorType().equals(HypervisorType.XenServer) && !vm.getHypervisorType().equals(HypervisorType.VMware) && !vm.getHypervisorType().equals(HypervisorType.KVM) && - !vm.getHypervisorType().equals(HypervisorType.Ovm)) { + !vm.getHypervisorType().equals(HypervisorType.Ovm) && + !vm.getHypervisorType().equals(HypervisorType.Simulator)) { throw new InvalidParameterValueException("Unsupported hypervisor type for vm migration, we support" + " XenServer/VMware/KVM only"); }
