Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F04E810315 for ; Tue, 30 Jul 2013 05:56:05 +0000 (UTC) Received: (qmail 83692 invoked by uid 500); 30 Jul 2013 05:56:04 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 83667 invoked by uid 500); 30 Jul 2013 05:56:04 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 83652 invoked by uid 99); 30 Jul 2013 05:56:04 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Jul 2013 05:56:04 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1308C31A395; Tue, 30 Jul 2013 05:56:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tsp@apache.org To: commits@cloudstack.apache.org Date: Tue, 30 Jul 2013 05:56:04 -0000 Message-Id: <9b4d88245ec54ba190b302b581283096@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: updated refs/heads/4.2 to 3d4d350 simulator supports migration Add simultor to the seemingly strict filter which should happen within the hypervisor resource and not the virtualmachine :/ Signed-off-by: Prasanna Santhanam Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3d4d350d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3d4d350d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3d4d350d Branch: refs/heads/4.2 Commit: 3d4d350dbe9728d3de42e4ee7a6ad06c6e10fced Parents: c78ed39 Author: Prasanna Santhanam Authored: Tue Jul 30 11:16:04 2013 +0530 Committer: Prasanna Santhanam Committed: Tue Jul 30 11:16:04 2013 +0530 ---------------------------------------------------------------------- server/src/com/cloud/vm/UserVmManagerImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d4d350d/server/src/com/cloud/vm/UserVmManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 280f7e9..4c5dd20 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -3838,7 +3838,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use 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.Ovm) + && !vm.getHypervisorType().equals(HypervisorType.Simulator)) { if (s_logger.isDebugEnabled()) { s_logger.debug(vm + " is not XenServer/VMware/KVM/Ovm, cannot migrate this VM."); @@ -4153,7 +4154,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use 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.Ovm) && + !vm.getHypervisorType().equals(HypervisorType.Simulator)) { throw new InvalidParameterValueException("Unsupported hypervisor type for vm migration, we support" + " XenServer/VMware/KVM only"); }