Tal Nisan has uploaded a new change for review. Change subject: core: Calculate disk alias on add disk prior to setting the job message ......................................................................
core: Calculate disk alias on add disk prior to setting the job message The disk alias to be created is calculated during the execution phase so if the user hasn't specified one, during the job creation the alias will not appear in the task description, the setting of the alias (whether it's default or the one the user supplied) is now done in the job message calculation phase Change-Id: Idee55da516bca986993e973dffc9058187e12a34 Signed-off-by: Tal Nisan <[email protected]> Bug-Url: https://bugzilla.redhat.com/1143967 --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java 1 file changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/68/35368/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java index 6c7dc35..89c54f3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java @@ -365,7 +365,6 @@ protected void executeVmCommand() { getParameters().getDiskInfo().setId(Guid.newGuid()); getParameters().setEntityInfo(new EntityInfo(VdcObjectType.Disk, getParameters().getDiskInfo().getId())); - ImagesHandler.setDiskAlias(getParameters().getDiskInfo(), getVm()); if (DiskStorageType.IMAGE == getParameters().getDiskInfo().getDiskStorageType()) { createDiskBasedOnImage(); } else { @@ -620,4 +619,13 @@ protected StorageDomainValidator createStorageDomainValidator() { return new StorageDomainValidator(getStorageDomain()); } + + @Override + public Map<String, String> getJobMessageProperties() { + if (jobProperties == null) { + ImagesHandler.setDiskAlias(getParameters().getDiskInfo(), getVm()); + jobProperties = super.getJobMessageProperties(); + } + return jobProperties; + } } -- To view, visit http://gerrit.ovirt.org/35368 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idee55da516bca986993e973dffc9058187e12a34 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Tal Nisan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
