etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update filter, log and test

This commit is contained in:
Suresh Kumar Anaparti 2026-01-20 20:10:04 +05:30
parent 47a6a81cde
commit 151444c7cf
No known key found for this signature in database
GPG Key ID: D7CEAE3A9E71D0AA
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/main/java/com/cloud/storage/StorageManagerImpl.java
View File

@ -1558,7 +1558,7 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C
protected String getStoragePoolNonDestroyedVolumesLog(long storagePoolId) {
StringBuilder sb = new StringBuilder();
List<VolumeVO> nonDestroyedVols = volumeDao.findByPoolId(storagePoolId, null);
List<VolumeVO> nonDestroyedVols = volumeDao.findByPoolId(storagePoolId, null).stream().filter(vol -> vol.getState() != Volume.State.Destroy).collect(Collectors.toList());
VMInstanceVO volInstance;
List<String> logMessageInfo = new ArrayList<>();
@ -1569,7 +1569,7 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C
if (volInstance != null) {
logMessageInfo.add(String.format("Volume [%s] (attached to VM [%s])", vol.getUuid(), volInstance.getUuid()));
} else {
logMessageInfo.add(String.format("Volume [%s]", vol.getUuid()));
logMessageInfo.add(String.format("Volume [%s] (attached VM with ID [%d] doesn't exists)", vol.getUuid(), vol.getInstanceId()));
}
} else {
logMessageInfo.add(String.format("Volume [%s] (not attached to any VM)", vol.getUuid()));

8
server/src/test/java/com/cloud/storage/StorageManagerImplTest.java
View File

@ -583,17 +583,21 @@ public class StorageManagerImplTest {
}
@Test
public void getStoragePoolNonDestroyedVolumesLogTestNonDestroyedVolumes_NoLog() {
public void getStoragePoolNonDestroyedVolumesLogTestNonDestroyedVolumes_VMNotExistsLog() {
Mockito.doReturn(1L).when(storagePoolVOMock).getId();
Mockito.doReturn(1L).when(volume1VOMock).getInstanceId();
Mockito.doReturn("786633d1-a942-4374-9d56-322dd4b0d202").when(volume1VOMock).getUuid();
Mockito.doReturn(1L).when(volume2VOMock).getInstanceId();
Mockito.doReturn("ffb46333-e983-4c21-b5f0-51c5877a3805").when(volume2VOMock).getUuid();
Mockito.when(_volumeDao.findByPoolId(storagePoolVOMock.getId(), null)).thenReturn(List.of(volume1VOMock, volume2VOMock));
Mockito.doReturn(null).when(vmInstanceDao).findById(Mockito.anyLong());
String log = storageManagerImpl.getStoragePoolNonDestroyedVolumesLog(storagePoolVOMock.getId());
String expected = String.format("[Volume [%s] (attached VM with ID [%d] doesn't exists), Volume [%s] (attached VM with ID [%d] doesn't exists)]",
volume1VOMock.getUuid(), volume1VOMock.getInstanceId(), volume2VOMock.getUuid(), volume2VOMock.getInstanceId());
Assert.assertEquals("[]", log);
Assert.assertEquals(expected, log);
}
private ChangeStoragePoolScopeCmd mockChangeStoragePooolScopeCmd(String newScope) {