etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-7869: Add simulator support for findHostsForMigration API 

(cherry picked from commit 8378485e56)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/server/ManagementServerImpl.java

Conflicts:
	server/src/com/cloud/server/ManagementServerImpl.java
This commit is contained in:
Koushik Das 2014-11-08 13:46:24 +05:30 committed by Rohit Yadav
parent c6ef739e25
commit 2320f5e91b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/src/com/cloud/server/ManagementServerImpl.java
View File

@ -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.");
}