(cloudstack) branch main updated: Don't show backup in list_capacity for dummy plugin or if backup_framework is disabled (#11485)

[harikrishna]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 3d6ec29c9bb Don't show backup in list_capacity for dummy plugin or if 
backup_framework is disabled (#11485)
3d6ec29c9bb is described below

commit 3d6ec29c9bb87dafe01ad39e2a1dda9d4e644d6c
Author: Abhisar Sinha <63767682+abh1...@users.noreply.github.com>
AuthorDate: Wed Sep 3 15:50:46 2025 +0530

    Don't show backup in list_capacity for dummy plugin or if backup_framework 
is disabled (#11485)
    
    * Don't show backup storage in list_capacity for dummy plugin or if 
backup_framework is disabled
    
    * Fix the tile to full size
    
    ---------
    
    Co-authored-by: Harikrishna Patnala <harikrishna.patn...@gmail.com>
---
 .../main/java/org/apache/cloudstack/backup/DummyBackupProvider.java    | 2 +-
 .../src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java  | 3 +++
 ui/src/views/dashboard/CapacityDashboard.vue                           | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/plugins/backup/dummy/src/main/java/org/apache/cloudstack/backup/DummyBackupProvider.java
 
b/plugins/backup/dummy/src/main/java/org/apache/cloudstack/backup/DummyBackupProvider.java
index 05b4b52ccb8..48082c1c8a4 100644
--- 
a/plugins/backup/dummy/src/main/java/org/apache/cloudstack/backup/DummyBackupProvider.java
+++ 
b/plugins/backup/dummy/src/main/java/org/apache/cloudstack/backup/DummyBackupProvider.java
@@ -191,7 +191,7 @@ public class DummyBackupProvider extends AdapterBase 
implements BackupProvider {
 
     @Override
     public Pair<Long, Long> getBackupStorageStats(Long zoneId) {
-        return new Pair<>(8L * 1024 * 1024 * 1024, 10L * 1024 * 1024 * 1024);
+        return new Pair<>(0L, 0L);
     }
 
     @Override
diff --git 
a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java 
b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
index 2682d53dd20..112626adf4f 100644
--- a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
+++ b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
@@ -2161,6 +2161,9 @@ public class BackupManagerImpl extends ManagerBase 
implements BackupManager {
 
     @Override
     public CapacityVO getBackupStorageUsedStats(Long zoneId) {
+        if (isDisabled(zoneId)) {
+            return new CapacityVO(null, zoneId, null, null, 0L, 0L, 
Capacity.CAPACITY_TYPE_BACKUP_STORAGE);
+        }
         final BackupProvider backupProvider = getBackupProvider(zoneId);
         Pair<Long, Long> backupUsage = 
backupProvider.getBackupStorageStats(zoneId);
         return new CapacityVO(null, zoneId, null, null, backupUsage.first(), 
backupUsage.second(), Capacity.CAPACITY_TYPE_BACKUP_STORAGE);
diff --git a/ui/src/views/dashboard/CapacityDashboard.vue 
b/ui/src/views/dashboard/CapacityDashboard.vue
index 9b374628886..bf25b706306 100644
--- a/ui/src/views/dashboard/CapacityDashboard.vue
+++ b/ui/src/views/dashboard/CapacityDashboard.vue
@@ -673,6 +673,7 @@ export default {
 
 .dashboard-storage {
   width: 100%;
+  min-height: 370px;
   overflow-x:hidden;
   overflow-y: scroll;
   max-height: 370px;