incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [39/43] git commit: refs/heads/ui-plugins - fix build issue after revert
Date Fri, 08 Feb 2013 21:10:33 GMT
fix build issue after revert


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

Branch: refs/heads/ui-plugins
Commit: 6df0ff2596f26d0a451dd65c1df124249e72bfac
Parents: c0f2cf1
Author: anthony <anthony@cloud.com>
Authored: Fri Feb 8 12:30:12 2013 -0800
Committer: anthony <anthony@cloud.com>
Committed: Fri Feb 8 12:30:12 2013 -0800

----------------------------------------------------------------------
 .../src/com/cloud/network/NetworkManagerImpl.java  |   10 ----------
 server/src/com/cloud/vm/UserVmManagerImpl.java     |    8 --------
 2 files changed, 0 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6df0ff25/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 42e0ef9..7a6ac27 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -1854,7 +1854,6 @@ 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!");
             	}
@@ -1868,15 +1867,6 @@ 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/6df0ff25/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 02f90d2..33a53d9 100644
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -2875,13 +2875,6 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager,
Use
 
         // If no network is specified, find system security group enabled network
         if (networkIdList == null || networkIdList.isEmpty()) {
-<<<<<<< HEAD
-            throw new InvalidParameterValueException("need to specify networkIDs");
-        }
-        // Verify that all the networks are Shared/Guest; can't create combination of SG
enabled and disabled networks 
-        for (Long networkId : networkIdList) {
-            NetworkVO network = _networkDao.findById(networkId);
-=======
             Network networkWithSecurityGroup = _networkModel.getNetworkWithSecurityGroupEnabled(zone.getId());
             if (networkWithSecurityGroup == null) {
                 throw new InvalidParameterValueException("No network with security enabled
is found in zone id=" + zone.getId());
@@ -2901,7 +2894,6 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager,
Use
 
             NetworkVO network = _networkDao.findById(networkIdList.get(0).longValue());
 
->>>>>>> parent of 65210f4...  CLOUDSTACK-737
             if (network == null) {
                 throw new InvalidParameterValueException(
                         "Unable to find network by id "


Mime
View raw message