You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by su...@apache.org on 2026/04/10 06:33:06 UTC
(cloudstack) branch main updated (c3614098da2 -> 11538df7102)
This is an automated email from the ASF dual-hosted git repository.
sureshanaparti pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from c3614098da2 Merge branch '4.22'
add 7ba5240b311 Block backup deletion while create-VM-from-backup or restore jobs are in progress (#12792)
add 1ff9eec9977 Load arch data for backup from template during create instance from backup (#12801)
add b5858029bb5 Fix listing service offerings with different host tags (#12919)
add b0b3dc91f53 fix: support SharedMountPoint volume checks for importVm (#12946)
add b1bc5380a28 fix: support SharedMountPoint for KVM volume import and unmanage (#12956)
add 416679fae13 Fix domain parsing for GPU & add Display controller in the supported PCI class (#12981)
add 4ba4bd33c3c replace GROUP_CONCAT with JSON_ARRAYAGG to avoid errors like Row 19 was cut by GROUP_CONCAT (#12777)
add 68bd0563061 Support timeout configuration for Create and Restore NAS backup (#12964)
add 7b467496cb9 Do not include snapshots with Group type in snapshots resource count (#12945)
add 2a60305792c Fix snapshot chaining on Xen (#12597)
new 11538df7102 Merge branch '4.22'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../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(-)
(cloudstack) 01/01: Merge branch '4.22'
Posted by su...@apache.org.
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 <su...@gmail.com>
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"};