From 6d7808ab7bb8e99770cf912ce65b9af14b022881 Mon Sep 17 00:00:00 2001
From: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>
Date: Wed, 28 Jan 2026 19:15:22 +0530
Subject: [PATCH 1/2] Update storage usage / size in backup usage response

---
 server/src/main/java/com/cloud/api/ApiResponseHelper.java      | 2 ++
 .../main/java/com/cloud/usage/parser/BackupUsageParser.java    | 3 +--
 .../java/com/cloud/usage/parser/VMSnapshotOnPrimaryParser.java | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
index 3331053dff22..cc74eceaf85d 100644
--- a/server/src/main/java/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
@@ -4380,6 +4380,8 @@ public UsageRecordResponse createUsageResponse(Usage usageRecord, Map<String, Se
 
             }
             usageRecResponse.setDescription(builder.toString());
+            usageRecResponse.setSize(usageRecord.getSize());
+            usageRecResponse.setVirtualSize(usageRecord.getVirtualSize());
         } else if (usageRecord.getUsageType() == UsageTypes.VM_SNAPSHOT) {
             resourceType = ResourceObjectType.VMSnapshot;
             VMSnapshotVO vmSnapshotVO = null;
diff --git a/usage/src/main/java/com/cloud/usage/parser/BackupUsageParser.java b/usage/src/main/java/com/cloud/usage/parser/BackupUsageParser.java
index 82370fcae3e9..257bc4683027 100644
--- a/usage/src/main/java/com/cloud/usage/parser/BackupUsageParser.java
+++ b/usage/src/main/java/com/cloud/usage/parser/BackupUsageParser.java
@@ -84,12 +84,11 @@ public static boolean parse(AccountVO account, Date startDate, Date endDate) {
             DecimalFormat dFormat = new DecimalFormat("#.######");
             String usageDisplay = dFormat.format(usage);
 
-            final Double rawUsage = (double) usageBackup.getSize();
             final String description = String.format("Backup usage VM ID: %d, backup offering: %d", vmId, offeringId);
 
             final UsageVO usageRecord =
                     new UsageVO(zoneId, account.getAccountId(), account.getDomainId(), description, usageDisplay + " Hrs",
-                            UsageTypes.BACKUP, new Double(usage), vmId, null, offeringId, null, vmId,
+                            UsageTypes.BACKUP, (double) usage, vmId, null, offeringId, null, vmId,
                             usageBackup.getSize(), usageBackup.getProtectedSize(), startDate, endDate);
             s_usageDao.persist(usageRecord);
         }
diff --git a/usage/src/main/java/com/cloud/usage/parser/VMSnapshotOnPrimaryParser.java b/usage/src/main/java/com/cloud/usage/parser/VMSnapshotOnPrimaryParser.java
index fb48bbde4bed..252f661569db 100644
--- a/usage/src/main/java/com/cloud/usage/parser/VMSnapshotOnPrimaryParser.java
+++ b/usage/src/main/java/com/cloud/usage/parser/VMSnapshotOnPrimaryParser.java
@@ -125,7 +125,7 @@ private static void createUsageRecord(int usageType, long runningTime, Date star
         String usageDesc = "VMSnapshot Id: " + vmSnapshotId + " On Primary Usage: VM Id: " + vmId;
         usageDesc += " Size: " + toHumanReadableSize(virtualSize);
 
-        UsageVO usageRecord = new UsageVO(zoneId, account.getId(), account.getDomainId(), usageDesc, usageDisplay + " Hrs", usageType, new Double(usage), vmId, name, null, null,
+        UsageVO usageRecord = new UsageVO(zoneId, account.getId(), account.getDomainId(), usageDesc, usageDisplay + " Hrs", usageType, (double) usage, vmId, name, null, null,
                 vmSnapshotId, physicalSize, virtualSize, startDate, endDate);
         s_usageDao.persist(usageRecord);
     }

From 3db2965b43119ccdd3a328fb46350aa3d23facd4 Mon Sep 17 00:00:00 2001
From: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>
Date: Thu, 29 Jan 2026 18:15:47 +0530
Subject: [PATCH 2/2] update backup usage description text with size

---
 server/src/main/java/com/cloud/api/ApiResponseHelper.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
index cc74eceaf85d..0aaf17a0e876 100644
--- a/server/src/main/java/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
@@ -4364,7 +4364,7 @@ public UsageRecordResponse createUsageResponse(Usage usageRecord, Map<String, Se
         } else if (usageRecord.getUsageType() == UsageTypes.BACKUP) {
             resourceType = ResourceObjectType.Backup;
             final StringBuilder builder = new StringBuilder();
-            builder.append("Backup usage of size ").append(usageRecord.getUsageDisplay());
+            builder.append("Backup usage");
             if (vmInstance != null) {
                 resourceId = vmInstance.getId();
                 usageRecResponse.setResourceName(vmInstance.getInstanceName());
@@ -4377,8 +4377,8 @@ public UsageRecordResponse createUsageResponse(Usage usageRecord, Map<String, Se
                             .append(" (").append(backupOffering.getUuid()).append(", user ad-hoc/scheduled backup allowed: ")
                             .append(backupOffering.isUserDrivenBackupAllowed()).append(")");
                 }
-
             }
+            builder.append(" with size ").append(toHumanReadableSize(usageRecord.getVirtualSize()));
             usageRecResponse.setDescription(builder.toString());
             usageRecResponse.setSize(usageRecord.getSize());
             usageRecResponse.setVirtualSize(usageRecord.getVirtualSize());