CSTACKEX-18_2: fixes for vm snapshot workflow

Author: rajiv-jain-netapp

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

@@ -190,6 +190,34 @@ private boolean allVolumesOnOntapManagedStorage(long vmId) {
         return true;
     }
 
+    // ──────────────────────────────────────────────────────────────────────────
+    // Per-Volume Snapshot (quiesce override)
+    // ──────────────────────────────────────────────────────────────────────────
+
+    /**
+     * Creates a per-volume disk snapshot as part of a VM snapshot operation.
+     *
+     * <p>Overrides the parent to ensure {@code quiescevm} is always {@code false}
+     * in the per-volume snapshot payload. ONTAP handles quiescing at the VM level
+     * via QEMU guest agent freeze/thaw in {@link #takeVMSnapshot}, so the
+     * individual volume snapshot must not request quiescing again. Without this
+     * override, {@link org.apache.cloudstack.storage.snapshot.DefaultSnapshotStrategy#takeSnapshot}
+     * would reject the request with "can't handle quiescevm equal true for volume snapshot"
+     * when the user selects the quiesce option in the UI.</p>
+     */
+    @Override
+    protected SnapshotInfo createDiskSnapshot(VMSnapshot vmSnapshot, List<SnapshotInfo> forRollback, VolumeInfo vol) {
+        // Temporarily override the quiesce option to false for the per-volume snapshot
+        VMSnapshotVO vmSnapshotVO = (VMSnapshotVO) vmSnapshot;
+        VMSnapshotOptions originalOptions = vmSnapshotVO.getOptions();
+        try {
+            vmSnapshotVO.setOptions(new VMSnapshotOptions(false));
+            return super.createDiskSnapshot(vmSnapshot, forRollback, vol);
+        } finally {
+            vmSnapshotVO.setOptions(originalOptions);
+        }
+    }
+
     // ──────────────────────────────────────────────────────────────────────────
     // Take VM Snapshot
     // ──────────────────────────────────────────────────────────────────────────

plugins/storage/volume/ontap/src/test/java/org/apache/cloudstack/storage/vmsnapshot/OntapVMSnapshotStrategyTest.java

@@ -713,6 +713,39 @@ void testTakeVMSnapshot_QuiesceOverriddenToTrue() throws Exception {
         verify(agentMgr, times(2)).send(eq(HOST_ID), any(FreezeThawVMCommand.class));
     }
 
+    @Test
+    void testTakeVMSnapshot_WithQuiesceTrue_SucceedsWithoutPayloadRejection() throws Exception {
+        VMSnapshotVO vmSnapshot = createTakeSnapshotVmSnapshot();
+        // Explicitly set quiesce to TRUE — this is the scenario that was failing
+        VMSnapshotOptions options = new VMSnapshotOptions(true);
+        when(vmSnapshot.getOptions()).thenReturn(options);
+
+        setupTakeSnapshotCommon(vmSnapshot);
+        setupSingleVolumeForTakeSnapshot();
+
+        FreezeThawVMAnswer freezeAnswer = mock(FreezeThawVMAnswer.class);
+        when(freezeAnswer.getResult()).thenReturn(true);
+        FreezeThawVMAnswer thawAnswer = mock(FreezeThawVMAnswer.class);
+        when(thawAnswer.getResult()).thenReturn(true);
+        when(agentMgr.send(eq(HOST_ID), any(FreezeThawVMCommand.class)))
+                .thenReturn(freezeAnswer)
+                .thenReturn(thawAnswer);
+
+        SnapshotInfo snapshotInfo = mock(SnapshotInfo.class);
+        doReturn(snapshotInfo).when(strategy).createDiskSnapshot(any(), any(), any());
+        doNothing().when(strategy).processAnswer(any(), any(), any(), any());
+        doNothing().when(strategy).publishUsageEvent(any(String.class), any(VMSnapshot.class), any(), any(VolumeObjectTO.class));
+        doNothing().when(strategy).publishUsageEvent(any(String.class), any(VMSnapshot.class), any(), anyLong(), anyLong());
+
+        VMSnapshot result = strategy.takeVMSnapshot(vmSnapshot);
+
+        // Snapshot should succeed with quiesce=true because ONTAP overrides quiesce
+        // to false in the per-volume createDiskSnapshot payload (freeze/thaw is at VM level)
+        assertNotNull(result);
+        verify(agentMgr, times(2)).send(eq(HOST_ID), any(FreezeThawVMCommand.class));
+        verify(strategy).createDiskSnapshot(any(), any(), any());
+    }
+
     // ══════════════════════════════════════════════════════════════════════════
     // Tests: Parent snapshot chain
     // ══════════════════════════════════════════════════════════════════════════