From 50bc143af155a0aee8c31c116e215e27a8c9b258 Mon Sep 17 00:00:00 2001
From: Rohit Yadav <rohit.yadav@shapeblue.com>
Date: Thu, 17 Jan 2019 14:37:40 +0530
Subject: [PATCH] api: Set network name as part of the network usage response

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
---
 .../cloudstack/api/response/UsageRecordResponse.java      | 8 ++++----
 server/src/main/java/com/cloud/api/ApiResponseHelper.java | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/api/src/main/java/org/apache/cloudstack/api/response/UsageRecordResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/UsageRecordResponse.java
index c53f2b99e0b0..cfc552d86b65 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/UsageRecordResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/UsageRecordResponse.java
@@ -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")
@@ -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) {
diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
index 0b310c0f11cd..cdcbf9725b11 100644
--- a/server/src/main/java/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
@@ -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) {
@@ -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
@@ -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());