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

refactoring old code and fixing some regression bugs (UI had an issue listing domains). Also fixed the listing of domain specific zones at vm creation for a domain admin (listing everything upto root in that domain + listing all the children based on a path search)

This commit is contained in:
abhishek 2010-11-08 12:15:53 -08:00
parent 67beda5244
commit cc93e7508c
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/cloud/domain/dao/DomainDao.java
View File

@ -29,5 +29,5 @@ public interface DomainDao extends GenericDao<DomainVO, Long> {
public DomainVO findDomainByPath(String domainPath);
public boolean isChildDomain(Long parentId, Long childId);
DomainVO findImmediateChildForParent(Long parentId);
List<DomainVO> findAllChildren(String path);
List<DomainVO> findAllChildren(String path, Long parentId);
}

6
core/src/com/cloud/domain/dao/DomainDaoImpl.java
View File

@ -64,6 +64,7 @@ public class DomainDaoImpl extends GenericDaoBase<DomainVO, Long> implements Dom
FindAllChildrenSearch = createSearchBuilder();
FindAllChildrenSearch.and("path", FindAllChildrenSearch.entity().getPath(), SearchCriteria.Op.LIKE);
FindAllChildrenSearch.and("id", FindAllChildrenSearch.entity().getId(), SearchCriteria.Op.NEQ);
FindAllChildrenSearch.done();
}
@ -209,9 +210,10 @@ public class DomainDaoImpl extends GenericDaoBase<DomainVO, Long> implements Dom
}
@Override
public List<DomainVO> findAllChildren(String path){
public List<DomainVO> findAllChildren(String path, Long parentId){
SearchCriteria<DomainVO> sc = FindAllChildrenSearch.create();
sc.setParameters("path", path);
sc.setParameters("path", "%"+path+"%");
sc.setParameters("id", parentId);
return listBy(sc);
}

34
server/src/com/cloud/server/ManagementServerImpl.java
View File

@ -1369,21 +1369,8 @@ public class ManagementServerImpl implements ManagementServer {
}
//this covers till leaf
if(domainRecord != null){
// DomainVO localParent = domainRecord;
// DomainVO immediateChild = null;
// while(true){
// //find immediate child domain
// immediateChild = _domainDao.findImmediateChildForParent(localParent.getId());
// if(immediateChild != null){
// dcs.addAll(_dcDao.findZonesByDomainId(immediateChild.getId()));
// localParent = immediateChild;//traverse down the list
// }else{
// break;
// }
// }
//find all children for this domain based on a like search by path
List<DomainVO> allChildDomains = _domainDao.findAllChildren(domainRecord.getPath());
List<DomainVO> allChildDomains = _domainDao.findAllChildren(domainRecord.getPath(), domainRecord.getId());
List<Long> allChildDomainIds = new ArrayList<Long>();
//create list of domainIds for search
for(DomainVO domain : allChildDomains){
@ -3422,13 +3409,18 @@ public class ManagementServerImpl implements ManagementServer {
public List<DomainVO> searchForDomains(ListDomainsCmd cmd) throws PermissionDeniedException {
Long domainId = cmd.getId();
Account account = UserContext.current().getAccount();
if(account == null || account.getType() == Account.ACCOUNT_TYPE_ADMIN){
return _domainDao.listAll();
}
if (account != null) {
if (domainId != null) {
if (!_domainDao.isChildDomain(account.getDomainId(), domainId)) {
throw new PermissionDeniedException("Unable to list domains for domain id " + domainId + ", permission denied.");
}
} else {
domainId = account.getDomainId();
}else {
domainId = account.getDomainId();
}
}
@ -3464,7 +3456,7 @@ public class ManagementServerImpl implements ManagementServer {
sc.setParameters("id", domainId);
}
return _domainDao.search(sc, searchFilter);
return _domainDao.search(sc, searchFilter);
}
@Override
@ -3485,7 +3477,13 @@ public class ManagementServerImpl implements ManagementServer {
}
}
SearchCriteria<DomainVO> sc = _domainDao.createSearchCriteria();
return searchForDomainChildren(searchFilter, domainId, domainName,
keyword);
}
private List<DomainVO> searchForDomainChildren(Filter searchFilter,
Long domainId, String domainName, Object keyword) {
SearchCriteria<DomainVO> sc = _domainDao.createSearchCriteria();
if (keyword != null) {
SearchCriteria<DomainVO> ssc = _domainDao.createSearchCriteria();