mooli tayer has uploaded a new change for review. Change subject: New AuditLogTypes for force removal of storage pool. ......................................................................
New AuditLogTypes for force removal of storage pool. USER_FORCE_REMOVE_STORAGE_POOL and USER_FORCE_REMOVE_STORAGE_POOL_FAILED for removal/failure of storage pool. Just like the ones existing for a for force removal of storage domain. Change-Id: Ife16cc79e8fe4b39174d13e7f903bcb89e92fad6 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=922504 Signed-off-by: Mooli Tayer <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommand.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 3 files changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/89/15789/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommand.java index e1b63a3..849632c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommand.java @@ -365,6 +365,9 @@ @Override public AuditLogType getAuditLogTypeValue() { + if (getParameters().getForceDelete()){ + return getSucceeded() ? AuditLogType.USER_FORCE_REMOVE_STORAGE_POOL : AuditLogType.USER_FORCE_REMOVE_STORAGE_POOL_FAILED; + } return getSucceeded() ? AuditLogType.USER_REMOVE_STORAGE_POOL : AuditLogType.USER_REMOVE_STORAGE_POOL_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 31036f1..4e57c21 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 @@ -623,6 +623,8 @@ USER_UPDATE_STORAGE_POOL_FAILED(953), USER_REMOVE_STORAGE_POOL(954), USER_REMOVE_STORAGE_POOL_FAILED(955), + USER_FORCE_REMOVE_STORAGE_POOL(918), + USER_FORCE_REMOVE_STORAGE_POOL_FAILED(919), USER_ADD_STORAGE_DOMAIN(956), USER_ADD_STORAGE_DOMAIN_FAILED(957), USER_UPDATE_STORAGE_DOMAIN(958), 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 0cc3824..14c7047 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties @@ -407,6 +407,8 @@ USER_REMOVE_STORAGE_DOMAIN_FAILED=Failed to remove Storage Domain ${StorageDomainName}. (User: ${UserName}) USER_FORCE_REMOVE_STORAGE_DOMAIN=Storage Domain ${StorageDomainName} was forcibly removed by ${UserName} USER_FORCE_REMOVE_STORAGE_DOMAIN_FAILED=Failed to forcibly remove Storage Domain ${StorageDomainName}. (User: ${UserName}) +USER_FORCE_REMOVE_STORAGE_POOL=Data Center ${StoragePoolName} was forcibly removed by ${UserName} +USER_FORCE_REMOVE_STORAGE_POOL_FAILED=Failed to forcibly remove Data Center ${StoragePoolName}. (User: ${UserName}) USER_REMOVE_STORAGE_POOL=Data Center ${StoragePoolName} was removed by ${UserName} USER_REMOVE_STORAGE_POOL_FAILED=Failed to remove Data Center ${StoragePoolName}. (User: ${UserName}) USER_UPDATE_STORAGE_DOMAIN=Storage Domain ${StorageDomainName} was updated by ${UserName} -- To view, visit http://gerrit.ovirt.org/15789 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ife16cc79e8fe4b39174d13e7f903bcb89e92fad6 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: mooli tayer <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
