From 48f7f10089418e02ec3660ed29fe276b6d2a2dd2 Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Fri, 22 Apr 2022 23:06:08 +0530 Subject: [PATCH] xen: Fix volume snapshot deletion when it has child snapshots (#6296) --- .../apache/cloudstack/storage/snapshot/SnapshotObject.java | 2 +- test/integration/smoke/test_list_ids_parameter.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotObject.java b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotObject.java index 5b463425a4f..2e45bee94b4 100644 --- a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotObject.java +++ b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotObject.java @@ -127,7 +127,7 @@ public class SnapshotObject implements SnapshotInfo { if (vo == null) { return null; } - return snapshotFactory.getSnapshot(vo.getId(), store); + return snapshotFactory.getSnapshot(vo.getSnapshotId(), store); } @Override diff --git a/test/integration/smoke/test_list_ids_parameter.py b/test/integration/smoke/test_list_ids_parameter.py index b0554f378f3..bc7bbbf7b02 100644 --- a/test/integration/smoke/test_list_ids_parameter.py +++ b/test/integration/smoke/test_list_ids_parameter.py @@ -192,9 +192,9 @@ class TestListIdsParams(cloudstackTestCase): ) cls._cleanup = [ - cls.snapshot_1, - cls.snapshot_2, cls.snapshot_3, + cls.snapshot_2, + cls.snapshot_1, cls.account, cls.disk_offering, cls.service_offering