@@ -68,7 +68,6 @@
 import com.cloud.storage.StorageManager;
 import com.cloud.storage.StoragePool;
 import com.cloud.storage.StoragePoolAutomation;
-import com.cloud.utils.Pair;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.google.common.base.Preconditions;
 
@@ -153,14 +152,16 @@ public DataStore initialize(Map<String, Object> dsInfos) {
                         + ". Error: " + e.getMessage(), e);
             }
 
-            Pair<String, String> lifResult;
+            Map<String, String> lifResult;
             try {
                 lifResult = storageStrategy.getNetworkInterface(aggregate);
             } catch (Exception e) {
                 logger.error("Exception occurred while retrieving network interface for pool: " + storagePoolName, e);
                 throw new CloudRuntimeException("Failed to retrieve Data LIF from ONTAP: " + e.getMessage(), e);
             }
-            processDataLifSelection(lifResult, details, storagePoolName, zoneId, podId);
+            String dataLif = lifResult.get(OntapStorageConstants.DATA_LIF);
+            String lifWarning = lifResult.get(OntapStorageConstants.LIF_WARNING);
+            processDataLifSelection(dataLif, lifWarning, details, storagePoolName, zoneId, podId);
 
             logger.info("Creating ONTAP volume '" + storagePoolName + "' with size: " + capacityBytes + " bytes (" +
                     (capacityBytes / (1024 * 1024 * 1024)) + " GB)");
@@ -290,18 +291,16 @@ private void validateInitializeInputs(Long capacityBytes, Long podId, Long clust
         }
     }
 
-    private void processDataLifSelection(Pair<String, String> lifResult, Map<String, String> details,
+    private void processDataLifSelection(String dataLIF, String lifWarning, Map<String, String> details,
                                          String storagePoolName, Long zoneId, Long podId) {
-        String dataLIF = lifResult.first();
         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);
 
         // Persist LIF warning as a pool detail and fire a storage alert so the user is informed
-        if (lifResult.second() != null) {
-            String lifWarning = lifResult.second();
+        if (lifWarning != null) {
             details.put(OntapStorageConstants.LIF_WARNING, lifWarning);
             logger.warn("LIF selection warning for pool '" + storagePoolName + "': " + lifWarning);
             String alertSubject = "ONTAP Storage Pool '" + storagePoolName + "': "
 
@@ -59,7 +59,6 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import com.cloud.utils.Pair;
 import com.cloud.utils.exception.CloudRuntimeException;
 
 import feign.FeignException;
@@ -675,10 +674,10 @@ public String getStoragePath() {
      *
      * @param aggregate the aggregate previously selected via {@link #chooseAggregate(Long)};
      *                  must include a node name for LIF affinity
-     * @return {@link Pair} where {@code first()} is the LIF's IP address and {@code second()} is
-     *         a warning message (null when no warning)
+     * @return map with {@link OntapStorageConstants#DATA_LIF} set to the LIF IP address, and
+     *         optionally {@link OntapStorageConstants#LIF_WARNING} when a non-ideal LIF was selected
      */
-    public Pair<String, String> getNetworkInterface(Aggregate aggregate) {
+    public Map<String, String> getNetworkInterface(Aggregate aggregate) {
         if (aggregate == null || aggregate.getNode() == null || aggregate.getNode().getName() == null
                 || aggregate.getNode().getName().isEmpty()) {
             throw new CloudRuntimeException("Aggregate with a node name is required to select a network interface");
@@ -729,7 +728,7 @@ public Pair<String, String> getNetworkInterface(Aggregate aggregate) {
                 String homeNode = iface.getLocation() != null && iface.getLocation().getHomeNode() != null
                         ? iface.getLocation().getHomeNode().getName() : null;
                 if (aggregateNode.equals(homeNode)) {
-                    return new Pair<>(iface.getIp().getAddress(), null);
+                    return networkInterfaceResult(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.
@@ -756,15 +755,15 @@ public Pair<String, String> getNetworkInterface(Aggregate aggregate) {
                 String warning = "No home-node LIF found for aggregate node '" + aggregateNode
                         + "'; using LIF '" + ip + "' currently running on that node (home node LIF may be down).";
                 logger.warn(warning);
-                return new Pair<>(ip, warning);
+                return networkInterfaceResult(ip, warning);
             }
 
             String ip = fallbackInterface.getIp().getAddress();
             String warning = "No operational LIF found on aggregate's home node '" + aggregateNode
                     + "'; using fallback LIF '" + ip + "' on a different node."
                     + " I/O will traverse an inter-node path, increasing latency.";
             logger.warn(warning);
-            return new Pair<>(ip, warning);
+            return networkInterfaceResult(ip, warning);
         } catch (CloudRuntimeException e) {
             throw e;
         } catch (Exception e) {
@@ -773,6 +772,15 @@ public Pair<String, String> getNetworkInterface(Aggregate aggregate) {
         }
     }
 
+    private Map<String, String> networkInterfaceResult(String address, String warning) {
+        Map<String, String> result = new HashMap<>();
+        result.put(OntapStorageConstants.DATA_LIF, address);
+        if (warning != null) {
+            result.put(OntapStorageConstants.LIF_WARNING, warning);
+        }
+        return result;
+    }
+
     /**
      * Returns true if the given IP address string is an IPv4 address.
      * IPv6 addresses contain colons; IPv4 addresses do not.