(cloudstack) branch 4.20 updated: Update storage usage / size in backup usage response (#12539)

[dahn]

This is an automated email from the ASF dual-hosted git repository.

dahn pushed a commit to branch 4.20
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.20 by this push:
     new 6bed3d4e641 Update storage usage / size in backup usage response 
(#12539)
6bed3d4e641 is described below

commit 6bed3d4e641f48822fc1b9126bd6e2c71f28ed02
Author: Suresh Kumar Anaparti <sureshkumar.anapa...@gmail.com>
AuthorDate: Fri Jan 30 18:15:59 2026 +0530

    Update storage usage / size in backup usage response (#12539)
---
 server/src/main/java/com/cloud/api/ApiResponseHelper.java          | 7 +++++--
 usage/src/main/java/com/cloud/usage/parser/BackupUsageParser.java  | 3 +--
 .../java/com/cloud/usage/parser/VMSnapshotOnPrimaryParser.java     | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java 
b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
index 3331053dff2..2b7ed1b1100 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 class ApiResponseHelper implements 
ResponseGenerator {
         } 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,9 +4377,12 @@ public class ApiResponseHelper implements 
ResponseGenerator {
                             .append(" 
(").append(backupOffering.getUuid()).append(", user ad-hoc/scheduled backup 
allowed: ")
                             
.append(backupOffering.isUserDrivenBackupAllowed()).append(")");
                 }
-
             }
+            builder.append(" with size 
").append(toHumanReadableSize(usageRecord.getSize()));
+            builder.append(" and with virtual size 
").append(toHumanReadableSize(usageRecord.getVirtualSize()));
             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 82370fcae3e..257bc468302 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 class BackupUsageParser {
             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 fb48bbde4be..252f661569d 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 @@ public class VMSnapshotOnPrimaryParser {
         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);
     }