From 953ad818f064e515718ccb3175de0c13b92203b4 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 e0100d4353c..316827524be 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -1270,9 +1270,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 4e82c9d7fc5..76eb18ffdb1 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -3297,7 +3297,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"); }