Skip to content

Commit c5ec5b2

Browse files
Addressed comments and fixed checkstyle issue
1 parent 246ff5f commit c5ec5b2

2 files changed

Lines changed: 19 additions & 1 deletion

File tree

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/StorageStrategy.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
package org.apache.cloudstack.storage.service;
2121

22-
import java.util.ArrayList;
2322
import java.util.HashMap;
2423
import java.util.List;
2524
import java.util.Map;

plugins/storage/volume/ontap/src/test/java/org/apache/cloudstack/storage/service/StorageStrategyTest.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -643,6 +643,25 @@ public void testDeleteStorageVolume_feignException() {
643643
assertTrue(ex.getMessage().contains("Failed to delete volume"));
644644
}
645645

646+
@Test
647+
public void testDeleteStorageVolume_notFound_404_returnsWithoutThrowing() {
648+
// Setup
649+
Volume volume = new Volume();
650+
volume.setName("test-volume");
651+
volume.setUuid("vol-uuid-1");
652+
653+
FeignException feignEx = mock(FeignException.class);
654+
when(feignEx.status()).thenReturn(404);
655+
when(volumeFeignClient.deleteVolume(anyString(), eq("vol-uuid-1")))
656+
.thenThrow(feignEx);
657+
658+
// Execute - 404 means volume already gone on ONTAP, treated as no-op
659+
storageStrategy.deleteStorageVolume(volume);
660+
661+
// Verify the delete was attempted
662+
verify(volumeFeignClient).deleteVolume(anyString(), eq("vol-uuid-1"));
663+
}
664+
646665
// ========== getStoragePath() Tests ==========
647666

648667
@Test

0 commit comments

Comments
 (0)