- Engine-commits - oVirt List Archives

Change in ovirt-engine[master]: core: Networking LinqUtils
by amureini＠redhat.com 08 Dec '15

08 Dec '15

Allon Mureinik has submitted this change and it was merged. Change subject: core: Networking LinqUtils ...................................................................... core: Networking LinqUtils Replace the old-fashioned LinqUtils usage in the org.ovirt.engine.core.bll.network.* packages and related classes with the modern, built-in streaming API introduced in Java 8. Change-Id: I86693118f1004a9b9c827dd52cc50d428621857a Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/HostSetupNetworksParametersBuilder.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/ManageLabeledNetworksParametersBuilderImpl.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkConfigurator.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/DefaultManagementNetworkFinderImpl.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/ManageNetworkClustersCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/ManagementNetworkUtilImpl.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterValidatorBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/PropagateLabeledNetworksToClusterHostsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/function/NetworkClusterParameterTransformer.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/function/NetworkClusterToAttachNetworkToVdsGroupParameterTransformer.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/predicate/ManagementNetworkAppointmentPredicate.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/GetManagementNetworkCandidatesQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/predicate/ManagementNetworkCandidatePredicate.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AddBondCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AddNetworkAttachmentCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/DetachNetworkFromVdsInterfaceCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetAllSiblingVlanInterfacesQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVdsFreeBondsByVdsIdQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/GetVdsInterfacesByVdsIdQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/NetworkDeviceHelperImpl.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/NetworkMtuValidator.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/RemoveBondCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SyncAllHostNetworksCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UpdateNetworkToVdsInterfaceCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/VfSchedulerImpl.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/predicate/ExternalNetworkPredicate.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/predicate/NetworkNotInSyncPredicate.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/UpdateVmTemplateInterfaceCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/network/DetachNetworkUsedByVmValidator.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/cluster/DefaultManagementNetworkFinderImplTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/dc/GetManagementNetworkCandidatesQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/dc/predicate/ManagementNetworkCandidatePredicateTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/NetworkDeviceHelperImplTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/predicate/ExternalNetworkPredicateTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/predicate/NetworkNotInSyncPredicateTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/network/DetachNetworkUsedByVmValidatorTest.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/network/predicate/InterfaceByAddressPredicate.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/network/predicate/InterfaceByNetworkNamePredicate.java A backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/DummyPredicate.java M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/network/predicate/AbstractVdsNetworkInterfacePredicateTest.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java 44 files changed, 236 insertions(+), 430 deletions(-) Approvals: Allon Mureinik: Verified; Looks good to me, approved; Passed CI tests -- To view, visit https://gerrit.ovirt.org/49230 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I86693118f1004a9b9c827dd52cc50d428621857a Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Alona Kaplan <alkaplan(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com> Gerrit-Reviewer: Yevgeny Zaspitsky <yzaspits(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[ovirt-engine-3.6]: restapi: Document the use of All-Content in /clusters
by tnisan＠redhat.com 08 Dec '15

08 Dec '15

Tal Nisan has submitted this change and it was merged. Change subject: restapi: Document the use of All-Content in /clusters ...................................................................... restapi: Document the use of All-Content in /clusters The "/clusters" resource uses the "All-Content" header to decide if additional information should be displayed for each cluster. In particular it uses it to decide if the "management_network" property should be displayed. But the header isn't documented in the RSDL metadata. As a result it isn't available in the SDKs or in the CLI. This patch documents it. Change-Id: I5cdf734ac9640a202006d46791a57d1d8ddc97c4 Bug-Url: https://bugzilla.redhat.com/1287688 Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com> (cherry picked from commit f0091b8a246022b5f699268b83bcd41fb521c868) --- M backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Juan Hernandez: Verified Alona Kaplan: Looks good to me, but someone else must approve Jenkins CI: Passed CI tests Yevgeny Zaspitsky: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/49634 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5cdf734ac9640a202006d46791a57d1d8ddc97c4 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.6 Gerrit-Owner: Juan Hernandez <juan.hernandez(a)redhat.com> Gerrit-Reviewer: Alona Kaplan <alkaplan(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: Yevgeny Zaspitsky <yzaspits(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[ovirt-engine-3.6]: core: cleanup RestoreFromSnapshotParameters from Cinder.
by tnisan＠redhat.com 08 Dec '15

08 Dec '15

Tal Nisan has submitted this change and it was merged. Change subject: core: cleanup RestoreFromSnapshotParameters from Cinder. ...................................................................... core: cleanup RestoreFromSnapshotParameters from Cinder. remove redundant Cinder references from RestoreFromSnapshotParameters class Change-Id: I1f8baa432299bed62923d642d6375821d106a71a Bug-Url: https://bugzilla.redhat.com/1256049 Signed-off-by: Maor Lipchuk <mlipchuk(a)redhat.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RestoreFromSnapshotParameters.java 1 file changed, 0 insertions(+), 19 deletions(-) Approvals: Tal Nisan: Passed CI tests Daniel Erez: Looks good to me, approved Maor Lipchuk: Verified -- To view, visit https://gerrit.ovirt.org/50070 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1f8baa432299bed62923d642d6375821d106a71a Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.6 Gerrit-Owner: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[ovirt-engine-3.6]: core: Remove redundant Cinder volumes for commited snapshot.
by tnisan＠redhat.com 08 Dec '15

08 Dec '15

Tal Nisan has submitted this change and it was merged. Change subject: core: Remove redundant Cinder volumes for commited snapshot. ...................................................................... core: Remove redundant Cinder volumes for commited snapshot. Once we commit a snapshot, there could be orphaned Cinder disks from the previous active snapshot that should get deleted. The engine should remove those leftovers in the end command phase. Change-Id: I1c071abc747367b21a97488c8298ebaa883ecc87 Bug-Url: https://bugzilla.redhat.com/1256049 Signed-off-by: Maor Lipchuk <mlipchuk(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RestoreAllCinderSnapshotsCommand.java 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: Tal Nisan: Passed CI tests Daniel Erez: Looks good to me, approved Maor Lipchuk: Verified -- To view, visit https://gerrit.ovirt.org/50069 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1c071abc747367b21a97488c8298ebaa883ecc87 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.6 Gerrit-Owner: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[ovirt-engine-3.6]: core: Re-factor restore snapshot for Cinder disks.
by tnisan＠redhat.com 08 Dec '15

08 Dec '15

Tal Nisan has submitted this change and it was merged. Change subject: core: Re-factor restore snapshot for Cinder disks. ...................................................................... core: Re-factor restore snapshot for Cinder disks. Make RestoreAllCinderSnapshotsCommand to remove also redundant disks/volumes. Change the command accordingly to accept different types of lists, so the process of restore will be alligned with the process we do for images. Change-Id: Ic41c6ec6473e3454430b474c152eb3a75bd843c1 Bug-Url: https://bugzilla.redhat.com/1256048 Bug-Url: https://bugzilla.redhat.com/1256049 Signed-off-by: Maor Lipchuk <mlipchuk(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RestoreAllCinderSnapshotsCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RestoreAllCinderSnapshotsParameters.java 3 files changed, 131 insertions(+), 53 deletions(-) Approvals: Tal Nisan: Passed CI tests Daniel Erez: Looks good to me, approved Maor Lipchuk: Verified -- To view, visit https://gerrit.ovirt.org/50068 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic41c6ec6473e3454430b474c152eb3a75bd843c1 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.6 Gerrit-Owner: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[ovirt-engine-3.6]: core: RestoreCinderSnapshot should delete volumes by order.
by tnisan＠redhat.com 08 Dec '15

08 Dec '15

Tal Nisan has submitted this change and it was merged. Change subject: core: RestoreCinderSnapshot should delete volumes by order. ...................................................................... core: RestoreCinderSnapshot should delete volumes by order. Re-implement restore Cinder snapshot to delete a Cinder volume and all its descendants from the DB by calling RemoveCinderDiskVolume for each volume by order. The order is important for since Cinder can only remove volume after all its snapshots get deleted first. Change-Id: Ife6ac08ca86a4cb2b30174e3de6422d9db5cbb65 Bug-Url: https://bugzilla.redhat.com/1256048 Bug-Url: https://bugzilla.redhat.com/1256049 Signed-off-by: Maor Lipchuk <mlipchuk(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RestoreFromCinderSnapshotCommand.java D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RestoreFromCinderSnapshotCommandCallback.java 2 files changed, 41 insertions(+), 214 deletions(-) Approvals: Tal Nisan: Passed CI tests Daniel Erez: Looks good to me, approved Maor Lipchuk: Verified -- To view, visit https://gerrit.ovirt.org/50067 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ife6ac08ca86a4cb2b30174e3de6422d9db5cbb65 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.6 Gerrit-Owner: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[ovirt-engine-3.6]: core: before unlock a VM, fetch it from the DB
by tnisan＠redhat.com 08 Dec '15

08 Dec '15

Tal Nisan has submitted this change and it was merged. Change subject: core: before unlock a VM, fetch it from the DB ...................................................................... core: before unlock a VM, fetch it from the DB The VM which is used to be unlocked is the VM from the meory, so the VM might be with DOWN status although it was locked on the proccess. Since CoCo handle the class in the memory (unlike the Async Task functionality), after commiting/undo a previewed Cinder snapshot, the VM from the memory is being unlocked but since the status of the memory of the VM is DOWN, the engine doesn't unlock it. The proposed fix is to make the VM property to be null in order to refresh the VM status from db. Bug-Url: https://bugzilla.redhat.com/1256048 Bug-Url: https://bugzilla.redhat.com/1256049 Change-Id: I7edd4e8b23277c57939bd5e965eb4da29e3600d3 Signed-off-by: Maor Lipchuk <mlipchuk(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Tal Nisan: Passed CI tests Daniel Erez: Looks good to me, approved Maor Lipchuk: Verified -- To view, visit https://gerrit.ovirt.org/50066 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7edd4e8b23277c57939bd5e965eb4da29e3600d3 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.6 Gerrit-Owner: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[ovirt-engine-3.6]: core: Rename parameter cinderDisks to cinderDisksToRestore.
by tnisan＠redhat.com 08 Dec '15

08 Dec '15

Tal Nisan has submitted this change and it was merged. Change subject: core: Rename parameter cinderDisks to cinderDisksToRestore. ...................................................................... core: Rename parameter cinderDisks to cinderDisksToRestore. Change-Id: I7a1cf1261f867c517c6d87e1b3ed01629d60e335 Bug-Url: https://bugzilla.redhat.com/1256048 Bug-Url: https://bugzilla.redhat.com/1256049 Signed-off-by: Maor Lipchuk <mlipchuk(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Tal Nisan: Passed CI tests Daniel Erez: Looks good to me, approved Maor Lipchuk: Verified -- To view, visit https://gerrit.ovirt.org/50065 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7a1cf1261f867c517c6d87e1b3ed01629d60e335 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.6 Gerrit-Owner: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[ovirt-engine-3.6]: core: Handle Cinder imaged once snapshot gets commited/undo.
by tnisan＠redhat.com 08 Dec '15

08 Dec '15

Tal Nisan has submitted this change and it was merged. Change subject: core: Handle Cinder imaged once snapshot gets commited/undo. ...................................................................... core: Handle Cinder imaged once snapshot gets commited/undo. Set the Cinder images to restore once a snapshot gets commited. Change-Id: I64170f1d82c0bd1ba973078eb11f5752ebd31036 Bug-Url: https://bugzilla.redhat.com/1256049 Signed-off-by: Maor Lipchuk <mlipchuk(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java 1 file changed, 30 insertions(+), 3 deletions(-) Approvals: Tal Nisan: Passed CI tests Daniel Erez: Looks good to me, approved Maor Lipchuk: Verified -- To view, visit https://gerrit.ovirt.org/50064 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I64170f1d82c0bd1ba973078eb11f5752ebd31036 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.6 Gerrit-Owner: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[ovirt-engine-3.6]: core: Get previewed snapshot's images by the snapshot's OVF.
by tnisan＠redhat.com 08 Dec '15

08 Dec '15

Tal Nisan has submitted this change and it was merged. Change subject: core: Get previewed snapshot's images by the snapshot's OVF. ...................................................................... core: Get previewed snapshot's images by the snapshot's OVF. We should get images from previewed snapshot configuration, instead fetching them from the DB. The reason for that is to overcome a scenrio when a VM contains several disks, gets previewed from a snapshot which only have part of those disks (Several disks were created after the snapshot was created). The preview operation, for the disks created after this snapshot, is to remove their data from the base_disks table and only leave their data in the images table. The problem appears once the user undo/commit the previewed snapshot. The functionality is adding the data to the base_disks and always assume it is an image disk. The proposed solution is to use the VM configuration when fetching the disks to restore once a previewed VM gets undo/commited so the engine can determined which type of disks we are restoring after an undo operation. Change-Id: I421e95e3dd0023927f07db697dcb86b2593be848 Bug-Url: https://bugzilla.redhat.com/1256048 Bug-Url: https://bugzilla.redhat.com/1256049 Signed-off-by: Maor Lipchuk <mlipchuk(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java 1 file changed, 21 insertions(+), 12 deletions(-) Approvals: Tal Nisan: Passed CI tests Daniel Erez: Looks good to me, approved Maor Lipchuk: Verified -- To view, visit https://gerrit.ovirt.org/50063 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I421e95e3dd0023927f07db697dcb86b2593be848 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.6 Gerrit-Owner: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0