vm instance creation test3

Author: Srivastava, Piyush

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

@@ -134,18 +134,20 @@ private String createCloudStackVolumeForTypeVolume(DataStore dataStore, DataObje
         // KVM will mount this subdirectory separately as: storage-ip:/vol/volumename/subdir -> /mnt/{volume-uuid}
         if (ProtocolType.NFS.name().equalsIgnoreCase(details.get(Constants.PROTOCOL))) {
             StorageStrategy storageStrategy = getStrategyByStoragePoolDetails(details);
-            s_logger.info("createCloudStackVolumeForTypeVolume: NFS - creating subdirectory on ONTAP for volume: {}", ((VolumeInfo) dataObject).getName());
+            String volumeName = ((VolumeInfo) dataObject).getName();
+            s_logger.info("createCloudStackVolumeForTypeVolume: NFS - creating subdirectory on ONTAP for volume: {}", volumeName);
             CloudStackVolume cloudStackVolumeRequest = Utility.createCloudStackVolumeRequestByProtocol(storagePool, details, (VolumeInfo) dataObject);
-            storageStrategy.createCloudStackVolume(cloudStackVolumeRequest);  // Creates subdirectory on ONTAP via REST API
+            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
-            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);
+            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
         }
         // For iSCSI and other protocols, use ONTAP REST API

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

@@ -78,11 +78,14 @@ public void setOntapStorage(OntapStorage ontapStorage) {
     public CloudStackVolume createCloudStackVolume(CloudStackVolume cloudstackVolume) {
         s_logger.info("createCloudStackVolume: Create cloudstack volume " + cloudstackVolume);
         try {
-            createFile(cloudstackVolume.getVolume().getUuid(),cloudstackVolume.getCloudstackVolName(), cloudstackVolume.getFile());
-            s_logger.debug("Successfully created file in ONTAP under volume with path {} or name {}  ", cloudstackVolume.getVolume().getUuid(), cloudstackVolume.getCloudstackVolName());
+            boolean success = createFile(cloudstackVolume.getVolume().getUuid(), cloudstackVolume.getCloudstackVolName(), cloudstackVolume.getFile());
+            if (!success) {
+                throw new CloudRuntimeException("Failed to create directory on ONTAP: " + cloudstackVolume.getCloudstackVolName());
+            }
+            s_logger.debug("Successfully created file in ONTAP under volume with path {} or name {}", cloudstackVolume.getVolume().getUuid(), cloudstackVolume.getCloudstackVolName());
             FileInfo responseFile = cloudstackVolume.getFile();
             responseFile.setPath(cloudstackVolume.getCloudstackVolName());
-        }catch (Exception e) {
+        } catch (Exception e) {
             s_logger.error("Exception occurred while creating file or dir: {}. Exception: {}", cloudstackVolume.getCloudstackVolName(), e.getMessage());
             throw new CloudRuntimeException("Failed to create file: " + e.getMessage());
         }

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