Allon Mureinik has posted comments on this change. Change subject: core: Fix error message for locked disks ......................................................................
Patch Set 9: (5 inline comments) .................................................... File backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommandTest.java Line 166: mockGetVmsListForDisk(); Line 167: } Line 168: Line 169: private void mockGetAllForImage() { Line 170: Map<Boolean, VmTemplate> map = Collections.singletonMap(true, new VmTemplate()); I'd inline this, but it's a matter of taste, IMHO Line 171: doReturn(map).when(vmTemplateDao).getAllForImage(any(Guid.class)); Line 172: } Line 173: Line 174: private void mockGetVmsListForDisk() { .................................................... File backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties Line 124: VM_NOT_FOUND=VM not found Line 125: ACTION_TYPE_FAILED_MISSED_STORAGES_FOR_SOME_DISKS=Cannot ${action} ${type}. Provided destination storage domains don't match for provided disks. Line 126: ACTION_TYPE_FAILED_STOARGE_DOMAIN_IS_WRONG=Cannot ${action} ${type}. Provided wrong storage domain, which is not related to disk. Line 127: ACTION_TYPE_FAILED_VM_IN_PREVIEW=Cannot ${action} ${type}. VM is previewing a Snapshot. Line 128: ACTION_TYPE_FAILED_DISKS_LOCKED=Cannot ${action} ${type}: The following disks: ${diskAliases} are locked. Please try again in a few minutes. I'd rephrase this as "The following disks are locked:: ${diskAliases}. Please try again in a few minutes." Line 129: ACTION_TYPE_FAILED_VM_IS_LOCKED=Cannot ${action} ${type}: VM is locked. Please try again in a few minutes. Line 130: ACTION_TYPE_FAILED_VM_DURING_EXPORT=Cannot ${action} ${type}: VM is being exported now. Please try again in a few minutes. Line 131: ACTION_TYPE_FAILED_VM_IMAGE_IS_ILLEGAL=Cannot ${action} ${type}. VM's Image might be corrupted. Line 132: ACTION_TYPE_FAILED_VM_HAS_NO_DISKS=Cannot ${action} ${type}. VM has no disks. .................................................... File frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java Line 309: Line 310: @DefaultStringValue("Cannot ${action} ${type}. VM is previewing a Snapshot.") Line 311: String ACTION_TYPE_FAILED_VM_IN_PREVIEW(); Line 312: Line 313: @DefaultStringValue("Cannot ${action} ${type}: The following disks: ${diskAliases} are locked. Please try again in a few minutes.") I'd rephrase this as "The following disks are locked:: ${diskAliases}. Please try again in a few minutes." Line 314: String ACTION_TYPE_FAILED_DISKS_LOCKED(); Line 315: Line 316: @DefaultStringValue("Cannot ${action} ${type}: VM is locked. Please try again in a few minutes.") Line 317: String ACTION_TYPE_FAILED_VM_IS_LOCKED(); .................................................... File frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties Line 122: DIRECTORY_GROUP_CANNOT_REMOVE_DIRECTORY_GROUP_ATTACHED_TO_VM=Cannot remove Directory Group. Detach Directory Group from VM first. Line 123: DIRECTORY_COMPUTER_WITH_THE_SAME_NAME_ALREADY_EXITS=A Computer with the same name already exists. Line 124: VM_NOT_FOUND=VM not found Line 125: ACTION_TYPE_FAILED_VM_IN_PREVIEW=Cannot ${action} ${type}. VM is previewing a Snapshot. Line 126: ACTION_TYPE_FAILED_DISKS_LOCKED=Cannot ${action} ${type}: The following disks: ${diskAliases} are locked. Please try again in a few minutes. I'd rephrase this as "The following disks are locked:: ${diskAliases}. Please try again in a few minutes." Line 127: ACTION_TYPE_FAILED_VM_IS_LOCKED=Cannot ${action} ${type}: VM is locked. Please try again in a few minutes. Line 128: ACTION_TYPE_FAILED_VM_DURING_EXPORT=Cannot ${action} ${type}: VM is being exported now. Please try again in a few minutes. Line 129: ACTION_TYPE_FAILED_VM_IMAGE_IS_ILLEGAL=Cannot ${action} ${type}. VM's Image might be corrupted. Line 130: ACTION_TYPE_FAILED_VM_HAS_NO_DISKS=Cannot ${action} ${type}. VM has no disks. .................................................... File frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties Line 121: DIRECTORY_GROUP_CANNOT_REMOVE_DIRECTORY_GROUP_ATTACHED_TO_VM=Cannot remove Directory Group. Detach Directory Group from VM first. Line 122: DIRECTORY_COMPUTER_WITH_THE_SAME_NAME_ALREADY_EXITS=A Computer with the same name already exists. Line 123: VM_NOT_FOUND=VM not found Line 124: ACTION_TYPE_FAILED_VM_IN_PREVIEW=Cannot ${action} ${type}. VM is previewing a Snapshot. Line 125: ACTION_TYPE_FAILED_DISKS_LOCKED=Cannot ${action} ${type}: The following disks: ${diskAliases} are locked. Please try again in a few minutes. I'd rephrase this as "The following disks are locked:: ${diskAliases}. Please try again in a few minutes." Line 126: ACTION_TYPE_FAILED_VM_IS_LOCKED=Cannot ${action} ${type}: VM is locked. Please try again in a few minutes. Line 127: ACTION_TYPE_FAILED_VM_DURING_EXPORT=Cannot ${action} ${type}: VM is being exported now. Please try again in a few minutes. Line 128: ACTION_TYPE_FAILED_VM_IMAGE_IS_ILLEGAL=Cannot ${action} ${type}. VM's Image might be corrupted. Line 129: ACTION_TYPE_FAILED_VM_HAS_NO_DISKS=Cannot ${action} ${type}. VM has no disks. -- To view, visit http://gerrit.ovirt.org/8693 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7c56d9d2926eaf34b4a279c8d61a8cb166524da9 Gerrit-PatchSet: 9 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Vered Volansky <vvola...@redhat.com> Gerrit-Reviewer: Allon Mureinik <amure...@redhat.com> Gerrit-Reviewer: Liron Aravot <lara...@redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipc...@redhat.com> Gerrit-Reviewer: Michael Kublin <mkub...@redhat.com> Gerrit-Reviewer: Omer Frenkel <ofren...@redhat.com> Gerrit-Reviewer: Vered Volansky <vvola...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches