Skip to content

Commit 72014a0

Browse files
authored
Fix KvmFileBasedStorageVmSnapshotStrategy unit test failures (#14135)
1 parent 4ce5291 commit 72014a0

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/KvmFileBasedStorageVmSnapshotStrategy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public class KvmFileBasedStorageVmSnapshotStrategy extends StorageVMSnapshotStra
108108
protected BackupOfferingDao backupOfferingDao;
109109

110110
@Inject
111-
private InternalBackupService internalBackupService;
111+
protected InternalBackupService internalBackupService;
112112

113113
@Inject
114114
private InternalBackupStoragePoolDao internalBackupStoragePoolDao;

engine/storage/snapshot/src/test/java/org/apache/cloudstack/storage/vmsnapshot/KvmFileBasedStorageVmSnapshotStrategyTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import java.util.Collections;
3838
import java.util.List;
3939

40+
import org.apache.cloudstack.backup.InternalBackupService;
4041
import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotDataFactory;
4142
import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo;
4243
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
@@ -121,6 +122,7 @@ public void setup() {
121122
strategy.vmInstanceDetailsDao = mock(VMInstanceDetailsDao.class);
122123
strategy.hostDetailsDao = hostDetailsDao;
123124
strategy.alertManager = mock(AlertManager.class);
125+
strategy.internalBackupService = mock(InternalBackupService.class);
124126
doNothing().when(strategy).publishUsageEvent(anyString(), any(VMSnapshot.class), any(UserVm.class), anyLong(), anyLong());
125127
doNothing().when(strategy).publishUsageEvent(anyString(), any(VMSnapshot.class), any(UserVm.class), any(VolumeObjectTO.class));
126128
}
@@ -343,12 +345,10 @@ public void testGetPrimaryDataStoreForNvramCleanupPrefersRootSnapshotPrimaryData
343345
SnapshotInfo rootSnapshotInfo = mock(SnapshotInfo.class);
344346
SnapshotObjectTO rootSnapshotObjectTo = mock(SnapshotObjectTO.class);
345347
VolumeObjectTO rootSnapshotVolume = mock(VolumeObjectTO.class);
346-
VMSnapshotDetailsVO volumeSnapshotDetail = new VMSnapshotDetailsVO(vmSnapshotId, "kvmFileBasedStorageSnapshot", String.valueOf(rootSnapshotId), true);
347348

348349
when(vmSnapshot.getId()).thenReturn(vmSnapshotId);
349350
when(vmSnapshot.getUuid()).thenReturn("vm-snapshot");
350-
when(vmSnapshotDetailsDao.findDetails(vmSnapshotId, "kvmFileBasedStorageSnapshot")).thenReturn(List.of(volumeSnapshotDetail));
351-
when(snapshotDataStoreDao.findOneBySnapshotAndDatastoreRole(rootSnapshotId, DataStoreRole.Primary)).thenReturn(rootSnapshotDataStore);
351+
when(vmSnapshotHelper.getVolumeSnapshotsAssociatedWithKvmDiskOnlyVmSnapshot(vmSnapshotId)).thenReturn(List.of(rootSnapshotDataStore));
352352
when(rootSnapshotDataStore.getSnapshotId()).thenReturn(rootSnapshotId);
353353
when(rootSnapshotDataStore.getDataStoreId()).thenReturn(dataStoreId);
354354
when(strategy.snapshotDataFactory.getSnapshot(rootSnapshotId, dataStoreId, DataStoreRole.Primary)).thenReturn(rootSnapshotInfo);

0 commit comments

Comments
 (0)