accessgroup create recode

Srivastava, Piyush · Srivastava, Piyush · commit e3c44ae55425 · 2025-11-10T15:18:34.000+05:30
diff --git a/plugins/storage/volume/ontap/pom.xml b/plugins/storage/volume/ontap/pom.xml
@@ -31,7 +31,6 @@
         <spring-cloud.version>2021.0.7</spring-cloud.version>
         <openfeign.version>11.0</openfeign.version>
         <json.version>20230227</json.version>
-        <jackson-databind.version>2.15.2</jackson-databind.version>
         <httpclient.version>4.5.14</httpclient.version>
         <swagger-annotations.version>1.6.2</swagger-annotations.version>
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
@@ -77,7 +76,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${jackson-databind.version}</version>
+            <version>2.13.4</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
diff --git a/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/driver/OntapPrimaryDatastoreDriver.java b/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/driver/OntapPrimaryDatastoreDriver.java
@@ -179,7 +179,6 @@ public boolean grantAccess(DataObject dataObject, Host host, DataStore dataStore
 
     @Override
     public void revokeAccess(DataObject dataObject, Host host, DataStore dataStore) {
-
     }
 
     @Override
diff --git a/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/FeignConfiguration.java b/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/FeignConfiguration.java
@@ -30,7 +30,7 @@
 import feign.codec.EncodeException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.json.JsonMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.http.conn.ConnectionKeepAliveStrategy;
 import org.apache.http.conn.ssl.NoopHostnameVerifier;
 import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
@@ -55,13 +55,11 @@ public class FeignConfiguration {
     private final int retryMaxInterval = 5;
     private final String ontapFeignMaxConnection = "80";
     private final String ontapFeignMaxConnectionPerRoute = "20";
-    private final JsonMapper jsonMapper;
+    private final ObjectMapper jsonMapper;
 
     public FeignConfiguration() {
-        this.jsonMapper = JsonMapper.builder()
-                .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
-                .findAndAddModules()
-                .build();
+        this.jsonMapper = new ObjectMapper();
+        this.jsonMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
     }
 
     public Client createClient() {
@@ -139,16 +137,43 @@ public Decoder createDecoder() {
             @Override
             public Object decode(Response response, Type type) throws IOException, DecodeException {
                 if (response.body() == null) {
+                    logger.debug("Response body is null, returning null");
                     return null;
                 }
                 String json = null;
                 try (InputStream bodyStream = response.body().asInputStream()) {
                     json = new String(bodyStream.readAllBytes(), StandardCharsets.UTF_8);
                     logger.debug("Decoding JSON response: {}", json);
-                    return jsonMapper.readValue(json, jsonMapper.getTypeFactory().constructType(type));
+                    logger.debug("Target type: {}", type);
+                    logger.debug("About to call jsonMapper.readValue()...");
+
+                    Object result = null;
+                    try {
+                        logger.debug("Calling jsonMapper.constructType()...");
+                        var javaType = jsonMapper.getTypeFactory().constructType(type);
+                        logger.debug("constructType() returned: {}", javaType);
+
+                        logger.debug("Calling jsonMapper.readValue() with json and javaType...");
+                        result = jsonMapper.readValue(json, javaType);
+                        logger.debug("jsonMapper.readValue() completed successfully");
+                    } catch (Throwable ex) {
+                        logger.error("EXCEPTION in jsonMapper.readValue()! Type: {}, Message: {}", ex.getClass().getName(), ex.getMessage(), ex);
+                        throw ex;
+                    }
+
+                    if (result == null) {
+                        logger.warn("Decoded result is null!");
+                    } else {
+                        logger.debug("Successfully decoded to object of type: {}", result.getClass().getName());
+                    }
+                    logger.debug("Returning result from decoder");
+                    return result;
                 } catch (IOException e) {
-                    logger.error("Error decoding JSON response. Status: {}, Raw body: {}", response.status(), json, e);
+                    logger.error("IOException during decoding. Status: {}, Raw body: {}", response.status(), json, e);
                     throw new DecodeException(response.status(), "Error decoding JSON response", response.request(), e);
+                } catch (Exception e) {
+                    logger.error("Unexpected error during decoding. Status: {}, Type: {}, Raw body: {}", response.status(), type, json, e);
+                    throw new DecodeException(response.status(), "Unexpected error during decoding", response.request(), e);
                 }
             }
         };
diff --git a/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/lifecycle/OntapPrimaryDatastoreLifecycle.java b/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/lifecycle/OntapPrimaryDatastoreLifecycle.java
@@ -38,8 +38,11 @@
 import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreLifeCycle;
 import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreParameters;
 import org.apache.cloudstack.engine.subsystem.api.storage.ZoneScope;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
 import org.apache.cloudstack.storage.datastore.lifecycle.BasePrimaryDataStoreLifeCycleImpl;
+import org.apache.cloudstack.storage.feign.model.ExportPolicy;
 import org.apache.cloudstack.storage.feign.model.OntapStorage;
+import org.apache.cloudstack.storage.feign.model.Svm;
 import org.apache.cloudstack.storage.feign.model.Volume;
 import org.apache.cloudstack.storage.provider.StorageProviderFactory;
 import org.apache.cloudstack.storage.service.StorageStrategy;
@@ -62,6 +65,7 @@ public class OntapPrimaryDatastoreLifecycle extends BasePrimaryDataStoreLifeCycl
     @Inject private StorageManager _storageMgr;
     @Inject private ResourceManager _resourceMgr;
     @Inject private PrimaryDataStoreHelper _dataStoreHelper;
+    @Inject private StoragePoolDetailsDao storagePoolDetailsDao;
     private static final Logger s_logger = LogManager.getLogger(OntapPrimaryDatastoreLifecycle.class);
 
     // ONTAP minimum volume size is 1.56 GB (1677721600 bytes)
@@ -216,9 +220,21 @@ public DataStore initialize(Map<String, Object> dsInfos) {
             long volumeSize = Long.parseLong(details.get(Constants.SIZE));
             s_logger.info("Creating ONTAP volume '" + storagePoolName + "' with size: " + volumeSize + " bytes (" +
                     (volumeSize / (1024 * 1024 * 1024)) + " GB)");
-            Volume volume = storageStrategy.createStorageVolume(storagePoolName, volumeSize);
-            details.put(Constants.VOLUME_UUID, volume.getUuid());
-            details.put(Constants.VOLUME_NAME, volume.getName());
+            try {
+                Volume volume = storageStrategy.createStorageVolume(storagePoolName, volumeSize);
+                if (volume == null) {
+                    s_logger.error("createStorageVolume returned null for volume: " + storagePoolName);
+                    throw new CloudRuntimeException("Failed to create ONTAP volume: " + storagePoolName);
+                }
+
+                s_logger.info("Volume object retrieved successfully. UUID: " + volume.getUuid() + ", Name: " + volume.getName());
+
+                details.putIfAbsent(Constants.VOLUME_UUID, volume.getUuid());
+                details.putIfAbsent(Constants.VOLUME_NAME, volume.getName());
+            } catch (Exception e) {
+                s_logger.error("Exception occurred while creating ONTAP volume: " + storagePoolName, e);
+                throw new CloudRuntimeException("Failed to create ONTAP volume: " + storagePoolName + ". Error: " + e.getMessage(), e);
+            }
         } else {
             throw new CloudRuntimeException("ONTAP details validation failed, cannot create primary storage");
         }
@@ -249,14 +265,21 @@ public boolean attachCluster(DataStore dataStore, ClusterScope scope) {
         PrimaryDataStoreInfo primaryStore = (PrimaryDataStoreInfo)dataStore;
         List<HostVO> hostsToConnect = _resourceMgr.getEligibleUpAndEnabledHostsInClusterForStorageConnection(primaryStore);
 
+        logger.debug(" datastore object received is  {} ",primaryStore );
+
         logger.debug(String.format("Attaching the pool to each of the hosts %s in the cluster: %s", hostsToConnect, primaryStore.getClusterId()));
 
-        Map<String, String> details = primaryStore.getDetails(); // TODO check while testing , if it is populated we can remove below db call
+        Map<String, String> details = storagePoolDetailsDao.listDetailsKeyPairs(primaryStore.getId());
         StorageStrategy strategy = Utility.getStrategyByStoragePoolDetails(details);
+        Svm svm = new Svm();
+        svm.setName(details.get(Constants.SVM_NAME));
+        ExportPolicy exportPolicy = new ExportPolicy();
+        exportPolicy.setSvm(svm);
         AccessGroup accessGroupRequest = new AccessGroup();
         accessGroupRequest.setHostsToConnect(hostsToConnect);
         accessGroupRequest.setScope(scope);
         accessGroupRequest.setPrimaryDataStoreInfo(primaryStore);
+        accessGroupRequest.setPolicy(exportPolicy);
         strategy.createAccessGroup(accessGroupRequest);
 
         logger.debug("attachCluster: Attaching the pool to each of the host in the cluster: {}", primaryStore.getClusterId());
diff --git a/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/provider/OntapHostListener.java b/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/provider/OntapHostListener.java
@@ -18,39 +18,41 @@
  */
 
 package org.apache.cloudstack.storage.provider;
-
-import com.cloud.exception.StorageConflictException;
-import org.apache.cloudstack.engine.subsystem.api.storage.HypervisorHostListener;
-
-class OntapHostListener implements HypervisorHostListener {
-
-    @Override
-    public boolean hostAdded(long hostId) {
-        return false;
-    }
-
-    @Override
-    public boolean hostConnect(long hostId, long poolId) throws StorageConflictException {
-        return false;
-    }
-
-    @Override
-    public boolean hostDisconnected(long hostId, long poolId) {
-        return false;
-    }
-
-    @Override
-    public boolean hostAboutToBeRemoved(long hostId) {
-        return false;
-    }
-
-    @Override
-    public boolean hostRemoved(long hostId, long clusterId) {
-        return false;
-    }
-
-    @Override
-    public boolean hostEnabled(long hostId) {
-        return false;
-    }
-}
+//
+//import com.cloud.exception.StorageConflictException;
+//import org.apache.cloudstack.engine.subsystem.api.storage.HypervisorHostListener;
+//
+//public class OntapHostListener implements HypervisorHostListener {
+//
+//    public OntapHostListener(){}
+//
+//    @Override
+//    public boolean hostAdded(long hostId) {
+//        return false;
+//    }
+//
+//    @Override
+//    public boolean hostConnect(long hostId, long poolId) throws StorageConflictException {
+//        return false;
+//    }
+//
+//    @Override
+//    public boolean hostDisconnected(long hostId, long poolId) {
+//        return false;
+//    }
+//
+//    @Override
+//    public boolean hostAboutToBeRemoved(long hostId) {
+//        return false;
+//    }
+//
+//    @Override
+//    public boolean hostRemoved(long hostId, long clusterId) {
+//        return false;
+//    }
+//
+//    @Override
+//    public boolean hostEnabled(long hostId) {
+//        return false;
+//    }
+//}
diff --git a/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/provider/OntapPrimaryDatastoreProvider.java b/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/provider/OntapPrimaryDatastoreProvider.java
@@ -41,7 +41,7 @@ public class OntapPrimaryDatastoreProvider implements PrimaryDataStoreProvider {
     private static final Logger s_logger = LogManager.getLogger(OntapPrimaryDatastoreProvider.class);
     private OntapPrimaryDatastoreDriver primaryDatastoreDriver;
     private OntapPrimaryDatastoreLifecycle primaryDatastoreLifecycle;
-    private OntapHostListener ontapHostListener;
+    // private HypervisorHostListener listener;
 
     public OntapPrimaryDatastoreProvider() {
         s_logger.info("OntapPrimaryDatastoreProvider initialized");
@@ -58,7 +58,7 @@ public DataStoreDriver getDataStoreDriver() {
 
     @Override
     public HypervisorHostListener getHostListener() {
-        return ontapHostListener;
+        return null;
     }
 
     @Override
@@ -72,7 +72,7 @@ public boolean configure(Map<String, Object> params) {
         s_logger.trace("OntapPrimaryDatastoreProvider: configure: Called");
         primaryDatastoreDriver = ComponentContext.inject(OntapPrimaryDatastoreDriver.class);
         primaryDatastoreLifecycle = ComponentContext.inject(OntapPrimaryDatastoreLifecycle.class);
-        ontapHostListener = ComponentContext.inject(OntapHostListener.class);
+       // listener = ComponentContext.inject(OntapHostListener.class);
 
         return true;
     }
diff --git a/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/StorageStrategy.java b/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/StorageStrategy.java
@@ -196,19 +196,37 @@ public Volume createStorageVolume(String volumeName, Long size) {
         }
         s_logger.info("Volume created successfully: " + volumeName);
         // Below code is to update volume uuid to storage pool mapping once and used for all other workflow saving get volume call
-        OntapResponse<Volume> ontapVolume = new OntapResponse<>();
         try {
             Map<String, Object> queryParams = Map.of(Constants.NAME, volumeName);
-             ontapVolume = volumeFeignClient.getVolume(authHeader, queryParams);
-            if ((ontapVolume == null || ontapVolume.getRecords().isEmpty())) {
-                s_logger.error("Exception while getting volume volume not found:");
-                throw new CloudRuntimeException("Failed to fetch volume " + volumeName);
+            s_logger.debug("Fetching volume details for: " + volumeName);
+
+            OntapResponse<Volume> ontapVolume = volumeFeignClient.getVolume(authHeader, queryParams);
+            s_logger.debug("Feign call completed. Processing response...");
+
+            if (ontapVolume == null) {
+                s_logger.error("OntapResponse is null for volume: " + volumeName);
+                throw new CloudRuntimeException("Failed to fetch volume " + volumeName + ": Response is null");
+            }
+            s_logger.debug("OntapResponse is not null. Checking records field...");
+
+            if (ontapVolume.getRecords() == null) {
+                s_logger.error("OntapResponse.records is null for volume: " + volumeName);
+                throw new CloudRuntimeException("Failed to fetch volume " + volumeName + ": Records list is null");
             }
-        }catch (Exception e) {
-            s_logger.error("Exception while getting volume: " + e.getMessage());
-            throw new CloudRuntimeException("Failed to fetch volume: " + e.getMessage());
+            s_logger.debug("Records field is not null. Size: " + ontapVolume.getRecords().size());
+
+            if (ontapVolume.getRecords().isEmpty()) {
+                s_logger.error("OntapResponse.records is empty for volume: " + volumeName);
+                throw new CloudRuntimeException("Failed to fetch volume " + volumeName + ": No records found");
+            }
+
+            Volume volume = ontapVolume.getRecords().get(0);
+            s_logger.info("Volume retrieved successfully: " + volumeName + ", UUID: " + volume.getUuid());
+            return volume;
+        } catch (Exception e) {
+            s_logger.error("Exception while retrieving volume details for: " + volumeName, e);
+            throw new CloudRuntimeException("Failed to fetch volume: " + volumeName + ". Error: " + e.getMessage(), e);
         }
-        return ontapVolume.getRecords().get(0);
     }
 
     /**
diff --git a/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/UnifiedNASStrategy.java b/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/UnifiedNASStrategy.java

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,6 @@ public boolean grantAccess(DataObject dataObject, Host host, DataStore dataStore`
`179`	`179`
`180`	`180`	`@Override`
`181`	`181`	`public void revokeAccess(DataObject dataObject, Host host, DataStore dataStore) {`
`182`		`-`
`183`	`182`	`}`
`184`	`183`
`185`	`184`	`@Override`