vm instance creation test15

Author: Srivastava, Piyush

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

@@ -136,18 +136,18 @@ private String createCloudStackVolumeForTypeVolume(DataStore dataStore, DataObje
         // 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))) {
+            // ManagedNFS semantics: libvirt (ManagedNfsStorageAdaptor) will create qcow2 backing file automatically.
             VolumeVO volume = volumeDao.findById(((VolumeInfo) dataObject).getId());
-            volume.setPoolType(Storage.StoragePoolType.NetworkFilesystem);
             String volumeUuid = ((VolumeInfo) dataObject).getUuid();
-            CloudStackVolume cloudStackVolumeRequest = Utility.createCloudStackVolumeRequestByProtocol(storagePool, details, (VolumeInfo) dataObject);
-            CloudStackVolume created = storageStrategy.createCloudStackVolume(cloudStackVolumeRequest);
-            String rawFileName = created.getCloudstackVolName(); // <uuid>.raw
-            volume.setPath(rawFileName);
-            volume.setFormat(Storage.ImageFormat.RAW);
+            // Pool type should reflect ManagedNFS now (lifecycle set it). Still set explicitly for safety.
+            volume.setPoolType(Storage.StoragePoolType.ManagedNFS);
+            // For ManagedNfsStorageAdaptor the volume name (uuid) is used and qcow2 is created without extension necessity.
+            volume.setPath(volumeUuid); // no extension; adaptor creates qcow2 libvirt volume with this name
+            volume.setFormat(Storage.ImageFormat.QCOW2);
             volume.setPoolId(dataStore.getId());
             volumeDao.update(volume.getId(), volume);
-            s_logger.info("ONTAP RAW managed NFS volume created: uuid={} path={} format=RAW", volumeUuid, rawFileName);
-            return rawFileName;
+            s_logger.info("ONTAP ManagedNFS volume registered: uuid={} path={} format=QCOW2", volumeUuid, volumeUuid);
+            return volumeUuid;
         }
 
         s_logger.info("createCloudStackVolumeForTypeVolume: Connection to Ontap SVM [{}] successful, preparing CloudStackVolumeRequest", details.get(Constants.SVM_NAME));
@@ -173,18 +173,8 @@ public void deleteAsync(DataStore store, DataObject data, AsyncCompletionCallbac
                 StoragePoolVO storagePool = storagePoolDao.findById(store.getId());
                 Map<String, String> details = storagePoolDetailsDao.listDetailsKeyPairs(store.getId());
                 if (ProtocolType.NFS.name().equalsIgnoreCase(details.get(Constants.PROTOCOL))) {
-                    VolumeVO volume = volumeDao.findById(data.getId());
-                    if (volume != null && volume.getPath() != null) {
-                        StorageStrategy strategy = getStrategyByStoragePoolDetails(details);
-                        if (strategy instanceof org.apache.cloudstack.storage.service.UnifiedNASStrategy) {
-                            boolean deleted = ((org.apache.cloudstack.storage.service.UnifiedNASStrategy) strategy)
-                                    .deleteManagedFile(details.get(Constants.VOLUME_UUID), volume.getPath());
-                            if (!deleted) {
-                                throw new CloudRuntimeException("Failed to delete RAW file " + volume.getPath());
-                            }
-                            s_logger.info("Deleted RAW managed file {} for volume id {}", volume.getPath(), volume.getId());
-                        }
-                    }
+                    // ManagedNFS qcow2 backing file deletion handled by KVM host/libvirt; nothing to do via ONTAP REST.
+                    s_logger.info("deleteAsync: ManagedNFS volume {} no-op ONTAP deletion", data.getId());
                 }
             }
         } catch (Exception e) {

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/lifecycle/OntapPrimaryDatastoreLifecycle.java

@@ -192,14 +192,12 @@ public DataStore initialize(Map<String, Object> dsInfos) {
         ProtocolType protocol = ProtocolType.valueOf(details.get(Constants.PROTOCOL));
         switch (protocol) {
             case NFS:
-                // Use NetworkFilesystem like CloudByte - volume pool type will be set per volume
-                // This allows managed storage to work with standard NFS pools
-                parameters.setType(Storage.StoragePoolType.NetworkFilesystem);
-                // Path should be just the NFS export path (junction path), NOT host:path
-                // CloudStack will construct the full mount path as: hostAddress + ":" + path
+                // Switch to ManagedNFS so KVM agent selects ManagedNfsStorageAdaptor
+                parameters.setType(Storage.StoragePoolType.ManagedNFS);
+                // Path remains the exported junction; ManagedNfsStorageAdaptor will mount per-volume using details
                 path = "/" + storagePoolName;
-                s_logger.info("Setting NetworkFilesystem path for storage pool: " + path);
-                host = "10.193.192.136"; // TODO hardcoded for now
+                s_logger.info("Setting ManagedNFS path for storage pool: " + path);
+                host = "10.193.192.136"; // TODO replace hardcoded host lookup
                 break;
             case ISCSI:
                 parameters.setType(Storage.StoragePoolType.Iscsi);

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/UnifiedNASStrategy.java

@@ -76,29 +76,17 @@ public void setOntapStorage(OntapStorage ontapStorage) {
 
     @Override
     public CloudStackVolume createCloudStackVolume(CloudStackVolume cloudstackVolume) {
-        s_logger.info("createCloudStackVolume: Creating RAW managed file for CloudStack volume: " + cloudstackVolume.getCloudstackVolName());
-        try {
-            FileInfo fileInfo = cloudstackVolume.getFile();
-            fileInfo.setPath(cloudstackVolume.getCloudstackVolName());
-            fileInfo.setType(FileInfo.TypeEnum.FILE);
-            fileInfo.setUnixPermissions(644);
-            boolean success = createFile(cloudstackVolume.getVolume().getUuid(), cloudstackVolume.getCloudstackVolName(), fileInfo);
-            if (!success) {
-                throw new CloudRuntimeException("Failed to create RAW file on ONTAP: " + cloudstackVolume.getCloudstackVolName());
-            }
-            s_logger.debug("RAW file created in FlexVol UUID={} filename={}", cloudstackVolume.getVolume().getUuid(), cloudstackVolume.getCloudstackVolName());
-            return cloudstackVolume;
-        } catch (Exception e) {
-            s_logger.error("Exception occurred while creating RAW file {}. Exception: {}", cloudstackVolume.getCloudstackVolName(), e.getMessage());
-            throw new CloudRuntimeException("Failed to create RAW file: " + e.getMessage());
-        }
+        // ManagedNFS refactor: no file creation via ONTAP; libvirt ManagedNfsStorageAdaptor will create qcow2.
+        s_logger.info("createCloudStackVolume: ManagedNFS metadata only, no ONTAP file creation for volume name=" + cloudstackVolume.getCloudstackVolName());
+        return cloudstackVolume;
     }
 
     /**
-     * Public wrapper for deleting managed RAW file.
+     * Public wrapper for deleting managed file (legacy RAW mode). Not used in ManagedNFS qcow2 flow.
      */
     public boolean deleteManagedFile(String volumeUuid, String fileName) {
-        return deleteFile(volumeUuid, fileName);
+        s_logger.debug("deleteManagedFile called for volumeUuid={} fileName={} but ManagedNFS qcow2 file was not created via ONTAP; skipping.", volumeUuid, fileName);
+        return true; // nothing to do
     }
 
     @Override

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

@@ -23,7 +23,6 @@
 import com.cloud.utils.exception.CloudRuntimeException;
 import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
-import org.apache.cloudstack.storage.feign.model.FileInfo;
 import org.apache.cloudstack.storage.feign.model.Lun;
 import org.apache.cloudstack.storage.feign.model.LunSpace;
 import org.apache.cloudstack.storage.feign.model.OntapStorage;
@@ -65,17 +64,13 @@ public static CloudStackVolume createCloudStackVolumeRequestByProtocol(StoragePo
         ProtocolType protocolType = ProtocolType.valueOf(protocol);
         switch (protocolType) {
             case NFS:
-                // RAW managed NFS: create a regular file <uuid>.raw via ONTAP API
+                // ManagedNFS qcow2 (libvirt creates file) – just set metadata; no '.raw' extension
                 cloudStackVolumeRequest = new CloudStackVolume();
-                FileInfo file = new FileInfo();
-                file.setUnixPermissions(644);
-                file.setType(FileInfo.TypeEnum.FILE);
-                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.getUuid() + ".raw");
+                Volume poolVol = new Volume();
+                poolVol.setName(details.get(Constants.VOLUME_NAME));
+                poolVol.setUuid(details.get(Constants.VOLUME_UUID));
+                cloudStackVolumeRequest.setVolume(poolVol);
+                cloudStackVolumeRequest.setCloudstackVolName(volumeObject.getUuid());
                 break;
             case ISCSI:
                 cloudStackVolumeRequest = new CloudStackVolume();