Maor Lipchuk has uploaded a new change for review. Change subject: core: Set disk alias and description on register disk ......................................................................
core: Set disk alias and description on register disk Setting the disk alias name and description from the disk's meta data, once it is being registered again. Change-Id: If65018fef71fa126173ab516a89e8bd158b06f7e Bug-Url: https://bugzilla.redhat.com/1047623 Signed-off-by: Maor Lipchuk <mlipc...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetUnregisteredDiskQuery.java 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/92/36392/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetUnregisteredDiskQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetUnregisteredDiskQuery.java index a2404555..18e80aff 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetUnregisteredDiskQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetUnregisteredDiskQuery.java @@ -1,7 +1,10 @@ package org.ovirt.engine.core.bll; +import java.io.IOException; import java.util.List; +import java.util.Map; +import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.bll.context.EngineContext; import org.ovirt.engine.core.common.businessentities.DiskImage; import org.ovirt.engine.core.common.businessentities.DiskInterface; @@ -12,6 +15,7 @@ import org.ovirt.engine.core.common.vdscommands.VDSCommandType; import org.ovirt.engine.core.common.vdscommands.VDSReturnValue; import org.ovirt.engine.core.compat.Guid; +import org.ovirt.engine.core.utils.JsonHelper; public class GetUnregisteredDiskQuery<P extends GetUnregisteredDiskQueryParameters> extends QueriesCommandBase<P> { @@ -70,6 +74,16 @@ } DiskImage newDiskImage = (DiskImage) imageInfoReturn.getReturnValue(); + if (StringUtils.isNotEmpty(newDiskImage.getDescription())) { + try { + Map<String, Object> diskDescriptionMap = JsonHelper.jsonToMap(newDiskImage.getDescription()); + newDiskImage.setDiskAlias((String) diskDescriptionMap.get(ImagesHandler.DISK_ALIAS)); + newDiskImage.setDiskDescription((String) diskDescriptionMap.get(ImagesHandler.DISK_DESCRIPTION)); + } catch (IOException e) { + log.warn("Exception while parsing JSON for disk. Exception: '{}'", e); + } + } + // The disk image won't have an interface set on it. Set it to IDE by default. When the // disk is attached to a VM, its interface can be changed to the appropriate value for that VM. newDiskImage.setDiskInterface(DiskInterface.IDE); -- To view, visit http://gerrit.ovirt.org/36392 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If65018fef71fa126173ab516a89e8bd158b06f7e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Maor Lipchuk <mlipc...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
