Skip to content

api: Set network name as part of the network usage response #3234

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
Jun 20, 2019
Merged

api: Set network name as part of the network usage response #3234

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
8 changes: 4 additions & 4 deletions api/src/main/java/org/apache/cloudstack/api/response/UsageRecordResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ public class UsageRecordResponse extends BaseResponseWithTagInformation implemen
private String virtualMachineId;

@SerializedName(ApiConstants.NAME)
@Param(description = "virtual machine name")
private String vmName;
@Param(description = "resource or virtual machine name")
private String resourceName;

@SerializedName("offeringid")
@Param(description = "offering ID")
Expand Down Expand Up @@ -186,8 +186,8 @@ public void setVirtualMachineId(String virtualMachineId) {
this.virtualMachineId = virtualMachineId;
}

public void setVmName(String vmName) {
this.vmName = vmName;
public void setResourceName(String name) {
this.resourceName = name;
}

public void setOfferingId(String offeringId) {
Expand Down
5 changes: 3 additions & 2 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 @@ -3309,7 +3309,7 @@ public UsageRecordResponse createUsageResponse(Usage usageRecord, Map<String, Se
usageRecResponse.setVirtualMachineId(vm.getUuid());
}
}
usageRecResponse.setVmName(usageRecord.getVmName());
usageRecResponse.setResourceName(usageRecord.getVmName());
if (usageRecord.getTemplateId() != null) {
VMTemplateVO template = ApiDBUtils.findTemplateById(usageRecord.getTemplateId());
if (template != null) {
Expand Down Expand Up @@ -3389,6 +3389,7 @@ public UsageRecordResponse createUsageResponse(Usage usageRecord, Map<String, Se
resourceType = ResourceObjectType.Network;
resourceId = network.getId();
usageRecResponse.setNetworkId(network.getUuid());
usageRecResponse.setResourceName(network.getName());
}
}
} else if (usageRecord.getUsageType() == UsageTypes.VM_DISK_IO_READ || usageRecord.getUsageType() == UsageTypes.VM_DISK_IO_WRITE
Expand Down Expand Up @@ -3495,7 +3496,7 @@ public UsageRecordResponse createUsageResponse(Usage usageRecord, Map<String, Se
resourceType = ResourceObjectType.UserVm;
if (vm != null) {
resourceId = vm.getId();
usageRecResponse.setVmName(vm.getInstanceName());
usageRecResponse.setResourceName(vm.getInstanceName());
usageRecResponse.setUsageId(vm.getUuid());
}
usageRecResponse.setSize(usageRecord.getSize());
Expand Down