Roy Golan has submitted this change and it was merged. Change subject: core: Refactor InternalMigrateVmCommand#canMigrateVm ...................................................................... core: Refactor InternalMigrateVmCommand#canMigrateVm Change InternalMigrateVmCommand#canMigrateVm method such that: 1. The check whether the vm is migratable is being done before calling super.canMigrateVm. That way, the checks in MigrateVmCommand#canMigrateVm won't be made if the vm is not migratable, as they are irrelevant in that case. 2. Add a proper error in case InternalMigrateVmCommand fails because the VM is not migratable. Change-Id: Ida10d53ccd5321d3ccc510bd2111fa013dcdcdbe Signed-off-by: Arik Hadas <ahadas@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InternalMigrateVmCommand.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 6 files changed, 19 insertions(+), 10 deletions(-) Approvals: Roy Golan: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/10107 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ida10d53ccd5321d3ccc510bd2111fa013dcdcdbe Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <ahadas@redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini@redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas@redhat.com> Gerrit-Reviewer: Omer Frenkel <ofrenkel@redhat.com> Gerrit-Reviewer: Roy Golan <rgolan@redhat.com>