Skip to content

Don't show backup in list_capacity for dummy plugin or if backup_framework is disabled #11485

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
harikrishna-patnala merged 2 commits into from
Sep 3, 2025
Merged

Don't show backup in list_capacity for dummy plugin or if backup_framework is disabled #11485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9937c26
Don't show backup storage in list_capacity for dummy plugin or if bac…
abh1sar Aug 20, 2025
1ce8709
Fix the tile to full size
harikrishna-patnala Sep 3, 2025
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
2 changes: 1 addition & 1 deletion plugins/backup/dummy/src/main/java/org/apache/cloudstack/backup/DummyBackupProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ public boolean supportsInstanceFromBackup() {

@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
Expand Down
3 changes: 3 additions & 0 deletions server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2161,6 +2161,9 @@ public BackupResponse createBackupResponse(Backup backup, Boolean listVmDetails)

@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);
Expand Down
1 change: 1 addition & 0 deletions ui/src/views/dashboard/CapacityDashboard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,6 +673,7 @@ export default {

.dashboard-storage {
width: 100%;
min-height: 370px;
overflow-x:hidden;
overflow-y: scroll;
max-height: 370px;
Expand Down
Loading