@@ -89,6 +89,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -194,21 +195,21 @@ public void createAsync(DataStore dataStore, DataObject dataObject, AsyncComplet
                      * 3) else — blank LUN (iSCSI) or qcow2 (NFS).
                      *
                      * Mutually exclusive from the motion/orchestrator layer; snapshot is checked first
-                     * (SolidFire-style) so a restore never accidentally falls through to blank create.
+                     * (SolidFire-style) so a create-from-snapshot never accidentally falls through to blank create.
                      */
                     Long cloneOfSnapshotId = getSnapshotIdForCloning(volInfo.getId());
+                    Long cloneOfTemplateId = getTemplateIdForCloning(volInfo.getId());
                     CloudStackVolume clonedCloudStackVolume;
                     if (cloneOfSnapshotId != null) {
                         clonedCloudStackVolume = cloneCloudStackVolumeFromSnapshot(
                                 storagePool, volInfo, details, cloneOfSnapshotId);
                         // TODO(CSTACKEX-306): apply persisted MIN_IOPS / MAX_IOPS from snapshot_details
                         // onto this CloudStack volume (and ONTAP QoS if applicable) after successful clone.
+                    } else if (cloneOfTemplateId != null) {
+                        clonedCloudStackVolume = cloneCloudStackVolumeFromTemplate(
+                                storagePool, volInfo, details, cloneOfTemplateId);
                     } else {
-                        Long cloneOfTemplateId = getTemplateIdForCloning(volInfo.getId());
-                        clonedCloudStackVolume = cloneOfTemplateId != null
-                                ? cloneCloudStackVolumeFromTemplate(
-                                        storagePool, volInfo, details, cloneOfTemplateId)
-                                : createCloudStackVolume(storagePool, volInfo, details);
+                        clonedCloudStackVolume = createCloudStackVolume(storagePool, volInfo, details);
                     }
 
                     createCmdResult = recordCreatedVolume(storagePool, volInfo, volumeVO, details, clonedCloudStackVolume);
@@ -375,7 +376,7 @@ private Long getTemplateIdForCloning(long volumeId) {
 
     /**
      * Returns the CloudStack snapshot id to clone from when {@code volume_details.cloneOfSnapshot}
-     * is set, or null when this create is not a restore-from-snapshot.
+     * is set, or null when this create is not a create-volume-from-snapshot.
      *
      * <p>Set by {@code StorageSystemDataMotionStrategy.handleCreateManagedVolumeFromManagedSnapshot}
      * for the duration of {@code createAsync} only (same pattern as {@link #getTemplateIdForCloning}).</p>
@@ -395,7 +396,7 @@ private Long getSnapshotIdForCloning(long volumeId) {
      * <p><b>Combinations (product + plugin v1):</b></p>
      * <ul>
      *   <li><b>Same pool only</b> — {@code snapshot_details.PRIMARY_POOL_ID} must equal this
-     *       {@code storagePool}. Cross-pool restore is descoped; use migrate later if needed.</li>
+     *       {@code storagePool}. Creating the volume on a different pool is descoped; use migrate later if needed.</li>
      *   <li><b>DATA snapshot</b> → attachable data disk (disk offering usually inherited).</li>
      *   <li><b>ROOT snapshot</b> → still a data disk here (not bootable). Bootable path remains
      *       {@code createTemplate(snapshotid)} then deploy.</li>
@@ -420,7 +421,7 @@ private CloudStackVolume cloneCloudStackVolumeFromSnapshot(StoragePoolVO storage
         if (!String.valueOf(storagePool.getId()).equals(primaryPoolId)) {
             throw new CloudRuntimeException("Create volume from snapshot [" + csSnapshotId
                     + "] requires the snapshot's primary pool [" + primaryPoolId
-                    + "]; requested pool is [" + storagePool.getId() + "] (cross-pool restore is not supported in v1)");
+                    + "]; requested pool is [" + storagePool.getId() + "] (creating a volume from a snapshot on a different pool is not supported)");
         }
         String poolProtocol = details.get(OntapStorageConstants.PROTOCOL);
         if (poolProtocol == null || !poolProtocol.equalsIgnoreCase(snapProtocol)) {
@@ -1388,9 +1389,20 @@ public void takeSnapshot(SnapshotInfo snapshot, AsyncCompletionCallback<CreateCm
             // Persist snapshot_details so deleteAsync can resolve ONTAP FlexVol/snapshot UUIDs
             // (see deleteCloudStackVolumeSnapshot and StorageStrategy.deleteFlexVolSnapshotForCloudStackVolume).
             // Also store source volume min/max IOPS when configured for later create-volume-from-snapshot.
-            updateSnapshotDetails(snapshot.getId(), volumeInfo.getId(), flexVolUuid,
-                    ontapSnapshotUuid, snapshotName, volumePath, volumeVO.getPoolId(), protocol, lunUuid,
-                    volumeVO.getMinIops(), volumeVO.getMaxIops());
+            Map<String, String> snapshotDetails = new LinkedHashMap<>();
+            snapshotDetails.put(OntapStorageConstants.SRC_CS_VOLUME_ID, String.valueOf(volumeInfo.getId()));
+            snapshotDetails.put(OntapStorageConstants.BASE_ONTAP_FV_ID, flexVolUuid);
+            snapshotDetails.put(OntapStorageConstants.ONTAP_SNAP_ID, ontapSnapshotUuid);
+            snapshotDetails.put(OntapStorageConstants.ONTAP_SNAP_NAME, snapshotName);
+            snapshotDetails.put(OntapStorageConstants.VOLUME_PATH, volumePath);
+            snapshotDetails.put(OntapStorageConstants.PRIMARY_POOL_ID, String.valueOf(volumeVO.getPoolId()));
+            snapshotDetails.put(OntapStorageConstants.PROTOCOL, protocol);
+            // iSCSI only — needed for LUN restore / identity; null (skipped) for NFS.
+            snapshotDetails.put(OntapStorageConstants.LUN_DOT_UUID, lunUuid);
+            // TODO(CSTACKEX-306): on create-volume-from-snapshot, read these and apply to the new volume.
+            putPositiveIopsDetail(snapshotDetails, OntapStorageConstants.MIN_IOPS, volumeVO.getMinIops());
+            putPositiveIopsDetail(snapshotDetails, OntapStorageConstants.MAX_IOPS, volumeVO.getMaxIops());
+            updateSnapshotDetails(snapshot.getId(), snapshotDetails);
 
             CreateObjectAnswer createObjectAnswer = new CreateObjectAnswer(snapshotObjectTo);
             result = new CreateCmdResult(null, createObjectAnswer);
@@ -1789,57 +1801,34 @@ private Storage.ImageFormat getImageFormat(StoragePoolVO storagePool) {
      * <p>All rows go through {@link #persistSnapshotDetail} so DAO writes stay consistent;
      * optional fields (LUN uuid, IOPS) are skipped when unset.</p>
      *
-     * @param csSnapshotId      CloudStack snapshot ID
-     * @param csVolumeId        Source CloudStack volume ID
-     * @param flexVolUuid       ONTAP FlexVolume UUID
-     * @param ontapSnapshotUuid ONTAP FlexVolume snapshot UUID
-     * @param snapshotName      ONTAP snapshot name
-     * @param volumePath        Path of the volume file/LUN within the FlexVolume (for restore)
-     * @param storagePoolId     Primary storage pool ID
-     * @param protocol          Storage protocol (NFS3 or ISCSI)
-     * @param lunUuid           LUN UUID (only for iSCSI, null for NFS)
-     * @param minIops           Source volume min IOPS if configured; null/&lt;=0 skipped
-     * @param maxIops           Source volume max IOPS if configured; null/&lt;=0 skipped
+     * @param csSnapshotId CloudStack snapshot ID
+     * @param details      {@code snapshot_details} name to value, keyed by {@link OntapStorageConstants};
+     *                     entries with null or blank values are skipped
      */
-    private void updateSnapshotDetails(long csSnapshotId, long csVolumeId, String flexVolUuid,
-                                        String ontapSnapshotUuid, String snapshotName,
-                                        String volumePath, long storagePoolId, String protocol,
-                                        String lunUuid, Long minIops, Long maxIops) {
-        persistSnapshotDetail(csSnapshotId, OntapStorageConstants.SRC_CS_VOLUME_ID, String.valueOf(csVolumeId));
-        persistSnapshotDetail(csSnapshotId, OntapStorageConstants.BASE_ONTAP_FV_ID, flexVolUuid);
-        persistSnapshotDetail(csSnapshotId, OntapStorageConstants.ONTAP_SNAP_ID, ontapSnapshotUuid);
-        persistSnapshotDetail(csSnapshotId, OntapStorageConstants.ONTAP_SNAP_NAME, snapshotName);
-        persistSnapshotDetail(csSnapshotId, OntapStorageConstants.VOLUME_PATH, volumePath);
-        persistSnapshotDetail(csSnapshotId, OntapStorageConstants.PRIMARY_POOL_ID, String.valueOf(storagePoolId));
-        persistSnapshotDetail(csSnapshotId, OntapStorageConstants.PROTOCOL, protocol);
-        // iSCSI only — needed for LUN restore / identity; omitted for NFS.
-        persistSnapshotDetail(csSnapshotId, OntapStorageConstants.LUN_DOT_UUID, lunUuid);
-        // Optional: only when the source volume has IOPS configured (no-op otherwise).
-        // TODO(CSTACKEX-306): on create-volume-from-snapshot, read these and apply to the new volume.
-        persistSnapshotIopsDetail(csSnapshotId, OntapStorageConstants.MIN_IOPS, minIops);
-        persistSnapshotIopsDetail(csSnapshotId, OntapStorageConstants.MAX_IOPS, maxIops);
+    private void updateSnapshotDetails(long csSnapshotId, Map<String, String> details) {
+        for (Map.Entry<String, String> detail : details.entrySet()) {
+            persistSnapshotDetail(csSnapshotId, detail.getKey(), detail.getValue());
+        }
     }
 
     /**
-     * Persists one {@code snapshot_details} row. No-op when {@code value} is null or blank so
-     * optional keys (e.g. LUN uuid on NFS) share the same DAO path as required keys.
+     * Adds an IOPS entry to {@code details} only when {@code iops} is non-null and positive.
      */
-    private void persistSnapshotDetail(long csSnapshotId, String detailName, String value) {
-        if (value == null || value.isEmpty()) {
-            return;
+    private static void putPositiveIopsDetail(Map<String, String> details, String detailName, Long iops) {
+        if (iops != null && iops > 0) {
+            details.put(detailName, String.valueOf(iops));
         }
-        snapshotDetailsDao.persist(new SnapshotDetailsVO(csSnapshotId, detailName, value, false));
     }
 
     /**
-     * Persists a snapshot IOPS detail when {@code iops} is non-null and positive; otherwise no-op.
+     * Persists one {@code snapshot_details} row. No-op when {@code value} is null or blank so
+     * optional keys (e.g. LUN uuid on NFS) share the same DAO path as required keys.
      */
-    private void persistSnapshotIopsDetail(long csSnapshotId, String detailName, Long iops) {
-        if (iops == null || iops <= 0) {
+    private void persistSnapshotDetail(long csSnapshotId, String detailName, String value) {
+        if (value == null || value.isEmpty()) {
             return;
         }
-        persistSnapshotDetail(csSnapshotId, detailName, String.valueOf(iops));
-        logger.debug("updateSnapshotDetails: persisted {}={} for snapshot [{}]", detailName, iops, csSnapshotId);
+        snapshotDetailsDao.persist(new SnapshotDetailsVO(csSnapshotId, detailName, value, false));
     }
 
 }
@@ -833,8 +833,8 @@ abstract public CloudStackVolume createTemplateCache(StoragePoolVO storagePool,
     /**
      * Creates a new file/LUN in the same FlexVolume by cloning from a FlexVolume snapshot.
      *
-     * <p><b>Product scope (v1):</b> same primary pool / FlexVol only. Cross-pool restore is
-     * descoped — operators may later {@code migrateVolume} if another pool is required.</p>
+     * <p><b>Product scope (v1):</b> same primary pool / FlexVol only. Creating the volume on a
+     * different pool is descoped — operators may later {@code migrateVolume} if another pool is required.</p>
      *
      * <p>ONTAP backends (protocol-specific; each subclass builds its own request):</p>
      * <ul>
@@ -844,14 +844,14 @@ abstract public CloudStackVolume createTemplateCache(StoragePoolVO storagePool,
      * </ul>
      *
      * @param storagePool       target CloudStack primary pool (same FlexVol as the snapshot)
-     * @param details           pool details (SVM, FlexVol name/uuid, protocol, …)
+     * @param poolDetails       pool details (SVM, FlexVol name/uuid, protocol, …)
      * @param volumeInfo        destination CloudStack volume being created
      * @param sourceVolumePath  snapshotted object path from {@code snapshot_details.VOLUME_PATH}
      * @param snapshotName      ONTAP FlexVol snapshot name from {@code snapshot_details}
      * @return created CloudStackVolume with protocol-specific identity (LUN uuid or file path)
      */
     abstract public CloudStackVolume cloneCloudStackVolumeFromSnapshot(StoragePoolVO storagePool,
-                                                                        Map<String, String> details,
+                                                                        Map<String, String> poolDetails,
                                                                         VolumeInfo volumeInfo,
                                                                         String sourceVolumePath,
                                                                         String snapshotName);
 
@@ -158,7 +158,7 @@ public CloudStackVolume cloneCloudStackVolume(CloudStackVolume cloudstackVolume)
         String flexVolUuid = details.get(OntapStorageConstants.VOLUME_UUID);
         String flexVolName = details.get(OntapStorageConstants.VOLUME_NAME);
         if (flexVolUuid == null || flexVolUuid.isEmpty()) {
-            throw new CloudRuntimeException("Failed to clone file, FlexVolume uuid is missing from pool details");
+            throw new CloudRuntimeException("Failed to clone file, FlexVolume uuid is missing from pool poolDetails");
         }
         String sourcePath = cloudstackVolume.getFile().getPath();
         String destinationPath = cloudstackVolume.getDestinationPath();
@@ -206,10 +206,10 @@ public CloudStackVolume cloneCloudStackVolume(CloudStackVolume cloudstackVolume)
      * </ul>
      */
     @Override
-    public CloudStackVolume cloneCloudStackVolumeFromSnapshot(StoragePoolVO storagePool, Map<String, String> details,
+    public CloudStackVolume cloneCloudStackVolumeFromSnapshot(StoragePoolVO storagePool, Map<String, String> poolDetails,
                                                               VolumeInfo volumeInfo, String sourceVolumePath,
                                                               String snapshotName) {
-        if (storagePool == null || details == null || volumeInfo == null) {
+        if (storagePool == null || poolDetails == null || volumeInfo == null) {
             throw new CloudRuntimeException("Failed to clone file from snapshot, invalid request");
         }
         if (sourceVolumePath == null || sourceVolumePath.isEmpty()) {
@@ -219,10 +219,10 @@ public CloudStackVolume cloneCloudStackVolumeFromSnapshot(StoragePoolVO storageP
             throw new CloudRuntimeException("Failed to clone file from snapshot, snapshot name is required");
         }
 
-        String flexVolUuid = details.get(OntapStorageConstants.VOLUME_UUID);
-        String flexVolName = details.get(OntapStorageConstants.VOLUME_NAME);
+        String flexVolUuid = poolDetails.get(OntapStorageConstants.VOLUME_UUID);
+        String flexVolName = poolDetails.get(OntapStorageConstants.VOLUME_NAME);
         if (flexVolUuid == null || flexVolUuid.isEmpty()) {
-            throw new CloudRuntimeException("Failed to clone file from snapshot, FlexVolume uuid is missing from pool details");
+            throw new CloudRuntimeException("Failed to clone file from snapshot, FlexVolume uuid is missing from pool poolDetails");
         }
 
         String sourcePath = OntapStorageUtils.toFlexVolRelativePath(sourceVolumePath, flexVolName);
@@ -337,7 +337,7 @@ public AccessGroup createAccessGroup(AccessGroup accessGroup) {
             logger.info("createAccessGroup: ExportPolicy created: {}, now attaching this policy to storage pool volume", createdPolicy.getName());
             // attach export policy to volume of storage pool
             assignExportPolicyToVolume(volumeUUID,createdPolicy.getName());
-            // save the export policy details in storage pool details
+            // save the export policy poolDetails in storage pool poolDetails
             storagePoolDetailsDao.addDetail(accessGroup.getStoragePoolId(), OntapStorageConstants.EXPORT_POLICY_ID, String.valueOf(createdPolicy.getId()), true);
             storagePoolDetailsDao.addDetail(accessGroup.getStoragePoolId(), OntapStorageConstants.EXPORT_POLICY_NAME, createdPolicy.getName(), true);
             logger.info("Successfully assigned exportPolicy {} to volume {}", policyRequest.getName(), volumeName);
@@ -398,7 +398,7 @@ public AccessGroup updateAccessGroup(AccessGroup accessGroup) {
 
         Map<String, String> details = storagePoolDetailsDao.listDetailsKeyPairs(accessGroup.getStoragePoolId());
         if (details == null || details.isEmpty()) {
-            throw new CloudRuntimeException("No storage pool details found for storagePoolId: " + accessGroup.getStoragePoolId());
+            throw new CloudRuntimeException("No storage pool poolDetails found for storagePoolId: " + accessGroup.getStoragePoolId());
         }
         String exportPolicyId = details.get(OntapStorageConstants.EXPORT_POLICY_ID);
         if (exportPolicyId == null || exportPolicyId.isEmpty()) {