vm instance creation test1

Author: Srivastava, Piyush

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

@@ -128,22 +128,19 @@ 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
+        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;
+        }
+        // For iSCSI and other protocols, use ONTAP REST API
         StorageStrategy storageStrategy = getStrategyByStoragePoolDetails(details);
         s_logger.info("createCloudStackVolumeForTypeVolume: Connection to Ontap SVM [{}] successful, preparing CloudStackVolumeRequest", details.get(Constants.SVM_NAME));
         CloudStackVolume cloudStackVolumeRequest = Utility.createCloudStackVolumeRequestByProtocol(storagePool, details, (VolumeInfo) dataObject);
         CloudStackVolume cloudStackVolume = storageStrategy.createCloudStackVolume(cloudStackVolumeRequest);
         if (ProtocolType.ISCSI.name().equalsIgnoreCase(details.get(Constants.PROTOCOL)) && cloudStackVolume.getLun() != null && cloudStackVolume.getLun().getName() != null) {
             return cloudStackVolume.getLun().getName();
-        } else if (ProtocolType.NFS.name().equalsIgnoreCase(details.get(Constants.PROTOCOL))) {
-            // For NFS, ONTAP creates a directory for organization
-            // CloudStack will create the actual .qcow2 file inside this directory
-            String directoryName = cloudStackVolume.getCloudstackVolName();
-            String volumeUuid = ((VolumeInfo) dataObject).getUuid();
-            // Return path: "directory-name/volume-uuid"
-            // CloudStack will append .qcow2 extension when creating the actual disk file
-            String volumePath = directoryName + "/" + volumeUuid;
-            s_logger.info("createCloudStackVolumeForTypeVolume: NFS volume directory [{}] created, returning path: {}", directoryName, volumePath);
-            return volumePath;
         } else {
             String errMsg = "createCloudStackVolumeForTypeVolume: Volume creation failed. Lun or Lun Path is null for dataObject: " + dataObject;
             s_logger.error(errMsg);

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

@@ -81,7 +81,7 @@ public static CloudStackVolume createCloudStackVolumeRequestByProtocol(StoragePo
                 cloudStackVolumeRequest.setVolume(poolVolume);
                 cloudStackVolumeRequest.setFile(file);
                 cloudStackVolumeRequest.setCloudstackVolName(volumeObject.getName());
-                cloudStackVolumeRequest.setCloudstackVolName(volumeObject.getUuid());
+                cloudStackVolumeRequest.setCloudstackVolUUID(volumeObject.getUuid());
                 break;
             case ISCSI:
                 cloudStackVolumeRequest = new CloudStackVolume();