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

bug 10671: list domain level networks for children domains when domainId is not specified 

status 10671: resolved fixed
This commit is contained in:
alena 2011-07-08 21:10:47 -07:00
parent 5b122e3669
commit cad925bc6b
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1842,23 +1842,15 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
accountId = owner.getId();
}
}
DomainVO domain = _domainDao.findById(caller.getDomainId());
path = domain.getPath();
if (caller.getType() == Account.ACCOUNT_TYPE_DOMAIN_ADMIN) {
DomainVO domain = _domainDao.findById(caller.getDomainId());
if (domain != null) {
path = domain.getPath();
}
}
} else {
accountId = caller.getId();
}
if ((isSystem == null || !isSystem) && (isShared == null || isShared)) {
if (domainId == null) {
sharedNetworkDomainId = caller.getDomainId();
} else {
sharedNetworkDomainId = domainId;
}
sharedNetworkDomainId = domainId;
}
Filter searchFilter = new Filter(NetworkVO.class, "id", false, cmd.getStartIndex(), cmd.getPageSizeVal());
@ -1890,6 +1882,11 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
if (sharedNetworkDomainId != null) {
networksToReturn.addAll(listDomainLevelNetworks(buildNetworkSearchCriteria(sb, keyword, id, isSystem, zoneId, type, isDefault, trafficType, isShared), searchFilter, sharedNetworkDomainId));
} else {
SearchBuilder<DomainVO> domainSearch = _domainDao.createSearchBuilder();
domainSearch.and("path", domainSearch.entity().getPath(), SearchCriteria.Op.LIKE);
sb.join("domainSearch", domainSearch, sb.entity().getDomainId(), domainSearch.entity().getId(), JoinBuilder.JoinType.INNER);
networksToReturn.addAll(listDomainSpecificNetworks(buildNetworkSearchCriteria(sb, keyword, id, isSystem, zoneId, type, isDefault, trafficType, isShared), searchFilter, path));
}
//if domain id is specified - list only domain level networks
@ -1987,6 +1984,18 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
return _networksDao.search(sc, searchFilter);
}
private List<NetworkVO> listDomainSpecificNetworks(SearchCriteria<NetworkVO> sc, Filter searchFilter, String path) {
if (path != null) {
sc.addAnd("isShared", SearchCriteria.Op.EQ, true);
sc.addAnd("isDomainSpecific", SearchCriteria.Op.EQ, true);
sc.setJoinParameters("domainSearch", "path", path + "%");
}
return _networksDao.search(sc, searchFilter);
}
@Override
@ActionEvent(eventType = EventTypes.EVENT_NETWORK_DELETE, eventDescription = "deleting network", async = true)