ofri masad has uploaded a new change for review. Change subject: core: Fix empty quota events tab ......................................................................
core: Fix empty quota events tab The Events sub tab under the quota always remained empty. The reasons for that were: a. The quota id was never saved in the audit_log table in the DB b. The search query for quota events was parsed wrong Added the quota ID and name to the AuditLogableBase. Added correct parsing for the search to recognize 'quota' as an object. Change-Id: I207db27df01705660dc33874cd0e222028c0ff63 Bug-Url: https://bugzilla.redhat.com/920226 Signed-off-by: Ofri Masad <oma...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/QuotaManager.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/QuotaManagerAuditLogger.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/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AuditCrossRefAutoCompleter.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleter.java 6 files changed, 31 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/04/13104/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/QuotaManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/QuotaManager.java index e97c4bf..07cca0e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/QuotaManager.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/QuotaManager.java @@ -296,6 +296,10 @@ requestIsApproved = true; } } + + if (!requestIsApproved) { + log.getSecond().setQuotaIdForLog(quota.getId()); + } return requestIsApproved; } @@ -377,6 +381,8 @@ // cache if(requestIsApproved) { cacheNewValues(quotaVdsGroup, newMemory, newVcpu); + } else { + auditLogPair.getSecond().setQuotaIdForLog(quota.getId()); } return requestIsApproved; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/QuotaManagerAuditLogger.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/QuotaManagerAuditLogger.java index c51302a..e6cfaeb 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/QuotaManagerAuditLogger.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/QuotaManagerAuditLogger.java @@ -17,6 +17,7 @@ auditLogableBase.addCustomValue("QuotaName", quotaName); auditLogableBase.addCustomValue("CurrentStorage", percentageFormatter.format(storageUsagePercentage)); auditLogableBase.addCustomValue("Requested", percentageFormatter.format(storageRequestedPercentage)); + auditLogableBase.setQuotaNameForLog(quotaName); } protected void addCustomValuesVdsGroup(AuditLogableBase auditLogableBase, @@ -48,6 +49,7 @@ auditLogableBase.addCustomValue("Utilization", currentUtilization.toString()); auditLogableBase.addCustomValue("Requested", request.toString()); + auditLogableBase.setQuotaNameForLog(quotaName); } public void auditLog(AuditLogType auditLogType, AuditLogableBase auditLogable) { 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 3260c4a..06f8b4a 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 @@ -844,6 +844,8 @@ tempVar.setGlusterVolumeId(auditLogable.getGlusterVolumeId()); tempVar.setGlusterVolumeName(auditLogable.getGlusterVolumeName()); tempVar.setExternal(auditLogable.isExternal()); + tempVar.setQuotaId(auditLogable.getQuotaIdForLog()); + tempVar.setQuotaName(auditLogable.getQuotaNameForLog()); auditLog = tempVar; } } else { 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 f057c26..768cb25 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 @@ -77,6 +77,8 @@ private String storagePoolType; private String compatibilityVersion; private String quotaEnforcementType; + private Guid quotaIdForLog; + private String quotaNameForLog; public AuditLogableBase() { } @@ -664,4 +666,19 @@ private static final Log log = LogFactory.getLog(AuditLogableBase.class); + public Guid getQuotaIdForLog() { + return quotaIdForLog; + } + + public void setQuotaIdForLog(Guid quotaIdForLog) { + this.quotaIdForLog = quotaIdForLog; + } + + public String getQuotaNameForLog() { + return quotaNameForLog; + } + + public void setQuotaNameForLog(String quotaNameForLog) { + this.quotaNameForLog = quotaNameForLog; + } } diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AuditCrossRefAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AuditCrossRefAutoCompleter.java index f439419..4b9b937 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AuditCrossRefAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AuditCrossRefAutoCompleter.java @@ -8,6 +8,7 @@ mVerbs.put(SearchObjects.VDC_USER_PLU_OBJ_NAME, SearchObjects.VDC_USER_PLU_OBJ_NAME); mVerbs.put(SearchObjects.VDC_CLUSTER_PLU_OBJ_NAME, SearchObjects.VDC_CLUSTER_PLU_OBJ_NAME); mVerbs.put(SearchObjects.GLUSTER_VOLUME_PLU_OBJ_NAME, SearchObjects.GLUSTER_VOLUME_PLU_OBJ_NAME); + mVerbs.put(SearchObjects.QUOTA_OBJ_NAME, SearchObjects.QUOTA_OBJ_NAME); buildCompletions(); mVerbs.put(SearchObjects.VM_OBJ_NAME, SearchObjects.VM_OBJ_NAME); mVerbs.put(SearchObjects.VDS_OBJ_NAME, SearchObjects.VDS_OBJ_NAME); diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleter.java index e0acc6f..c3d1494 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleter.java @@ -127,6 +127,9 @@ // audit - gluster volume addJoin(SearchObjects.GLUSTER_VOLUME_OBJ_NAME, "id", SearchObjects.AUDIT_OBJ_NAME, "gluster_volume_id"); + //quota - audit + addJoin(SearchObjects.AUDIT_OBJ_NAME, "quota_id", SearchObjects.QUOTA_OBJ_NAME, "quota_id"); + // data center - network addJoin(SearchObjects.VDC_STORAGE_POOL_OBJ_NAME, "id", SearchObjects.NETWORK_OBJ_NAME, "storage_pool_id"); -- To view, visit http://gerrit.ovirt.org/13104 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I207db27df01705660dc33874cd0e222028c0ff63 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: ofri masad <oma...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
