From 34e751fb8dbacfb016fb6149cb8d63db384f6976 Mon Sep 17 00:00:00 2001 From: Prasanna Santhanam Date: Tue, 30 Jul 2013 11:16:04 +0530 Subject: [PATCH] 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 (cherry picked from commit 3d4d350dbe9728d3de42e4ee7a6ad06c6e10fced) --- server/src/com/cloud/vm/UserVmManagerImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 6eb510c6683..227a78532f5 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"); }