apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 11513: another customer hits the same issue by associate ip in the basic zone

Browse Source 
Reviewed-by: alena@citrix.com
This commit is contained in:
Edison Su 2011-09-21 19:11:37 -07:00
parent 211c7099a6
commit ee59c26e93
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -552,7 +552,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
if (ipOwner == null) {
throw new InvalidParameterValueException("Unable to find account " + accountName + " in domain " + domainId + ", permission denied");
}
_accountMgr.checkAccess(caller, null, ipOwner);
DataCenterVO zone = null;
@ -561,6 +561,10 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
if (zone == null) {
throw new InvalidParameterValueException("Can't find zone by id " + zoneId);
}
if (zone.getNetworkType() == NetworkType.Basic) {
throw new InvalidParameterValueException("Can't associate ip in basic zone");
}
if (Grouping.AllocationState.Disabled == zone.getAllocationState() && !_accountMgr.isRootAdmin(caller.getType())) {
throw new PermissionDeniedException("Cannot perform this operation, Zone is currently disabled: " + zoneId);