Create & Delete, Enable & Disable, Enter & Cancel maintenance of Primary StoragePool with ONTAP storage

Co-authored-by: Sandeep Locharla  <Sandeep.Locharla@netapp.com>
Co-authored-by: Rajiv Jain <Rajiv.Jain@netapp.com>
Co-authored-by: Piyush Srivastava piyush5@netapp.com
Co-authored-by: Surya Gupta suryag@netapp.com

Author: 2 people

plugins/storage/volume/ontap/pom.xml

@@ -36,6 +36,9 @@
         <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
         <jackson-databind.version>2.13.4</jackson-databind.version>
         <assertj.version>3.24.2</assertj.version>
+        <junit-jupiter.version>5.8.1</junit-jupiter.version>
+        <mockito.version>3.12.4</mockito.version>
+        <mockito-junit-jupiter.version>5.2.0</mockito-junit-jupiter.version>
     </properties>
     <dependencyManagement>
         <dependencies>
@@ -84,16 +87,6 @@
             <artifactId>cloud-engine-storage-volume</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.cloudstack</groupId>
-            <artifactId>cloud-engine-storage-snapshot</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cloudstack</groupId>
-            <artifactId>cloud-server</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
@@ -103,29 +96,29 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.8.1</version>
+            <version>${junit-jupiter.version}</version>
             <scope>test</scope>
         </dependency>
 
         <!-- Mockito -->
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>3.12.4</version>
+            <version>${mockito.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-junit-jupiter</artifactId>
-            <version>5.2.0</version>
+            <version>${mockito-junit-jupiter.version}</version>
             <scope>test</scope>
         </dependency>
 
         <!-- Mockito Inline (for static method mocking) -->
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-inline</artifactId>
-            <version>3.12.4</version>
+            <version>${mockito.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

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

@@ -21,9 +21,7 @@
 
 import feign.QueryMap;
 import org.apache.cloudstack.storage.feign.model.ExportPolicy;
-import org.apache.cloudstack.storage.feign.model.FileClone;
 import org.apache.cloudstack.storage.feign.model.FileInfo;
-import org.apache.cloudstack.storage.feign.model.response.JobResponse;
 import org.apache.cloudstack.storage.feign.model.response.OntapResponse;
 import feign.Headers;
 import feign.Param;
@@ -34,7 +32,7 @@
 public interface NASFeignClient {
 
     // File Operations
-    @RequestLine("GET /api/storage/volumes/{volumeUuid}/files/{path}?return_metadata=true")
+    @RequestLine("GET /api/storage/volumes/{volumeUuid}/files/{path}")
     @Headers({"Authorization: {authHeader}"})
     OntapResponse<FileInfo> getFileResponse(@Param("authHeader") String authHeader,
                                             @Param("volumeUuid") String volumeUUID,
@@ -60,11 +58,6 @@ void createFile(@Param("authHeader") String authHeader,
                     @Param("path") String filePath,
                     FileInfo file);
 
-    @RequestLine("POST /api/storage/file/clone")
-    @Headers({"Authorization: {authHeader}"})
-    JobResponse cloneFile(@Param("authHeader") String authHeader,
-                          FileClone fileClone);
-
     // Export Policy Operations
     @RequestLine("POST /api/protocols/nfs/export-policies")
     @Headers({"Authorization: {authHeader}"})

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

@@ -23,15 +23,12 @@
 import org.apache.cloudstack.storage.feign.model.IscsiService;
 import org.apache.cloudstack.storage.feign.model.Lun;
 import org.apache.cloudstack.storage.feign.model.LunMap;
-import org.apache.cloudstack.storage.feign.model.LunRestoreRequest;
-import org.apache.cloudstack.storage.feign.model.response.JobResponse;
 import org.apache.cloudstack.storage.feign.model.response.OntapResponse;
 import feign.Headers;
 import feign.Param;
 import feign.RequestLine;
 import java.util.Map;
 
-//TODO: Proper URLs should be added in the RequestLine annotations below
 public interface SANFeignClient {
     // iSCSI Service APIs
     @RequestLine("GET /api/protocols/san/iscsi/services")
@@ -91,24 +88,4 @@ public interface SANFeignClient {
     void deleteLunMap(@Param("authHeader") String authHeader,
                       @Param("lunUuid") String lunUUID,
                       @Param("igroupUuid") String igroupUUID);
-
-    // LUN Restore API
-    /**
-     * Restores a LUN from a FlexVolume snapshot.
-     *
-     * <p>ONTAP REST: {@code POST /api/storage/luns/{lun.uuid}/restore}</p>
-     *
-     * <p>This API restores the LUN data from a specified snapshot to a destination path.
-     * The LUN must exist and the snapshot must contain the LUN data.</p>
-     *
-     * @param authHeader  Basic auth header
-     * @param lunUuid     UUID of the LUN to restore
-     * @param request     Request body with snapshot name and destination path
-     * @return JobResponse containing the async job reference
-     */
-    @RequestLine("POST /api/storage/luns/{lunUuid}/restore")
-    @Headers({"Authorization: {authHeader}", "Content-Type: application/json"})
-    JobResponse restoreLun(@Param("authHeader") String authHeader,
-                           @Param("lunUuid") String lunUuid,
-                           LunRestoreRequest request);
 }

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

@@ -25,6 +25,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonValue;
 
+import java.time.OffsetDateTime;
 import java.util.Objects;
 
 /**
@@ -35,6 +36,8 @@
 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")
@@ -43,6 +46,8 @@ 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")
@@ -105,6 +110,10 @@ public Long getBytesUsed() {
     return bytesUsed;
   }
 
+  public OffsetDateTime getCreationTime() {
+    return creationTime;
+  }
+
   public FileInfo fillEnabled(Boolean fillEnabled) {
     this.fillEnabled = fillEnabled;
     return this;
@@ -140,6 +149,11 @@ public Boolean isIsVmAligned() {
     return isVmAligned;
   }
 
+
+  public OffsetDateTime getModifiedTime() {
+    return modifiedTime;
+  }
+
   public FileInfo name(String name) {
     this.name = name;
     return this;
@@ -252,10 +266,12 @@ 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");

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

@@ -24,18 +24,20 @@
 public class OntapStorage {
     private final String username;
     private final String password;
-    private final String storageIP;
+    private final String managementLIF;
     private final String svmName;
     private final Long size;
     private final ProtocolType protocolType;
+    private final Boolean isDisaggregated;
 
-    public OntapStorage(String username, String password, String storageIP, String svmName, Long size, ProtocolType protocolType) {
+    public OntapStorage(String username, String password, String managementLIF, String svmName, Long size, ProtocolType protocolType, Boolean isDisaggregated) {
         this.username = username;
         this.password = password;
-        this.storageIP = storageIP;
+        this.managementLIF = managementLIF;
         this.svmName = svmName;
         this.size = size;
         this.protocolType = protocolType;
+        this.isDisaggregated = isDisaggregated;
     }
 
     public String getUsername() {
@@ -46,9 +48,13 @@ public String getPassword() {
         return password;
     }
 
-    public String getStorageIP() { return storageIP; }
+    public String getManagementLIF() {
+        return managementLIF;
+    }
 
-    public String getSvmName() { return svmName; }
+    public String getSvmName() {
+        return svmName;
+    }
 
     public Long getSize() {
         return size;
@@ -57,4 +63,8 @@ public Long getSize() {
     public ProtocolType getProtocol() {
         return protocolType;
     }
+
+    public Boolean getIsDisaggregated() {
+        return isDisaggregated;
+    }
 }