CSTACKEX-46: Fixed a couple of issues observed while testing NFS3 storagePool create and delete

Author: Locharla, Sandeep

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

@@ -415,6 +415,20 @@ private boolean validateProtocolSupportAndFetchHostsIdentifier(List<HostVO> host
                     hostIdentifiers.add(host.getStorageUrl());
                 }
                 break;
+            case NFS3:
+                String ip = "";
+                for (HostVO host : hosts) {
+                    if (host != null) {
+                        ip =  host.getStorageIpAddress() != null ? host.getStorageIpAddress().trim() : "";
+                        if (ip.isEmpty() && host.getPrivateIpAddress() != null || host.getPrivateIpAddress().trim().isEmpty()) {
+                            return false;
+                        } else {
+                            ip = ip.isEmpty() ? host.getPrivateIpAddress().trim() : ip;
+                        }
+                    }
+                    hostIdentifiers.add(ip);
+                }
+                break;
             default:
                 throw new CloudRuntimeException("validateProtocolSupportAndFetchHostsIdentifier : Unsupported protocol: " + protocolType.name());
         }
@@ -471,15 +485,6 @@ public boolean deleteDataStore(DataStore store) {
             PrimaryDataStoreInfo primaryDataStoreInfo = (PrimaryDataStoreInfo) store;
             primaryDataStoreInfo.setDetails(details);
 
-            // Create AccessGroup object with PrimaryDataStoreInfo
-            AccessGroup accessGroup = new AccessGroup();
-            accessGroup.setPrimaryDataStoreInfo(primaryDataStoreInfo);
-
-            // Call deleteAccessGroup - it will figure out scope, protocol, and all details internally
-            storageStrategy.deleteAccessGroup(accessGroup);
-
-            s_logger.info("deleteDataStore: Successfully deleted access groups for storage pool '{}'", storagePool.getName());
-
             // Call deleteStorageVolume to delete the underlying ONTAP volume
             s_logger.info("deleteDataStore: Deleting ONTAP volume for storage pool '{}'", storagePool.getName());
             Volume volume = new Volume();
@@ -497,6 +502,11 @@ public boolean deleteDataStore(DataStore store) {
                 s_logger.error("deleteDataStore: Exception while retrieving volume UUID for storage pool id: {}. Error: {}",
                         storagePoolId, e.getMessage(), e);
             }
+            AccessGroup accessGroup = new AccessGroup();
+            accessGroup.setPrimaryDataStoreInfo(primaryDataStoreInfo);
+            // Delete access groups associated with this storage pool
+            storageStrategy.deleteAccessGroup(accessGroup);
+            s_logger.info("deleteDataStore: Successfully deleted access groups for storage pool '{}'", storagePool.getName());
 
         } catch (Exception e) {
             s_logger.error("deleteDataStore: Failed to delete access groups for storage pool id: {}. Error: {}",

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

@@ -447,8 +447,19 @@ public String getNetworkInterface() {
             OntapResponse<IpInterface> response =
                     networkFeignClient.getNetworkIpInterfaces(authHeader, queryParams);
             if (response != null && response.getRecords() != null && !response.getRecords().isEmpty()) {
-                // For simplicity, return the first interface's name
-                IpInterface ipInterface = response.getRecords().get(0);
+                IpInterface ipInterface = null;
+                // For simplicity, return the first interface's name (Of IPv4 type for NFS3)
+                if (storage.getProtocol() == ProtocolType.ISCSI) {
+                    ipInterface = response.getRecords().get(0);
+                } else if (storage.getProtocol() == ProtocolType.NFS3) {
+                    for (IpInterface iface : response.getRecords()) {
+                        if (iface.getIp().getAddress().contains(".")) {
+                            ipInterface = iface;
+                            break;
+                        }
+                    }
+                }
+
                 s_logger.info("Retrieved network interface: " + ipInterface.getIp().getAddress());
                 return ipInterface.getIp().getAddress();
             } else {