testing and review comments fix

Author: Srivastava, Piyush

plugins/storage/volume/ontap/pom.xml

@@ -35,6 +35,7 @@
         <swagger-annotations.version>1.6.2</swagger-annotations.version>
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
         <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
+        <jackson-databind.version>2.13.4</jackson-databind.version>
     </properties>
     <dependencyManagement>
         <dependencies>
@@ -76,7 +77,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.13.4</version>
+            <version>${jackson-databind.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>

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

@@ -103,7 +103,8 @@ public void createAsync(DataStore dataStore, DataObject dataObject, AsyncComplet
             s_logger.info("createAsync: Started for data store [{}] and data object [{}] of type [{}]",
                     dataStore, dataObject, dataObject.getType());
             if (dataObject.getType() == DataObjectType.VOLUME) {
-                path = createCloudStackVolumeForTypeVolume(dataStore, (VolumeInfo)dataObject);
+                VolumeInfo volumeInfo = (VolumeInfo) dataObject;
+                path = createCloudStackVolumeForTypeVolume(dataStore, volumeInfo);
                 createCmdResult = new CreateCmdResult(path, new Answer(null, true, null));
             } else {
                 errMsg = "Invalid DataObjectType (" + dataObject.getType() + ") passed to createAsync";

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

@@ -195,7 +195,7 @@ public DataStore initialize(Map<String, Object> dsInfos) {
                 parameters.setType(Storage.StoragePoolType.NetworkFilesystem);
                 path = "/" + storagePoolName;
                 s_logger.info("Setting NFS path for storage pool: " + path);
-                host = "10.193.192.136"; // TODO hardcoded for now
+                // host = "10.193.192.136"; // TODO hardcoded for now,uncomment and replace it with data lif
                 break;
             case ISCSI:
                 parameters.setType(Storage.StoragePoolType.Iscsi);

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/listener/OntapHostListener.java

@@ -57,7 +57,7 @@ public boolean hostConnect(long hostId, long poolId)  {
         logger.info("Connect to host " + hostId + " from pool " + poolId);
         Host host = _hostDao.findById(hostId);
         if (host == null) {
-            logger.error("Failed to add host by HostListener as host was not found with id : {}", hostId);
+            logger.error("host was not found with id : {}", hostId);
             return false;
         }
 

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

@@ -19,6 +19,7 @@
 
 package org.apache.cloudstack.storage.provider;
 
+import com.cloud.utils.component.ComponentContext;
 import com.cloud.utils.exception.CloudRuntimeException;
 import org.apache.cloudstack.storage.feign.model.OntapStorage;
 import org.apache.cloudstack.storage.service.StorageStrategy;
@@ -39,13 +40,15 @@ public static StorageStrategy getStrategy(OntapStorage ontapStorage) {
             case NFS:
                 if (!ontapStorage.getIsDisaggregated()) {
                     UnifiedNASStrategy unifiedNASStrategy = new UnifiedNASStrategy(ontapStorage);
+                    ComponentContext.inject(unifiedNASStrategy);
                     unifiedNASStrategy.setOntapStorage(ontapStorage);
                     return unifiedNASStrategy;
                 }
                 throw new CloudRuntimeException("Unsupported configuration: Disaggregated ONTAP is not supported.");
             case ISCSI:
                 if (!ontapStorage.getIsDisaggregated()) {
                     UnifiedSANStrategy unifiedSANStrategy = new UnifiedSANStrategy(ontapStorage);
+                    ComponentContext.inject(unifiedSANStrategy);
                     unifiedSANStrategy.setOntapStorage(ontapStorage);
                     return unifiedSANStrategy;
                 }

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

@@ -26,9 +26,9 @@
 import com.cloud.storage.dao.VolumeDao;
 import com.cloud.utils.exception.CloudRuntimeException;
 import feign.FeignException;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
 import org.apache.cloudstack.engine.subsystem.api.storage.EndPoint;
 import org.apache.cloudstack.engine.subsystem.api.storage.EndPointSelector;
-import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
 import org.apache.cloudstack.storage.command.CreateObjectCommand;
 import org.apache.cloudstack.storage.feign.FeignClientFactory;
 import org.apache.cloudstack.storage.feign.client.JobFeignClient;
@@ -48,6 +48,7 @@
 import org.apache.cloudstack.storage.service.model.CloudStackVolume;
 import org.apache.cloudstack.storage.utils.Constants;
 import org.apache.cloudstack.storage.utils.Utility;
+import org.apache.cloudstack.storage.volume.VolumeObject;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -82,16 +83,21 @@ public void setOntapStorage(OntapStorage ontapStorage) {
     @Override
     public CloudStackVolume createCloudStackVolume(CloudStackVolume cloudstackVolume) {
         s_logger.info("createCloudStackVolume: Create cloudstack volume " + cloudstackVolume);
-        // Step 1: set cloudstack volume metadata
-        String volumeUuid = updateCloudStackVolumeMetadata(cloudstackVolume.getDatastoreId(), cloudstackVolume.getVolumeInfo());
-        // Step 2: Send command to KVM host to create qcow2 file using qemu-img
-        Answer answer = createVolumeOnKVMHost(cloudstackVolume.getVolumeInfo());
+        try {
+            // Step 1: set cloudstack volume metadata
+            String volumeUuid = updateCloudStackVolumeMetadata(cloudstackVolume.getDatastoreId(), cloudstackVolume.getVolumeInfo());
+            // Step 2: Send command to KVM host to create qcow2 file using qemu-img
+            Answer answer = createVolumeOnKVMHost(cloudstackVolume.getVolumeInfo());
             if (answer == null || !answer.getResult()) {
                 String errMsg = answer != null ? answer.getDetails() : "Failed to create qcow2 on KVM host";
                 s_logger.error("createCloudStackVolumeForTypeVolume: " + errMsg);
                 throw new CloudRuntimeException(errMsg);
             }
             return cloudstackVolume;
+        }catch (Exception e) {
+            s_logger.error("createCloudStackVolumeForTypeVolume: error occured " + e);
+            throw new CloudRuntimeException(e);
+        }
     }
 
     @Override
@@ -374,18 +380,29 @@ private ExportPolicy createExportPolicyRequest(AccessGroup accessGroup,String sv
         return exportPolicy;
     }
 
-    private String updateCloudStackVolumeMetadata(String dataStoreId, VolumeInfo volumeInfo) {
-        s_logger.info("createManagedNfsVolume called with datastoreID: {} volumeInfo: {} ", dataStoreId, volumeInfo );
-        VolumeVO volume = volumeDao.findById(volumeInfo.getId());
-        String volumeUuid = volumeInfo.getUuid();
-        volume.setPoolType(Storage.StoragePoolType.NetworkFilesystem);
-        volume.setPoolId(Long.parseLong(dataStoreId)); //need to check if volume0 already has this data filled
-        volume.setPath(volumeUuid);  // Filename for qcow2 file
-        volumeDao.update(volume.getId(), volume);
-        return volumeUuid;
+    private String updateCloudStackVolumeMetadata(String dataStoreId, DataObject volumeInfo) {
+        s_logger.info("updateCloudStackVolumeMetadata called with datastoreID: {} volumeInfo: {} ", dataStoreId, volumeInfo );
+       try {
+           VolumeObject volumeObject = (VolumeObject) volumeInfo;
+           long volumeId = volumeObject.getId();
+           s_logger.info("VolumeInfo ID from VolumeObject: {}", volumeId);
+           VolumeVO volume = volumeDao.findById(volumeId);
+           if (volume == null) {
+               throw new CloudRuntimeException("Volume not found with id: " + volumeId);
+           }
+           String volumeUuid = volumeInfo.getUuid();
+           volume.setPoolType(Storage.StoragePoolType.NetworkFilesystem);
+           volume.setPoolId(Long.parseLong(dataStoreId));
+           volume.setPath(volumeUuid);  // Filename for qcow2 file
+           volumeDao.update(volume.getId(), volume);
+           return volumeUuid;
+       }catch (Exception e){
+           s_logger.error("Exception while updating volumeInfo: {} in volume: {}", dataStoreId, volumeInfo.getUuid(), e);
+           throw new CloudRuntimeException("Exception while updating volumeInfo: " + e.getMessage());
+       }
     }
 
-    private Answer createVolumeOnKVMHost(VolumeInfo volumeInfo) {
+    private Answer createVolumeOnKVMHost(DataObject volumeInfo) {
         s_logger.info("createVolumeOnKVMHost called with volumeInfo: {} ", volumeInfo);
 
         try {

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

@@ -19,7 +19,7 @@
 
 package org.apache.cloudstack.storage.service.model;
 
-import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
 import org.apache.cloudstack.storage.feign.model.FileInfo;
 import org.apache.cloudstack.storage.feign.model.Lun;
 
@@ -28,7 +28,7 @@ public class CloudStackVolume {
     private FileInfo file;
     private Lun lun;
     private String datastoreId;
-    private VolumeInfo volumeInfo;
+    private DataObject volumeInfo; // This is needed as we need DataObject to be passed to agent to create volume
     public FileInfo getFile() {
         return file;
     }
@@ -50,10 +50,10 @@ public String getDatastoreId() {
     public void setDatastoreId(String datastoreId) {
         this.datastoreId = datastoreId;
     }
-    public VolumeInfo getVolumeInfo() {
+    public DataObject getVolumeInfo() {
         return volumeInfo;
     }
-    public void setVolumeInfo(VolumeInfo volumeInfot) {
-        this.volumeInfo = volumeInfot;
+    public void setVolumeInfo(DataObject volumeInfo) {
+        this.volumeInfo = volumeInfo;
     }
 }

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

@@ -21,7 +21,7 @@
 
 import com.cloud.utils.StringUtils;
 import com.cloud.utils.exception.CloudRuntimeException;
-import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 import org.apache.cloudstack.storage.feign.model.Lun;
 import org.apache.cloudstack.storage.feign.model.LunSpace;
@@ -56,7 +56,7 @@ public static String generateAuthHeader (String username, String password) {
         return BASIC + StringUtils.SPACE + new String(encodedBytes);
     }
 
-    public static CloudStackVolume createCloudStackVolumeRequestByProtocol(StoragePoolVO storagePool, Map<String, String> details, VolumeInfo volumeObject) {
+    public static CloudStackVolume createCloudStackVolumeRequestByProtocol(StoragePoolVO storagePool, Map<String, String> details, DataObject volumeObject) {
         CloudStackVolume cloudStackVolumeRequest = null;
 
         String protocol = details.get(Constants.PROTOCOL);