CSTACKEX-46: Rebase changes

Author: Locharla, Sandeep

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/UnifiedNASStrategy.java

@@ -110,13 +110,17 @@ CloudStackVolume updateCloudStackVolume(CloudStackVolume cloudstackVolume) {
     }
 
     @Override
-    void deleteCloudStackVolume(CloudStackVolume cloudstackVolume) {
+    public void deleteCloudStackVolume(CloudStackVolume cloudstackVolume) {
         //TODO
     }
 
     @Override
-    CloudStackVolume getCloudStackVolume(CloudStackVolume cloudstackVolume) {
-        //TODO
+    public void copyCloudStackVolume(CloudStackVolume cloudstackVolume) {
+
+    }
+
+    @Override
+    public CloudStackVolume getCloudStackVolume(Map<String, String> cloudStackVolumeMap) {
         return null;
     }
 
@@ -188,52 +192,63 @@ public AccessGroup updateAccessGroup(AccessGroup accessGroup) {
     }
 
     @Override
-    public AccessGroup getAccessGroup(AccessGroup accessGroup) {
-        s_logger.info("getAccessGroup: Get export policy");
+    public AccessGroup getAccessGroup(Map<String, String> values) {
+        return null; //TODO: This method need to be rewritten according to the signature in StorageStrategy interface
+    }
 
-        if (accessGroup == null) {
-            throw new CloudRuntimeException("getAccessGroup: Invalid accessGroup object - accessGroup is null");
-        }
+//    @Override
+//    public AccessGroup getAccessGroup(AccessGroup accessGroup) {
+//        s_logger.info("getAccessGroup: Get export policy");
+//
+//        if (accessGroup == null) {
+//            throw new CloudRuntimeException("getAccessGroup: Invalid accessGroup object - accessGroup is null");
+//        }
+//
+//        // Get PrimaryDataStoreInfo from accessGroup
+//        PrimaryDataStoreInfo primaryDataStoreInfo = accessGroup.getPrimaryDataStoreInfo();
+//        if (primaryDataStoreInfo == null) {
+//            throw new CloudRuntimeException("getAccessGroup: PrimaryDataStoreInfo is null in accessGroup");
+//        }
+//        s_logger.info("getAccessGroup: Get export policy for the storage pool {}", primaryDataStoreInfo.getName());
+//        try {
+//            String authHeader = Utility.generateAuthHeader(storage.getUsername(), storage.getPassword());
+//            // Determine export policy attached to the storage pool
+//            String exportPolicyName = primaryDataStoreInfo.getDetails().get(Constants.EXPORT_POLICY_NAME);
+//            String exportPolicyId = primaryDataStoreInfo.getDetails().get(Constants.EXPORT_POLICY_ID);
+//
+//            try {
+//               ExportPolicy exportPolicy =  nasFeignClient.getExportPolicyById(authHeader,exportPolicyId);
+//               if(exportPolicy==null){
+//                   s_logger.error("getAccessGroup: Failed to retrieve export policy for export policy");
+//                   throw new CloudRuntimeException("getAccessGroup: Failed to retrieve export policy for export policy");
+//               }
+//               accessGroup.setPolicy(exportPolicy);
+//                s_logger.info("getAccessGroup: Successfully fetched export policy '{}'", exportPolicyName);
+//            } catch (Exception e) {
+//                s_logger.error("getAccessGroup: Failed to delete export policy. Exception: {}", e.getMessage(), e);
+//                throw new CloudRuntimeException("Failed to delete export policy: " + e.getMessage(), e);
+//            }
+//        } catch (Exception e) {
+//            s_logger.error("getAccessGroup: Failed to delete export policy. Exception: {}", e.getMessage(), e);
+//            throw new CloudRuntimeException("Failed to delete export policy: " + e.getMessage(), e);
+//        }
+//        return accessGroup;
+//    }
 
-        // Get PrimaryDataStoreInfo from accessGroup
-        PrimaryDataStoreInfo primaryDataStoreInfo = accessGroup.getPrimaryDataStoreInfo();
-        if (primaryDataStoreInfo == null) {
-            throw new CloudRuntimeException("getAccessGroup: PrimaryDataStoreInfo is null in accessGroup");
-        }
-        s_logger.info("getAccessGroup: Get export policy for the storage pool {}", primaryDataStoreInfo.getName());
-        try {
-            String authHeader = Utility.generateAuthHeader(storage.getUsername(), storage.getPassword());
-            // Determine export policy attached to the storage pool
-            String exportPolicyName = primaryDataStoreInfo.getDetails().get(Constants.EXPORT_POLICY_NAME);
-            String exportPolicyId = primaryDataStoreInfo.getDetails().get(Constants.EXPORT_POLICY_ID);
-
-            try {
-               ExportPolicy exportPolicy =  nasFeignClient.getExportPolicyById(authHeader,exportPolicyId);
-               if(exportPolicy==null){
-                   s_logger.error("getAccessGroup: Failed to retrieve export policy for export policy");
-                   throw new CloudRuntimeException("getAccessGroup: Failed to retrieve export policy for export policy");
-               }
-               accessGroup.setPolicy(exportPolicy);
-                s_logger.info("getAccessGroup: Successfully fetched export policy '{}'", exportPolicyName);
-            } catch (Exception e) {
-                s_logger.error("getAccessGroup: Failed to delete export policy. Exception: {}", e.getMessage(), e);
-                throw new CloudRuntimeException("Failed to delete export policy: " + e.getMessage(), e);
-            }
-        } catch (Exception e) {
-            s_logger.error("getAccessGroup: Failed to delete export policy. Exception: {}", e.getMessage(), e);
-            throw new CloudRuntimeException("Failed to delete export policy: " + e.getMessage(), e);
-        }
-        return accessGroup;
+    @Override
+    public Map<String, String> enableLogicalAccess(Map<String, String> values) {
+        //TODO
+        return null;
     }
 
     @Override
-    void enableLogicalAccess(Map<String, String> values) {
+    public void disableLogicalAccess(Map<String, String> values) {
         //TODO
     }
 
     @Override
-    void disableLogicalAccess(Map<String, String> values) {
-        //TODO
+    public Map<String, String> getLogicalAccess(Map<String, String> values) {
+        return Map.of();
     }
 
 

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/UnifiedSANStrategy.java

@@ -409,6 +409,7 @@ public AccessGroup updateAccessGroup(AccessGroup accessGroup) {
         return null;
     }
 
+    @Override
     public AccessGroup getAccessGroup(Map<String, String> values) {
         s_logger.info("getAccessGroup : fetch Igroup");
         s_logger.debug("getAccessGroup : fetching Igroup with params {} ", values);

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/utils/Constants.java

@@ -66,6 +66,9 @@ public class Constants {
     public static final String SERVICES = "services";
     public static final String RETURN_RECORDS = "return_records";
 
+    public static final int JOB_MAX_RETRIES = 100;
+    public static final int CREATE_VOLUME_CHECK_SLEEP_TIME = 2000;
+
     public static final String SLASH = "/";
     public static final String EQUALS = "=";
     public static final String SEMICOLON = ";";