Eli Mesika has uploaded a new change for review. Change subject: core:Add Data Center event message is missing ... ......................................................................
core:Add Data Center event message is missing ... Add Data Center event message is missing important parameters values. Adding Data Center Type, Compatibility Version and Quota Enforcement type to the audit log message generated when adding a Data Center. Change-Id: I216bb1d2311e3257da6819ab786514a078105e1c Signed-off-by: Eli Mesika <[email protected]> Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=834849 --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddEmptyStoragePoolCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AuditLog.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java M backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties 4 files changed, 66 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/99/12399/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddEmptyStoragePoolCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddEmptyStoragePoolCommand.java index e479072..4b9fcd7 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddEmptyStoragePoolCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddEmptyStoragePoolCommand.java @@ -11,6 +11,7 @@ import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.action.StoragePoolManagementParameter; import org.ovirt.engine.core.common.businessentities.StoragePoolStatus; +import org.ovirt.engine.core.common.businessentities.storage_pool; import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; @@ -32,12 +33,20 @@ @Override protected void executeCommand() { + setDataCenterDetails(); addStoragePoolToDb(); getReturnValue().setActionReturnValue(getStoragePool().getId()); addDefaultNetworks(); setSucceeded(true); } + private void setDataCenterDetails() { + storage_pool dc = getParameters().getStoragePool(); + setCompatibilityVersion(dc.getcompatibility_version().toString()); + setStoragePoolType(dc.getstorage_pool_type().name()); + setQuotaEnforcementType(dc.getQuotaEnforcementType().name()); + } + @Override public AuditLogType getAuditLogTypeValue() { return getSucceeded() ? AuditLogType.USER_ADD_STORAGE_POOL : AuditLogType.USER_ADD_STORAGE_POOL_FAILED; diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AuditLog.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AuditLog.java index bece962..86e1218 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AuditLog.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AuditLog.java @@ -42,6 +42,9 @@ private String customData = ""; private boolean external = false; private boolean deleted = false; + private String storagePoolType; + private String compatibilityVersion; + private String quotaEnforcementType; public AuditLog() { } @@ -376,6 +379,30 @@ this.deleted = deleted; } + public String getStoragePoolType() { + return storagePoolType; + } + + public void setStoragePoolType(String storagePoolType) { + this.storagePoolType = storagePoolType; + } + + public String getCompatibilityVersion() { + return compatibilityVersion; + } + + public void setCompatibilityVersion(String compatibilityVersion) { + this.compatibilityVersion = compatibilityVersion; + } + + public String getQuotaEnforcementType() { + return quotaEnforcementType; + } + + public void setQuotaEnforcementType(String quotaEnforcementType) { + this.quotaEnforcementType = quotaEnforcementType; + } + @Override public int hashCode() { final int prime = 31; diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java index 7525c50..f057c26 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java @@ -9,12 +9,12 @@ import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.businessentities.AuditLog; +import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.StorageDomainStatus; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.businessentities.VmTemplate; -import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.storage_pool; import org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeEntity; import org.ovirt.engine.core.common.interfaces.IVdcUser; @@ -74,6 +74,9 @@ private int eventFloodInSec = 30; private String customData = ""; private boolean external = false; + private String storagePoolType; + private String compatibilityVersion; + private String quotaEnforcementType; public AuditLogableBase() { } @@ -634,6 +637,31 @@ public void setExternal(boolean external) { this.external = external; } + + public String getStoragePoolType() { + return storagePoolType; + } + + public void setStoragePoolType(String storagePoolType) { + this.storagePoolType = storagePoolType; + } + + public String getCompatibilityVersion() { + return compatibilityVersion; + } + + public void setCompatibilityVersion(String compatibilityVersion) { + this.compatibilityVersion = compatibilityVersion; + } + + public String getQuotaEnforcementType() { + return quotaEnforcementType; + } + + public void setQuotaEnforcementType(String quotaEnforcementType) { + this.quotaEnforcementType = quotaEnforcementType; + } + private static final Log log = LogFactory.getLog(AuditLogableBase.class); } 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 b776f06..7f4fc15 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties @@ -395,7 +395,7 @@ USER_ACTIVATE_STORAGE_DOMAIN_FAILED_ASYNC=Failed to autorecover Storage Domain ${StorageDomainName} (Data Center ${StoragePoolName}). USER_ADD_STORAGE_DOMAIN=Storage Domain ${StorageDomainName} was added by ${UserName} USER_ADD_STORAGE_DOMAIN_FAILED=Failed to add Storage Domain ${StorageDomainName}. (User: ${UserName}) -USER_ADD_STORAGE_POOL=Data Center ${StoragePoolName} was added by ${UserName} +USER_ADD_STORAGE_POOL=Data Center ${StoragePoolName} with Type ${StoragePoolType}, Compatibility Version ${CompatibilityVersion} and Quota Type ${QuotaEnforcementType} was added by ${UserName} USER_ADD_STORAGE_POOL_FAILED=Failed to add Data Center ${StoragePoolName}. (User: ${UserName}) USER_ATTACH_STORAGE_DOMAIN_TO_POOL=Storage Domain ${StorageDomainName} was attached to Data Center ${StoragePoolName} by ${UserName} USER_ATTACH_STORAGE_DOMAIN_TO_POOL_FAILED=Failed to attach Storage Domain ${StorageDomainName} to Data Center ${StoragePoolName}. (User: ${UserName}) -- To view, visit http://gerrit.ovirt.org/12399 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I216bb1d2311e3257da6819ab786514a078105e1c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Eli Mesika <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
