CSTACKEX-198: removing unwanted flags from file clone also

Author: rajiv-jain-netapp

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

@@ -688,7 +688,6 @@ public void takeSnapshot(SnapshotInfo snapshot, AsyncCompletionCallback<CreateCm
                 fileCloneRequest.setVolume(volumeRef);
                 fileCloneRequest.setSourcePath(volumePath);
                 fileCloneRequest.setDestinationPath(cloneName);
-                fileCloneRequest.setIsOverride(Boolean.FALSE);
                 logger.info("takeSnapshot: Creating NFS file clone [{}] from source [{}] on FlexVol UUID [{}]",
                         cloneName, volumePath, flexVolUuid);
                 nfsJobResponse = storageStrategy.getNasFeignClient().cloneFile(authHeader, fileCloneRequest);

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

@@ -32,9 +32,6 @@ public class FileCloneRequest {
     @JsonProperty("destination_path")
     private String destinationPath;
 
-    @JsonProperty("is_override")
-    private Boolean isOverride;
-
     public VolumeRef getVolume() {
         return volume;
     }
@@ -59,14 +56,6 @@ public void setDestinationPath(String destinationPath) {
         this.destinationPath = destinationPath;
     }
 
-    public Boolean getIsOverride() {
-        return isOverride;
-    }
-
-    public void setIsOverride(Boolean isOverride) {
-        this.isOverride = isOverride;
-    }
-
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public static class VolumeRef {
         @JsonProperty("name")

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/vmsnapshot/OntapVMSnapshotStrategy.java

@@ -393,7 +393,6 @@ public VMSnapshot takeVMSnapshot(VMSnapshot vmSnapshot) {
                             cloneRequest.setVolume(volumeRef);
                             cloneRequest.setSourcePath(volumePath);
                             cloneRequest.setDestinationPath(cloneName);
-                            cloneRequest.setIsOverride(Boolean.FALSE);
                             JobResponse fileJobResponse = storageStrategy.getNasFeignClient().cloneFile(authHeader, cloneRequest);
                             if (fileJobResponse == null || fileJobResponse.getJob() == null) {
                                 throw new CloudRuntimeException("Failed to submit clone-backed VM snapshot for volume " + volumeId);
@@ -639,7 +638,7 @@ public boolean revertVMSnapshot(VMSnapshot vmSnapshot) {
                     userVm.getUuid(), vmSnapshotTO, volumeTOs, guestOS.getDisplayName());
 
             // Revert clone-backed snapshot artifacts per volume:
-            //  - NFS: cloneFile(source=clone, destination=live file, isOverride=true)
+            //  - NFS: patch file(source=clone, destination=live file, overwrite=true)
             //  - iSCSI: patch LUN (clone.source=clone LUN, destination=live LUN)
             List<VMSnapshotDetailsVO> cloneDetails = vmSnapshotDetailsDao.findDetails(vmSnapshot.getId(), OntapStorageConstants.ONTAP_FLEXVOL_SNAPSHOT);
             if (CollectionUtils.isNotEmpty(cloneDetails)) {