You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2013/05/30 02:04:34 UTC
[40/50] [abbrv] git commit: updated refs/heads/vmsync to cd6aea1
only check hypervisor type for security enabled advanced zone
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9905f656
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9905f656
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9905f656
Branch: refs/heads/vmsync
Commit: 9905f656a5307c9d9b990ed988c2ea82b432231a
Parents: 8d1189c
Author: Anthony Xu <an...@citrix.com>
Authored: Wed May 29 11:32:15 2013 -0700
Committer: Anthony Xu <an...@citrix.com>
Committed: Wed May 29 11:32:15 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/9905f656/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 1e28d92..74bd6d0 100755
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -161,6 +161,7 @@ import com.cloud.vm.VMInstanceVO;
import com.cloud.vm.VirtualMachine.State;
import com.cloud.vm.VirtualMachineManager;
import com.cloud.vm.dao.VMInstanceDao;
+import com.cloud.dc.DataCenter.NetworkType;
@Component
@Local({ ResourceManager.class, ResourceService.class })
@@ -444,7 +445,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
+ cmd.getHypervisor() + " to a supported ");
}
- if (zone.isSecurityGroupEnabled()) {
+ if (zone.isSecurityGroupEnabled() && zone.getNetworkType().equals(NetworkType.Advanced)) {
if (hypervisorType != HypervisorType.KVM && hypervisorType != HypervisorType.XenServer
&& hypervisorType != HypervisorType.Simulator) {
throw new InvalidParameterValueException("Don't support hypervisor type " + hypervisorType + " in advanced security enabled zone");