vm instance creation test2

Author: Srivastava, Piyush

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

@@ -27,6 +27,7 @@
 import com.cloud.storage.Storage;
 import com.cloud.storage.StoragePool;
 import com.cloud.storage.Volume;
+import com.cloud.storage.VolumeVO;
 import com.cloud.utils.Pair;
 import com.cloud.utils.exception.CloudRuntimeException;
 import org.apache.cloudstack.engine.subsystem.api.storage.ChapInfo;
@@ -64,6 +65,7 @@ public class OntapPrimaryDatastoreDriver implements PrimaryDataStoreDriver {
 
     @Inject private StoragePoolDetailsDao storagePoolDetailsDao;
     @Inject private PrimaryDataStoreDao storagePoolDao;
+    @Inject private com.cloud.storage.dao.VolumeDao volumeDao;
     @Override
     public Map<String, String> getCapabilities() {
         s_logger.trace("OntapPrimaryDatastoreDriver: getCapabilities: Called");
@@ -128,11 +130,23 @@ 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 NFS, skip ONTAP REST API operations - CloudStack manages files natively
+        // 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}
         if (ProtocolType.NFS.name().equalsIgnoreCase(details.get(Constants.PROTOCOL))) {
-            String volumeUuid = ((VolumeInfo) dataObject).getUuid();
-            s_logger.info("createCloudStackVolumeForTypeVolume: NFS protocol detected - returning volume UUID for native file management: {}", volumeUuid);
-            return volumeUuid;
+            StorageStrategy storageStrategy = getStrategyByStoragePoolDetails(details);
+            s_logger.info("createCloudStackVolumeForTypeVolume: NFS - creating subdirectory on ONTAP for volume: {}", ((VolumeInfo) dataObject).getName());
+            CloudStackVolume cloudStackVolumeRequest = Utility.createCloudStackVolumeRequestByProtocol(storagePool, details, (VolumeInfo) dataObject);
+            storageStrategy.createCloudStackVolume(cloudStackVolumeRequest);  // Creates subdirectory on ONTAP via REST API
+            // Store the subdirectory path for KVM to mount separately
+            String subdirectoryPath = "/" + ((VolumeInfo) dataObject).getName();
+            VolumeVO volume = volumeDao.findById(((VolumeInfo) dataObject).getId());
+            volume.set_iScsiName(subdirectoryPath);  // Used as MOUNT_POINT for NFS managed storage
+            volume.setFolder(((VolumeInfo) dataObject).getUuid());
+            volume.setPoolId(dataStore.getId());
+            volume.setPath(null);  // Path is null for managed storage - KVM creates files in mounted subdir
+            volumeDao.update(volume.getId(), volume);
+            s_logger.info("createCloudStackVolumeForTypeVolume: NFS subdirectory created, path stored: {}", subdirectoryPath);
+            return null;  // Return null - backend work done, KVM 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

@@ -69,7 +69,7 @@ public static CloudStackVolume createCloudStackVolumeRequestByProtocol(StoragePo
                 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.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