CSTACKEX-28 - incorporated review comments

Author: rajiv-jain-netapp

plugins/storage/volume/ontap/pom.xml

@@ -30,6 +30,10 @@
     <properties>
         <spring-cloud.version>2021.0.7</spring-cloud.version>
         <openfeign.version>11.0</openfeign.version>
+        <json.version>20230227</json.version>
+        <swagger-annotations.version>1.6.2</swagger-annotations.version>
+        <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+        <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
     </properties>
     <dependencyManagement>
         <dependencies>
@@ -51,7 +55,7 @@
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>20230227</version>
+            <version>${json.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -80,22 +84,23 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>1.6.2</version>
+            <version>${swagger-annotations.version}</version>
         </dependency>
     </dependencies>
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>${maven-compiler-plugin.version}</version>
                 <configuration>
                     <source>11</source>
                     <target>11</target>
                 </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
                 <configuration>
                     <skipTests>true</skipTests>
                 </configuration>

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

@@ -30,6 +30,11 @@ public class Aggregate {
     @SerializedName("name")
     private String name = null;
 
+    @Override
+    public int hashCode() {
+        return Objects.hash(getName(), getUuid());
+    }
+
     @SerializedName("uuid")
     private String uuid = null;
 

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

@@ -24,5 +24,11 @@ public class AntiRansomware {
     @JsonProperty("state")
     private String state;
 
-    // Getters and setters
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
 }

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

@@ -20,6 +20,8 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 
+import java.util.Objects;
+
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class ExportPolicy {
     private String name;
@@ -28,4 +30,16 @@ public class ExportPolicy {
     public void setName(String name) { this.name = name; }
     public long getId() { return id; }
     public void setId(long id) { this.id = id; }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == null || getClass() != o.getClass()) return false;
+        ExportPolicy that = (ExportPolicy) o;
+        return getId() == that.getId();
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(getId());
+    }
 }

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

@@ -29,5 +29,21 @@ public class Nas {
     @JsonProperty("export_policy")
     private ExportPolicy exportPolicy;
 
-    // Getters and setters
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public ExportPolicy getExportPolicy() {
+        return exportPolicy;
+    }
+
+    public void setExportPolicy(ExportPolicy exportPolicy) {
+        this.exportPolicy = exportPolicy;
+    }
+
+
 }

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

@@ -21,6 +21,8 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 
+import java.util.Objects;
+
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class Policy {
     private int minThroughputIops;
@@ -41,4 +43,16 @@ public class Policy {
     public void setUuid(String uuid) { this.uuid = uuid; }
     public String getName() { return name; }
     public void setName(String name) { this.name = name; }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == null || getClass() != o.getClass()) return false;
+        Policy policy = (Policy) o;
+        return Objects.equals(getUuid(), policy.getUuid());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(getUuid());
+    }
 }

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

@@ -26,5 +26,11 @@ public class Qos {
     @JsonProperty("policy")
     private Policy policy;
 
-    // Getters and setters
+    public Policy getPolicy() {
+        return policy;
+    }
+
+    public void setPolicy(Policy policy) {
+        this.policy = policy;
+    }
 }

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

@@ -24,6 +24,7 @@
 import com.google.gson.annotations.SerializedName;
 
 import java.util.List;
+import java.util.Objects;
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class Svm {
@@ -58,4 +59,80 @@ public class Svm {
     @JsonProperty("state.value")
     @SerializedName("state.value")
     private String state = null;
+
+    public String getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Boolean getIscsiEnabled() {
+        return iscsiEnabled;
+    }
+
+    public void setIscsiEnabled(Boolean iscsiEnabled) {
+        this.iscsiEnabled = iscsiEnabled;
+    }
+
+    public Boolean getFcpEnabled() {
+        return fcpEnabled;
+    }
+
+    public void setFcpEnabled(Boolean fcpEnabled) {
+        this.fcpEnabled = fcpEnabled;
+    }
+
+    public Boolean getNfsEnabled() {
+        return nfsEnabled;
+    }
+
+    public void setNfsEnabled(Boolean nfsEnabled) {
+        this.nfsEnabled = nfsEnabled;
+    }
+
+    public List<Aggregate> getAggregates() {
+        return aggregates;
+    }
+
+    public void setAggregates(List<Aggregate> aggregates) {
+        this.aggregates = aggregates;
+    }
+
+    public Boolean getAggregatesDelegated() {
+        return aggregatesDelegated;
+    }
+
+    public void setAggregatesDelegated(Boolean aggregatesDelegated) {
+        this.aggregatesDelegated = aggregatesDelegated;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == null || getClass() != o.getClass()) return false;
+        Svm svm = (Svm) o;
+        return Objects.equals(getUuid(), svm.getUuid());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(getUuid());
+    }
 }

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

@@ -75,6 +75,42 @@ public Nas getNas() {
         return nas;
     }
 
+    public void setNas(Nas nas) {
+        this.nas = nas;
+    }
+
+    public Svm getSvm() {
+        return svm;
+    }
+
+    public void setSvm(Svm svm) {
+        this.svm = svm;
+    }
+
+    public Qos getQos() {
+        return qos;
+    }
+
+    public void setQos(Qos qos) {
+        this.qos = qos;
+    }
+
+    public VolumeSpace getSpace() {
+        return space;
+    }
+
+    public void setSpace(VolumeSpace space) {
+        this.space = space;
+    }
+
+    public AntiRansomware getAntiRansomware() {
+        return antiRansomware;
+    }
+
+    public void setAntiRansomware(AntiRansomware antiRansomware) {
+        this.antiRansomware = antiRansomware;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (o == null || getClass() != o.getClass()) return false;

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

@@ -44,4 +44,44 @@ public class VolumeQosPolicy {
     @JsonProperty("uuid")
     @SerializedName("uuid")
     private String uuid = null;
+
+    public Integer getMaxThroughputIops() {
+        return maxThroughputIops;
+    }
+
+    public void setMaxThroughputIops(Integer maxThroughputIops) {
+        this.maxThroughputIops = maxThroughputIops;
+    }
+
+    public Integer getMaxThroughputMbps() {
+        return maxThroughputMbps;
+    }
+
+    public void setMaxThroughputMbps(Integer maxThroughputMbps) {
+        this.maxThroughputMbps = maxThroughputMbps;
+    }
+
+    public Integer getMinThroughputIops() {
+        return minThroughputIops;
+    }
+
+    public void setMinThroughputIops(Integer minThroughputIops) {
+        this.minThroughputIops = minThroughputIops;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
 }