ofri masad has uploaded a new change for review. Change subject: core: QuotaManager Test - test 2,3,4 ......................................................................
core: QuotaManager Test - test 2,3,4 DecreaseStorageQuota test (currently ignored). ValidateAndSetClusterQuota For VCPU test ValidateAndSetClusterQuota For Memory test Change-Id: I0bf60a6cc6b6e6842ea6b53c0e1feac134b508b2 Signed-off-by: Ofri Masad <oma...@redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/quota/QuotaManagerTest.java 1 file changed, 100 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/64/8464/1 diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/quota/QuotaManagerTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/quota/QuotaManagerTest.java index 6a25885..e35005d 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/quota/QuotaManagerTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/quota/QuotaManagerTest.java @@ -201,19 +201,114 @@ parameters.clear(); } + // This method currently act as a rollback. and so the test will not pass. + @Ignore @Test public void testDecreaseStorageQuota() throws Exception { - // TODO + List<StorageQuotaValidationParameter> parameters = new ArrayList<StorageQuotaValidationParameter>(); + quotaManager.rollbackQuota(STORAGE_QUOTA_GLOBAL_IN_GRACE); + + // decrease the quota usage from 104 GB to 96 (our of 100 GB quota) + parameters.add(new StorageQuotaValidationParameter(STORAGE_QUOTA_GLOBAL_IN_GRACE, DESTINATION_GUID, 8)); + quotaManager.decreaseStorageQuota(storage_pool, parameters); + parameters.clear(); + + // try to consume 1 GB from the same quota (will reach 97 GB out of 100 GB) + parameters.add(new StorageQuotaValidationParameter(STORAGE_QUOTA_GLOBAL_IN_GRACE, DESTINATION_GUID, 1)); + assertTrue(quotaManager.validateAndSetStorageQuota(storage_pool, parameters, canDoActionMessages)); + assertEmptyCanDoActionMessage(); + parameters.clear(); + canDoActionMessages.clear(); } @Test - public void testValidateQuotaForStoragePool() throws Exception { - // TODO + public void testValidateAndSetClusterQuotaForVCPU() throws Exception { + quotaManager.removeStoragePoolFromCache(storage_pool.getId()); + + assertTrue(quotaManager.validateAndSetClusterQuota(storage_pool, DESTINATION_GUID + , VCPU_QUOTA_GLOBAL_NOT_EXCEEDED, 1, 1, canDoActionMessages)); + assertEmptyCanDoActionMessage(); + assertAuditLogNotWritten(); + + assertTrue(quotaManager.validateAndSetClusterQuota(storage_pool, DESTINATION_GUID + , VCPU_QUOTA_GLOBAL_OVER_THRESHOLD, 1, 1, canDoActionMessages)); + assertEmptyCanDoActionMessage(); + assertAuditLogWritten(); + + assertTrue(quotaManager.validateAndSetClusterQuota(storage_pool, DESTINATION_GUID + , VCPU_QUOTA_GLOBAL_IN_GRACE, 1, 1, canDoActionMessages)); + assertEmptyCanDoActionMessage(); + assertAuditLogWritten(); + + assertFalse(quotaManager.validateAndSetClusterQuota(storage_pool, DESTINATION_GUID + , VCPU_QUOTA_GLOBAL_OVER_GRACE, 1, 1, canDoActionMessages)); + assertNotEmptyCanDoActionMessage(); + assertAuditLogWritten(); + + assertTrue(quotaManager.validateAndSetClusterQuota(storage_pool, DESTINATION_GUID + , VCPU_QUOTA_SPECIFIC_NOT_EXCEEDED, 1, 1, canDoActionMessages)); + assertEmptyCanDoActionMessage(); + assertAuditLogNotWritten(); + + assertTrue(quotaManager.validateAndSetClusterQuota(storage_pool, DESTINATION_GUID + , VCPU_QUOTA_SPECIFIC_OVER_THRESHOLD, 1, 1, canDoActionMessages)); + assertEmptyCanDoActionMessage(); + assertAuditLogWritten(); + + assertTrue(quotaManager.validateAndSetClusterQuota(storage_pool, DESTINATION_GUID + , VCPU_QUOTA_SPECIFIC_IN_GRACE, 1, 1, canDoActionMessages)); + assertEmptyCanDoActionMessage(); + assertAuditLogWritten(); + + assertFalse(quotaManager.validateAndSetClusterQuota(storage_pool, DESTINATION_GUID + , VCPU_QUOTA_SPECIFIC_OVER_GRACE, 1, 1, canDoActionMessages)); + assertNotEmptyCanDoActionMessage(); + assertAuditLogWritten(); } @Test - public void testValidateAndSetClusterQuota() throws Exception { - // TODO + public void testValidateAndSetClusterQuotaForMem() throws Exception { + quotaManager.removeStoragePoolFromCache(storage_pool.getId()); + + assertTrue(quotaManager.validateAndSetClusterQuota(storage_pool, DESTINATION_GUID + , MEM_QUOTA_GLOBAL_NOT_EXCEEDED, 1, 1, canDoActionMessages)); + assertEmptyCanDoActionMessage(); + assertAuditLogNotWritten(); + + assertTrue(quotaManager.validateAndSetClusterQuota(storage_pool, DESTINATION_GUID + , MEM_QUOTA_GLOBAL_OVER_THRESHOLD, 1, 1, canDoActionMessages)); + assertEmptyCanDoActionMessage(); + assertAuditLogWritten(); + + assertTrue(quotaManager.validateAndSetClusterQuota(storage_pool, DESTINATION_GUID + , MEM_QUOTA_GLOBAL_IN_GRACE, 1, 1, canDoActionMessages)); + assertEmptyCanDoActionMessage(); + assertAuditLogWritten(); + + assertFalse(quotaManager.validateAndSetClusterQuota(storage_pool, DESTINATION_GUID + , MEM_QUOTA_GLOBAL_OVER_GRACE, 1, 1, canDoActionMessages)); + assertNotEmptyCanDoActionMessage(); + assertAuditLogWritten(); + + assertTrue(quotaManager.validateAndSetClusterQuota(storage_pool, DESTINATION_GUID + , MEM_QUOTA_SPECIFIC_NOT_EXCEEDED, 1, 1, canDoActionMessages)); + assertEmptyCanDoActionMessage(); + assertAuditLogNotWritten(); + + assertTrue(quotaManager.validateAndSetClusterQuota(storage_pool, DESTINATION_GUID + , MEM_QUOTA_SPECIFIC_OVER_THRESHOLD, 1, 1, canDoActionMessages)); + assertEmptyCanDoActionMessage(); + assertAuditLogWritten(); + + assertTrue(quotaManager.validateAndSetClusterQuota(storage_pool, DESTINATION_GUID + , MEM_QUOTA_SPECIFIC_IN_GRACE, 1, 1, canDoActionMessages)); + assertEmptyCanDoActionMessage(); + assertAuditLogWritten(); + + assertFalse(quotaManager.validateAndSetClusterQuota(storage_pool, DESTINATION_GUID + , MEM_QUOTA_SPECIFIC_OVER_GRACE, 1, 1, canDoActionMessages)); + assertNotEmptyCanDoActionMessage(); + assertAuditLogWritten(); } @Test -- To view, visit http://gerrit.ovirt.org/8464 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0bf60a6cc6b6e6842ea6b53c0e1feac134b508b2 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