Github user agneya2001 commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/768#discussion_r46796854
--- Diff:
framework/quota/test/org/apache/cloudstack/quota/QuotaManagerImplTest.java ---
@@ -0,0 +1,203 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.quota;
+
+import com.cloud.usage.UsageVO;
+import com.cloud.usage.dao.UsageDao;
+import com.cloud.user.Account;
+import com.cloud.user.AccountVO;
+import com.cloud.user.dao.AccountDao;
+import com.cloud.utils.Pair;
+import com.cloud.utils.db.TransactionLegacy;
+import junit.framework.TestCase;
+import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.quota.dao.QuotaAccountDao;
+import org.apache.cloudstack.quota.dao.QuotaBalanceDao;
+import org.apache.cloudstack.quota.dao.QuotaTariffDao;
+import org.apache.cloudstack.quota.dao.QuotaUsageDao;
+import org.apache.cloudstack.quota.dao.ServiceOfferingDao;
+import org.apache.cloudstack.quota.vo.QuotaAccountVO;
+import org.apache.cloudstack.quota.vo.QuotaTariffVO;
+import org.apache.cloudstack.quota.vo.QuotaUsageVO;
+import org.apache.cloudstack.usage.UsageTypes;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.Spy;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import javax.naming.ConfigurationException;
+import java.lang.reflect.Field;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RunWith(MockitoJUnitRunner.class)
+public class QuotaManagerImplTest extends TestCase {
+
+ @Mock
+ private AccountDao accountDao;
+ @Mock
+ private QuotaAccountDao quotaAcc;
+ @Mock
+ private UsageDao usageDao;
+ @Mock
+ private QuotaTariffDao quotaTariffDao;
+ @Mock
+ private QuotaUsageDao quotaUsageDao;
+ @Mock
+ private ServiceOfferingDao serviceOfferingDao;
+ @Mock
+ private QuotaBalanceDao quotaBalanceDao;
+ @Mock
+ private ConfigurationDao configDao;
+
+ @Spy
+ QuotaManagerImpl quotaManager = new QuotaManagerImpl();
+
+ private void injectMockToField(Object mock, String fieldName) throws
NoSuchFieldException, IllegalAccessException {
+ Field f = QuotaManagerImpl.class.getDeclaredField(fieldName);
+ f.setAccessible(true);
+ f.set(quotaManager, mock);
+ }
+
+ @Before
+ public void setup() throws IllegalAccessException,
NoSuchFieldException, ConfigurationException {
+ // Dummy transaction stack setup
+ TransactionLegacy.open("QuotaManagerImplTest");
+
+ injectMockToField(accountDao, "_accountDao");
+ injectMockToField(quotaAcc, "_quotaAcc");
+ injectMockToField(usageDao, "_usageDao");
+ injectMockToField(quotaTariffDao, "_quotaTariffDao");
+ injectMockToField(quotaUsageDao, "_quotaUsageDao");
+ injectMockToField(serviceOfferingDao, "_serviceOfferingDao");
+ injectMockToField(quotaBalanceDao, "_quotaBalanceDao");
+ injectMockToField(configDao, "_configDao");
+ }
+
+ @Test
+ public void testStartStop() {
+ try {
+ quotaManager.start(); // expected to fail as pid is not
available
+ } catch (NumberFormatException ignored) {
+ }
+ assertTrue(quotaManager.stop());
+ }
+
+ @Test
+ public void testConfig() throws ConfigurationException {
+
Mockito.when(configDao.getConfiguration(Mockito.anyMapOf(String.class,
Object.class))).thenReturn(new HashMap<String, String>());
+ Map<String, Object> map = new HashMap<>();
+ map.put("usage.stats.job.aggregation.range", "0");
+ assertTrue(quotaManager.configure("quotaManager", map));
+ }
+
+ @Test
+ public void testCalculateQuotaUsage() {
+ AccountVO accountVO = new AccountVO();
+ accountVO.setId(2L);
+ accountVO.setDomainId(1L);
+ accountVO.setType(Account.ACCOUNT_TYPE_NORMAL);
+ List<AccountVO> accountVOList = new ArrayList<>();
+ accountVOList.add(accountVO);
+ Mockito.when(accountDao.listAll()).thenReturn(accountVOList);
+
+ UsageVO usageVO = new UsageVO();
+ usageVO.setQuotaCalculated(0);
+ List<UsageVO> usageVOList = new ArrayList<UsageVO>();
+ usageVOList.add(usageVO);
+ Pair<List<? extends UsageVO>, Integer> usageRecords = new
Pair<List<? extends UsageVO>, Integer>(usageVOList, usageVOList.size());
+
Mockito.when(usageDao.getUsageRecordsPendingQuotaAggregation(Mockito.anyLong(),
Mockito.anyLong())).thenReturn(usageRecords);
+
+ QuotaUsageVO quotaUsageVO = new QuotaUsageVO();
+ quotaUsageVO.setAccountId(2L);
+ List<QuotaUsageVO> quotaListForAccount = new ArrayList<>();
+ quotaListForAccount.add(quotaUsageVO);
+
Mockito.doReturn(quotaListForAccount).when(quotaManager).aggregatePendingQuotaRecordsForAccount(Mockito.eq(accountVO),
Mockito.eq(usageRecords));
+
Mockito.doNothing().when(quotaManager).processQuotaBalanceForAccount(Mockito.eq(accountVO),
Mockito.eq(quotaListForAccount));
+
+ assertTrue(quotaManager.calculateQuotaUsage());
+ }
+
+ @Test
+ public void testAggregatePendingQuotaRecordsForAccount() {
+ AccountVO accountVO = new AccountVO();
+ accountVO.setId(2L);
+ accountVO.setDomainId(1L);
+ accountVO.setType(Account.ACCOUNT_TYPE_NORMAL);
+
+ UsageVO usageVO = new UsageVO();
+ usageVO.setQuotaCalculated(0);
+ usageVO.setUsageType(UsageTypes.ALLOCATED_VM);
+ List<UsageVO> usageVOList = new ArrayList<UsageVO>();
+ usageVOList.add(usageVO);
+ Pair<List<? extends UsageVO>, Integer> usageRecords = new
Pair<List<? extends UsageVO>, Integer>(usageVOList, usageVOList.size());
+
+ QuotaUsageVO quotaUsageVO = new QuotaUsageVO();
+ quotaUsageVO.setAccountId(2L);
+
Mockito.doReturn(quotaUsageVO).when(quotaManager).updateQuotaAllocatedVMUsage(Mockito.eq(usageVO),
Mockito.any(BigDecimal.class));
+
+
assertTrue(quotaManager.aggregatePendingQuotaRecordsForAccount(accountVO, new
Pair<List<? extends UsageVO>, Integer>(null, 0)).size() == 0);
+
assertTrue(quotaManager.aggregatePendingQuotaRecordsForAccount(accountVO,
usageRecords).size() == 1);
+ }
+
+ @Test
+ public void testProcessQuotaBalanceForAccount() {
+ AccountVO accountVO = new AccountVO();
+ accountVO.setId(2L);
+ accountVO.setDomainId(1L);
+ accountVO.setType(Account.ACCOUNT_TYPE_NORMAL);
+
+ QuotaUsageVO quotaUsageVO = new QuotaUsageVO();
+ quotaUsageVO.setAccountId(2L);
+ quotaUsageVO.setStartDate(new Date());
+ quotaUsageVO.setEndDate(new Date());
+ List<QuotaUsageVO> quotaListForAccount = new ArrayList<>();
+ quotaListForAccount.add(quotaUsageVO);
+
+ quotaManager.processQuotaBalanceForAccount(accountVO,
quotaListForAccount);
+ Mockito.verify(quotaAcc,
Mockito.times(1)).persistQuotaAccount(Mockito.any(QuotaAccountVO.class));
--- End diff --
Right now there is a check if the new QuotaAccountVO object was saved in
the DB. To actually check for records aggregation this code needs to be
refactored.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
