This is an automated email from the ASF dual-hosted git repository. sureshanaparti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 11538df7102ee0731541d2a1d23bee767321d8da Merge: c3614098da2 2a60305792c Author: Suresh Kumar Anaparti <[email protected]> AuthorDate: Fri Apr 10 12:02:40 2026 +0530 Merge branch '4.22' .../volume/VolumeImportUnmanageService.java | 2 +- .../main/java/com/cloud/host/dao/HostTagsDao.java | 5 + .../java/com/cloud/host/dao/HostTagsDaoImpl.java | 20 ++ .../com/cloud/storage/dao/SnapshotDaoImpl.java | 2 + .../storage/datastore/db/SnapshotDataStoreDao.java | 2 + .../datastore/db/SnapshotDataStoreDaoImpl.java | 15 ++ .../resources/META-INF/db/schema-42010to42100.sql | 62 ++++--- .../storage/snapshot/DefaultSnapshotStrategy.java | 2 +- .../snapshot/DefaultSnapshotStrategyTest.java | 7 +- .../hypervisor/kvm/resource/LibvirtGpuDef.java | 47 +++-- .../wrapper/LibvirtCheckVolumeCommandWrapper.java | 5 +- .../LibvirtGetVolumesOnStorageCommandWrapper.java | 2 +- .../LibvirtRestoreBackupCommandWrapper.java | 6 +- .../wrapper/LibvirtTakeBackupCommandWrapper.java | 3 +- .../hypervisor/kvm/resource/LibvirtGpuDefTest.java | 139 ++++++++++++++ .../LibvirtRestoreBackupCommandWrapperTest.java | 30 ++- scripts/vm/hypervisor/kvm/gpudiscovery.sh | 204 ++++++++++++++++----- .../java/com/cloud/api/query/QueryManagerImpl.java | 30 ++- .../src/main/java/com/cloud/vm/UserVmManager.java | 3 + .../main/java/com/cloud/vm/UserVmManagerImpl.java | 2 +- .../cloudstack/backup/BackupManagerImpl.java | 14 ++ .../com/cloud/api/query/QueryManagerImplTest.java | 40 ++++ .../cloudstack/backup/BackupManagerTest.java | 30 +++ ui/src/components/view/DeployVMFromBackup.vue | 46 +---- .../compute/wizard/ComputeOfferingSelection.vue | 23 ++- ui/src/views/storage/CreateVMFromBackup.vue | 25 ++- 26 files changed, 600 insertions(+), 166 deletions(-) diff --cc server/src/test/java/org/apache/cloudstack/backup/BackupManagerTest.java index 9aba65791a3,2c9d11612c4..f5ec79fbeaf --- a/server/src/test/java/org/apache/cloudstack/backup/BackupManagerTest.java +++ b/server/src/test/java/org/apache/cloudstack/backup/BackupManagerTest.java @@@ -246,12 -242,9 +247,15 @@@ public class BackupManagerTest @Mock private GuestOSDao _guestOSDao; + @Mock + private BackupOfferingDetailsDao backupOfferingDetailsDao; + + @Mock + DomainHelper domainHelper; + + @Mock + AsyncJobManager asyncJobManager; + private Gson gson; private String[] hostPossibleValues = {"127.0.0.1", "hostname"};
