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:55:27 UTC
[1/2] git commit: updated refs/heads/master to 5552d26
Updated Branches:
refs/heads/master 7bccc3e13 -> 5552d2687
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>
(cherry picked from commit 3d4d350dbe9728d3de42e4ee7a6ad06c6e10fced)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/34e751fb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/34e751fb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/34e751fb
Branch: refs/heads/master
Commit: 34e751fb8dbacfb016fb6149cb8d63db384f6976
Parents: 7bccc3e
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:25:14 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/34e751fb/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 6eb510c..227a785 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -3801,7 +3801,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
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.");
@@ -4116,7 +4117,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
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");
}
[2/2] git commit: updated refs/heads/master to 5552d26
Posted by ts...@apache.org.
Fix a few typos in ConfigurationManager.
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
(cherry picked from commit c78ed39b2f53a3544b93515e6bb4889eef8c5888)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5552d268
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5552d268
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5552d268
Branch: refs/heads/master
Commit: 5552d26872a13e7eab584412f787ae99551df23e
Parents: 34e751f
Author: Thomas O'Dowd <tp...@cloudian.com>
Authored: Fri Jul 26 17:34:15 2013 +0900
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Tue Jul 30 11:25:15 2013 +0530
----------------------------------------------------------------------
.../com/cloud/configuration/ConfigurationManagerImpl.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5552d268/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 6c32c55..d5e6c00 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -733,7 +733,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
if (type.equals(Boolean.class)) {
if (!(value.equals("true") || value.equals("false"))) {
- s_logger.error("Configuration variable " + name + " is expecting true or false in stead of " + value);
+ s_logger.error("Configuration variable " + name + " is expecting true or false instead of " + value);
return "Please enter either 'true' or 'false'.";
}
return null;
@@ -790,17 +790,17 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
} else if (range.equals("hypervisorList")) {
String[] hypervisors = value.split(",");
if (hypervisors == null) {
- return "Please enter hypervisor list, seperated by comma";
+ return "Please enter hypervisor list, separated by comma";
}
for (String hypervisor : hypervisors) {
if (HypervisorType.getType(hypervisor) == HypervisorType.Any
|| HypervisorType.getType(hypervisor) == HypervisorType.None) {
- return "Please enter valid hypervisor type";
+ return "Please enter a valid hypervisor type";
}
}
} else if (range.equalsIgnoreCase("instanceName")) {
if (!NetUtils.verifyInstanceName(value)) {
- return "Instance name can not contain hyphen, spaces and plus sign";
+ return "Instance name can not contain hyphen, space or plus sign";
}
} else if (range.equals("routes")) {
String[] routes = value.split(",");