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

allow subdomain access parent domain's network

This commit is contained in:
Anthony Xu 2013-05-29 16:27:08 -07:00
parent fdc9f10cc1
commit 271cf92ab7
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1544,6 +1544,9 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L
finalizeServicesAndProvidersForNetwork(offering, plan.getPhysicalNetworkId())));
if (domainId != null && aclType == ACLType.Domain) {
if (subdomainAccess == null ) {
subdomainAccess = true;
}
_networksDao.addDomainToNetwork(id, domainId, subdomainAccess);
}

2
server/src/com/cloud/network/NetworkModelImpl.java
View File

@ -1673,7 +1673,7 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel {
if (networkDomainMap.subdomainAccess) {
Set<Long> parentDomains = _domainMgr.getDomainParentIds(domainId);
if (parentDomains.contains(domainId)) {
if (parentDomains.contains(networkDomainId)) {
return true;
}
}