apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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.patnala@gmail.com>
This commit is contained in:
Abhisar Sinha 2025-09-03 15:50:46 +05:30 committed by GitHub
parent 66a584624f
commit 3d6ec29c9b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/backup/dummy/src/main/java/org/apache/cloudstack/backup/DummyBackupProvider.java
View File

@ -191,7 +191,7 @@ public class DummyBackupProvider extends AdapterBase implements BackupProvider {
@Override @Override
public Pair<Long, Long> getBackupStorageStats(Long zoneId) { public Pair<Long, Long> getBackupStorageStats(Long zoneId) {
return new Pair<>(8L * 1024 * 1024 * 1024, 10L * 1024 * 1024 * 1024); return new Pair<>(0L, 0L);
} }
@Override @Override

3
server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
View File

@ -2161,6 +2161,9 @@ public class BackupManagerImpl extends ManagerBase implements BackupManager {
@Override @Override
public CapacityVO getBackupStorageUsedStats(Long zoneId) { 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); final BackupProvider backupProvider = getBackupProvider(zoneId);
Pair<Long, Long> backupUsage = backupProvider.getBackupStorageStats(zoneId); Pair<Long, Long> backupUsage = backupProvider.getBackupStorageStats(zoneId);
return new CapacityVO(null, zoneId, null, null, backupUsage.first(), backupUsage.second(), Capacity.CAPACITY_TYPE_BACKUP_STORAGE); return new CapacityVO(null, zoneId, null, null, backupUsage.first(), backupUsage.second(), Capacity.CAPACITY_TYPE_BACKUP_STORAGE);

1
ui/src/views/dashboard/CapacityDashboard.vue
View File

@ -673,6 +673,7 @@ export default {
.dashboard-storage { .dashboard-storage {
width: 100%; width: 100%;
min-height: 370px;
overflow-x:hidden; overflow-x:hidden;
overflow-y: scroll; overflow-y: scroll;
max-height: 370px; max-height: 370px;