Libor Spevak has uploaded a new change for review. Change subject: engine,webadmin: Show VM as stateless in audit log ......................................................................
engine,webadmin: Show VM as stateless in audit log Show different message in audit log (Events), in case a VM was started in stateless mode (can be specified in RunOnce dialog - 'stateless' checkbox option or in Edit VM dialog (for desktop only). Change-Id: Id9bb0bd88e544880406c340afb7e213041b2f845 Bug-Url: https://bugzilla.redhat.com/907997 Signed-off-by: Libor Spevak <lspe...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.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/44/13344/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java index 7a02fa3..3a576d4 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java @@ -455,15 +455,17 @@ if (mResume) { return getSucceeded() ? AuditLogType.USER_RESUME_VM : AuditLogType.USER_FAILED_RESUME_VM; } else if (getParameters() != null && getParameters().getIsInternal()) { - return getSucceeded() ? AuditLogType.VDS_INITIATED_RUN_VM : AuditLogType.VDS_INITIATED_RUN_VM_FAILED; + return getSucceeded() ? + (statelessSnapshotExistsForVm() ? AuditLogType.VDS_INITIATED_RUN_VM_AS_STATELESS : AuditLogType.VDS_INITIATED_RUN_VM) : + AuditLogType.VDS_INITIATED_RUN_VM_FAILED; } else { return getSucceeded() ? (VMStatus) getActionReturnValue() == VMStatus.Up ? getParameters() != null && getParameters().getDestinationVdsId() == null && getVm().getDedicatedVmForVds() != null && !getVm().getRunOnVds().equals(getVm().getDedicatedVmForVds()) ? - AuditLogType.USER_RUN_VM_ON_NON_DEFAULT_VDS - : AuditLogType.USER_RUN_VM + AuditLogType.USER_RUN_VM_ON_NON_DEFAULT_VDS : + (statelessSnapshotExistsForVm() ? AuditLogType.USER_RUN_VM_AS_STATELESS : AuditLogType.USER_RUN_VM) : _isRerun ? AuditLogType.VDS_INITIATED_RUN_VM : getTaskIdList().size() > 0 ? 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 2f1145e..afb107e 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 @@ -37,6 +37,7 @@ VDS_INSTALL(504), VDS_INSTALL_FAILED(505), VDS_INITIATED_RUN_VM(506), + VDS_INITIATED_RUN_VM_AS_STATELESS(537), VDS_INITIATED_RUN_VM_FAILED(507), // VDS_INITIATED_RUN_VM_CHECKOUT_FAILED = 508, VDS_INSTALL_IN_PROGRESS(509), @@ -89,6 +90,7 @@ USER_STARTED_VM(153), USER_INITIATED_RUN_VM_FAILED(151), USER_RUN_VM(32), // User issued runVm command + USER_RUN_VM_AS_STATELESS(538), // User issued runVm command in stateless mode USER_FAILED_RUN_VM(54), // User issued runVm command USER_RUN_VM_AS_STATELESS_FINISHED_FAILURE(70), USER_RUN_VM_AS_STATELESS_WITH_DISKS_NOT_ALLOWING_SNAPSHOT(171), diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java index 9f69164..fd24dd3 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java @@ -266,6 +266,7 @@ severities.put(AuditLogType.VDS_INSTALL_IN_PROGRESS_WARNING, AuditLogSeverity.WARNING); severities.put(AuditLogType.VDS_INSTALL_IN_PROGRESS_ERROR, AuditLogSeverity.ERROR); severities.put(AuditLogType.VDS_INITIATED_RUN_VM, AuditLogSeverity.NORMAL); + severities.put(AuditLogType.VDS_INITIATED_RUN_VM_AS_STATELESS, AuditLogSeverity.NORMAL); severities.put(AuditLogType.VDS_INITIATED_RUN_VM_FAILED, AuditLogSeverity.ERROR); severities.put(AuditLogType.VDS_FENCE_STATUS, AuditLogSeverity.NORMAL); severities.put(AuditLogType.VDS_FENCE_STATUS_FAILED, AuditLogSeverity.ERROR); @@ -446,6 +447,7 @@ severities.put(AuditLogType.VM_PAUSED_EPERM, AuditLogSeverity.ERROR); severities.put(AuditLogType.VM_POWER_DOWN_FAILED, AuditLogSeverity.WARNING); severities.put(AuditLogType.USER_RUN_VM, AuditLogSeverity.NORMAL); + severities.put(AuditLogType.USER_RUN_VM_AS_STATELESS, AuditLogSeverity.NORMAL); severities.put(AuditLogType.USER_FAILED_RUN_VM, AuditLogSeverity.ERROR); severities.put(AuditLogType.USER_RUN_VM_AS_STATELESS_FINISHED_FAILURE, AuditLogSeverity.ERROR); severities.put(AuditLogType.USER_RUN_VM_AS_STATELESS_WITH_DISKS_NOT_ALLOWING_SNAPSHOT, 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 6fe4c9c..0aff7b0 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties @@ -153,6 +153,7 @@ USER_RESTORE_FROM_SNAPSHOT_FINISH_FAILURE=Failed to complete restoring from Snapshot of VM ${VmName}. USER_RESUME_VM=VM ${VmName} was resumed by ${UserName} (Host: ${VdsName}). USER_RUN_VM=VM ${VmName} started on Host ${VdsName} +USER_RUN_VM_AS_STATELESS=VM ${VmName} started on Host ${VdsName} as stateless USER_RUN_VM_ON_NON_DEFAULT_VDS=Guest ${VmName} started on Host ${VdsName}. (Default Host parameter was ignored - assigned Host was down). USER_STOP_VM=VM ${VmName} powered off by ${UserName} (Host: ${VdsName}). USER_STOP_SUSPENDED_VM=Suspended VM ${VmName} powered off by ${UserName}. @@ -305,6 +306,7 @@ VDS_INSTALL_FAILED=Host ${VdsName} installation failed. ${FailedInstallMessage}. VDS_INITIALIZING=Host ${VdsName} is initializing. Message: ${ErrorMessage} VDS_INITIATED_RUN_VM=VM ${VmName} was restarted on Host ${VdsName} +VDS_INITIATED_RUN_VM_AS_STATELESS=VM ${VmName} was restarted on Host ${VdsName} as stateless VDS_INITIATED_RUN_VM_FAILED=Failed to restart VM ${VmName} on Host ${VdsName} USER_ADD_VDS_GROUP=Host cluster ${VdsGroupName} was added by ${UserName} USER_ADD_VDS_GROUP_FAILED=Failed to add Host cluster (User: ${UserName}) -- To view, visit http://gerrit.ovirt.org/13344 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id9bb0bd88e544880406c340afb7e213041b2f845 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Libor Spevak <lspe...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
