feature/CSTACKEX-122: Per host Igroup changes 2

Author: Srivastava, Piyush

engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java

@@ -1337,6 +1337,14 @@ private void createManagedVolumeCopyTemplateAsync(VolumeInfo volumeInfo, Primary
             primaryDataStore.setDetails(details);
 
             grantAccess(volumeInfo, destHost, primaryDataStore);
+            volumeInfo = volFactory.getVolume(volumeInfo.getId(), primaryDataStore);
+            details.put(PrimaryDataStore.MANAGED_STORE_TARGET, volumeInfo.get_iScsiName());
+            primaryDataStore.setDetails(details);
+
+            // Update destTemplateInfo with the iSCSI path from volumeInfo
+            if (destTemplateInfo instanceof TemplateObject) {
+                ((TemplateObject)destTemplateInfo).setInstallPath(volumeInfo.getPath());
+            }
 
             try {
                 motionSrv.copyAsync(srcTemplateInfo, destTemplateInfo, destHost, caller);

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

@@ -170,19 +170,6 @@ public void createAsync(DataStore dataStore, DataObject dataObject, AsyncComplet
                         volumeVO.set_iScsiName(null);
                         volumeVO.setPath(null);
                         createCmdResult = new CreateCmdResult(lunName, new Answer(null, true, null));
-
-//                        // Create LUN-to-igroup mapping and retrieve the assigned LUN ID
-//                        UnifiedSANStrategy sanStrategy = (UnifiedSANStrategy) Utility.getStrategyByStoragePoolDetails(details);
-//                        String accessGroupName = Utility.getIgroupName(svmName, storagePoolUuid);
-//                        String lunNumber = sanStrategy.ensureLunMapped(svmName, lunName, accessGroupName);
-//
-//                        // Construct iSCSI path: /<iqn>/<lun_id> format for KVM/libvirt attachment
-//                        String iscsiPath = Constants.SLASH + storagePool.getPath() + Constants.SLASH + lunNumber;
-//                        volumeVO.set_iScsiName(iscsiPath);
-//                        volumeVO.setPath(iscsiPath);
-//                        s_logger.info("createAsync: Volume [{}] iSCSI path set to {}", volumeVO.getId(), iscsiPath);
-//                        createCmdResult = new CreateCmdResult(null, new Answer(null, true, null));
-
                     } else if (ProtocolType.NFS3.name().equalsIgnoreCase(details.get(Constants.PROTOCOL))) {
                         createCmdResult = new CreateCmdResult(volInfo.getUuid(), new Answer(null, true, null));
                         s_logger.info("createAsync: Managed NFS volume [{}] associated with pool {}",

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

@@ -120,7 +120,7 @@ public DataStore initialize(Map<String, Object> dsInfos) {
             throw new CloudRuntimeException("Cluster Id or Pod Id is null, cannot create primary storage");
         }
 
-        if (podId == null && clusterId == null) {
+        if (podId == 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 {
@@ -231,7 +231,7 @@ public DataStore initialize(Map<String, Object> dsInfos) {
                 path = Constants.SLASH + storagePoolName;
                 port = Constants.NFS3_PORT;
                 // Force NFSv3 for ONTAP managed storage to avoid NFSv4 ID mapping issues
-                details.put("nfsmountopts", "vers=3");
+                details.put(Constants.NFS_MOUNT_OPTIONS,Constants.NFS3_MOUNT_OPTIONS_VER_3);
                 s_logger.info("Setting NFS path for storage pool: " + path + ", port: " + port + " with mount option: vers=3");
                 break;
             case ISCSI:

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

@@ -42,6 +42,8 @@ public class Constants {
     public static final String IS_DISAGGREGATED = "isDisaggregated";
     public static final String RUNNING = "running";
     public static final String EXPORT = "export";
+    public static final String NFS_MOUNT_OPTIONS = "nfsmountopts";
+    public static final String NFS3_MOUNT_OPTIONS_VER_3 = "vers=3";
 
     public static final int ONTAP_PORT = 443;