vm instance creation test9

Author: Srivastava, Piyush

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

@@ -130,47 +130,34 @@ 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 on ONTAP for volume isolation
-        // Use readable name combining volume name and UUID for subdirectory
+        // For managed NFS: Use flat structure (no subdirectories) like other managed storage providers
+        // KVM expects volumes to be in the root of the NFS mount with unique names
         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-17_5d11c615-3142-494c-ac48-96517adbecff"
-            String readableSubdirName = volumeName + "_" + volumeUuid;
-            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
-            String subdirectoryName = cloudStackVolume.getFile().getPath();
-            // Store metadata in CloudStack database
             VolumeVO volume = volumeDao.findById(((VolumeInfo) dataObject).getId());
             // CRITICAL: Set poolType at VOLUME level
             // This tells KVM to use LibvirtStorageAdaptor (NFS) instead of IscsiAdmStorageAdaptor
             volume.setPoolType(Storage.StoragePoolType.NetworkFilesystem);
-            // For managed NFS with subdirectories, point to file INSIDE the subdirectory
-            // Path format: subdirectory/uuid (e.g., ROOT-20_85969d09.../85969d09...)
-            String volumePath = subdirectoryName + "/" + volumeUuid;
-            volume.setPath(volumePath);
-            // CRITICAL FIX: Also update the volume NAME to the full path
-            // This is what KVM LibvirtStorageAdaptor uses when creating the physical disk
-            // Without this, KVM uses just the original volume name (ROOT-20) instead of the path
-            volume.setName(volumePath);
-            // Set _iScsiName to subdirectory path for managed storage tracking
-            volume.set_iScsiName(subdirectoryName);
-            volume.setFolder(volumeUuid);  // Store UUID in folder field
+            // Use unique volume name combining CloudStack volume name and UUID
+            // This creates a unique filename directly in NFS root (flat structure)
+            String volumeName = ((VolumeInfo) dataObject).getName();
+            String volumeUuid = ((VolumeInfo) dataObject).getUuid();
+            String uniqueVolumeName = volumeName + "_" + volumeUuid;
+            // For managed NFS, set the volume name to the unique name
+            // KVM will create qcow2 file directly in NFS root: /mnt/pool/ROOT-21_uuid.qcow2
+            volume.setName(uniqueVolumeName);
+            volume.setPath(uniqueVolumeName);
+            volume.setFolder(volumeUuid);  // Store UUID for reference
             volume.setPoolId(dataStore.getId());
             volumeDao.update(volume.getId(), volume);
-            // Re-read from database to verify the changes
-            VolumeVO updatedVolume = volumeDao.findById(volume.getId());
-            s_logger.info("=== ONTAP NFS Volume Configuration ===");
-            s_logger.info("Subdirectory created: {}", subdirectoryName);
-            s_logger.info("Volume Name: {} (THIS IS WHAT KVM USES)", updatedVolume.getName());
-            s_logger.info("Volume Path: {}", updatedVolume.getPath());
-            s_logger.info("Volume _iScsiName: {}", updatedVolume.get_iScsiName());
-            s_logger.info("Volume Folder: {}", updatedVolume.getFolder());
-            s_logger.info("Volume PoolType: {}", updatedVolume.getPoolType());
-            s_logger.info("======================================");
-            return null;  // Return null - hypervisor will create qcow2 file inside subdirectory
+            s_logger.info("=== ONTAP Managed NFS Volume (Flat Structure) ===");
+            s_logger.info("Volume Name: {} (used by KVM for file creation)", uniqueVolumeName);
+            s_logger.info("Volume Path: {}", volume.getPath());
+            s_logger.info("Volume UUID: {}", volumeUuid);
+            s_logger.info("Volume PoolType: {}", volume.getPoolType());
+            s_logger.info("Hypervisor will create: /mnt/<pool>/{}.qcow2", uniqueVolumeName);
+            s_logger.info("================================================");
+            // Return null - let hypervisor create the qcow2 file directly in NFS root
+            return null;
         }
         // For iSCSI and other protocols, use ONTAP REST API
         StorageStrategy storageStrategy = getStrategyByStoragePoolDetails(details);