Maor Lipchuk has uploaded a new change for review. Change subject: core: Filter in Cinder disks to be used for snapshots ......................................................................
core: Filter in Cinder disks to be used for snapshots Change-Id: I7949ecb3ef9c5fef90ef300182718c4b4f05e967 Bug-Url: https://bugzilla.redhat.com/?????? Signed-off-by: Maor Lipchuk <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java 1 file changed, 11 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/74/40974/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java index e293231..f788931 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java @@ -43,6 +43,7 @@ import org.ovirt.engine.core.common.businessentities.Snapshot.SnapshotType; import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.VMStatus; +import org.ovirt.engine.core.common.businessentities.storage.CinderDisk; import org.ovirt.engine.core.common.businessentities.storage.Disk; import org.ovirt.engine.core.common.businessentities.storage.DiskImage; import org.ovirt.engine.core.common.errors.VdcBLLException; @@ -111,21 +112,28 @@ */ protected List<DiskImage> getDisksList() { if (cachedSelectedActiveDisks == null) { - List<DiskImage> imagesForVm = getDiskImagesForVm(); + List<DiskImage> imagesAndCinderForVm = getDiskImagesAndCinder(); // Get disks from the specified parameters or according to the VM if (getParameters().getDisks() == null) { - cachedSelectedActiveDisks = imagesForVm; + cachedSelectedActiveDisks = imagesAndCinderForVm; } else { // Get selected images from 'DiskImagesForVm' to ensure disks entities integrity // (i.e. only images' IDs are relevant). - cachedSelectedActiveDisks = ImagesHandler.imagesIntersection(imagesForVm, getParameters().getDisks()); + cachedSelectedActiveDisks = ImagesHandler.imagesIntersection(imagesAndCinderForVm, getParameters().getDisks()); } } return cachedSelectedActiveDisks; } + private List<DiskImage> getDiskImagesAndCinder() { + List<DiskImage> imagesForVm = getDiskImagesForVm(); + List<CinderDisk> cinderImages = ImagesHandler.filterDisksBasedOnCinder(DbFacade.getInstance().getDiskDao().getAllForVm(getVmId())); + imagesForVm.addAll(cinderImages); + return imagesForVm; + } + protected List<DiskImage> getDisksListForChecks() { List<DiskImage> disksListForChecks = getDisksList(); if (getParameters().getDiskIdsToIgnoreInChecks().isEmpty()) { -- To view, visit https://gerrit.ovirt.org/40974 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7949ecb3ef9c5fef90ef300182718c4b4f05e967 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Maor Lipchuk <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
