vm instance creation test

Author: Srivastava, Piyush

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

@@ -135,7 +135,15 @@ private String createCloudStackVolumeForTypeVolume(DataStore dataStore, DataObje
         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))) {
-            return cloudStackVolume.getFile().getName();
+            // 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/service/model/CloudStackVolume.java

@@ -27,9 +27,11 @@ public class CloudStackVolume {
 
     private FileInfo file;
     private Lun lun;
-    private Volume volume;
+    private Volume storagePoolvolume;
     // will be replaced after testing
     private String cloudstackVolName;
+    private String cloudstackVolUUID;
+
 
     public FileInfo getFile() {
         return file;
@@ -47,15 +49,21 @@ public void setLun(Lun lun) {
         this.lun = lun;
     }
     public Volume getVolume() {
-        return volume;
+        return storagePoolvolume;
     }
     public void setVolume(Volume volume) {
-        this.volume = volume;
+        this.storagePoolvolume = volume;
     }
     public String getCloudstackVolName() {
         return cloudstackVolName;
     }
     public void setCloudstackVolName(String cloudstackVolName) {
         this.cloudstackVolName = cloudstackVolName;
     }
+    public String getCloudstackVolUUID() {
+        return cloudstackVolUUID;
+    }
+    public void setCloudstackVolUUID(String cloudstackVolUUID) {
+        this.cloudstackVolUUID = cloudstackVolUUID;
+    }
 }

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

@@ -70,8 +70,8 @@ public static CloudStackVolume createCloudStackVolumeRequestByProtocol(StoragePo
                 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.setSize(Long.parseLong("10000"));
-                file.setSize(volumeObject.getSize());
+                //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
                 file.setType(FileInfo.TypeEnum.DIRECTORY); // We are creating file for a cloudstack volume . Should it be dir ? // TODO change once multipart is done
 
@@ -81,6 +81,7 @@ public static CloudStackVolume createCloudStackVolumeRequestByProtocol(StoragePo
                 cloudStackVolumeRequest.setVolume(poolVolume);
                 cloudStackVolumeRequest.setFile(file);
                 cloudStackVolumeRequest.setCloudstackVolName(volumeObject.getName());
+                cloudStackVolumeRequest.setCloudstackVolName(volumeObject.getUuid());
                 break;
             case ISCSI:
                 cloudStackVolumeRequest = new CloudStackVolume();