Skip to content

Commit f8ca597

Browse files
Pearl1594Pearl1594
committed
fix EOF and trailing spaces
1 parent 0afa603 commit f8ca597

File tree

4 files changed

+7
-28
lines changed

4 files changed

+7
-28
lines changed

‎engine/storage/src/test/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelectorTest.java‎

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public class DefaultEndPointSelectorTest {
8585
@Before
8686
public void setup() {
8787
Mockito.doReturn(volumeInfoMock).when(snapshotInfoMock).getBaseVolume();
88-
88+
8989
// Common volume mock setup
9090
Mockito.when(volumeInfoMock.getId()).thenReturn(VOLUME_ID);
9191
Mockito.when(volumeInfoMock.getUuid()).thenReturn(VOLUME_UUID);
@@ -234,11 +234,9 @@ public void getEndPointForSnapshotOperationsInKvmTestVolumeAttachedToStoppedVmAn
234234
Mockito.verify(defaultEndPointSelectorSpy, Mockito.times(1)).select(snapshotInfoMock, false);
235235
}
236236

237-
// ==================== CLVM/CLVM_NG Tests ====================
238237

239238
@Test
240239
public void testSelectClvmEndpoint_VolumeWithDestinationHost_CLVM() {
241-
// Setup CLVM pool
242240
Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
243241
Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
244242
Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
@@ -256,7 +254,6 @@ public void testSelectClvmEndpoint_VolumeWithDestinationHost_CLVM() {
256254

257255
@Test
258256
public void testSelectClvmEndpoint_VolumeWithDestinationHost_CLVM_NG() {
259-
// Setup CLVM_NG pool
260257
Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
261258
Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
262259
Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
@@ -274,7 +271,6 @@ public void testSelectClvmEndpoint_VolumeWithDestinationHost_CLVM_NG() {
274271

275272
@Test
276273
public void testSelectClvmEndpoint_VolumeWithoutDestinationHost() {
277-
// Setup CLVM pool but no destination host
278274
Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
279275
Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
280276
Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
@@ -293,7 +289,6 @@ public void testSelectClvmEndpoint_VolumeWithoutDestinationHost() {
293289

294290
@Test
295291
public void testSelectClvmEndpoint_NonCLVMPool() {
296-
// Setup NFS pool (non-CLVM)
297292
Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
298293
Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
299294
Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
@@ -311,7 +306,6 @@ public void testSelectClvmEndpoint_NonCLVMPool() {
311306

312307
@Test
313308
public void testSelectClvmEndpoint_SnapshotWithBaseVolumeDestHost() {
314-
// Setup snapshot with base volume having destination host
315309
Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
316310
Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
317311
Mockito.when(snapshotInfoMock.getDataStore()).thenReturn(datastoreMock);
@@ -331,7 +325,6 @@ public void testSelectClvmEndpoint_SnapshotWithBaseVolumeDestHost() {
331325

332326
@Test
333327
public void testSelectWithAction_DeleteVolume_CLVMWithLockHost() {
334-
// Setup CLVM volume with lock host
335328
Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
336329
Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
337330
Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
@@ -351,7 +344,6 @@ public void testSelectWithAction_DeleteVolume_CLVMWithLockHost() {
351344

352345
@Test
353346
public void testSelectWithAction_DeleteVolume_CLVM_NG_WithLockHost() {
354-
// Setup CLVM_NG volume with lock host
355347
Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
356348
Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
357349
Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
@@ -371,7 +363,6 @@ public void testSelectWithAction_DeleteVolume_CLVM_NG_WithLockHost() {
371363

372364
@Test
373365
public void testSelectWithAction_DeleteVolume_CLVMWithoutLockHost() {
374-
// Setup CLVM volume without lock host
375366
Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
376367
Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
377368
Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
@@ -390,7 +381,6 @@ public void testSelectWithAction_DeleteVolume_CLVMWithoutLockHost() {
390381

391382
@Test
392383
public void testSelectWithAction_DeleteVolume_NonCLVM() {
393-
// Setup non-CLVM volume (NFS)
394384
Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
395385
Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
396386
Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
@@ -408,7 +398,6 @@ public void testSelectWithAction_DeleteVolume_NonCLVM() {
408398

409399
@Test
410400
public void testSelectObject_CLVMVolumeWithLockHost() {
411-
// Setup CLVM volume with lock host tracked in volume_details
412401
Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
413402
Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
414403
Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
@@ -427,7 +416,6 @@ public void testSelectObject_CLVMVolumeWithLockHost() {
427416

428417
@Test
429418
public void testSelectObject_CLVM_NG_VolumeWithLockHost() {
430-
// Setup CLVM_NG volume with lock host tracked in volume_details
431419
Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
432420
Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
433421
Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
@@ -446,7 +434,6 @@ public void testSelectObject_CLVM_NG_VolumeWithLockHost() {
446434

447435
@Test
448436
public void testSelectObject_CLVMVolumeWithoutLockHost() {
449-
// Setup CLVM volume without lock host
450437
Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
451438
Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
452439
Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
@@ -464,7 +451,6 @@ public void testSelectObject_CLVMVolumeWithoutLockHost() {
464451

465452
@Test
466453
public void testSelectObject_CLVMVolumeWithInvalidLockHostId() {
467-
// Setup CLVM volume with invalid lock host ID (non-numeric)
468454
Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
469455
Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
470456
Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
@@ -483,7 +469,6 @@ public void testSelectObject_CLVMVolumeWithInvalidLockHostId() {
483469

484470
@Test
485471
public void testSelectObject_CLVMVolumeWithEmptyLockHostId() {
486-
// Setup CLVM volume with empty lock host ID
487472
Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
488473
Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
489474
Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
@@ -502,10 +487,8 @@ public void testSelectObject_CLVMVolumeWithEmptyLockHostId() {
502487

503488
@Test
504489
public void testSelectTwoObjects_TemplateToVolume_CLVMWithDestHost() {
505-
// Test template-to-volume copy for CLVM with destination host
506490
DataObject srcDataMock = Mockito.mock(DataObject.class);
507-
DataStore srcStoreMock = Mockito.mock(DataStore.class);
508-
491+
509492
Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
510493
Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
511494
Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);
@@ -523,13 +506,12 @@ public void testSelectTwoObjects_TemplateToVolume_CLVMWithDestHost() {
523506

524507
@Test
525508
public void testSelectTwoObjects_TemplateToVolume_CLVMWithoutDestHost() {
526-
// Test template-to-volume copy for CLVM without destination host
527509
DataObject srcDataMock = Mockito.mock(DataObject.class);
528510
DataStore srcStoreMock = Mockito.mock(DataStore.class);
529-
511+
530512
Mockito.when(srcDataMock.getDataStore()).thenReturn(srcStoreMock);
531513
Mockito.when(srcStoreMock.getRole()).thenReturn(DataStoreRole.Image);
532-
514+
533515
Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock);
534516
Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary);
535517
Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID);

‎engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3129,4 +3129,3 @@ private String extractVgNameFromPath(String poolPath) {
31293129
return poolPath.startsWith("/") ? poolPath.substring(1) : poolPath;
31303130
}
31313131
}
3132-

‎plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessorTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ public void testDeleteClvmSnapshot_InvalidPath() {
829829
@Test
830830
public void testComputeMd5Hash_ValidInput() {
831831
String input = "snapshot-uuid-123";
832-
832+
833833
try {
834834
Method method = KVMStorageProcessor.class.getDeclaredMethod(
835835
"computeMd5Hash", String.class);
@@ -847,7 +847,7 @@ public void testComputeMd5Hash_ValidInput() {
847847
@Test
848848
public void testComputeMd5Hash_EmptyInput() {
849849
String input = "";
850-
850+
851851
try {
852852
java.lang.reflect.Method method = KVMStorageProcessor.class.getDeclaredMethod(
853853
"computeMd5Hash", String.class);
@@ -864,7 +864,7 @@ public void testComputeMd5Hash_EmptyInput() {
864864
@Test
865865
public void testComputeMd5Hash_ConsistentResults() {
866866
String input = "snapshot-uuid-456";
867-
867+
868868
try {
869869
java.lang.reflect.Method method = KVMStorageProcessor.class.getDeclaredMethod(
870870
"computeMd5Hash", String.class);

‎server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2643,5 +2643,3 @@ private <T> T invokePrivateMethod(String methodName, Class<?>[] paramTypes, Obje
26432643
}
26442644
}
26452645
}
2646-
2647-

0 commit comments

Comments
 (0)