Liron Aravot has uploaded a new change for review. Change subject: asd ......................................................................
asd Change-Id: I203a50e541458bdeb6cee0a694537c22fb65c0c9 Signed-off-by: Liron Aravot <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcObjectType.java M backend/manager/modules/dal/src/main/resources/bundles/ExecutionMessages.properties 3 files changed, 17 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/44/7744/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java index 880312f..66175c8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java @@ -7,6 +7,7 @@ import org.ovirt.engine.core.bll.job.ExecutionHandler; import org.ovirt.engine.core.bll.snapshots.SnapshotsValidator; import org.ovirt.engine.core.common.AuditLogType; +import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.action.ImagesContainterParametersBase; import org.ovirt.engine.core.common.action.RemoveSnapshotParameters; import org.ovirt.engine.core.common.action.VdcActionType; @@ -41,9 +42,18 @@ } } + @Override + public Map<String, String> getJobMessageProperties() { + if (jobProperties == null) { + jobProperties = super.getJobMessageProperties(); + jobProperties.put(VdcObjectType.Snapshot.name().toLowerCase(), getSnapshotName()); + } + return jobProperties; + } + /** - * @return The image snapshots associated with the VM snapshot. - * Note that the first time this method is run it issues DAO call. + * @return The image snapshots associated with the VM snapshot. Note that the first time this method is run it + * issues DAO call. */ protected List<DiskImage> getSourceImages() { if (_sourceImages == null) { @@ -183,7 +193,8 @@ } // TODO: this is a temporary method used until ImagesHandler.PerformImagesChecks will get decoupeld to several tests - // Until then, this method is called and passes hasImages() onwards so the VM validations are done even for diskless VMs + // Until then, this method is called and passes hasImages() onwards so the VM validations are done even for diskless + // VMs protected boolean validateImagesAndVMStates() { return ImagesHandler.PerformImagesChecks(getVm(), getReturnValue().getCanDoActionMessages(), getVm().getstorage_pool_id(), Guid.Empty, diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcObjectType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcObjectType.java index ee9635b..46cc0b0 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcObjectType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcObjectType.java @@ -27,7 +27,8 @@ Quota(17, "Quota"), GlusterVolume(18, "Gluster Volume"), Disk(19, "Disk"), - VmInterface(20, "VmInterface"); + VmInterface(20, "VmInterface"), + Snapshot(20, "Snapshot"); private int value; private String vdcObjectTranslationVal; 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 1308076..17242fb 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/ExecutionMessages.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/ExecutionMessages.properties @@ -67,6 +67,7 @@ job.MaintananceVds=Moving Host ${VDS} to Maintenance job.VdsNotRespondingTreatment=Handling non responsive Host ${VDS} job.ReconstructMasterDomain=Reconstructing master domain on Data Center ${StoragePool} +job.RemoveSnapshot=Removing Snapshot ${Snapshot} of VM ${VM} # Step types step.VALIDATING=Validating -- To view, visit http://gerrit.ovirt.org/7744 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I203a50e541458bdeb6cee0a694537c22fb65c0c9 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Liron Aravot <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
