Github user abhinandanprateek commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/768#discussion_r41845814
--- Diff:
plugins/database/quota/src/org/apache/cloudstack/quota/QuotaServiceImpl.java ---
@@ -0,0 +1,304 @@
+//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.configuration.Config;
+import com.cloud.domain.dao.DomainDao;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.exception.PermissionDeniedException;
+import com.cloud.user.Account;
+import com.cloud.user.AccountVO;
+import com.cloud.user.dao.AccountDao;
+import com.cloud.utils.component.ManagerBase;
+import com.cloud.utils.db.Filter;
+import com.cloud.utils.db.TransactionLegacy;
+
+import org.apache.cloudstack.api.command.QuotaBalanceCmd;
+import org.apache.cloudstack.api.command.QuotaCreditsCmd;
+import org.apache.cloudstack.api.command.QuotaEmailTemplateUpdateCmd;
+import org.apache.cloudstack.api.command.QuotaEmailTemplateListCmd;
+import org.apache.cloudstack.api.command.QuotaStatementCmd;
+import org.apache.cloudstack.api.command.QuotaTariffListCmd;
+import org.apache.cloudstack.api.command.QuotaTariffUpdateCmd;
+import org.apache.cloudstack.api.response.QuotaResponseBuilder;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.cloudstack.framework.config.Configurable;
+import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.quota.constant.QuotaConfig;
+import org.apache.cloudstack.quota.dao.QuotaAccountDao;
+import org.apache.cloudstack.quota.dao.QuotaBalanceDao;
+import org.apache.cloudstack.quota.dao.QuotaUsageDao;
+import org.apache.cloudstack.quota.vo.QuotaAccountVO;
+import org.apache.cloudstack.quota.vo.QuotaBalanceVO;
+import org.apache.cloudstack.quota.vo.QuotaUsageVO;
+import org.apache.cloudstack.utils.usage.UsageUtils;
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
+
+import javax.ejb.Local;
+import javax.inject.Inject;
+import javax.naming.ConfigurationException;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.TimeZone;
+
+@Component
+@Local(value = QuotaService.class)
+public class QuotaServiceImpl extends ManagerBase implements QuotaService,
Configurable, QuotaConfig {
+ private static final Logger s_logger =
Logger.getLogger(QuotaServiceImpl.class.getName());
+
+ @Inject
+ private AccountDao _accountDao;
+ @Inject
+ private QuotaAccountDao _quotaAcc;
+ @Inject
+ private QuotaUsageDao _quotaUsageDao;
+ @Inject
+ private DomainDao _domainDao;
+ @Inject
+ private ConfigurationDao _configDao;
+ @Inject
+ private QuotaBalanceDao _quotaBalanceDao;
+ @Inject
+ private QuotaResponseBuilder _respBldr;
+
+ private TimeZone _usageTimezone;
+ private int _aggregationDuration = 0;
+
+ final static BigDecimal s_hoursInMonth = new BigDecimal(30 * 24);
+ final static BigDecimal s_minutesInMonth = new BigDecimal(30 * 24 *
60);
+ final static BigDecimal s_gb = new BigDecimal(1024 * 1024 * 1024);
+
+ public QuotaServiceImpl() {
+ super();
+ }
+
+ @Override
+ public boolean configure(String name, Map<String, Object> params)
throws ConfigurationException {
+ super.configure(name, params);
+ String timeZoneStr =
_configDao.getValue(Config.UsageAggregationTimezone.toString());
+ String aggregationRange =
_configDao.getValue(Config.UsageStatsJobAggregationRange.toString());
+ if (timeZoneStr == null) {
+ timeZoneStr = "GMT";
+ }
+ _usageTimezone = TimeZone.getTimeZone(timeZoneStr);
+
+ _aggregationDuration = Integer.parseInt(aggregationRange);
+ if (_aggregationDuration < UsageUtils.USAGE_AGGREGATION_RANGE_MIN)
{
+ s_logger.warn("Usage stats job aggregation range is to small,
using the minimum value of " + UsageUtils.USAGE_AGGREGATION_RANGE_MIN);
+ _aggregationDuration = UsageUtils.USAGE_AGGREGATION_RANGE_MIN;
+ }
+ if (s_logger.isDebugEnabled()){
+ s_logger.debug("Usage timezone = " + _usageTimezone + "
AggregationDuration=" + _aggregationDuration);
+ }
+ return true;
+ }
+
+ @Override
+ public List<Class<?>> getCommands() {
+ final List<Class<?>> cmdList = new ArrayList<Class<?>>();
+ if (!isQuotaServiceEnabled()) {
+ return cmdList;
+ }
+ cmdList.add(QuotaStatementCmd.class);
+ cmdList.add(QuotaBalanceCmd.class);
+ cmdList.add(QuotaTariffListCmd.class);
+ cmdList.add(QuotaTariffUpdateCmd.class);
+ cmdList.add(QuotaCreditsCmd.class);
+ cmdList.add(QuotaEmailTemplateListCmd.class);
+ cmdList.add(QuotaEmailTemplateUpdateCmd.class);
+ return cmdList;
+ }
+
+ @Override
+ public String getConfigComponentName() {
+ return "QUOTA-PLUGIN";
+ }
+
+ @Override
+ public ConfigKey<?>[] getConfigKeys() {
+ return new ConfigKey<?>[] { QuotaPluginEnabled,
QuotaEnableEnforcement, QuotaCurrencySymbol, QuotaSmtpHost, QuotaSmtpPort,
QuotaSmtpTimeout, QuotaSmtpUser,
+ QuotaSmtpPassword, QuotaSmtpAuthType, QuotaSmtpSender };
+ }
+
+ public Boolean isQuotaServiceEnabled() {
+ return QuotaPluginEnabled.value();
+ }
+
+ @Override
+ public List<QuotaBalanceVO> findQuotaBalanceVO(Long accountId, String
accountName, Long domainId, Date startDate, Date endDate) {
+ final short opendb =
TransactionLegacy.currentTxn().getDatabaseId();
+ TransactionLegacy.open(TransactionLegacy.CLOUD_DB).close();
--- End diff --
I think you are pointing at the "TransactionLegacy.open" not being in a
DAO. The reason is that the cloud dao layer always assumes that the DB is set
to cloud db. Unlike in quota service dao where we make sure the db is
explicitly switched to usage db.
The code in there does not belong in a DAO but yes we still need to switch
the DB to cloud to make sure the cloud DAOs reach out to the right set of
schema.
To avoid that we can create a utility class and have all cloud calls to
proxy thru it. But again that will increase code quality or readability is
debatable.
---
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.
---
