Skip to content

api: include tags in listvmsnapshots response #3216

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

Merged
yadvr merged 1 commit into from
May 10, 2019
Merged

api: include tags in listvmsnapshots response #3216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 12 additions & 4 deletions api/src/main/java/org/apache/cloudstack/api/response/VMSnapshotResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,19 @@
package org.apache.cloudstack.api.response;

import java.util.Date;

import com.google.gson.annotations.SerializedName;
import java.util.LinkedHashSet;
import java.util.Set;

import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseResponse;
import org.apache.cloudstack.api.BaseResponseWithTagInformation;
import org.apache.cloudstack.api.EntityReference;

import com.cloud.serializer.Param;
import com.cloud.vm.snapshot.VMSnapshot;
import com.google.gson.annotations.SerializedName;

@EntityReference(value = VMSnapshot.class)
public class VMSnapshotResponse extends BaseResponse implements ControlledEntityResponse {
public class VMSnapshotResponse extends BaseResponseWithTagInformation implements ControlledEntityResponse {

@SerializedName(ApiConstants.ID)
@Param(description = "the ID of the vm snapshot")
Expand Down Expand Up @@ -99,6 +100,10 @@ public class VMSnapshotResponse extends BaseResponse implements ControlledEntity
@Param(description = "the domain associated with the disk volume")
private String domainName;

public VMSnapshotResponse() {
tags = new LinkedHashSet<ResourceTagResponse>();
}

@Override
public String getObjectId() {
return getId();
Expand Down Expand Up @@ -226,6 +231,9 @@ public void setDomainId(String domainId) {
@Override
public void setDomainName(String domainName) {
this.domainName = domainName;
}

public void setTags(Set<ResourceTagResponse> tags) {
this.tags = tags;
}
}
8 changes: 8 additions & 0 deletions server/src/main/java/com/cloud/api/ApiResponseHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,6 +619,14 @@ public VMSnapshotResponse createVMSnapshotResponse(VMSnapshot vmSnapshot) {
vmSnapshotResponse.setDomainName(domain.getName());
}

List<? extends ResourceTag> tags = _resourceTagDao.listBy(vmSnapshot.getId(), ResourceObjectType.VMSnapshot);
List<ResourceTagResponse> tagResponses = new ArrayList<ResourceTagResponse>();
for (ResourceTag tag : tags) {
ResourceTagResponse tagResponse = createResourceTagResponse(tag, false);
CollectionUtils.addIgnoreNull(tagResponses, tagResponse);
}
vmSnapshotResponse.setTags(new HashSet<>(tagResponses));

vmSnapshotResponse.setCurrent(vmSnapshot.getCurrent());
vmSnapshotResponse.setType(vmSnapshot.getType().toString());
vmSnapshotResponse.setObjectName("vmsnapshot");
Expand Down