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

bug 7002: adding a check to ensure the account specific vlan added, is within the domain tree of the zone for which the vlan is being added for (whether it is a child domain or not)

Browse Source 
status 7002: resolved fixed
This commit is contained in:
abhishek 2010-11-05 13:23:44 -07:00
parent fff9b41ae0
commit 452c7f4d1a
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
View File

@ -73,6 +73,7 @@ import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientAddressCapacityException;
import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.PermissionDeniedException;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.network.NetworkManager;
import com.cloud.network.dao.IPAddressDao;
@ -1388,6 +1389,12 @@ public class ConfigurationManagerImpl implements ConfigurationManager {
if (zoneId == null || ((zone = _zoneDao.findById(zoneId)) == null)) {
throw new InvalidParameterValueException("Please specify a valid zone.");
}
//check if the account's domain is a child of the zone's domain, for adding vlan ip ranges
if(domainId != null && !_domainDao.isChildDomain(zone.getDomainId(), domainId)){
//this is for account specific case, as domainId != null
throw new PermissionDeniedException("The account associated with specific domain id:"+domainId+" doesn't have permissions to add vlan ip ranges for the zone:"+zone.getId());
}
boolean associateIpRangeToAccount = false;
if (vlanType.equals(VlanType.VirtualNetwork)) {