Quota UI rework

api/src/main/java/org/apache/cloudstack/api/ApiConstants.java

@@ -286,6 +286,7 @@ public class ApiConstants {
  public static final String HEALTH = "health";
  public static final String HEADERS = "headers";
  public static final String HIDE_IP_ADDRESS_USAGE = "hideipaddressusage";
+ public static final String HISTORY = "history";
  public static final String HOST_ID = "hostid";
  public static final String HOST_IDS = "hostids";
  public static final String HOST_IP = "hostip";

framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaCreditsDao.java

@@ -25,7 +25,7 @@
 
 public interface QuotaCreditsDao extends GenericDao<QuotaCreditsVO, Long> {
 
- List<QuotaCreditsVO> findCredits(Long accountId, Long domainId, Date startDate, Date endDate, boolean recursive);
+ List<QuotaCreditsVO> findCredits(Long accountId, List<Long> domainIds, Date startDate, Date endDate);
 
  QuotaCreditsVO saveCredits(QuotaCreditsVO credits);
 

framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaCreditsDaoImpl.java

@@ -21,7 +21,6 @@
 
 import javax.inject.Inject;
 
-import com.cloud.domain.dao.DomainDao;
 import com.cloud.utils.db.Filter;
 import com.cloud.utils.db.SearchBuilder;
 import org.apache.cloudstack.quota.vo.QuotaBalanceVO;
@@ -39,8 +38,6 @@
 @Component
 public class QuotaCreditsDaoImpl extends GenericDaoBase<QuotaCreditsVO, Long> implements QuotaCreditsDao {
 
- @Inject
- DomainDao domainDao;
  @Inject
  QuotaBalanceDao quotaBalanceDao;
 
@@ -50,19 +47,18 @@ public QuotaCreditsDaoImpl() {
  quotaCreditsVoSearch = createSearchBuilder();
  quotaCreditsVoSearch.and("updatedOn", quotaCreditsVoSearch.entity().getUpdatedOn(), SearchCriteria.Op.BETWEEN);
  quotaCreditsVoSearch.and("accountId", quotaCreditsVoSearch.entity().getAccountId(), SearchCriteria.Op.EQ);
- quotaCreditsVoSearch.and("domainId", quotaCreditsVoSearch.entity().getDomainId(), SearchCriteria.Op.IN);
+ quotaCreditsVoSearch.and("domainIds", quotaCreditsVoSearch.entity().getDomainId(), SearchCriteria.Op.IN);
  quotaCreditsVoSearch.done();
  }
 
  @Override
- public List<QuotaCreditsVO> findCredits(Long accountId, Long domainId, Date startDate, Date endDate, boolean recursive) {
+ public List<QuotaCreditsVO> findCredits(Long accountId, List<Long> domainIds, Date startDate, Date endDate) {
  SearchCriteria<QuotaCreditsVO> sc = quotaCreditsVoSearch.create();
  Filter filter = new Filter(QuotaCreditsVO.class, "updatedOn", true, 0L, Long.MAX_VALUE);
 
  sc.setParametersIfNotNull("accountId", accountId);
- if (domainId != null) {
- List<Long> domainIds = recursive ? domainDao.getDomainAndChildrenIds(domainId) : List.of(domainId);
- sc.setParameters("domainId", domainIds.toArray());
+ if (domainIds != null) {
+ sc.setParameters("domainIds", domainIds.toArray());
  }
 
  if (ObjectUtils.allNotNull(startDate, endDate)) {

plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaCreditsCmd.java

@@ -21,14 +21,13 @@
 import org.apache.cloudstack.api.ACL;
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
-import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.AccountResponse;
 import org.apache.cloudstack.api.response.DomainResponse;
+import org.apache.cloudstack.api.response.ProjectResponse;
 import org.apache.cloudstack.api.response.QuotaCreditsResponse;
 import org.apache.cloudstack.api.response.QuotaResponseBuilder;
-import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.quota.QuotaService;
 
 import javax.inject.Inject;
@@ -42,22 +41,35 @@ public class QuotaCreditsCmd extends BaseCmd {
  @Inject
  QuotaService _quotaService;
 
-
-
-@Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, required = true, description = "Account Id for which quota credits need to be added")
+ @Deprecated
+ @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "Name of the Account for which Quota credits will be added. Deprecated, please use '" +
+ ApiConstants.ACCOUNT_ID + "' instead.")
  private String accountName;
 
  @ACL
- @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, required = true, entityType = DomainResponse.class, description = "Domain for which quota credits need to be added")
+ @Deprecated
+ @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class,
+ description = "Domain of the Account specified by '" + ApiConstants.ACCOUNT + "' for which Quota credits will be added. " +
+ "Deprecated, please use '" + ApiConstants.ACCOUNT_ID + "' instead.")
  private Long domainId;
 
- @Parameter(name = ApiConstants.VALUE, type = CommandType.DOUBLE, required = true, description = "Value of the credits to be added+, subtracted-")
+ @ACL
+ @Parameter(name = ApiConstants.ACCOUNT_ID, type = CommandType.UUID, entityType = AccountResponse.class,
+ description = "ID of the Account for which Quota credits will be added. Cannot be specified with '" + ApiConstants.PROJECT_ID + "'.")
+ private Long accountId;
+
+ @ACL
+ @Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class,
+ description = "ID of the Project for which Quota credits will be added. Cannot be specified with '" + ApiConstants.ACCOUNT_ID + "'.")
+ private Long projectId;
+
+ @Parameter(name = ApiConstants.VALUE, type = CommandType.DOUBLE, required = true, description = "Amount of credits to be added (in case of a positive value) or subtracted (in case of a negative value).")
  private Double value;
 
- @Parameter(name = "min_balance", type = CommandType.DOUBLE, required = false, description = "Minimum balance threshold of the Account")
+ @Parameter(name = "min_balance", type = CommandType.DOUBLE, description = "An email will be sent to the Account when the Quota credits get below this threshold.")
  private Double minBalance;
 
- @Parameter(name = "quota_enforce", type = CommandType.BOOLEAN, required = false, description = "Account for which quota enforce is set to false will not be locked when there is no credit balance")
+ @Parameter(name = "quota_enforce", type = CommandType.BOOLEAN, description = "Whether to lock the Account when Quota credits are below zero.")
  private Boolean quotaEnforce;
 
  public Double getMinBalance() {
@@ -100,42 +112,28 @@ public void setValue(Double value) {
  this.value = value;
  }
 
+ public Long getAccountId() {
+ return accountId;
+ }
+
+ public Long getProjectId() {
+ return projectId;
+ }
+
  public QuotaCreditsCmd() {
  super();
  }
 
  @Override
  public void execute() {
- Long accountId = null;
- Account account = _accountService.getActiveAccountByName(accountName, domainId);
- if (account != null) {
- accountId = account.getAccountId();
- }
- if (accountId == null) {
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "The Account does not exists or has been removed/disabled");
- }
- if (getValue() == null) {
- throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Please send a valid non-empty quota value");
- }
- if (getQuotaEnforce() != null) {
- _quotaService.setLockAccount(accountId, getQuotaEnforce());
- }
- if (getMinBalance() != null) {
- _quotaService.setMinBalance(accountId, getMinBalance());
- }
-
- final QuotaCreditsResponse response = _responseBuilder.addQuotaCredits(accountId, getDomainId(), getValue(), CallContext.current().getCallingUserId(), getQuotaEnforce());
+ QuotaCreditsResponse response = _responseBuilder.addQuotaCredits(this);
  response.setResponseName(getCommandName());
  response.setObjectName("quotacredits");
  setResponseObject(response);
  }
 
  @Override
  public long getEntityOwnerId() {
- Account account = _accountService.getActiveAccountByName(accountName, domainId);
- if (account != null) {
- return account.getAccountId();
- }
  return Account.ACCOUNT_ID_SYSTEM;
  }
 

plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaCreditsListCmd.java

@@ -18,16 +18,18 @@
 
 import com.cloud.utils.Pair;
 
-import org.apache.cloudstack.api.ACL;
+import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.response.AccountResponse;
 import org.apache.cloudstack.api.response.DomainResponse;
 import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.api.response.ProjectResponse;
 import org.apache.cloudstack.api.response.QuotaCreditsResponse;
 import org.apache.cloudstack.api.response.QuotaResponseBuilder;
+import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.time.DateUtils;
 
@@ -44,13 +46,16 @@ public class QuotaCreditsListCmd extends BaseCmd {
  @Inject
  QuotaResponseBuilder quotaResponseBuilder;
 
- @ACL
-@Parameter(name = ApiConstants.ACCOUNT_ID, type = CommandType.UUID, entityType = AccountResponse.class, description = "ID of the account for which the credit statement will be generated.")
+ @Parameter(name = ApiConstants.ACCOUNT_ID, type = CommandType.UUID, entityType = AccountResponse.class,
+description = "ID of the Account for which the credit statement will be generated. Cannot be specified with '" + ApiConstants.PROJECT_ID + "'.")
  private Long accountId;
 
- @ACL
- @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, description = "ID of the domain for which credit statement will be generated. " +
- "Available only for administrators.")
+ @Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class,
+ description = "ID of the Project for which the credit statement will be generated. Cannot be specified with '" + ApiConstants.ACCOUNT_ID + "'.")
+ private Long projectId;
+
+ @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, description = "ID of the Domain for which credit statement will be generated. " +
+ "Available only for administrators.", authorized = {RoleType.Admin, RoleType.DomainAdmin})
  private Long domainId;
 
  @Parameter(name = ApiConstants.END_DATE, type = CommandType.DATE, description = "End date of the credit statement. If not provided, the current date will be " +
@@ -97,14 +102,18 @@ public void setStartDate(Date startDate) {
  this.startDate = startDate;
  }
 
- public Boolean getRecursive() {
- return recursive;
+ public boolean isRecursive() {
+ return BooleanUtils.isTrue(recursive);
  }
 
  public void setRecursive(Boolean recursive) {
  this.recursive = recursive;
  }
 
+ public Long getProjectId() {
+ return projectId;
+ }
+
  @Override
  public void execute() {
  Pair<List<QuotaCreditsResponse>, Integer> responses = quotaResponseBuilder.createQuotaCreditsListResponse(this);
@@ -116,7 +125,10 @@ public void execute() {
 
  @Override
  public long getEntityOwnerId() {
- return -1;
+ if (ObjectUtils.allNull(accountId, projectId)) {
+ return -1;
+ }
+ return _accountService.finalizeAccountId(accountId, null, null, projectId);
  }
 
 }

plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaResponseBuilder.java

@@ -19,6 +19,7 @@
 import com.cloud.user.User;
 import org.apache.cloudstack.api.command.QuotaBalanceCmd;
 import org.apache.cloudstack.api.command.QuotaConfigureEmailCmd;
+import org.apache.cloudstack.api.command.QuotaCreditsCmd;
 import org.apache.cloudstack.api.command.QuotaCreditsListCmd;
 import org.apache.cloudstack.api.command.QuotaEmailTemplateListCmd;
 import org.apache.cloudstack.api.command.QuotaEmailTemplateUpdateCmd;
@@ -54,7 +55,7 @@ public interface QuotaResponseBuilder {
 
  Pair<List<QuotaSummaryResponse>, Integer> createQuotaSummaryResponse(QuotaSummaryCmd cmd);
 
- QuotaCreditsResponse addQuotaCredits(Long accountId, Long domainId, Double amount, Long updatedBy, Boolean enforce);
+ QuotaCreditsResponse addQuotaCredits(QuotaCreditsCmd cmd);
 
  List<QuotaEmailTemplateResponse> listQuotaEmailTemplates(QuotaEmailTemplateListCmd cmd);