Daniel Erez has uploaded a new change for review. Change subject: core: Added download_image to StepEnum for monitoring ......................................................................
core: Added download_image to StepEnum for monitoring Added DOWNLOAD_IMAGE to StepEnum and ExecutionMessages for proper task monitoring (currently used by ImportRepoImageCopyTaskHandler and DownloadImageVDSCommand). Change-Id: I2ee2669edff2d385d759fba3bf7caf77d89efecf Related-To-Bug-Url: https://bugzilla.redhat.com/1074311 Signed-off-by: Daniel Erez <de...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCopyTaskHandler.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/job/StepEnum.java M backend/manager/modules/dal/src/main/resources/bundles/ExecutionMessages.properties M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/DownloadImageVDSCommand.java 4 files changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/34/27534/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCopyTaskHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCopyTaskHandler.java index 1b59c3a..530b75c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCopyTaskHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCopyTaskHandler.java @@ -49,7 +49,7 @@ @Override public AsyncTaskType getTaskType() { - return AsyncTaskType.copyImage; + return AsyncTaskType.downloadImage; } protected OpenStackImageProviderProxy getProviderProxy() { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/job/StepEnum.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/job/StepEnum.java index c13c17a..0988652 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/job/StepEnum.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/job/StepEnum.java @@ -36,6 +36,7 @@ MERGE_SNAPSHOTS(AsyncTaskType.mergeSnapshots), CLONE_IMAGE_STRUCTURE(AsyncTaskType.cloneImageStructure), SYNC_IMAGE_DATA(AsyncTaskType.syncImageData), + DOWNLOAD_IMAGE(AsyncTaskType.downloadImage), UNKNOWN(AsyncTaskType.unknown); /** diff --git a/backend/manager/modules/dal/src/main/resources/bundles/ExecutionMessages.properties b/backend/manager/modules/dal/src/main/resources/bundles/ExecutionMessages.properties index 75ead71..bb8be49 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/ExecutionMessages.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/ExecutionMessages.properties @@ -123,6 +123,7 @@ step.CREATE_VOLUME=Creating Volume step.DELETE_VOLUME=Deleting Volume step.DELETE_IMAGE=Deleting Image +step.DOWNLOAD_IMAGE=Downloading Image step.MERGE_SNAPSHOTS=Merging snapshots (${SourceSnapshot} into ${DestinationSnapshot}) of disk ${Disk} step.ADD_VM_TO_POOL=Creating VM ${VM} for VM Pool step.MIGRATE_VM=Migrating VM ${VM} from Host ${VDS} diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/DownloadImageVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/DownloadImageVDSCommand.java index 3a8865f3..88cefba 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/DownloadImageVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/DownloadImageVDSCommand.java @@ -44,6 +44,6 @@ proceedProxyReturnValue(); getVDSReturnValue().setCreationInfo( - new AsyncTaskCreationInfo(new Guid(uuidReturn.mUuid), AsyncTaskType.copyImage, getParameters().getStoragePoolId())); + new AsyncTaskCreationInfo(new Guid(uuidReturn.mUuid), AsyncTaskType.downloadImage, getParameters().getStoragePoolId())); } } -- To view, visit http://gerrit.ovirt.org/27534 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2ee2669edff2d385d759fba3bf7caf77d89efecf Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <de...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
