You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by we...@apache.org on 2013/06/26 11:30:14 UTC
[04/25] git commit: updated refs/heads/advancedsg-leaseweb to c5383c8
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/28261b5e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/28261b5e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/28261b5e
Branch: refs/heads/advancedsg-leaseweb
Commit: 28261b5e76f611435487da14cfef4c1e67974544
Parents: adf31ab
Author: Anthony Xu <an...@citrix.com>
Authored: Wed May 29 11:32:15 2013 -0700
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Tue Jun 11 10:49:10 2013 +0200
----------------------------------------------------------------------
server/src/com/cloud/resource/ResourceManagerImpl.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/28261b5e/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 169e735..b84373c 100755
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -156,6 +156,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 })
@@ -437,8 +438,9 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
+ cmd.getHypervisor() + " to a supported ");
}
- if (zone.isSecurityGroupEnabled()) {
- if( hypervisorType != HypervisorType.KVM && hypervisorType != HypervisorType.XenServer ) {
+ 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");
}
}