STACK-18_2: fixes

Author: rajiv-jain-netapp

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

@@ -532,7 +532,7 @@ public long getUsedIops(StoragePool storagePool) {
 
     @Override
     public void takeSnapshot(SnapshotInfo snapshot, AsyncCompletionCallback<CreateCmdResult> callback) {
-
+        s_logger.error("temp takeSnapshot : entered with snapshot id: " + snapshot.getId() + " and name: " + snapshot.getName());
         CreateCmdResult result;
 
         try {
@@ -561,7 +561,7 @@ public void takeSnapshot(SnapshotInfo snapshot, AsyncCompletionCallback<CreateCm
                 throw new CloudRuntimeException("takeSnapshot: Failed to get source file to take snapshot");
             }
             long capacityBytes = storagePool.getCapacityBytes();
-
+            s_logger.error("temp takeSnapshot : entered after getting cloudstack volume with file path: " + cloudStackVolume.getFile().getPath() + " and size: " + cloudStackVolume.getFile().getSize());
             long usedBytes = getUsedBytes(storagePool);
             long fileSize = cloudStackVolume.getFile().getSize();
 

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/client/NASFeignClient.java

@@ -34,7 +34,7 @@
 public interface NASFeignClient {
 
     // File Operations
-    @RequestLine("GET /api/storage/volumes/{volumeUuid}/files/{path}")
+    @RequestLine("GET /api/storage/volumes/{volumeUuid}/files/{path}?return_metadata=true")
     @Headers({"Authorization: {authHeader}"})
     OntapResponse<FileInfo> getFileResponse(@Param("authHeader") String authHeader,
                                             @Param("volumeUuid") String volumeUUID,
@@ -60,7 +60,7 @@ void createFile(@Param("authHeader") String authHeader,
                     @Param("path") String filePath,
                     FileInfo file);
 
-    @RequestLine("POST /api/storage/volumes/{volumeUuid}/files/{path}")
+    @RequestLine("POST /api/storage/file/clone")
     @Headers({"Authorization: {authHeader}"})
     JobResponse cloneFile(@Param("authHeader") String authHeader,
                           FileClone fileClone);

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/FileClone.java

@@ -47,5 +47,7 @@ public void setSourcePath(String sourcePath) {
     public String getDestinationPath() {
         return destinationPath;
     }
-    public void setDestinationPath(String destinationPath) {}
+    public void setDestinationPath(String destinationPath) {
+        this.destinationPath = destinationPath;
+    }
 }

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/FileInfo.java

@@ -25,7 +25,6 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonValue;
 
-import java.time.OffsetDateTime;
 import java.util.Objects;
 
 /**
@@ -36,8 +35,6 @@
 public class FileInfo {
   @JsonProperty("bytes_used")
   private Long bytesUsed = null;
-  @JsonProperty("creation_time")
-  private OffsetDateTime creationTime = null;
   @JsonProperty("fill_enabled")
   private Boolean fillEnabled = null;
   @JsonProperty("is_empty")
@@ -46,8 +43,6 @@ public class FileInfo {
   private Boolean isSnapshot = null;
   @JsonProperty("is_vm_aligned")
   private Boolean isVmAligned = null;
-  @JsonProperty("modified_time")
-  private OffsetDateTime modifiedTime = null;
   @JsonProperty("name")
   private String name = null;
   @JsonProperty("overwrite_enabled")
@@ -110,10 +105,6 @@ public Long getBytesUsed() {
     return bytesUsed;
   }
 
-  public OffsetDateTime getCreationTime() {
-    return creationTime;
-  }
-
   public FileInfo fillEnabled(Boolean fillEnabled) {
     this.fillEnabled = fillEnabled;
     return this;
@@ -149,11 +140,6 @@ public Boolean isIsVmAligned() {
     return isVmAligned;
   }
 
-
-  public OffsetDateTime getModifiedTime() {
-    return modifiedTime;
-  }
-
   public FileInfo name(String name) {
     this.name = name;
     return this;
@@ -266,12 +252,10 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FileInfo {\n");
     sb.append("    bytesUsed: ").append(toIndentedString(bytesUsed)).append("\n");
-    sb.append("    creationTime: ").append(toIndentedString(creationTime)).append("\n");
     sb.append("    fillEnabled: ").append(toIndentedString(fillEnabled)).append("\n");
     sb.append("    isEmpty: ").append(toIndentedString(isEmpty)).append("\n");
     sb.append("    isSnapshot: ").append(toIndentedString(isSnapshot)).append("\n");
     sb.append("    isVmAligned: ").append(toIndentedString(isVmAligned)).append("\n");
-    sb.append("    modifiedTime: ").append(toIndentedString(modifiedTime)).append("\n");
     sb.append("    name: ").append(toIndentedString(name)).append("\n");
     sb.append("    overwriteEnabled: ").append(toIndentedString(overwriteEnabled)).append("\n");
     sb.append("    path: ").append(toIndentedString(path)).append("\n");