cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anthon...@apache.org
Subject git commit: refs/heads/master - Revert "CLOUDSTACK-737"
Date Fri, 08 Feb 2013 18:42:50 GMT
Updated Branches:
  refs/heads/master b4f3f9260 -> 0a6c6bb25


Revert "CLOUDSTACK-737"

This reverts commit d7201dfe1f49fb75054e1f0b6922ed21446ad130.

Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/0a6c6bb2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/0a6c6bb2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/0a6c6bb2

Branch: refs/heads/master
Commit: 0a6c6bb2540c448f0e3f12dc40187d90fa9f2ab3
Parents: b4f3f92
Author: Anthony Xu <anthony.xu@citrix.com>
Authored: Fri Feb 8 10:42:36 2013 -0800
Committer: Anthony Xu <anthony.xu@citrix.com>
Committed: Fri Feb 8 10:42:36 2013 -0800

----------------------------------------------------------------------
 .../src/com/cloud/network/NetworkManagerImpl.java  |   10 ++++++++++
 .../com/cloud/resource/ResourceManagerImpl.java    |    6 ------
 ui/scripts/zoneWizard.js                           |    1 +
 3 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0a6c6bb2/server/src/com/cloud/network/NetworkManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index ec4d26e..57555a1 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -1854,6 +1854,7 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager,
L
 
         } else if (zone.getNetworkType() == NetworkType.Advanced) {
             if (zone.isSecurityGroupEnabled()) {
+<<<<<<< HEAD
             	if (ipv6) {
             		throw new InvalidParameterValueException("IPv6 is not supported with security
group!");
             	}
@@ -1867,6 +1868,15 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager,
L
                 }
                 if ( ! _networkModel.areServicesSupportedByNetworkOffering(ntwkOff.getId(),
Service.SecurityGroup)) {
                     throw new InvalidParameterValueException("network must have SecurityGroup
provider in security group enabled zone");
+=======
+                // Only Account specific Isolated network with sourceNat service disabled
are allowed in security group
+                // enabled zone
+                boolean allowCreation = (ntwkOff.getGuestType() == GuestType.Isolated 
+                        && !_networkModel.areServicesSupportedByNetworkOffering(ntwkOff.getId(),
Service.SourceNat));
+                if (!allowCreation) {
+                    throw new InvalidParameterValueException("Only Account specific Isolated
network with sourceNat " +
+                            "service disabled are allowed in security group enabled zone");
+>>>>>>> parent of d7201df... CLOUDSTACK-737
                 }
             }
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0a6c6bb2/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 55e377d..82013d4 100755
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -427,12 +427,6 @@ 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/incubator-cloudstack/blob/0a6c6bb2/ui/scripts/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index 141cd6d..26838a1 100755
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -373,6 +373,7 @@
 									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;


Mime
View raw message