From 65f3bb1df58ea122c83ca33b4e6895b3fce82539 Mon Sep 17 00:00:00 2001 From: frank Date: Mon, 17 Oct 2011 16:25:13 -0700 Subject: [PATCH] Bug 11647 - OVM - no support for migrate instance return available hosts when hypervisor type is Ovm status 11647: resovled fixed --- server/src/com/cloud/server/ManagementServerImpl.java | 4 ++-- server/src/com/cloud/vm/UserVmManagerImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index 081f02f4bd1..e0a875c1a3f 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -977,9 +977,9 @@ public class ManagementServerImpl implements ManagementServer { throw new InvalidParameterValueException("VM is not Running, unable to migrate the vm " + vm); } - if (!vm.getHypervisorType().equals(HypervisorType.XenServer) && !vm.getHypervisorType().equals(HypervisorType.VMware) && !vm.getHypervisorType().equals(HypervisorType.KVM)) { + if (!vm.getHypervisorType().equals(HypervisorType.XenServer) && !vm.getHypervisorType().equals(HypervisorType.VMware) && !vm.getHypervisorType().equals(HypervisorType.KVM) && !vm.getHypervisorType().equals(HypervisorType.Ovm)) { if (s_logger.isDebugEnabled()) { - s_logger.debug(vm + " is not XenServer/VMware/KVM, cannot migrate this VM."); + s_logger.debug(vm + " is not XenServer/VMware/KVM/OVM, cannot migrate this VM."); } throw new InvalidParameterValueException("Unsupported Hypervisor Type for VM migration, we support XenServer/VMware/KVM only"); } diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 9ecc71a95ea..1b898a8d1d8 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -3212,7 +3212,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager } if (!vm.getHypervisorType().equals(HypervisorType.XenServer) && !vm.getHypervisorType().equals(HypervisorType.VMware) && !vm.getHypervisorType().equals(HypervisorType.KVM) && !vm.getHypervisorType().equals(HypervisorType.Ovm)) { if (s_logger.isDebugEnabled()) { - s_logger.debug(vm + " is not XenServer/VMware/KVM, cannot migrate this VM."); + s_logger.debug(vm + " is not XenServer/VMware/KVM/Ovm, cannot migrate this VM."); } throw new InvalidParameterValueException("Unsupported Hypervisor Type for VM migration, we support XenServer/VMware/KVM only"); }