From a83f7b53449a91c7782d0ed56ee1c0cbfbc97869 Mon Sep 17 00:00:00 2001 From: anthony Date: Wed, 9 Feb 2011 13:57:00 -0800 Subject: [PATCH] list recurring snapshot if volumeId and interval are specified --- .../src/com/cloud/storage/snapshot/SnapshotManagerImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java index def38f2ed65..11b33603f11 100755 --- a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java +++ b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java @@ -840,6 +840,7 @@ public class SnapshotManagerImpl implements SnapshotManager, SnapshotService, Ma Object id = cmd.getId(); Object keyword = cmd.getKeyword(); Object snapshotTypeStr = cmd.getSnapshotType(); + Object intervalTypeStr = cmd.getIntervalType(); Filter searchFilter = new Filter(SnapshotVO.class, "created", false, cmd.getStartIndex(), cmd.getPageSizeVal()); SearchBuilder sb = _snapshotDao.createSearchBuilder(); @@ -906,10 +907,12 @@ public class SnapshotManagerImpl implements SnapshotManager, SnapshotService, Ma throw new InvalidParameterValueException("Unsupported snapshot type " + snapshotTypeStr); } sc.setParameters("snapshotTypeEQ", snapshotType.ordinal()); + } else if (intervalTypeStr != null && volumeId != null) { + sc.setParameters("snapshotTypeEQ", Snapshot.Type.RECURRING.ordinal()); } else { // Show only MANUAL and RECURRING snapshot types sc.setParameters("snapshotTypeNEQ", Snapshot.Type.TEMPLATE.ordinal()); - } + } return _snapshotDao.search(sc, searchFilter); }