You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sa...@apache.org on 2013/05/30 13:22:35 UTC
[04/50] [abbrv] git commit: updated refs/heads/vmware-storage-motion
to 406785b
Workaround for broken bvt/ simulator tests
Actually this check makes no sense since it breaks basic zone for all hypervisors except KVM, XS
Will revisit later
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ccac84c4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ccac84c4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ccac84c4
Branch: refs/heads/vmware-storage-motion
Commit: ccac84c469607768665cd2239abfdf8bf0561f21
Parents: ab2e3b9
Author: Chiradeep Vittal <ch...@apache.org>
Authored: Tue May 28 17:05:51 2013 -0700
Committer: Chiradeep Vittal <ch...@apache.org>
Committed: Tue May 28 17:05:51 2013 -0700
----------------------------------------------------------------------
.../com/cloud/resource/ResourceManagerImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ccac84c4/server/src/com/cloud/resource/ResourceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java
index f767b68..1e28d92 100755
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -445,7 +445,8 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
}
if (zone.isSecurityGroupEnabled()) {
- if( hypervisorType != HypervisorType.KVM && hypervisorType != HypervisorType.XenServer ) {
+ if (hypervisorType != HypervisorType.KVM && hypervisorType != HypervisorType.XenServer
+ && hypervisorType != HypervisorType.Simulator) {
throw new InvalidParameterValueException("Don't support hypervisor type " + hypervisorType + " in advanced security enabled zone");
}
}