You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by nv...@apache.org on 2022/04/22 17:36:15 UTC
[cloudstack] branch main updated: xen: Fix volume snapshot deletion when it has child snapshots (#6296)
This is an automated email from the ASF dual-hosted git repository.
nvazquez pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/main by this push:
new 48f7f10089 xen: Fix volume snapshot deletion when it has child snapshots (#6296)
48f7f10089 is described below
commit 48f7f10089418e02ec3660ed29fe276b6d2a2dd2
Author: Pearl Dsilva <pe...@gmail.com>
AuthorDate: Fri Apr 22 23:06:08 2022 +0530
xen: Fix volume snapshot deletion when it has child snapshots (#6296)
---
.../java/org/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 5b463425a4..2e45bee94b 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 b0554f378f..bc7bbbf7b0 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