CLOUDSTACK-737
add xenserver support in UI
only XenServer and KVM clusters are allowed in security enabled zone.
only shared security enabled networks are allowed in security enabled zone.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/297115ca
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/297115ca
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/297115ca
Branch: refs/heads/master
Commit: 297115cac56d9d211dd8a7ab0413973ed2e2df95
Parents: b32d7c0
Author: anthony <[email protected]>
Authored: Thu Jan 24 17:26:51 2013 -0800
Committer: Anthony Xu <[email protected]>
Committed: Wed May 15 14:53:48 2013 -0700
----------------------------------------------------------------------
.../com/cloud/resource/ResourceManagerImpl.java | 6 ++++++
ui/scripts/zoneWizard.js | 1 -
2 files changed, 6 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/297115ca/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 0ab35dd..4bd6237 100755
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -438,6 +438,12 @@ public class ResourceManagerImpl extends ManagerBase
implements ResourceManager,
+ cmd.getHypervisor() + " to a
supported ");
}
+ if (zone.isSecurityGroupEnabled()) {
+ if( hypervisorType != HypervisorType.KVM && hypervisorType !=
HypervisorType.XenServer ) {
+ throw new InvalidParameterValueException("Don't support
hypervisor type " + hypervisorType + " in advanced security enabled zone");
+ }
+ }
+
Cluster.ClusterType clusterType = null;
if (cmd.getClusterType() != null && !cmd.getClusterType().isEmpty()) {
clusterType = Cluster.ClusterType.valueOf(cmd.getClusterType());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/297115ca/ui/scripts/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index 9b28c32..421c591 100755
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -401,7 +401,6 @@
var
nonSupportedHypervisors = {};
if(args.context.zones[0]['network-model'] == "Advanced" &&
args.context.zones[0]['zone-advanced-sg-enabled'] == "on") {
firstOption = "KVM";
-
nonSupportedHypervisors["XenServer"] = 1; //to developers: comment this line
if you need to test Advanced SG-enabled zone with XenServer hypervisor
nonSupportedHypervisors["VMware"] = 1;
nonSupportedHypervisors["BareMetal"] = 1;
nonSupportedHypervisors["Ovm"] = 1;
