CLOUDSTACK-7869: Add simulator support for findHostsForMigration API
(cherry picked from commit 8378485e56d973639dfc06013d64db6a80056a3b)
Signed-off-by: Rohit Yadav <[email protected]>
Conflicts:
server/src/com/cloud/server/ManagementServerImpl.java
Conflicts:
server/src/com/cloud/server/ManagementServerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2320f5e9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2320f5e9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2320f5e9
Branch: refs/heads/4.4
Commit: 2320f5e91b3bfd7720de155d2532d8901cc26844
Parents: c6ef739
Author: Koushik Das <[email protected]>
Authored: Sat Nov 8 13:46:24 2014 +0530
Committer: Rohit Yadav <[email protected]>
Committed: Thu Dec 11 20:36:11 2014 +0530
----------------------------------------------------------------------
server/src/com/cloud/server/ManagementServerImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2320f5e9/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 fd063fd..93cb48d 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.");
}
