Tal Nisan has uploaded a new change for review. Change subject: core: Fix event message when removing a LUN disk ......................................................................
core: Fix event message when removing a LUN disk When removing a disk, the event message included the domain name parameter in case the disk is a LUN disk there is no storage domain and the message appeared incorrectly, added a new type of event message for LUN disks that displays the same message without the storage domain parameter Change-Id: I7624619d27e9e9fd6ffdc09f4380b9d2dbe5624b Signed-off-by: Tal Nisan <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.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, 15 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/63/24163/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java index c7e874b..ba6e62c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java @@ -318,8 +318,14 @@ public AuditLogType getAuditLogTypeValue() { switch (getActionState()) { case EXECUTE: - return getSucceeded() ? AuditLogType.USER_FINISHED_REMOVE_DISK - : AuditLogType.USER_FINISHED_FAILED_REMOVE_DISK; + if (getDisk().getDiskStorageType() == DiskStorageType.LUN) { + return getSucceeded() ? AuditLogType.USER_FINISHED_REMOVE_DISK_NO_DOMAIN + : AuditLogType.USER_FINISHED_FAILED_REMOVE_DISK_NO_DOMAIN; + } + else { + return getSucceeded() ? AuditLogType.USER_FINISHED_REMOVE_DISK + : AuditLogType.USER_FINISHED_FAILED_REMOVE_DISK; + } default: return AuditLogType.UNASSIGNED; } 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 8801a87..724b29f 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 @@ -183,6 +183,8 @@ USER_MOVED_VM_DISK_FINISHED_FAILURE(2011), USER_FINISHED_REMOVE_DISK(2014), USER_FINISHED_FAILED_REMOVE_DISK(2015), + USER_FINISHED_REMOVE_DISK_NO_DOMAIN(2012), + USER_FINISHED_FAILED_REMOVE_DISK_NO_DOMAIN(2013), USER_ATTACH_DISK_TO_VM(2016), USER_FAILED_ATTACH_DISK_TO_VM(2017), USER_DETACH_DISK_FROM_VM(2018), 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 d4cc83f..6c311bc 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 @@ -443,6 +443,8 @@ severities.put(AuditLogType.USER_MOVED_VM_DISK_FINISHED_FAILURE, AuditLogSeverity.ERROR); severities.put(AuditLogType.USER_FINISHED_REMOVE_DISK, AuditLogSeverity.NORMAL); severities.put(AuditLogType.USER_FINISHED_FAILED_REMOVE_DISK, AuditLogSeverity.WARNING); + severities.put(AuditLogType.USER_FINISHED_REMOVE_DISK_NO_DOMAIN, AuditLogSeverity.NORMAL); + severities.put(AuditLogType.USER_FINISHED_FAILED_REMOVE_DISK_NO_DOMAIN, AuditLogSeverity.WARNING); severities.put(AuditLogType.IRS_FAILURE, AuditLogSeverity.ERROR); severities.put(AuditLogType.IRS_DISK_SPACE_LOW_ERROR, AuditLogSeverity.ERROR); severities.put(AuditLogType.IRS_DISK_SPACE_LOW, AuditLogSeverity.WARNING); 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 08195f2..37ca067 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties @@ -110,8 +110,10 @@ USER_FAILED_MOVED_VM_DISK=User ${UserName} failed to move disk ${DiskAlias} to domain ${StorageDomainName}. USER_MOVED_VM_DISK_FINISHED_SUCCESS=User ${UserName} finished moving disk ${DiskAlias} to domain ${StorageDomainName}. USER_MOVED_VM_DISK_FINISHED_FAILURE=User ${UserName} have failed to move disk ${DiskAlias} to domain ${StorageDomainName}. -USER_FINISHED_REMOVE_DISK=Disk ${DiskAlias} was successfully removed from domain ${StorageDomainName} (User ${UserName}. +USER_FINISHED_REMOVE_DISK=Disk ${DiskAlias} was successfully removed from domain ${StorageDomainName} (User ${UserName}). USER_FINISHED_FAILED_REMOVE_DISK=Disk ${DiskAlias} was successfully removed from domain ${StorageDomainName} with storage failure (User ${UserName}). +USER_FINISHED_REMOVE_DISK_NO_DOMAIN=Disk ${DiskAlias} was successfully removed (User ${UserName}). +USER_FINISHED_FAILED_REMOVE_DISK_NO_DOMAIN=Disk ${DiskAlias} was successfully removed with storage failure (User ${UserName}). USER_ATTACH_DISK_TO_VM=Disk ${DiskAlias} was successfully attached to VM ${VmName} by ${UserName}. USER_FAILED_ATTACH_DISK_TO_VM=Failed to attach Disk ${DiskAlias} to VM ${VmName} (User: ${UserName}). USER_DETACH_DISK_FROM_VM=Disk ${DiskAlias} was successfully detached from VM ${VmName} by ${UserName}. -- To view, visit http://gerrit.ovirt.org/24163 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7624619d27e9e9fd6ffdc09f4380b9d2dbe5624b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tal Nisan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
