Addressed final set of comments

Author: Locharla, Sandeep

.github/CODEOWNERS

@@ -17,6 +17,7 @@
 
 /plugins/storage/volume/linstor @rp-
 /plugins/storage/volume/storpool @slavkap
+/plugins/storage/volume/ontap @rajiv1 @sandeeplocharla @piyush5 @suryag
 
 .pre-commit-config.yaml @jbampton
 /.github/linters/ @jbampton

plugins/storage/volume/ontap/pom.xml

@@ -39,6 +39,7 @@
         <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>
+        <commons-lang3.version>3.12.0</commons-lang3.version>
     </properties>
     <dependencyManagement>
         <dependencies>
@@ -92,6 +93,11 @@
             <artifactId>swagger-annotations</artifactId>
             <version>${swagger-annotations.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+        </dependency>
         <!-- JUnit 5 -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>

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

@@ -45,11 +45,11 @@
 
 public class OntapPrimaryDatastoreDriver implements PrimaryDataStoreDriver {
 
-    private static final Logger s_logger = LogManager.getLogger(OntapPrimaryDatastoreDriver.class);
+    private static final Logger logger = LogManager.getLogger(OntapPrimaryDatastoreDriver.class);
 
     @Override
     public Map<String, String> getCapabilities() {
-        s_logger.trace("OntapPrimaryDatastoreDriver: getCapabilities: Called");
+        logger.trace("OntapPrimaryDatastoreDriver: getCapabilities: Called");
         Map<String, String> mapCapabilities = new HashMap<>();
         mapCapabilities.put(DataStoreCapabilities.STORAGE_SYSTEM_SNAPSHOT.toString(), Boolean.FALSE.toString());
         mapCapabilities.put(DataStoreCapabilities.CAN_CREATE_VOLUME_FROM_SNAPSHOT.toString(), Boolean.FALSE.toString());
@@ -63,27 +63,39 @@ public DataTO getTO(DataObject data) {
     }
 
     @Override
-    public DataStoreTO getStoreTO(DataStore store) { return null; }
+    public DataStoreTO getStoreTO(DataStore store) {
+        return null;
+    }
 
     @Override
-    public void createAsync(DataStore dataStore, DataObject dataObject, AsyncCompletionCallback<CreateCmdResult> callback) {}
+    public void createAsync(DataStore dataStore, DataObject dataObject, AsyncCompletionCallback<CreateCmdResult> callback) {
+        throw new UnsupportedOperationException("Create operation is not supported for ONTAP primary storage.");
+    }
 
     @Override
-    public void deleteAsync(DataStore store, DataObject data, AsyncCompletionCallback<CommandResult> callback) {}
+    public void deleteAsync(DataStore store, DataObject data, AsyncCompletionCallback<CommandResult> callback) {
+        throw new UnsupportedOperationException("Delete operation is not supported for ONTAP primary storage.");
+    }
 
     @Override
-    public void copyAsync(DataObject srcData, DataObject destData, AsyncCompletionCallback<CopyCommandResult> callback) {}
+    public void copyAsync(DataObject srcData, DataObject destData, AsyncCompletionCallback<CopyCommandResult> callback) {
+        throw new UnsupportedOperationException("Copy operation is not supported for ONTAP primary storage.");
+    }
 
     @Override
-    public void copyAsync(DataObject srcData, DataObject destData, Host destHost, AsyncCompletionCallback<CopyCommandResult> callback) {}
+    public void copyAsync(DataObject srcData, DataObject destData, Host destHost, AsyncCompletionCallback<CopyCommandResult> callback) {
+        throw new UnsupportedOperationException("Copy operation is not supported for ONTAP primary storage.");
+    }
 
     @Override
     public boolean canCopy(DataObject srcData, DataObject destData) {
         return false;
     }
 
     @Override
-    public void resize(DataObject data, AsyncCompletionCallback<CreateCmdResult> callback) {}
+    public void resize(DataObject data, AsyncCompletionCallback<CreateCmdResult> callback) {
+        throw new UnsupportedOperationException("Resize operation is not supported for ONTAP primary storage.");
+    }
 
     @Override
     public ChapInfo getChapInfo(DataObject dataObject) {
@@ -119,10 +131,14 @@ public long getUsedIops(StoragePool storagePool) {
     }
 
     @Override
-    public void takeSnapshot(SnapshotInfo snapshot, AsyncCompletionCallback<CreateCmdResult> callback) {}
+    public void takeSnapshot(SnapshotInfo snapshot, AsyncCompletionCallback<CreateCmdResult> callback) {
+        throw new UnsupportedOperationException("Snapshot operation is not supported for ONTAP primary storage.");
+    }
 
     @Override
-    public void revertSnapshot(SnapshotInfo snapshotOnImageStore, SnapshotInfo snapshotOnPrimaryStore, AsyncCompletionCallback<CommandResult> callback) {}
+    public void revertSnapshot(SnapshotInfo snapshotOnImageStore, SnapshotInfo snapshotOnPrimaryStore, AsyncCompletionCallback<CommandResult> callback) {
+        throw new UnsupportedOperationException("Snapshot operation is not supported for ONTAP primary storage.");
+    }
 
     @Override
     public void handleQualityOfServiceForVolumeMigration(VolumeInfo volumeInfo, QualityOfServiceState qualityOfServiceState) {}

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

@@ -52,7 +52,7 @@ public class FeignConfiguration {
     private static final Logger logger = LogManager.getLogger(FeignConfiguration.class);
 
     private final int retryMaxAttempt = 3;
-    private final int retryMaxInterval = 5;
+    private final int retryMaxIntervalInSecs = 5;
     private final String ontapFeignMaxConnection = "80";
     private final String ontapFeignMaxConnectionPerRoute = "20";
     private final ObjectMapper objectMapper;
@@ -110,7 +110,7 @@ public RequestInterceptor createRequestInterceptor() {
     }
 
     public Retryer createRetryer() {
-        return new Retryer.Default(1000L, retryMaxInterval * 1000L, retryMaxAttempt);
+        return new Retryer.Default(1000L, retryMaxIntervalInSecs * 1000L, retryMaxAttempt);
     }
 
     public Encoder createEncoder() {

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

@@ -41,13 +41,13 @@ public class ExportRule {
     private Integer index = null;
 
     public enum ProtocolsEnum {
-        any("any"),
+        ANY("any"),
 
-        nfs("nfs"),
+        NFS("nfs"),
 
-        nfs3("nfs3"),
+        NFS3("nfs3"),
 
-        nfs4("nfs4");
+        NFS4("nfs4");
 
         private String value;
 

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

@@ -56,15 +56,15 @@ public class Igroup {
     private String uuid = null;
 
     public enum OsTypeEnum {
-        hyper_v("hyper_v"),
+        HyperV("hyper_v"),
 
-        linux("linux"),
+        Linux("linux"),
 
-        vmware("vmware"),
+        VMware("vmware"),
 
-        windows("windows"),
+        Windows("windows"),
 
-        xen("xen");
+        Xen("xen");
 
         private String value;
 

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

@@ -128,7 +128,6 @@ public void setAntiRansomware(AntiRansomware antiRansomware) {
 
     public void setSize (Long size) { this.size = size; }
 
-
     @Override
     public boolean equals(Object o) {
         if (o == null || getClass() != o.getClass()) return false;