CSTACKEX-46: Fixed few checkstyle issues that were observed

Author: Locharla, Sandeep

plugins/storage/volume/ontap/src/test/java/org/apache/cloudstack/storage/driver/OntapPrimaryDatastoreDriverTest.java

@@ -58,9 +58,23 @@
 import java.util.Map;
 
 import static com.cloud.agent.api.to.DataObjectType.VOLUME;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockStatic;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
 class OntapPrimaryDatastoreDriverTest {
@@ -534,4 +548,3 @@ void testCanProvideVolumeStats_ReturnsFalse() {
         assertFalse(driver.canProvideVolumeStats());
     }
 }
-

plugins/storage/volume/ontap/src/test/java/org/apache/cloudstack/storage/lifecycle/OntapPrimaryDatastoreLifecycleTest.java

@@ -60,6 +60,8 @@
 import org.apache.cloudstack.storage.service.StorageStrategy;
 import org.apache.cloudstack.storage.volume.datastore.PrimaryDataStoreHelper;
 import org.apache.cloudstack.storage.utils.Utility;
+import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 
 
 @ExtendWith(MockitoExtension.class)
@@ -86,6 +88,9 @@ public class OntapPrimaryDatastoreLifecycleTest {
     @Mock
     private StoragePoolDetailsDao storagePoolDetailsDao;
 
+    @Mock
+    private PrimaryDataStoreDao storagePoolDao;
+
     // Mock object that implements both DataStore and PrimaryDataStoreInfo
     // This is needed because attachCluster(DataStore) casts DataStore to PrimaryDataStoreInfo internally
     private DataStore dataStore;
@@ -121,12 +126,23 @@ void setUp() {
         // Configure dataStore mock with necessary methods (works for both DataStore and PrimaryDataStoreInfo)
         when(dataStore.getId()).thenReturn(1L);
         when(((PrimaryDataStoreInfo) dataStore).getClusterId()).thenReturn(1L);
+
+        // Mock the setDetails method to prevent NullPointerException
+        Mockito.doNothing().when(((PrimaryDataStoreInfo) dataStore)).setDetails(any());
+
+        // Mock storagePoolDao to return a valid StoragePoolVO
+        StoragePoolVO mockStoragePoolVO = new StoragePoolVO();
+        mockStoragePoolVO.setId(1L);
+        when(storagePoolDao.findById(1L)).thenReturn(mockStoragePoolVO);
+
         mockHosts = new ArrayList<>();
         HostVO host1 = new HostVO("host1-guid");
         host1.setPrivateIpAddress("192.168.1.10");
+        host1.setStorageIpAddress("192.168.1.10");
         host1.setClusterId(1L);
         HostVO host2 = new HostVO("host2-guid");
         host2.setPrivateIpAddress("192.168.1.11");
+        host2.setStorageIpAddress("192.168.1.11");
         host2.setClusterId(1L);
         mockHosts.add(host1);
         mockHosts.add(host2);
@@ -451,6 +467,7 @@ public void testAttachCluster_withMultipleHosts() throws Exception {
         // Setup - add more hosts
         HostVO host3 = new HostVO("host3-guid");
         host3.setPrivateIpAddress("192.168.1.12");
+        host3.setStorageIpAddress("192.168.1.12");
         host3.setClusterId(1L);
         mockHosts.add(host3);
 
@@ -651,6 +668,7 @@ public void testAttachZone_withMultipleHosts() throws Exception {
         // Setup - add more hosts
         HostVO host3 = new HostVO("host3-guid");
         host3.setPrivateIpAddress("192.168.1.12");
+        host3.setStorageIpAddress("192.168.1.12");
         host3.setClusterId(1L);
         mockHosts.add(host3);
 

plugins/storage/volume/ontap/src/test/java/org/apache/cloudstack/storage/provider/OntapPrimaryDatastoreProviderTest.java

@@ -26,7 +26,6 @@
 import org.apache.cloudstack.storage.driver.OntapPrimaryDatastoreDriver;
 import org.apache.cloudstack.storage.lifecycle.OntapPrimaryDatastoreLifecycle;
 import org.apache.cloudstack.storage.listener.OntapHostListener;
-import org.apache.cloudstack.storage.provider.OntapPrimaryDatastoreProvider;
 import org.apache.cloudstack.storage.utils.Constants;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

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

@@ -49,9 +49,25 @@
 import java.util.List;
 import java.util.Map;
 
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.*;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyMap;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.lenient;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockStatic;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
 class UnifiedSANStrategyTest {