Allon Mureinik has submitted this change and it was merged. Change subject: core: ImportVm: disk alias with copyCollapse=false ...................................................................... core: ImportVm: disk alias with copyCollapse=false Added disk aliases in ImportVmCommand when copyCollapse=false. This patch contains the following: 1. The bug fix. 2. A test for the bug. 3. Some minor refactoring to extract blocks of ImportVmCommand DAO handling to methods, so they can be mocked out for the test mentioned in (2). Change-Id: I4f03699ece4d20f2d20beb791c3cb1518e39c4d1 Bug-Url: https://bugzilla.redhat.com/872506 Signed-off-by: Allon Mureinik <amureini@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmCommandTest.java 2 files changed, 69 insertions(+), 22 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Allon Mureinik: Verified -- To view, visit http://gerrit.ovirt.org/9631 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4f03699ece4d20f2d20beb791c3cb1518e39c4d1 Gerrit-PatchSet: 19 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini@redhat.com> Gerrit-Reviewer: Alissa Bonas <abonas@redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini@redhat.com> Gerrit-Reviewer: Ayal Baron <abaron@redhat.com> Gerrit-Reviewer: Daniel Erez <derez@redhat.com> Gerrit-Reviewer: Laszlo Hornyak <lhornyak@redhat.com> Gerrit-Reviewer: Liron Aravot <laravot@redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk@redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan@redhat.com> Gerrit-Reviewer: Vered Volansky <vvolansk@redhat.com>