# This is a combination of 11 commits.� This is a combination of 10 commits.

# This is the 1st commit message:

CSTACKEX-25: Basic class structure

# This is the commit message #2:

Add PrimaryStoragePool base code

# This is the commit message #3:

CSTACKEX-25: Create Volume code basic code added

# This is the commit message #4:

CSTACKEX-25: additional logic for Primary storage pool creation

# This is the commit message #5:

CSTACKEX-29 Cluster, SVM and Aggr Feign Client

# This is the commit message #6:

CSTACKEX-29 Added License Info

# This is the commit message #7:

CSTACKEX-29 Resolve Review Comments

# This is the commit message #8:

CSTACKEX-29 Resolve Style check issues

� This is the commit message #9:

CSTACKEX-29 Resolve Style check issues

� This is the commit message #10:

CSTACKEX-29 Resolve Precommits Issues

# This is the commit message #11:

CSTACKEX-29 Resolve Precommits Issues

Author: Locharla, Sandeep

plugins/storage/volume/ontap/pom.xml

@@ -17,7 +17,7 @@
   under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>cloud-plugin-storage-volume-ontap</artifactId>
     <name>Apache CloudStack Plugin - Storage Volume ONTAP Provider</name>
@@ -29,6 +29,7 @@
     </parent>
     <properties>
         <spring-cloud.version>2021.0.7</spring-cloud.version>
+        <spring-boot.version>2.7.10</spring-boot.version>
         <openfeign.version>11.0</openfeign.version>
         <json.version>20230227</json.version>
         <swagger-annotations.version>1.6.2</swagger-annotations.version>
@@ -86,6 +87,15 @@
             <artifactId>swagger-annotations</artifactId>
             <version>${swagger-annotations.version}</version>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework</groupId>-->
+<!--            <artifactId>spring-web</artifactId>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter</artifactId>-->
+<!--            <version>${spring-boot.version}</version>-->
+<!--        </dependency>-->
     </dependencies>
     <build>
         <plugins>

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/response/OnTapResponse.java

@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cloudstack.storage.feign.model.response;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+
+/**
+ * OnTapResponse
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class OnTapResponse<T> {
+  @JsonProperty("num_records")
+  private Integer numRecords;
+
+  @JsonProperty("records")
+  private List<T> records;
+
+  public OnTapResponse() {
+    // Default constructor
+  }
+
+  public OnTapResponse(List<T> records) {
+    this.records = records;
+    this.numRecords = (records != null) ? records.size() : 0;
+  }
+
+  public Integer getNumRecords() {
+    return numRecords;
+  }
+
+  public void setNumRecords(Integer numRecords) {
+    this.numRecords = numRecords;
+  }
+
+  public List<T> getRecords() {
+    return records;
+  }
+
+  public void setRecords(List<T> records) {
+    this.records = records;
+    this.numRecords = (records != null) ? records.size() : 0;
+  }
+}

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/response/OntapResponse.java

@@ -27,18 +27,18 @@
  * OnTapResponse
  */
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class OntapResponse<T> {
+public class OnTapResponse<T> {
   @JsonProperty("num_records")
   private Integer numRecords;
 
   @JsonProperty("records")
   private List<T> records;
 
-  public OntapResponse () {
+  public OnTapResponse() {
     // Default constructor
   }
 
-  public OntapResponse (List<T> records) {
+  public OnTapResponse(List<T> records) {
     this.records = records;
     this.numRecords = (records != null) ? records.size() : 0;
   }
@@ -60,3 +60,5 @@ public void setRecords(List<T> records) {
     this.numRecords = (records != null) ? records.size() : 0;
   }
 }
+
+

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

@@ -21,19 +21,40 @@
 
 
 import com.cloud.agent.api.StoragePoolInfo;
+import com.cloud.dc.ClusterVO;
+import com.cloud.dc.dao.ClusterDao;
+import com.cloud.host.HostVO;
 import com.cloud.hypervisor.Hypervisor;
+import com.cloud.resource.ResourceManager;
+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;
 import org.apache.cloudstack.engine.subsystem.api.storage.HostScope;
+import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreInfo;
 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.lifecycle.BasePrimaryDataStoreLifeCycleImpl;
+import org.apache.cloudstack.storage.provider.StorageProviderManager;
+import org.apache.cloudstack.storage.volume.datastore.PrimaryDataStoreHelper;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import java.util.Map;
 
-public class OntapPrimaryDatastoreLifecycle implements PrimaryDataStoreLifeCycle {
+import javax.inject.Inject;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 
+public class OntapPrimaryDatastoreLifecycle extends BasePrimaryDataStoreLifeCycleImpl implements PrimaryDataStoreLifeCycle {
+    @Inject private ClusterDao _clusterDao;
+    @Inject private StorageManager _storageMgr;
+    @Inject private ResourceManager _resourceMgr;
+    @Inject private PrimaryDataStoreHelper _dataStoreHelper;
     private static final Logger s_logger = (Logger)LogManager.getLogger(OntapPrimaryDatastoreLifecycle.class);
 
     /**
@@ -43,14 +64,94 @@ public class OntapPrimaryDatastoreLifecycle implements PrimaryDataStoreLifeCycle
      */
     @Override
     public DataStore initialize(Map<String, Object> dsInfos) {
-
-        return null;
-
+        String url = dsInfos.get("url").toString();
+        Long zoneId = (Long) dsInfos.get("zoneId");
+        Long podId = (Long)dsInfos.get("podId");
+        Long clusterId = (Long)dsInfos.get("clusterId");
+        String storagePoolName = dsInfos.get("name").toString();
+        String providerName = dsInfos.get("providerName").toString();
+        String tags = dsInfos.get("tags").toString();
+        Boolean isTagARule = (Boolean) dsInfos.get("isTagARule");
+        String scheme = dsInfos.get("scheme").toString();
+
+        // Additional details requested for ONTAP primary storage pool creation
+        @SuppressWarnings("unchecked")
+        Map<String, String> details = (Map<String, String>)dsInfos.get("details");
+        // Validations
+        if (podId != null && clusterId == null) {
+            s_logger.error("Cluster Id is null, cannot create primary storage");
+            return null;
+        } else if (podId == null && clusterId != null) {
+            s_logger.error("Pod Id is null, cannot create primary storage");
+            return null;
+        }
+
+        if (podId == null && clusterId == null) {
+            if (zoneId != null) {
+                s_logger.info("Both Pod Id and Cluster Id are null, Primary storage pool will be associated with a Zone");
+            } else {
+                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());
+        }
+        // Validate the ONTAP details
+        StorageProviderManager storageProviderManager = new StorageProviderManager(details, scheme);
+        boolean isValid = storageProviderManager.connect(details);
+        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
+        } else {
+            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
+        if (scheme.equalsIgnoreCase("nfs")) {
+            parameters.setType(Storage.StoragePoolType.NetworkFilesystem);
+        } else if (scheme.equalsIgnoreCase("iscsi")) {
+            parameters.setType(Storage.StoragePoolType.Iscsi);
+        } else {
+            throw new CloudRuntimeException("Unsupported protocol: " + scheme + ", cannot create primary storage");
+        }
+
+        parameters.setTags(tags);
+        parameters.setIsTagARule(isTagARule);
+        parameters.setDetails(details);
+        parameters.setUuid(UUID.randomUUID().toString());
+        parameters.setZoneId(zoneId);
+        parameters.setPodId(podId);
+        parameters.setClusterId(clusterId);
+        parameters.setName(storagePoolName);
+        parameters.setProviderName(providerName);
+        parameters.setManaged(true);
+
+        return _dataStoreHelper.createPrimaryDataStore(parameters);
     }
 
     @Override
-    public boolean attachCluster(DataStore store, ClusterScope scope) {
-        return false;
+    public boolean attachCluster(DataStore dataStore, ClusterScope scope) {
+        PrimaryDataStoreInfo primarystore = (PrimaryDataStoreInfo)dataStore;
+        List<HostVO> hostsToConnect = _resourceMgr.getEligibleUpAndEnabledHostsInClusterForStorageConnection(primarystore);
+
+        logger.debug(String.format("Attaching the pool to each of the hosts %s in the cluster: %s", hostsToConnect, primarystore.getClusterId()));
+        for (HostVO host : hostsToConnect) {
+            // TODO: Fetch the host IQN and add to the initiator group on ONTAP cluster
+            try {
+                _storageMgr.connectHostToSharedPool(host, dataStore.getId());
+            } catch (Exception e) {
+                logger.warn("Unable to establish a connection between " + host + " and " + dataStore, e);
+            }
+        }
+        _dataStoreHelper.attachCluster(dataStore);
+        return true;
     }
 
     @Override
@@ -60,7 +161,24 @@ public boolean attachHost(DataStore store, HostScope scope, StoragePoolInfo exis
 
     @Override
     public boolean attachZone(DataStore dataStore, ZoneScope scope, Hypervisor.HypervisorType hypervisorType) {
-        return false;
+        List<HostVO> hostsToConnect = new ArrayList<>();
+        Hypervisor.HypervisorType[] hypervisorTypes = {Hypervisor.HypervisorType.XenServer, Hypervisor.HypervisorType.VMware, Hypervisor.HypervisorType.KVM};
+
+        for (Hypervisor.HypervisorType type : hypervisorTypes) {
+            hostsToConnect.addAll(_resourceMgr.getEligibleUpAndEnabledHostsInZoneForStorageConnection(dataStore, scope.getScopeId(), type));
+        }
+
+        logger.debug(String.format("In createPool. Attaching the pool to each of the hosts in %s.", hostsToConnect));
+        for (HostVO host : hostsToConnect) {
+            // TODO: Fetch the host IQN and add to the initiator group on ONTAP cluster
+            try {
+                _storageMgr.connectHostToSharedPool(host, dataStore.getId());
+            } catch (Exception e) {
+                logger.warn("Unable to establish a connection between " + host + " and " + dataStore, e);
+            }
+        }
+        _dataStoreHelper.attachZone(dataStore);
+        return true;
     }
 
     @Override