You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/07/30 07:56:04 UTC
[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 <ts...@apache.org>
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 <ts...@apache.org>
Authored: Tue Jul 30 11:16:04 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
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");
}