Daniel Erez has uploaded a new change for review. Change subject: core: auditlog for importing a Template from a data domain ......................................................................
core: auditlog for importing a Template from a data domain For an indication of a successful Template registration, added an AuditLog to register flow in ImportVmTemplateFromConfigurationCommand. Change-Id: I727df2d9c0f11b48cfecca311b589f4fa0e8a608 Signed-off-by: Daniel Erez <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateFromConfigurationCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java M backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties M backend/manager/modules/dal/src/main/resources/bundles/ExecutionMessages.properties 4 files changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/26/28726/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateFromConfigurationCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateFromConfigurationCommand.java index 04bf251..611d846 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateFromConfigurationCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateFromConfigurationCommand.java @@ -2,6 +2,7 @@ import java.util.ArrayList; +import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.action.ImportVmTemplateParameters; import org.ovirt.engine.core.common.businessentities.DiskImage; import org.ovirt.engine.core.common.businessentities.OvfEntityData; @@ -25,7 +26,6 @@ public ImportVmTemplateFromConfigurationCommand(T parameters) { super(parameters); - setCommandShouldBeLogged(false); } @Override @@ -77,5 +77,12 @@ getUnregisteredOVFDataDao().removeEntity(ovfEntityData.getEntityId(), null); } setActionReturnValue(getVmTemplate().getId()); + setSucceeded(true); + } + + @Override + public AuditLogType getAuditLogTypeValue() { + return getSucceeded() ? AuditLogType.TEMPLATE_IMPORT_FROM_CONFIGURATION_SUCCESS : + AuditLogType.TEMPLATE_IMPORT_FROM_CONFIGURATION_FAILED; } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java index 64c4b29..7373f8d 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java @@ -421,6 +421,8 @@ USER_FAILED_REMOVE_VM_TEMPLATE(110, AuditLogSeverity.ERROR), TEMPLATE_IMPORT(135), TEMPLATE_IMPORT_FAILED(136, AuditLogSeverity.ERROR), + TEMPLATE_IMPORT_FROM_CONFIGURATION_SUCCESS(180), + TEMPLATE_IMPORT_FROM_CONFIGURATION_FAILED(181), USER_ATTACH_USER_TO_VM(520), USER_DETACH_USER_FROM_VM(360), USER_FAILED_DETACH_USER_FROM_VM(361, AuditLogSeverity.ERROR), diff --git a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties index 6db437f..772d799 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties @@ -330,6 +330,8 @@ VM_IMPORT_FAILED=Failed to import VM ${ImportedVmName} (User: ${UserName}) TEMPLATE_IMPORT=Started Template import of ${ImportedVmTemplateName} (User: ${UserName}) TEMPLATE_IMPORT_FAILED=Failed to import Template ${ImportedVmTemplateName} (User: ${UserName}) +TEMPLATE_IMPORT_FROM_CONFIGURATION_SUCCESS=Template ${VmTemplateName} has been successfully imported from the given configuration. +TEMPLATE_IMPORT_FROM_CONFIGURATION_FAILED=Failed to import Template ${VmTemplateName} from the given configuration. VM_NOT_RESPONDING=VM ${VmName} is not responding. VM_PAUSED_ENOSPC=VM ${VmName} has paused due to no Storage space error. VM_PAUSED_ERROR=VM ${VmName} has paused due to unknown storage error. 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 ed4e764..78d6f52 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/ExecutionMessages.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/ExecutionMessages.properties @@ -25,6 +25,7 @@ job.ImportVm=Importing VM ${VM} to Cluster ${VdsGroups} job.ForceSelectSPM=Force selecting ${VDS} as SPM for Data Center ${StoragePool} job.ImportVmFromConfiguration=Importing VM ${VM} from configuration to Cluster ${VdsGroups} +job.ImportVmTemplateFromConfiguration=Importing Template ${VmTemplate} from configuration to Cluster ${VdsGroups} job.RemoveVmFromImportExport=Removing VM ${VM} image from Storage Domain ${Storage} job.RemoveVmTemplateFromImportExport=Removing VM Template ${VmTemplate} image from Storage Domain ${Storage} job.ImportVmTemplate=Importing VM Template ${VmTemplate} to Data Center ${StoragePool} -- To view, visit http://gerrit.ovirt.org/28726 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I727df2d9c0f11b48cfecca311b589f4fa0e8a608 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
