vm instance creation test17

Author: Srivastava, Piyush

engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java

@@ -1608,6 +1608,11 @@ private Map<String, String> getDetails(VolumeInfo volumeInfo, DataStore dataStor
         details.put(DiskTO.PROTOCOL_TYPE, (volume.getPoolType() != null) ? volume.getPoolType().toString() : null);
         details.put(StorageManager.STORAGE_POOL_DISK_WAIT.toString(), String.valueOf(StorageManager.STORAGE_POOL_DISK_WAIT.valueIn(storagePool.getId())));
 
+        // ManagedNFS enhancement: provide UUID explicitly for libvirt storage pool XML if adaptor wants it.
+        if (volume.getPoolType() == Storage.StoragePoolType.ManagedNFS) {
+            details.put(DiskTO.UUID, volume.getUuid());
+        }
+
          if (volume.getPoolId() != null) {
             StoragePoolVO poolVO = _storagePoolDao.findById(volume.getPoolId());
             if (poolVO.getParent() != 0L) {

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ManagedNfsStorageAdaptor.java

@@ -98,6 +98,10 @@ public KVMPhysicalDisk createPhysicalDisk(String volumeUuid, KVMStoragePool pool
      */
     @Override
     public boolean connectPhysicalDisk(String volumeUuid, KVMStoragePool pool, Map<String, String> details, boolean isVMMigrate) {
+        logger.info(String.format("ManagedNFS connectPhysicalDisk invoked: volumeUuid=%s sourceHost=%s mountPoint=%s uuidDetail=%s", volumeUuid,
+            (pool != null ? pool.getSourceHost() : "null"),
+            (details != null ? details.get(com.cloud.agent.api.to.DiskTO.MOUNT_POINT) : "null"),
+            (details != null ? details.get(com.cloud.agent.api.to.DiskTO.UUID) : "null")));
 
         StoragePool sp = null;
         Connect conn = null;
@@ -111,6 +115,7 @@ public boolean connectPhysicalDisk(String volumeUuid, KVMStoragePool pool, Map<S
 
             targetPath = "/mnt" + volumeUuid;
             spd = new LibvirtStoragePoolDef(PoolType.NETFS, volumeUuid, details.get(DiskTO.UUID), pool.getSourceHost(), details.get(DiskTO.MOUNT_POINT), targetPath);
+            logger.debug("ManagedNFS creating libvirt storage pool XML: host=" + pool.getSourceHost() + " dir=" + details.get(DiskTO.MOUNT_POINT) + " target=" + targetPath);
             _storageLayer.mkdir(targetPath);
 
             logger.debug(spd.toString());

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

@@ -145,9 +145,9 @@ private String createCloudStackVolumeForTypeVolume(DataStore dataStore, DataObje
             if (storagePool.getPath() != null) {
                 volume.set_iScsiName(storagePool.getPath());
             }
-            // 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);
+            // Defer physical file creation and path assignment until attach/connectPhysicalDisk.
+            // Leave path null so managed attach flow on KVM triggers ManagedNfsStorageAdaptor.
+            volume.setFormat(Storage.ImageFormat.QCOW2); // Format known in advance
             volume.setPoolId(dataStore.getId());
             volumeDao.update(volume.getId(), volume);
             s_logger.info("ONTAP ManagedNFS volume registered: uuid={} path={} format=QCOW2", volumeUuid, volumeUuid);