Maor Lipchuk has uploaded a new change for review. Change subject: core: Refactor of getJsonDiskDescription ......................................................................
core: Refactor of getJsonDiskDescription Move getJsonDiskDescription method to StorageHandlingCommandBase to be used for all storage related operations. Change-Id: I89b36811ecb6079d83f81de63fd2a551ff409f13 Bug-Url: https://bugzilla.redhat.com/?????? Signed-off-by: Maor Lipchuk <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java 2 files changed, 14 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/82/40482/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java index ca24b8c..2484bae 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java @@ -1,11 +1,9 @@ package org.ovirt.engine.core.bll; -import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; -import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.bll.context.CommandContext; import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.action.AddImageFromScratchParameters; @@ -92,7 +90,10 @@ new CreateImageVDSCommandParameters(getParameters().getStoragePoolId(), getParameters() .getStorageDomainId(), getImageGroupId(), getParameters().getDiskInfo().getSize(), getParameters().getDiskInfo().getVolumeType(), getParameters().getDiskInfo() - .getVolumeFormat(), getDestinationImageId(), getJsonDiskDescription())); + .getVolumeFormat(), getDestinationImageId(), + getJsonDiskDescription(getParameters().getDiskInfo().getDiskAlias(), + getParameters().getDiskInfo().getDiskDescription()) + )); if (vdsReturnValue.getSucceeded()) { getParameters().setVdsmTaskIds(new ArrayList<Guid>()); getParameters().getVdsmTaskIds().add( @@ -107,16 +108,6 @@ } return false; - } - - private String getJsonDiskDescription() { - try { - return ImagesHandler.getJsonDiskDescription(getParameters().getDiskInfo().getDiskAlias(), - getParameters().getDiskInfo().getDiskDescription()); - } catch (IOException e) { - log.error("Exception while generating json for disk. ERROR: '{}'", e); - return StringUtils.EMPTY; - } } @Override diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java index b3ed598..188ec30 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java @@ -12,6 +12,7 @@ import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.bll.CommandBase; +import org.ovirt.engine.core.bll.ImagesHandler; import org.ovirt.engine.core.bll.RetrieveImageDataParameters; import org.ovirt.engine.core.bll.context.CommandContext; import org.ovirt.engine.core.bll.interfaces.BackendInternal; @@ -612,6 +613,15 @@ return map.get(OvfInfoFileConstants.Domains).toString().contains(storageDomainId.toString()); } + protected String getJsonDiskDescription(String diskAlias, String diskDescription) { + try { + return ImagesHandler.getJsonDiskDescription(diskAlias, diskDescription); + } catch (IOException e) { + log.error("Exception while generating json for disk. ERROR: '{}'", e); + return StringUtils.EMPTY; + } + } + @Override public List<PermissionSubject> getPermissionCheckSubjects() { return Collections.singletonList(new PermissionSubject(getStoragePoolId(), -- To view, visit https://gerrit.ovirt.org/40482 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I89b36811ecb6079d83f81de63fd2a551ff409f13 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Maor Lipchuk <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
