Update ONTAP UTs for chooseAggregate/LIF-before-volume create signatures.

Align StorageStrategy and lifecycle tests with the Aggregate-based APIs and assert volume create is skipped when LIF selection fails.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: sandeeplocharla

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

@@ -30,6 +30,7 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.mockito.junit.jupiter.MockitoSettings;
 import org.mockito.quality.Strictness;
+import org.apache.cloudstack.storage.feign.model.Aggregate;
 import org.apache.cloudstack.storage.feign.model.Volume;
 import com.cloud.dc.dao.ClusterDao;
 import com.cloud.utils.exception.CloudRuntimeException;
@@ -55,7 +56,10 @@
 import static org.mockito.Mockito.when;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.withSettings;
+import org.mockito.InOrder;
 import static org.mockito.ArgumentMatchers.contains;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -122,12 +126,19 @@ void setUp() {
         when(_clusterDao.findById(1L)).thenReturn(clusterVO);
 
         when(storageStrategy.connect()).thenReturn(true);
-        when(storageStrategy.getNetworkInterface()).thenReturn(new Pair<>("testNetworkInterface", null));
+        Aggregate aggregate = new Aggregate();
+        aggregate.setName("aggr1");
+        aggregate.setUuid("aggr-uuid-1");
+        Aggregate.Node node = new Aggregate.Node();
+        node.setName("node-a");
+        aggregate.setNode(node);
+        when(storageStrategy.chooseAggregate(any())).thenReturn(aggregate);
+        when(storageStrategy.getNetworkInterface(any())).thenReturn(new Pair<>("testNetworkInterface", null));
 
         Volume volume = new Volume();
         volume.setUuid("test-volume-uuid");
         volume.setName("testVolume");
-        when(storageStrategy.createStorageVolume(any(), any())).thenReturn(volume);
+        when(storageStrategy.createStorageVolume(any(), any(), any())).thenReturn(volume);
 
         // Setup for attachCluster tests
         // Configure dataStore mock with necessary methods (works for both DataStore and PrimaryDataStoreInfo)
@@ -435,7 +446,7 @@ public void testInitialize_dataLifWithWarning() {
         dsInfos.put("details", detailsMap);
 
         String warningMessage = "LIF on node-b; expected on node-a;Details about LIF failover";
-        when(storageStrategy.getNetworkInterface()).thenReturn(new Pair<>("10.0.0.1", warningMessage));
+        when(storageStrategy.getNetworkInterface(any())).thenReturn(new Pair<>("10.0.0.1", warningMessage));
 
         try (MockedStatic<StorageProviderFactory> storageProviderFactory = Mockito.mockStatic(StorageProviderFactory.class);
              MockedStatic<OntapStorageUtils> utilityMock = Mockito.mockStatic(OntapStorageUtils.class)) {
@@ -470,12 +481,13 @@ public void testInitialize_nullDataLif() {
         dsInfos.put("isTagARule", false);
         dsInfos.put("details", detailsMap);
 
-        when(storageStrategy.getNetworkInterface()).thenReturn(new Pair<>(null, null));
+        when(storageStrategy.getNetworkInterface(any())).thenReturn(new Pair<>(null, null));
 
         try (MockedStatic<StorageProviderFactory> storageProviderFactory = Mockito.mockStatic(StorageProviderFactory.class)) {
             storageProviderFactory.when(() -> StorageProviderFactory.getStrategy(any())).thenReturn(storageStrategy);
             Exception ex = assertThrows(CloudRuntimeException.class, () -> ontapPrimaryDatastoreLifecycle.initialize(dsInfos));
             assertTrue(ex.getMessage().contains("Failed to retrieve Data LIF from ONTAP, cannot create primary storage"));
+            verify(storageStrategy, never()).createStorageVolume(any(), any(), any());
         }
     }
 
@@ -501,12 +513,13 @@ public void testInitialize_emptyDataLif() {
         dsInfos.put("isTagARule", false);
         dsInfos.put("details", detailsMap);
 
-        when(storageStrategy.getNetworkInterface()).thenReturn(new Pair<>("", null));
+        when(storageStrategy.getNetworkInterface(any())).thenReturn(new Pair<>("", null));
 
         try (MockedStatic<StorageProviderFactory> storageProviderFactory = Mockito.mockStatic(StorageProviderFactory.class)) {
             storageProviderFactory.when(() -> StorageProviderFactory.getStrategy(any())).thenReturn(storageStrategy);
             Exception ex = assertThrows(CloudRuntimeException.class, () -> ontapPrimaryDatastoreLifecycle.initialize(dsInfos));
             assertTrue(ex.getMessage().contains("Failed to retrieve Data LIF from ONTAP, cannot create primary storage"));
+            verify(storageStrategy, never()).createStorageVolume(any(), any(), any());
         }
     }
 
@@ -532,13 +545,14 @@ public void testInitialize_getNetworkInterfaceException() {
         dsInfos.put("isTagARule", false);
         dsInfos.put("details", detailsMap);
 
-        when(storageStrategy.getNetworkInterface()).thenThrow(new RuntimeException("ONTAP API error"));
+        when(storageStrategy.getNetworkInterface(any())).thenThrow(new RuntimeException("ONTAP API error"));
 
         try (MockedStatic<StorageProviderFactory> storageProviderFactory = Mockito.mockStatic(StorageProviderFactory.class)) {
             storageProviderFactory.when(() -> StorageProviderFactory.getStrategy(any())).thenReturn(storageStrategy);
             Exception ex = assertThrows(CloudRuntimeException.class, () -> ontapPrimaryDatastoreLifecycle.initialize(dsInfos));
             assertTrue(ex.getMessage().contains("Failed to retrieve Data LIF from ONTAP"));
             assertTrue(ex.getCause() != null && ex.getCause().getMessage().contains("ONTAP API error"));
+            verify(storageStrategy, never()).createStorageVolume(any(), any(), any());
         }
     }
 
@@ -564,7 +578,7 @@ public void testInitialize_volumeCreationFailure_nullVolume() {
         dsInfos.put("isTagARule", false);
         dsInfos.put("details", detailsMap);
 
-        when(storageStrategy.createStorageVolume(any(), any())).thenReturn(null);
+        when(storageStrategy.createStorageVolume(any(), any(), any())).thenReturn(null);
 
         try (MockedStatic<StorageProviderFactory> storageProviderFactory = Mockito.mockStatic(StorageProviderFactory.class)) {
             storageProviderFactory.when(() -> StorageProviderFactory.getStrategy(any())).thenReturn(storageStrategy);
@@ -595,7 +609,7 @@ public void testInitialize_volumeCreationException() {
         dsInfos.put("isTagARule", false);
         dsInfos.put("details", detailsMap);
 
-        when(storageStrategy.createStorageVolume(any(), any())).thenThrow(new RuntimeException("Volume creation failed"));
+        when(storageStrategy.createStorageVolume(any(), any(), any())).thenThrow(new RuntimeException("Volume creation failed"));
 
         try (MockedStatic<StorageProviderFactory> storageProviderFactory = Mockito.mockStatic(StorageProviderFactory.class)) {
             storageProviderFactory.when(() -> StorageProviderFactory.getStrategy(any())).thenReturn(storageStrategy);
@@ -628,13 +642,19 @@ public void testInitialize_positiveWithDetailAssertions() {
         dsInfos.put("details", detailsMap);
 
         String expectedDataLif = "192.168.1.100";
-        when(storageStrategy.getNetworkInterface()).thenReturn(new Pair<>(expectedDataLif, null));
+        when(storageStrategy.getNetworkInterface(any())).thenReturn(new Pair<>(expectedDataLif, null));
         when(storageStrategy.getStoragePath()).thenReturn("/vol/testVolume");
 
         try (MockedStatic<StorageProviderFactory> storageProviderFactory = Mockito.mockStatic(StorageProviderFactory.class)) {
             storageProviderFactory.when(() -> StorageProviderFactory.getStrategy(any())).thenReturn(storageStrategy);
             ontapPrimaryDatastoreLifecycle.initialize(dsInfos);
 
+            // Verify LIF selection completes before FlexVol creation
+            InOrder inOrder = inOrder(storageStrategy);
+            inOrder.verify(storageStrategy).chooseAggregate(any());
+            inOrder.verify(storageStrategy).getNetworkInterface(any());
+            inOrder.verify(storageStrategy).createStorageVolume(any(), any(), any());
+
             // Verify that createPrimaryDataStore was called and host parameter contains the DATA_LIF
             verify(_dataStoreHelper, times(1)).createPrimaryDataStore(any());
         }