CSTACKEX-198: keeping ONTAP clone object name unique with pattern as <"Snapshot_base_name_from_CS"+"snapshot_id"+"CS-Volume_id">

Author: rajiv-jain-netapp

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/vmsnapshot/OntapVMSnapshotStrategy.java

@@ -389,7 +389,7 @@ public VMSnapshot takeVMSnapshot(VMSnapshot vmSnapshot) {
                     // Create one clone per CloudStack volume and persist detail for protocol-specific revert.
                     for (Long volumeId : groupInfo.volumeIds) {
                         String volumePath = resolveVolumePathOnOntap(volumeId, protocol, groupInfo.poolDetails);
-                        String cloneName = snapshotNameBase;
+                        String cloneName = buildPerVolumeCloneName(snapshotNameBase, vmSnapshot.getId(), volumeId);
                         String cloneUuid = cloneName;
                         if (ProtocolType.NFS3.name().equalsIgnoreCase(protocol)) {
                             org.apache.cloudstack.storage.feign.model.FileCloneRequest cloneRequest = new org.apache.cloudstack.storage.feign.model.FileCloneRequest();
@@ -725,6 +725,14 @@ String buildSnapshotName(VMSnapshot vmSnapshot) {
         return OntapStorageUtils.getOntapCloneName(vmSnapshot.getName());
     }
 
+    /**
+     * Builds a deterministic per-volume clone name for VM snapshot workflows.
+     * Keeps VM snapshot name as base while preventing collisions across ROOT/DATA volumes.
+     */
+    String buildPerVolumeCloneName(String snapshotNameBase, Long vmSnapshotId, Long volumeId) {
+        return OntapStorageUtils.getOntapCloneName(snapshotNameBase + "_s" + vmSnapshotId + "_v" + volumeId);
+    }
+
     String resolveLunUuid(StorageStrategy strategy, String authHeader, String svmName, String lunName) {
         OntapResponse<org.apache.cloudstack.storage.feign.model.Lun> response = strategy.getSanFeignClient()
                 .getLunResponse(authHeader, Map.of(OntapStorageConstants.SVM_DOT_NAME, svmName, OntapStorageConstants.NAME, lunName));