Maor Lipchuk has submitted this change and it was merged. Change subject: core: avoid pk violation during import vm ...................................................................... core: avoid pk violation during import vm When importing a vm (not as a new entity) while having a disk with the same id, pk violation occurs - this patch adds a validation to prevent it from happening. Bug-Url: https://bugzilla.redhat.com/902040 related to Bug-Url: https://bugzilla.redhat.com/890922 Change-Id: I84afa8167357b96ce47bc1340a64561a6d232b2d Signed-off-by: Liron Aravot <laravot@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 M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties 7 files changed, 70 insertions(+), 0 deletions(-) Approvals: Maor Lipchuk: Looks good to me, approved Liron Aravot: Verified -- To view, visit http://gerrit.ovirt.org/11332 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I84afa8167357b96ce47bc1340a64561a6d232b2d Gerrit-PatchSet: 8 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Liron Aravot <laravot@redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini@redhat.com> Gerrit-Reviewer: Liron Aravot <laravot@redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk@redhat.com>