Fixed some rebase issues

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/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());
@@ -66,16 +66,24 @@ public DataTO getTO(DataObject data) {
     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) {
@@ -96,7 +104,9 @@ public boolean grantAccess(DataObject dataObject, Host host, DataStore dataStore
     }
 
     @Override
-    public void revokeAccess(DataObject dataObject, Host host, DataStore dataStore) {}
+    public void revokeAccess(DataObject dataObject, Host host, DataStore dataStore) {
+        throw new UnsupportedOperationException("Revoke access operation is not supported for ONTAP primary storage.");
+    }
 
     @Override
     public long getDataObjectSizeIncludingHypervisorSnapshotReserve(DataObject dataObject, StoragePool storagePool) {

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

@@ -40,13 +40,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

@@ -55,15 +55,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;