Commit 12

Author: Srivastava, Piyush

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/OntapNfsStorageAdaptor.java

@@ -131,15 +131,20 @@ public boolean deleteStoragePool(KVMStoragePool pool) {
     public boolean connectPhysicalDisk(String volumeUuid, KVMStoragePool pool, Map<String, String> details, boolean isVMMigrate) {
         logger.info("Connecting ONTAP NFS volume: " + volumeUuid);
 
-        // Get the per-volume junction path from details
-        // This was set by OntapPrimaryDatastoreDriver as _iScsiName
-        String junctionPath = details.get(DiskTO.MOUNT_POINT);
+        // For ONTAP NFS, volumeUuid is actually the junction path (e.g., "/cloudstack_vol_ROOT_7")
+        // This comes from managedStoreTarget set by OntapPrimaryDatastoreDriver
+        String junctionPath = volumeUuid;
+        
+        // Validate junction path
         if (junctionPath == null || junctionPath.isEmpty()) {
-            logger.error("Missing MOUNT_POINT (junction path) for volume: " + volumeUuid);
+            logger.error("Invalid junction path for volume: " + volumeUuid);
             return false;
         }
 
-        String mountPoint = _mountPoint + "/" + volumeUuid;
+        // Create a sanitized mount point name (remove leading slash, replace special chars)
+        String sanitizedPath = junctionPath.startsWith("/") ? junctionPath.substring(1) : junctionPath;
+        sanitizedPath = sanitizedPath.replace("/", "_");
+        String mountPoint = _mountPoint + "/" + sanitizedPath;
 
         // Check if already mounted
         if (isMounted(mountPoint)) {

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/driver/OntapPrimaryDatastoreDriver.java

@@ -255,8 +255,8 @@ private String createManagedNfsVolume(DataStore dataStore, DataObject dataObject
         Map<String, String> details = storagePoolDetailsDao.listDetailsKeyPairs(dataStore.getId());
         StorageStrategy storageStrategy = getStrategyByStoragePoolDetails(details);
 
-        String sanitizedName = volumeInfo.getName().replace('-', '_'); // "DATA_4"
-        String ontapVolumeName = "cloudstack_vol_" + sanitizedName;    // "cloudstack_vol_DATA_4"
+        String sanitizedName = volumeUuid.replace('-', '_');
+        String ontapVolumeName = "cs_vol_" + sanitizedName;
         String junctionPath = "/" + ontapVolumeName;
         long sizeInBytes = volumeInfo.getSize();