Skip to content

Commit 7a7fb5b

Browse files
raveningravening
committed
Provide cleanup option to force deleting a project
Provide an option to user which when selected deletes all the resources in the project. If not selected then the project is not deleted if all the resources are not yet cleaned up
1 parent 88762c1 commit 7a7fb5b

5 files changed

Lines changed: 71 additions & 6 deletions

File tree

‎api/src/main/java/com/cloud/projects/ProjectService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public interface ProjectService {
5555
* - project id
5656
* @return true if the project was deleted successfully, false otherwise
5757
*/
58-
boolean deleteProject(long id);
58+
boolean deleteProject(long id, Boolean cleanup);
5959

6060
/**
6161
* Gets a project by id

‎api/src/main/java/org/apache/cloudstack/api/command/user/project/DeleteProjectCmd.java‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ public class DeleteProjectCmd extends BaseAsyncCmd {
4848
@Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = ProjectResponse.class, required = true, description = "id of the project to be deleted")
4949
private Long id;
5050

51+
@Parameter(name = ApiConstants.CLEANUP, type = CommandType.BOOLEAN, description = "true if all project resources have to be cleaned up, false otherwise")
52+
private Boolean cleanup;
53+
5154
/////////////////////////////////////////////////////
5255
/////////////////// Accessors ///////////////////////
5356
/////////////////////////////////////////////////////
@@ -56,6 +59,10 @@ public Long geId() {
5659
return id;
5760
}
5861

62+
public Boolean isCleanup() {
63+
return cleanup;
64+
}
65+
5966
@Override
6067
public String getCommandName() {
6168
return s_name;
@@ -68,7 +75,7 @@ public String getCommandName() {
6875
@Override
6976
public void execute() {
7077
CallContext.current().setEventDetails("Project Id: " + id);
71-
boolean result = _projectService.deleteProject(id);
78+
boolean result = _projectService.deleteProject(id, isCleanup());
7279
if (result) {
7380
SuccessResponse response = new SuccessResponse(getCommandName());
7481
this.setResponseObject(response);

‎server/src/main/java/com/cloud/projects/ProjectManagerImpl.java‎

Lines changed: 49 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import java.util.concurrent.ScheduledExecutorService;
3030
import java.util.concurrent.TimeUnit;
3131
import java.util.stream.Collectors;
32+
import java.util.stream.Stream;
3233

3334
import javax.inject.Inject;
3435
import javax.mail.Authenticator;
@@ -40,6 +41,18 @@
4041
import javax.mail.internet.InternetAddress;
4142
import javax.naming.ConfigurationException;
4243

44+
import com.cloud.network.dao.NetworkDao;
45+
import com.cloud.network.dao.NetworkVO;
46+
import com.cloud.network.vpc.Vpc;
47+
import com.cloud.network.vpc.VpcManager;
48+
import com.cloud.storage.VMTemplateVO;
49+
import com.cloud.storage.VolumeVO;
50+
import com.cloud.storage.dao.VMTemplateDao;
51+
import com.cloud.storage.dao.VolumeDao;
52+
import com.cloud.vm.UserVmVO;
53+
import com.cloud.vm.dao.UserVmDao;
54+
import com.cloud.vm.snapshot.VMSnapshotVO;
55+
import com.cloud.vm.snapshot.dao.VMSnapshotDao;
4356
import org.apache.cloudstack.acl.ProjectRole;
4457
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
4558
import org.apache.cloudstack.acl.dao.ProjectRoleDao;
@@ -131,6 +144,18 @@ public class ProjectManagerImpl extends ManagerBase implements ProjectManager {
131144
private ProjectRoleDao projectRoleDao;
132145
@Inject
133146
private UserDao userDao;
147+
@Inject
148+
private VolumeDao _volumeDao;
149+
@Inject
150+
private UserVmDao _userVmDao;
151+
@Inject
152+
private VMTemplateDao _templateDao;
153+
@Inject
154+
private NetworkDao _networkDao;
155+
@Inject
156+
private VMSnapshotDao _vmSnapshotDao;
157+
@Inject
158+
private VpcManager _vpcMgr;
134159

135160
protected boolean _invitationRequired = false;
136161
protected long _invitationTimeOut = 86400000;
@@ -301,7 +326,7 @@ public Project enableProject(long projectId) {
301326

302327
@Override
303328
@ActionEvent(eventType = EventTypes.EVENT_PROJECT_DELETE, eventDescription = "deleting project", async = true)
304-
public boolean deleteProject(long projectId) {
329+
public boolean deleteProject(long projectId, Boolean isCleanup) {
305330
CallContext ctx = CallContext.current();
306331

307332
ProjectVO project = getProject(projectId);
@@ -313,7 +338,29 @@ public boolean deleteProject(long projectId) {
313338
CallContext.current().setProject(project);
314339
_accountMgr.checkAccess(ctx.getCallingAccount(), AccessType.ModifyProject, true, _accountMgr.getAccount(project.getProjectAccountId()));
315340

316-
return deleteProject(ctx.getCallingAccount(), ctx.getCallingUserId(), project);
341+
if (isCleanup != null && isCleanup) {
342+
return deleteProject(ctx.getCallingAccount(), ctx.getCallingUserId(), project);
343+
} else {
344+
List<VMTemplateVO> userTemplates = _templateDao.listByAccountId(project.getProjectAccountId());
345+
List<VMSnapshotVO> vmSnapshots = _vmSnapshotDao.listByAccountId(project.getProjectAccountId());
346+
List<UserVmVO> vms = _userVmDao.listByAccountId(project.getProjectAccountId());
347+
List<VolumeVO> volumes = _volumeDao.findDetachedByAccount(project.getProjectAccountId());
348+
List<NetworkVO> networks = _networkDao.listByOwner(project.getProjectAccountId());
349+
List<? extends Vpc> vpcs = _vpcMgr.getVpcsForAccount(project.getProjectAccountId());
350+
351+
Optional<String> message = Stream.of(userTemplates, vmSnapshots, vms, volumes, networks, vpcs)
352+
.filter(entity -> !entity.isEmpty())
353+
.map(entity -> entity.size() + " " + entity.get(0).getEntityType().getSimpleName() + " to clean up")
354+
.findFirst();
355+
356+
if (message.isEmpty()) {
357+
return deleteProject(ctx.getCallingAccount(), ctx.getCallingUserId(), project);
358+
}
359+
360+
CloudRuntimeException e = new CloudRuntimeException("Can't delete the project yet because it has " + message.get());
361+
e.addProxyObject(project.getUuid(), "projectId");
362+
throw e;
363+
}
317364
}
318365

319366
@DB

‎server/src/test/java/com/cloud/projects/MockProjectManagerImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public Project createProject(String name, String displayText, String accountName
3737
}
3838

3939
@Override
40-
public boolean deleteProject(long id) {
40+
public boolean deleteProject(long id, Boolean cleanup) {
4141
// TODO Auto-generated method stub
4242
return false;
4343
}

‎ui/scripts/projects.js‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -937,13 +937,24 @@
937937

938938
remove: {
939939
label: 'label.delete.project',
940+
createForm: {
941+
title: 'label.delete.project',
942+
desc: 'message.delete.project',
943+
fields: {
944+
isForced: {
945+
label: 'force.delete',
946+
isBoolean: true
947+
}
948+
}
949+
},
940950
action: function(args) {
941951
$.ajax({
942952
url: createURL('deleteProject', {
943953
ignoreProject: true
944954
}),
945955
data: {
946-
id: args.data.id
956+
id: args.context.projects[0].id,
957+
cleanup: (args.data.isForced === "on")
947958
},
948959
dataType: 'json',
949960
async: true,

0 commit comments

Comments
 (0)