etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix build issue after revert

This commit is contained in:
anthony 2013-02-08 12:30:12 -08:00
parent c0f2cf1e06
commit 6df0ff2596
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/src/com/cloud/network/NetworkManagerImpl.java
View File

@ -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
}
}

8
server/src/com/cloud/vm/UserVmManagerImpl.java
View File

@ -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 "