From 2320f5e91b3bfd7720de155d2532d8901cc26844 Mon Sep 17 00:00:00 2001 From: Koushik Das Date: Sat, 8 Nov 2014 13:46:24 +0530 Subject: [PATCH] CLOUDSTACK-7869: Add simulator support for findHostsForMigration API (cherry picked from commit 8378485e56d973639dfc06013d64db6a80056a3b) Signed-off-by: Rohit Yadav Conflicts: server/src/com/cloud/server/ManagementServerImpl.java Conflicts: server/src/com/cloud/server/ManagementServerImpl.java --- server/src/com/cloud/server/ManagementServerImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index fd063fdcf3e..93cb48d2cf6 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -1122,7 +1122,8 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe } 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.Hyperv)) { + && !vm.getHypervisorType().equals(HypervisorType.Ovm) && !vm.getHypervisorType().equals(HypervisorType.Hyperv) && !vm.getHypervisorType().equals(HypervisorType.LXC) + && !vm.getHypervisorType().equals(HypervisorType.Simulator)) { if (s_logger.isDebugEnabled()) { s_logger.debug(vm + " is not XenServer/VMware/KVM/OVM/Hyperv, cannot migrate this VM."); }