fixed database update on snapshot with multiple volumes and an api change

Author: owsferraro

engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/ScaleIOVMSnapshotStrategy.java

@@ -40,6 +40,7 @@
 import org.apache.cloudstack.storage.datastore.util.ScaleIOUtil;
 import org.apache.cloudstack.storage.to.VolumeObjectTO;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.cloudstack.storage.datastore.api.Volume;
 
 import com.cloud.agent.api.VMSnapshotTO;
 import com.cloud.alert.AlertManager;
@@ -201,11 +202,44 @@ public VMSnapshot takeVMSnapshot(VMSnapshot vmSnapshot) {
                     List<VMSnapshotDetailsVO> vmSnapshotDetails = new ArrayList<VMSnapshotDetailsVO>();
                     vmSnapshotDetails.add(new VMSnapshotDetailsVO(vmSnapshot.getId(), "SnapshotGroupId", snapshotGroupId, false));
 
-                    for (int index = 0; index < volumeIds.size(); index++) {
+           /*         for (int index = 0; index < volumeIds.size(); index++) {
                         String volumeSnapshotName = srcVolumeDestSnapshotMap.get(ScaleIOUtil.getVolumePath(volumeTOs.get(index).getPath()));
                         String pathWithScaleIOVolumeName = ScaleIOUtil.updatedPathWithVolumeName(volumeIds.get(index), volumeSnapshotName);
                         vmSnapshotDetails.add(new VMSnapshotDetailsVO(vmSnapshot.getId(), "Vol_" + volumeTOs.get(index).getId() + "_Snapshot", pathWithScaleIOVolumeName, false));
                     }
+           */
+                 // Invert the srcVolumeDestSnapshotMap: snapshotName -> srcVolumePath
+                 // Invert the srcVolumeDestSnapshotMap: snapshotName -> srcVolumePath
+                    Map<String, String> snapshotNameToSrcPathMap = new HashMap<>();
+                    for (Map.Entry<String, String> entry : srcVolumeDestSnapshotMap.entrySet()) {
+                        snapshotNameToSrcPathMap.put(entry.getValue(), entry.getKey());
+                    }
+
+                    for (String snapshotVolumeId : volumeIds) {
+                        // Use getVolume() to fetch snapshot volume details and get its name
+                        Volume snapshotVolume = client.getVolume(snapshotVolumeId);
+                        if (snapshotVolume == null) {
+                            throw new CloudRuntimeException("Cannot find snapshot volume with id: " + snapshotVolumeId);
+                        }
+                        String snapshotName = snapshotVolume.getName();
+
+                        // Match back to source volume path
+                        String srcVolumePath = snapshotNameToSrcPathMap.get(snapshotName);
+                        if (srcVolumePath == null) {
+                            throw new CloudRuntimeException("Cannot match snapshot " + snapshotName + " to a source volume");
+                        }
+
+                        // Find the matching VolumeObjectTO by path
+                        VolumeObjectTO matchedVolume = volumeTOs.stream()
+                            .filter(v -> ScaleIOUtil.getVolumePath(v.getPath()).equals(srcVolumePath))
+                            .findFirst()
+                            .orElseThrow(() -> new CloudRuntimeException("Cannot find source volume for path: " + srcVolumePath));
+
+                        String pathWithScaleIOVolumeName = ScaleIOUtil.updatedPathWithVolumeName(snapshotVolumeId, snapshotName);
+                        vmSnapshotDetails.add(new VMSnapshotDetailsVO(vmSnapshot.getId(),
+                            "Vol_" + matchedVolume.getId() + "_Snapshot",
+                            pathWithScaleIOVolumeName, false));
+                    }
 
                     vmSnapshotDetailsDao.saveDetails(vmSnapshotDetails);
                 }