Fixed merge conflicts and addressed comments

Author: sandeeplocharla

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/lifecycle/OntapPrimaryDatastoreLifecycle.java

@@ -140,13 +140,6 @@ public DataStore initialize(Map<String, Object> dsInfos) {
         StorageStrategy storageStrategy = StorageProviderFactory.getStrategy(ontapStorage);
         boolean isValid = storageStrategy.connect();
         if (isValid) {
-            // Get the DataLIF for data access
-            String dataLIF = storageStrategy.getNetworkInterface();
-            if (dataLIF == null || dataLIF.isEmpty()) {
-                throw new CloudRuntimeException("Failed to retrieve Data LIF from ONTAP, cannot create primary storage");
-            }
-            logger.info("Using Data LIF for storage access: " + dataLIF);
-            details.put(OntapStorageConstants.DATA_LIF, dataLIF);
             if (storageStrategy.getResolvedSvmUuid() != null && !storageStrategy.getResolvedSvmUuid().isEmpty()) {
                 details.put(OntapStorageConstants.SVM_UUID, storageStrategy.getResolvedSvmUuid());
             }

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

@@ -232,6 +232,8 @@ private void validateAndSelectAggregatesForVolumeCreation(String authHeader, Str
     public Volume createStorageVolume(String volumeName, Long size) {
         logger.info("Creating volume: " + volumeName + " of size: " + size + " bytes");
 
+        this.chosenAggregateNode = null;
+
         String svmName = storage.getSvmName();
         if (aggregates == null || aggregates.isEmpty()) {
             logger.error("No aggregates available to create volume on SVM " + svmName);
@@ -299,9 +301,7 @@ public Volume createStorageVolume(String volumeName, Long size) {
         }
         logger.info("Selected aggregate: " + aggrChosen.getName() + " for volume operations.");
 
-        if (aggrChosen.getNode() != null) {
-            this.chosenAggregateNode = aggrChosen.getNode().getName();
-        }
+        this.chosenAggregateNode = aggrChosen.getNode() != null ? aggrChosen.getNode().getName() : null;
 
         Aggregate aggr = new Aggregate();
         aggr.setName(aggrChosen.getName());
@@ -532,11 +532,14 @@ public Pair<String, String> getNetworkInterface() {
                     continue;
                 }
                 if (chosenAggregateNode != null) {
+                    // LIF is homed on the aggregate's node
                     String homeNode = iface.getLocation() != null && iface.getLocation().getHomeNode() != null
                             ? iface.getLocation().getHomeNode().getName() : null;
                     if (chosenAggregateNode.equals(homeNode)) {
                         return new Pair<>(iface.getIp().getAddress(), null);
                     }
+                    // LIF has failed over and is currently running on the aggregate's node
+                    // (home_node differs). Keep as a candidate; returned with a warning if no match is found earlier.
                     if (currentNodeInterface == null) {
                         String currentNode = iface.getLocation() != null && iface.getLocation().getNode() != null
                                 ? iface.getLocation().getNode().getName() : null;