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 8452: more delete domain specific changes

Browse Source
This commit is contained in:
abhishek 2011-02-17 15:29:13 -08:00
parent 2275d8d833
commit 13fc3b0dd8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2939,9 +2939,6 @@ public class ManagementServerImpl implements ManagementServer {
Account account = UserContext.current().getCaller(); Account account = UserContext.current().getCaller();
Long domainId = cmd.getId(); Long domainId = cmd.getId();
Boolean cleanup = cmd.getCleanup(); Boolean cleanup = cmd.getCleanup();
//TODO
cleanup = true;
if ((domainId == DomainVO.ROOT_DOMAIN) || ((account != null) && !_domainDao.isChildDomain(account.getDomainId(), domainId))) { if ((domainId == DomainVO.ROOT_DOMAIN) || ((account != null) && !_domainDao.isChildDomain(account.getDomainId(), domainId))) {
throw new PermissionDeniedException("Unable to delete domain " + domainId + ", permission denied."); throw new PermissionDeniedException("Unable to delete domain " + domainId + ", permission denied.");
@ -2961,10 +2958,13 @@ public class ManagementServerImpl implements ManagementServer {
if (!_domainDao.remove(domainId)) { if (!_domainDao.remove(domainId)) {
s_logger.error("Delete failed on domain " + domain.getName() + " (id: " + domainId + "); please make sure all users and sub domains have been removed from the domain before deleting"); s_logger.error("Delete failed on domain " + domain.getName() + " (id: " + domainId + "); please make sure all users and sub domains have been removed from the domain before deleting");
return false; return false;
} else {
domain.setState(Domain.State.Inactive);
_domainDao.update(domainId, domain);
} }
} }
} else { } else {
throw new InvalidParameterValueException("Failed to delete domain nable " + domainId + ", domain not found"); throw new InvalidParameterValueException("Failed to delete domain " + domainId + ", domain not found");
} }
cleanupDomainOfferings(domainId); cleanupDomainOfferings(domainId);
return true; return true;
@ -3004,7 +3004,7 @@ public class ManagementServerImpl implements ManagementServer {
sc1.addAnd("path", SearchCriteria.Op.LIKE, "%"+domainHandle.getPath()+"%"); sc1.addAnd("path", SearchCriteria.Op.LIKE, "%"+domainHandle.getPath()+"%");
List<DomainVO> domainsToBeInactivated = _domainDao.search(sc1, null); List<DomainVO> domainsToBeInactivated = _domainDao.search(sc1, null);
//update all subdomains to inactive so no accounts can be created //update all subdomains to inactive so no accounts/users can be created
for(DomainVO domain : domainsToBeInactivated) { for(DomainVO domain : domainsToBeInactivated) {
domain.setState(Domain.State.Inactive); domain.setState(Domain.State.Inactive);
_domainDao.update(domain.getId(), domain); _domainDao.update(domain.getId(), domain);