vm instance creation test5

Author: Srivastava, Piyush

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

@@ -130,26 +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 via ONTAP REST API, store path in DB, return null
-        // KVM will mount this subdirectory separately as: storage-ip:/vol/volumename/subdir -> /mnt/{volume-uuid}
+        // For managed NFS: create subdirectory via ONTAP REST API
+        // 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();
-            s_logger.info("createCloudStackVolumeForTypeVolume: NFS - creating subdirectory on ONTAP for volume: {}", volumeName);
+            String volumeUuid = ((VolumeInfo) dataObject).getUuid();
+            // Create readable subdirectory name: "ROOT-15_9c2e59a8-ee14-4f80-9db4-e279a12e0d7b"
+            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 via REST API
             String subdirectoryName = cloudStackVolume.getFile().getPath();
             String subdirectoryPath = "/" + subdirectoryName;
-            // Store the subdirectory path for KVM to mount separately
+            // Store metadata in CloudStack database
             VolumeVO volume = volumeDao.findById(((VolumeInfo) dataObject).getId());
-            volume.set_iScsiName(subdirectoryPath);  // Used as MOUNT_POINT for NFS managed storage
+            volume.set_iScsiName(subdirectoryPath);  // Subdirectory path for reference
             volume.setPoolType(Storage.StoragePoolType.NetworkFilesystem);  // Set volume pool type for KVM adaptor selection
-            volume.setFolder(((VolumeInfo) dataObject).getUuid());
+            volume.setFolder(volumeUuid);  // Store UUID in folder field
             volume.setPoolId(dataStore.getId());
-            volume.setPath(null);  // Path is null for managed storage - KVM creates files in mounted subdir
+            // CRITICAL: Set path to point to file INSIDE the subdirectory, not the subdirectory itself
+            // Subdirectory exists at: /mnt/{pool-uuid}/{volume-uuid}/
+            // We want hypervisor to create file at: /mnt/{pool-uuid}/{volume-uuid}/{volume-uuid}.{format}
+            // So path should be: /{volume-uuid}/{volume-uuid} (hypervisor adds extension)
+            String volumePath = subdirectoryPath + "/" + volumeUuid;  // e.g., /9c2e59a8.../9c2e59a8...
+            volume.setPath(volumePath);
             volumeDao.update(volume.getId(), volume);
-            s_logger.info("createCloudStackVolumeForTypeVolume: NFS subdirectory created on ONTAP: {}, path stored in DB: {}", subdirectoryName, subdirectoryPath);
-            return null;  // Return null - backend work done, KVM will handle file creation
+            s_logger.info("createCloudStackVolumeForTypeVolume: NFS subdirectory '{}' created on ONTAP, volume will be created at path: {}", subdirectoryPath, volumePath);
+            return null;  // Return null - backend work done, hypervisor will handle file creation
         }
         // For iSCSI and other protocols, use ONTAP REST API
         StorageStrategy storageStrategy = getStrategyByStoragePoolDetails(details);

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/utils/Utility.java

@@ -65,22 +65,22 @@ public static CloudStackVolume createCloudStackVolumeRequestByProtocol(StoragePo
         ProtocolType protocolType = ProtocolType.valueOf(protocol);
         switch (protocolType) {
             case NFS:
-                // TODO add logic for NFS file creation
+                // For managed NFS: create subdirectory with readable name combining volume name and UUID
+                // Format: "ROOT-15_9c2e59a8-ee14-4f80-9db4-e279a12e0d7b"
+                // Hypervisor will create volume files inside this subdirectory with format-specific extensions
                 cloudStackVolumeRequest = new CloudStackVolume();
                 FileInfo file = new FileInfo();
-                //file.setName("test1"); // to be replaced with volume name // this should not be passed for dir
-                // file.setName(volumeObject.getName()); // to check whether this needs to be sent or not
-                //file.setSize(Long.parseLong("10000"));
-                //file.setSize(volumeObject.getSize());
-                file.setUnixPermissions(755); // check if it is needed only for dir ? it is needed for dir
-                file.setType(FileInfo.TypeEnum.DIRECTORY); // We are creating file for a cloudstack volume . Should it be dir ? // TODO change once multipart is done
+                file.setUnixPermissions(755);
+                file.setType(FileInfo.TypeEnum.DIRECTORY);
 
                 Volume poolVolume = new Volume();
                 poolVolume.setName(details.get(Constants.VOLUME_NAME));
                 poolVolume.setUuid(details.get(Constants.VOLUME_UUID));
                 cloudStackVolumeRequest.setVolume(poolVolume);
                 cloudStackVolumeRequest.setFile(file);
-                cloudStackVolumeRequest.setCloudstackVolName(volumeObject.getName());
+                // Use "name_uuid" format for readable subdirectory name
+                String readableSubdirName = volumeObject.getName() + "_" + volumeObject.getUuid();
+                cloudStackVolumeRequest.setCloudstackVolName(readableSubdirName);
                 cloudStackVolumeRequest.setCloudstackVolUUID(volumeObject.getUuid());
                 break;
             case ISCSI: