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

fix EOF and trailing spaces

This commit is contained in:
Pearl Dsilva 2026-03-27 15:24:07 -04:00
parent 0afa603145
commit 2f0fc971c2
4 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
engine/storage/src/test/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelectorTest.java
View File

@ -85,7 +85,7 @@ public class DefaultEndPointSelectorTest {
@Before
public void setup() {
Mockito.doReturn(volumeInfoMock).when(snapshotInfoMock).getBaseVolume();
// Common volume mock setup
Mockito.when(volumeInfoMock.getId()).thenReturn(VOLUME_ID);
Mockito.when(volumeInfoMock.getUuid()).thenReturn(VOLUME_UUID);
@ -234,11 +234,9 @@ public class DefaultEndPointSelectorTest {
Mockito.verify(defaultEndPointSelectorSpy, Mockito.times(1)).select(snapshotInfoMock, false);
}
// ==================== CLVM/CLVM_NG Tests ====================
@Test
public void testSelectClvmEndpoint_VolumeWithDestinationHost_CLVM() {
// Setup CLVM pool
Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
@ -256,7 +254,6 @@ public class DefaultEndPointSelectorTest {
@Test
public void testSelectClvmEndpoint_VolumeWithDestinationHost_CLVM_NG() {
// Setup CLVM_NG pool
Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
@ -274,7 +271,6 @@ public class DefaultEndPointSelectorTest {
@Test
public void testSelectClvmEndpoint_VolumeWithoutDestinationHost() {
// Setup CLVM pool but no destination host
Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
@ -293,7 +289,6 @@ public class DefaultEndPointSelectorTest {
@Test
public void testSelectClvmEndpoint_NonCLVMPool() {
// Setup NFS pool (non-CLVM)
Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
@ -311,7 +306,6 @@ public class DefaultEndPointSelectorTest {
@Test
public void testSelectClvmEndpoint_SnapshotWithBaseVolumeDestHost() {
// Setup snapshot with base volume having destination host
Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
Mockito.when(snapshotInfoMock.getDataStore()).thenReturn(datastoreMock);
@ -331,7 +325,6 @@ public class DefaultEndPointSelectorTest {
@Test
public void testSelectWithAction_DeleteVolume_CLVMWithLockHost() {
// Setup CLVM volume with lock host
Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
@ -351,7 +344,6 @@ public class DefaultEndPointSelectorTest {
@Test
public void testSelectWithAction_DeleteVolume_CLVM_NG_WithLockHost() {
// Setup CLVM_NG volume with lock host
Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
@ -371,7 +363,6 @@ public class DefaultEndPointSelectorTest {
@Test
public void testSelectWithAction_DeleteVolume_CLVMWithoutLockHost() {
// Setup CLVM volume without lock host
Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
@ -390,7 +381,6 @@ public class DefaultEndPointSelectorTest {
@Test
public void testSelectWithAction_DeleteVolume_NonCLVM() {
// Setup non-CLVM volume (NFS)
Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
@ -408,7 +398,6 @@ public class DefaultEndPointSelectorTest {
@Test
public void testSelectObject_CLVMVolumeWithLockHost() {
// Setup CLVM volume with lock host tracked in volume_details
Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
@ -427,7 +416,6 @@ public class DefaultEndPointSelectorTest {
@Test
public void testSelectObject_CLVM_NG_VolumeWithLockHost() {
// Setup CLVM_NG volume with lock host tracked in volume_details
Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
@ -446,7 +434,6 @@ public class DefaultEndPointSelectorTest {
@Test
public void testSelectObject_CLVMVolumeWithoutLockHost() {
// Setup CLVM volume without lock host
Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
@ -464,7 +451,6 @@ public class DefaultEndPointSelectorTest {
@Test
public void testSelectObject_CLVMVolumeWithInvalidLockHostId() {
// Setup CLVM volume with invalid lock host ID (non-numeric)
Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
@ -483,7 +469,6 @@ public class DefaultEndPointSelectorTest {
@Test
public void testSelectObject_CLVMVolumeWithEmptyLockHostId() {
// Setup CLVM volume with empty lock host ID
Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
@ -502,10 +487,8 @@ public class DefaultEndPointSelectorTest {
@Test
public void testSelectTwoObjects_TemplateToVolume_CLVMWithDestHost() {
// Test template-to-volume copy for CLVM with destination host
DataObject srcDataMock = Mockito.mock(DataObject.class);
DataStore srcStoreMock = Mockito.mock(DataStore.class);
Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
@ -523,13 +506,12 @@ public class DefaultEndPointSelectorTest {
@Test
public void testSelectTwoObjects_TemplateToVolume_CLVMWithoutDestHost() {
// Test template-to-volume copy for CLVM without destination host
DataObject srcDataMock = Mockito.mock(DataObject.class);
DataStore srcStoreMock = Mockito.mock(DataStore.class);
Mockito.when(srcDataMock.getDataStore()).thenReturn(srcStoreMock);
Mockito.when(srcStoreMock.getRole()).thenReturn(DataStoreRole.Image);
Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);

1
engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
View File

@ -3129,4 +3129,3 @@ public class VolumeServiceImpl implements VolumeService {
return poolPath.startsWith("/") ? poolPath.substring(1) : poolPath;
}
}

9
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessorTest.java
View File

@ -829,7 +829,7 @@ public class KVMStorageProcessorTest {
@Test
public void testComputeMd5Hash_ValidInput() {
String input = "snapshot-uuid-123";
try {
Method method = KVMStorageProcessor.class.getDeclaredMethod(
"computeMd5Hash", String.class);
@ -847,7 +847,7 @@ public class KVMStorageProcessorTest {
@Test
public void testComputeMd5Hash_EmptyInput() {
String input = "";
try {
java.lang.reflect.Method method = KVMStorageProcessor.class.getDeclaredMethod(
"computeMd5Hash", String.class);
@ -864,7 +864,7 @@ public class KVMStorageProcessorTest {
@Test
public void testComputeMd5Hash_ConsistentResults() {
String input = "snapshot-uuid-456";
try {
java.lang.reflect.Method method = KVMStorageProcessor.class.getDeclaredMethod(
"computeMd5Hash", String.class);
@ -938,6 +938,9 @@ public class KVMStorageProcessorTest {
method.invoke(storageProcessorSpy, kvmStoragePoolMock, volumeObjectToMock, bitmapName);
Assert.assertTrue("Method should handle null volume path gracefully", true);
} catch (java.lang.reflect.InvocationTargetException e) {
Assert.fail("Method should handle null volume path internally, but threw: " +
(e.getCause() != null ? e.getCause().getMessage() : e.getMessage()));
} catch (Exception e) {
Assert.fail("Failed to test cleanupBrokenBitmap: " + e.getMessage());
}

2
server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java
View File

@ -2643,5 +2643,3 @@ public class VolumeApiServiceImplTest {
}
}
}