CSTACKEX-25: additional logic for Primary storage pool creation

Author: Locharla, Sandeep

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/lifecycle/OntapPrimaryDatastoreLifecycle.java

@@ -29,6 +29,7 @@
 import com.cloud.storage.Storage;
 import com.cloud.storage.StorageManager;
 import com.cloud.storage.StoragePool;
+import com.cloud.utils.exception.CloudRuntimeException;
 import com.google.common.base.Preconditions;
 import org.apache.cloudstack.engine.subsystem.api.storage.ClusterScope;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
@@ -89,33 +90,27 @@ public DataStore initialize(Map<String, Object> dsInfos) {
             if (zoneId != null) {
                 s_logger.info("Both Pod Id and Cluster Id are null, Primary storage pool will be associated with a Zone");
             } else {
-                s_logger.error("Pod Id, Cluster Id and Zone Id are all null, cannot create primary storage");
-                return null;
+                throw new CloudRuntimeException("Pod Id, Cluster Id and Zone Id are all null, cannot create primary storage");
             }
         }
 
         PrimaryDataStoreParameters parameters = new PrimaryDataStoreParameters();
         if (clusterId != null) {
             ClusterVO clusterVO = _clusterDao.findById(clusterId);
             Preconditions.checkNotNull(clusterVO, "Unable to locate the specified cluster");
+            if (clusterVO.getHypervisorType() != Hypervisor.HypervisorType.KVM) {
+                throw new CloudRuntimeException("ONTAP primary storage is not supported for KVM hypervisor");
+            }
             parameters.setHypervisorType(clusterVO.getHypervisorType());
         }
-        else {
-            parameters.setHypervisorType(Hypervisor.HypervisorType.Any); //TODO: Make sure the hypervisor is KVM, if not throw exception
-        }
-
         // Validate the ONTAP details
         StorageProviderManager storageProviderManager = new StorageProviderManager(details, scheme);
         boolean isValid = storageProviderManager.connect(details);
-        //TODO: Use the return value to decide if we should proceed with pool creation
-
         if (isValid) {
 //            String volumeName = storagePoolName + "_vol"; //TODO: Figure out a better naming convention
             storageProviderManager.createVolume(storagePoolName, Integer.parseInt((details.get("size")))); // TODO: size should be in bytes, so see if conversion is needed
-            // TODO: The volume name should be stored against the StoragePool name/id in the DB
         } else {
-            s_logger.error("ONTAP details validation failed, cannot create primary storage");
-            return null; // TODO: Figure out a better exception handling mechanism
+            throw new CloudRuntimeException("ONTAP details validation failed, cannot create primary storage");
         }
 
         // TODO: While testing need to check what does this actually do and if the fields corresponding to each protocol should also be set
@@ -124,8 +119,7 @@ public DataStore initialize(Map<String, Object> dsInfos) {
         } else if (scheme.equalsIgnoreCase("iscsi")) {
             parameters.setType(Storage.StoragePoolType.Iscsi);
         } else {
-            s_logger.error("Unsupported protocol: " + scheme + ", cannot create primary storage");
-            return null; // TODO: Figure out a better exception handling mechanism
+            throw new CloudRuntimeException("Unsupported protocol: " + scheme + ", cannot create primary storage");
         }
 
         parameters.setTags(tags);

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/provider/StorageProviderManager.java

@@ -20,6 +20,7 @@
 package org.apache.cloudstack.storage.provider;
 
 import com.cloud.storage.Storage;
+import com.cloud.utils.exception.CloudRuntimeException;
 import org.apache.cloudstack.storage.feign.client.VolumeFeignClient;
 import org.apache.cloudstack.storage.feign.model.Svm;
 import org.apache.cloudstack.storage.feign.model.request.VolumeRequestDTO;
@@ -59,24 +60,22 @@ public StorageProviderManager(Map<String, String> details, String protocol) {
         this.aggrName = details.get("aggrName");
         this.username = details.get("username");
         this.password = details.get("password");
-        if (protocol.equalsIgnoreCase(Storage.StoragePoolType.NetworkFilesystem.name())) { // TODO: Cloudstack protocol list is different than ONTAP supported protocols, so figure out the proper mapping
+        if (protocol.equalsIgnoreCase(Storage.StoragePoolType.NetworkFilesystem.name())) {
             this.nasStrategy = new UnifiedNASStrategy(details);
             this.sanStrategy = null;
-        } else if (protocol.equalsIgnoreCase(Storage.StoragePoolType.Iscsi.name())) { // TODO: Cloudstack protocol list is different than ONTAP supported protocols, so figure out the proper mapping
+        } else if (protocol.equalsIgnoreCase(Storage.StoragePoolType.Iscsi.name())) {
             this.sanStrategy = new UnifiedSANStrategy(details);
             this.nasStrategy = null;
         } else {
-            //TODO: Figure out the appropriate exception handling mechanism
             this.nasStrategy = null;
             this.sanStrategy = null;
-            s_logger.error("Unsupported protocol: " + protocol);
-            return;
+            throw new CloudRuntimeException("Unsupported protocol: " + protocol);
         }
     }
 
     // Connect method to validate ONTAP cluster, credentials, protocol, and SVM
     public boolean connect(Map<String, String> details) {
-        // 1. Check if ONTAP cluster is reachable
+        // 1. Check if ONTAP cluster is reachable ==> Use GET cluster API
         // 2. Validate credentials
         // 3. Check protocol support
         // 4. Check if SVM with given name exists
@@ -91,7 +90,6 @@ public void createVolume(String volumeName, int size) {
        // TODO: Call the ontap feign client for creating volume here
         // Get the AuthHeader
         String authHeader = utils.generateAuthHeader(username, password);
-        // Call Create Volume API
 
         // Generate the Create Volume Request
         VolumeRequestDTO volumeRequest = new VolumeRequestDTO();
@@ -102,11 +100,17 @@ public void createVolume(String volumeName, int size) {
 
         volumeRequest.setName(volumeName);
         volumeRequest.setSvm(svm);
-        volumeRequest.setAggregates((List<VolumeRequestDTO.AggregateDTO>) aggr); //TODO: Should we accept comma separated list of aggregates in the UI?
+        volumeRequest.setAggregates((List<VolumeRequestDTO.AggregateDTO>) aggr);
         volumeRequest.setSize(size);
         // Make the POST API call to create the volume
-        JobResponseDTO response = volumeFeignClient.createVolumeWithJob(authHeader, volumeRequest);
-
+        try {
+            JobResponseDTO response = volumeFeignClient.createVolumeWithJob(authHeader, volumeRequest);
+            //TODO: Add code to poll the job status until it is completed/ a timeout of 3 mins
 
+        } catch (Exception e) {
+            s_logger.error("Exception while creating volume: ", e);
+            throw new CloudRuntimeException("Failed to create volume: " + e.getMessage());
+        }
+        s_logger.info("Volume created successfully: " + volumeName);
     }
 }