Eldan Shachar has uploaded a new change for review. Change subject: core: Fix ISO file support to be case insensitive ......................................................................
core: Fix ISO file support to be case insensitive This patch fixes a bug where an ISO file with an upper-case file extension was not accepted as a valid ISO. Change-Id: Iec8df04bacb81db6c872c7920610abdbe1471da4 Bug-Url: https://bugzilla.redhat.com/1154391 Signed-off-by: Eldan Shachar <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeDiskCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/38/35038/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeDiskCommand.java index dd5f046..f04b7f6 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeDiskCommand.java @@ -53,7 +53,7 @@ return failCanDoAction(VdcBllMessages.VM_CANNOT_WITHOUT_ACTIVE_STORAGE_DOMAIN_ISO); } - if (StringUtils.isNotEmpty(cdImagePath) && !cdImagePath.endsWith(ValidationUtils.ISO_SUFFIX)) { + if (StringUtils.isNotEmpty(cdImagePath) && !cdImagePath.toLowerCase().endsWith(ValidationUtils.ISO_SUFFIX)) { return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_INVALID_CDROM_DISK_FORMAT); } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java index ecdf995..d5be8a3 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java @@ -156,7 +156,7 @@ @CopyOnNewVersion @EditableField - @Pattern(regexp = ValidationUtils.ISO_SUFFIX_PATTERN, message = "ACTION_TYPE_FAILED_INVALID_CDROM_DISK_FORMAT") + @Pattern(regexp = ValidationUtils.ISO_SUFFIX_PATTERN, flags = {Pattern.Flag.CASE_INSENSITIVE}, message = "ACTION_TYPE_FAILED_INVALID_CDROM_DISK_FORMAT") @Size(max = BusinessEntitiesDefinitions.GENERAL_MAX_SIZE) private String isoPath; -- To view, visit http://gerrit.ovirt.org/35038 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iec8df04bacb81db6c872c7920610abdbe1471da4 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Eldan Shachar <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
