This is an automated email from the ASF dual-hosted git repository. Pearl1594 pushed a commit to branch fix-test-failure in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit cfdd378c13131015fb6c6f4d751c7a61f72faa47 Author: Pearl1594 <[email protected]> AuthorDate: Thu Sep 10 12:53:43 2026 -0400 Fix KvmFileBasedStorageVmSnapshotStrategy unit test failures --- .../storage/vmsnapshot/KvmFileBasedStorageVmSnapshotStrategy.java | 2 +- .../vmsnapshot/KvmFileBasedStorageVmSnapshotStrategyTest.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/KvmFileBasedStorageVmSnapshotStrategy.java b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/KvmFileBasedStorageVmSnapshotStrategy.java index c812f5acf06..4cb1d0361aa 100644 --- a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/KvmFileBasedStorageVmSnapshotStrategy.java +++ b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/KvmFileBasedStorageVmSnapshotStrategy.java @@ -108,7 +108,7 @@ public class KvmFileBasedStorageVmSnapshotStrategy extends StorageVMSnapshotStra protected BackupOfferingDao backupOfferingDao; @Inject - private InternalBackupService internalBackupService; + protected InternalBackupService internalBackupService; @Inject private InternalBackupStoragePoolDao internalBackupStoragePoolDao; diff --git a/engine/storage/snapshot/src/test/java/org/apache/cloudstack/storage/vmsnapshot/KvmFileBasedStorageVmSnapshotStrategyTest.java b/engine/storage/snapshot/src/test/java/org/apache/cloudstack/storage/vmsnapshot/KvmFileBasedStorageVmSnapshotStrategyTest.java index c1135d795e6..7107f38dffc 100644 --- a/engine/storage/snapshot/src/test/java/org/apache/cloudstack/storage/vmsnapshot/KvmFileBasedStorageVmSnapshotStrategyTest.java +++ b/engine/storage/snapshot/src/test/java/org/apache/cloudstack/storage/vmsnapshot/KvmFileBasedStorageVmSnapshotStrategyTest.java @@ -37,6 +37,7 @@ import java.lang.reflect.Method; import java.util.Collections; import java.util.List; +import org.apache.cloudstack.backup.InternalBackupService; import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotDataFactory; import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo; import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; @@ -121,6 +122,7 @@ public class KvmFileBasedStorageVmSnapshotStrategyTest { strategy.vmInstanceDetailsDao = mock(VMInstanceDetailsDao.class); strategy.hostDetailsDao = hostDetailsDao; strategy.alertManager = mock(AlertManager.class); + strategy.internalBackupService = mock(InternalBackupService.class); doNothing().when(strategy).publishUsageEvent(anyString(), any(VMSnapshot.class), any(UserVm.class), anyLong(), anyLong()); doNothing().when(strategy).publishUsageEvent(anyString(), any(VMSnapshot.class), any(UserVm.class), any(VolumeObjectTO.class)); } @@ -343,12 +345,10 @@ public class KvmFileBasedStorageVmSnapshotStrategyTest { SnapshotInfo rootSnapshotInfo = mock(SnapshotInfo.class); SnapshotObjectTO rootSnapshotObjectTo = mock(SnapshotObjectTO.class); VolumeObjectTO rootSnapshotVolume = mock(VolumeObjectTO.class); - VMSnapshotDetailsVO volumeSnapshotDetail = new VMSnapshotDetailsVO(vmSnapshotId, "kvmFileBasedStorageSnapshot", String.valueOf(rootSnapshotId), true); when(vmSnapshot.getId()).thenReturn(vmSnapshotId); when(vmSnapshot.getUuid()).thenReturn("vm-snapshot"); - when(vmSnapshotDetailsDao.findDetails(vmSnapshotId, "kvmFileBasedStorageSnapshot")).thenReturn(List.of(volumeSnapshotDetail)); - when(snapshotDataStoreDao.findOneBySnapshotAndDatastoreRole(rootSnapshotId, DataStoreRole.Primary)).thenReturn(rootSnapshotDataStore); + when(vmSnapshotHelper.getVolumeSnapshotsAssociatedWithKvmDiskOnlyVmSnapshot(vmSnapshotId)).thenReturn(List.of(rootSnapshotDataStore)); when(rootSnapshotDataStore.getSnapshotId()).thenReturn(rootSnapshotId); when(rootSnapshotDataStore.getDataStoreId()).thenReturn(dataStoreId); when(strategy.snapshotDataFactory.getSnapshot(rootSnapshotId, dataStoreId, DataStoreRole.Primary)).thenReturn(rootSnapshotInfo);
