Destroyvm also removes volumes by houthuis · Pull Request #18 · shapeblue/cloudstack · GitHub
Skip to content

Destroyvm also removes volumes #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
houthuis wants to merge 15 commits into from
Closed

Destroyvm also removes volumes #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
4a154b6
WIP volume validation, volume detach
Jul 9, 2018
880b38e
WIP delete volume code added. functionally complete, cleanup and refa…
Jul 9, 2018
eb929a0
WIP ui code
Jul 24, 2018
12e627b
Adding a test for DestroyVM with volumes
borisstoyanov Jul 25, 2018
e953db9
WIP front end complete
Jul 31, 2018
fbc3fdf
Merge branch 'destroyvm-also-removes-volumes' of https://github.com/s…
Jul 31, 2018
d2f3b35
code cleanup
Jul 31, 2018
bff19b3
Merge branch 'master' of https://github.com/shapeblue/cloudstack into…
Jul 31, 2018
3c7e0cc
improved wording
Jul 31, 2018
83ae447
changes following code review
Jul 31, 2018
6129eb6
changes following code review
Aug 1, 2018
ff5004e
Adding a test for DestroyVM with volumes
borisstoyanov Aug 2, 2018
eb02664
ui enhancement when no volumes are attached to a vm
Aug 3, 2018
9590da1
Merge branch 'destroyvm-also-removes-volumes' of https://github.com/s…
Aug 3, 2018
d996e77
added code to allow users to detach and delete volumes when destroyin…
Jul 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions api/src/main/java/com/cloud/storage/VolumeApiService.java
View file
Open in desktop
2 changes: 2 additions & 0 deletions api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -726,6 +726,8 @@ public class ApiConstants {
public static final String EXITCODE = "exitcode";
public static final String TARGET_ID = "targetid";

public static final String VOLUME_IDS = "volumeids";

public enum HostDetails {
all, capacity, events, stats, min;
}
Expand Down
13 changes: 13 additions & 0 deletions api/src/main/java/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
import org.apache.cloudstack.context.CallContext;

import com.cloud.event.EventTypes;
Expand Down Expand Up @@ -63,6 +64,14 @@ public class DestroyVMCmd extends BaseAsyncCmd {
since = "4.2.1")
private Boolean expunge;

@Parameter( name = ApiConstants.VOLUME_IDS,
type = CommandType.LIST,
collectionType = CommandType.UUID,
entityType = VolumeResponse.class,
description = "Comma separated list of UUIDs for volumes that will be deleted",
since = "4.12.0")
private List<Long> volumeIds;

/////////////////////////////////////////////////////
/////////////////// Accessors ///////////////////////
/////////////////////////////////////////////////////
Expand All @@ -78,6 +87,10 @@ public boolean getExpunge() {
return expunge;
}

public List<Long> getVolumeIds() {
return volumeIds;
}

/////////////////////////////////////////////////////
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
Expand Down
8 changes: 8 additions & 0 deletions server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1849,6 +1849,14 @@ private void validateRootVolumeDetachAttach(VolumeVO volume, UserVmVO vm) {
}
}

@ActionEvent(eventType = EventTypes.EVENT_VOLUME_DETACH, eventDescription = "detaching volume")
public Volume detachVolumeViaDestroyVM(long vmId, long volumeId) {

Volume result = orchestrateDetachVolumeFromVM(vmId, volumeId);

return result;
}

private Volume orchestrateDetachVolumeFromVM(long vmId, long volumeId) {

Volume volume = _volsDao.findById(volumeId);
Expand Down
236 changes: 155 additions & 81 deletions server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
View file
Open in desktop
Loading