vm instance creation test7

Author: Srivastava, Piyush

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

@@ -130,37 +130,40 @@ private String createCloudStackVolumeForTypeVolume(DataStore dataStore, DataObje
             throw new CloudRuntimeException("createCloudStackVolume : Storage Pool not found for id: " + dataStore.getId());
         }
         Map<String, String> details = storagePoolDetailsDao.listDetailsKeyPairs(dataStore.getId());
-        // For managed NFS: create subdirectory via ONTAP REST API
+        // For managed NFS: create subdirectory on ONTAP for volume isolation
         // Use readable name combining volume name and UUID for subdirectory
         if (ProtocolType.NFS.name().equalsIgnoreCase(details.get(Constants.PROTOCOL))) {
             StorageStrategy storageStrategy = getStrategyByStoragePoolDetails(details);
             String volumeName = ((VolumeInfo) dataObject).getName();
             String volumeUuid = ((VolumeInfo) dataObject).getUuid();
-            // Create readable subdirectory name: "ROOT-15_9c2e59a8-ee14-4f80-9db4-e279a12e0d7b"
+            // Create readable subdirectory name: "ROOT-17_5d11c615-3142-494c-ac48-96517adbecff"
             String readableSubdirName = volumeName + "_" + volumeUuid;
-            s_logger.info("createCloudStackVolumeForTypeVolume: NFS - creating subdirectory on ONTAP: {}", readableSubdirName);
+            s_logger.info("createCloudStackVolumeForTypeVolume: NFS - Creating subdirectory on ONTAP: {}", readableSubdirName);
             CloudStackVolume cloudStackVolumeRequest = Utility.createCloudStackVolumeRequestByProtocol(storagePool, details, (VolumeInfo) dataObject);
-            CloudStackVolume cloudStackVolume = storageStrategy.createCloudStackVolume(cloudStackVolumeRequest);  // Creates subdirectory on ONTAP via REST API
+            CloudStackVolume cloudStackVolume = storageStrategy.createCloudStackVolume(cloudStackVolumeRequest);  // Creates subdirectory on ONTAP
             String subdirectoryName = cloudStackVolume.getFile().getPath();
-            String subdirectoryPath = subdirectoryName;  // No leading slash to avoid double slash
-            // Store metadata in CloudStack database (following CloudByte pattern)
+            // Store metadata in CloudStack database
             VolumeVO volume = volumeDao.findById(((VolumeInfo) dataObject).getId());
-            // CRITICAL: Set poolType at VOLUME level (like CloudByte does)
+            // CRITICAL: Set poolType at VOLUME level
             // This tells KVM to use LibvirtStorageAdaptor (NFS) instead of IscsiAdmStorageAdaptor
             volume.setPoolType(Storage.StoragePoolType.NetworkFilesystem);
-            // Set _iScsiName for NFS (CloudByte also sets this for NFS paths)
-            // This field stores the subdirectory path for reference
+            // For managed NFS with subdirectories, set path to point to file INSIDE the subdirectory
+            // Path format: ROOT-17_5d11c615.../5d11c615...
+            // Full path on KVM will be: /mnt/{pool-uuid}/ROOT-17_5d11c615.../5d11c615....qcow2
+            // The subdirectory already exists (created by ONTAP), qemu-img will create the file inside
+            String volumePath = subdirectoryName + "/" + volumeUuid;
+            volume.setPath(volumePath);
+            // Set _iScsiName to subdirectory path for managed storage tracking
+            // This field is used during cleanup operations
             volume.set_iScsiName(subdirectoryName);
             volume.setFolder(volumeUuid);  // Store UUID in folder field
             volume.setPoolId(dataStore.getId());
-            // Set path to file inside the subdirectory (no leading slash to avoid double slash)
-            // Path format: ROOT-16_865446e6.../865446e6...
-            // Full path will be: /mnt/{pool-uuid}/ROOT-16_865446e6.../865446e6....qcow2
-            String volumePath = subdirectoryPath + "/" + volumeUuid;
-            volume.setPath(volumePath);
             volumeDao.update(volume.getId(), volume);
-            s_logger.info("createCloudStackVolumeForTypeVolume: NFS subdirectory '{}' created on ONTAP, volume path: {}", subdirectoryPath, volumePath);
-            return null;  // Return null - backend work done, hypervisor will handle file creation
+            // Re-read from database to confirm the path was saved correctly
+            VolumeVO updatedVolume = volumeDao.findById(volume.getId());
+            s_logger.info("createCloudStackVolumeForTypeVolume: NFS subdirectory '{}' created on ONTAP", subdirectoryName);
+            s_logger.info("createCloudStackVolumeForTypeVolume: Volume {} - Path set to: {}, _iScsiName: {}, Folder: {}, PoolType: {}", updatedVolume.getName(), updatedVolume.getPath(), updatedVolume.get_iScsiName(), updatedVolume.getFolder(), updatedVolume.getPoolType());
+            return null;  // Return null - hypervisor will create the qcow2 file inside the subdirectory
         }
         // For iSCSI and other protocols, use ONTAP REST API
         StorageStrategy storageStrategy = getStrategyByStoragePoolDetails(details);