Roy Golan has uploaded a new change for review. Change subject: core: log set VM ticket event ......................................................................
core: log set VM ticket event Log the set VM ticket event. Change-Id: I61308fdd59d0d11b045a8e1ed72648c85f039701 Signed-off-by: Roy Golan <rgo...@redhat.com> Bug-Url: https://bugzilla.redhat.com/886788 --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetVmTicketCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java M backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties 4 files changed, 11 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/42/17742/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetVmTicketCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetVmTicketCommand.java index def8c88..f4c9c2a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetVmTicketCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetVmTicketCommand.java @@ -4,6 +4,7 @@ import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.bll.utils.PermissionSubject; +import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.action.SetVmTicketParameters; import org.ovirt.engine.core.common.businessentities.ActionGroup; @@ -20,7 +21,6 @@ import org.ovirt.engine.core.utils.log.Log; import org.ovirt.engine.core.utils.log.LogFactory; -@InternalCommandAttribute public class SetVmTicketCommand<T extends SetVmTicketParameters> extends VmOperationCommandBase<T> { // The log: @@ -42,8 +42,8 @@ @Override protected void setActionMessageParameters () { - addCanDoActionMessage(VdcBllMessages.VAR__ACTION__SET); - addCanDoActionMessage(VdcBllMessages.VAR__TYPE__VM_TICKET); + addCanDoActionMessage(VdcBllMessages.VAR__TYPE__VM); + addCanDoActionMessage(VdcBllMessages.VAR__ACTION__SET_TICKET); } @Override @@ -189,4 +189,9 @@ } setSucceeded(sent); } + + @Override + public AuditLogType getAuditLogTypeValue() { + return AuditLogType.VM_SET_TICKET; + } } 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 42cd84d..a10d8cf 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 @@ -358,6 +358,7 @@ VM_CANCEL_MIGRATION(161), VM_CANCEL_MIGRATION_FAILED(162), VM_STATUS_RESTORED(163), + VM_SET_TICKET(164), VM_MIGRATION_FAILED_DURING_MOVE_TO_MAINTENANCE(140), VM_SET_TO_UNKNOWN_STATUS(142), diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java index 4429958..c806ff9 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java @@ -92,6 +92,7 @@ VAR__ACTION__CLEAR, VAR__ACTION__FORCE_SELECT, VAR__ACTION__EXTEND_IMAGE_SIZE, + VAR__ACTION__SET_TICKET, // Host statuses replacements VAR__HOST_STATUS__UP, 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 ad4e5f5..1335f14 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties @@ -224,6 +224,7 @@ VM_CANCEL_MIGRATION=Migration cancelled (VM: ${VmName}, Source: ${VdsName}, User: ${UserName}). VM_CANCEL_MIGRATION_FAILED=Failed to cancel migration for VM: ${VmName} VM_STATUS_RESTORED=VM ${VmName} status was restored to ${VmStatus}. +VM_SET_TICKET=user initiated console session for VM ${VmName} VDS_SLOW_STORAGE_RESPONSE_TIME=Slow storage response time on Host ${VdsName}. IRS_HOSTED_ON_VDS=Storage Pool Manager runs on Host ${VdsName} (Address: ${ServerIp}). USER_ATTACH_VM_POOL_TO_AD_GROUP=Group ${AdGroupName} was attached to VM Pool ${VmPoolName} by ${UserName}. -- To view, visit http://gerrit.ovirt.org/17742 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I61308fdd59d0d11b045a8e1ed72648c85f039701 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Roy Golan <rgo...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
