etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merging fixes

This commit is contained in:
Abhinandan Prateek 2015-07-01 15:03:43 +05:30 committed by Rohit Yadav
parent 1da4271b17
commit c9770e7777
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/database/quota/src/org/apache/cloudstack/api/command/QuotaCreditsCmd.java
View File

@ -17,8 +17,6 @@
package org.apache.cloudstack.api.command;
import javax.inject.Inject;
import java.util.ArrayList;
import java.util.List;
import org.apache.log4j.Logger;
import org.apache.cloudstack.api.APICommand;
@ -32,7 +30,6 @@ import org.apache.cloudstack.api.response.QuotaCreditsResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.quota.QuotaManager;
import com.cloud.user.Account;
@APICommand(name = "quotaCredits", responseObject = QuotaCreditsResponse.class, description = "Add +-credits to an account", since = "4.2.0", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class QuotaCreditsCmd extends BaseListCmd {
@ -110,9 +107,9 @@ public void execute() {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "The account does not exists or has been removed/disabled");
}
final QuotaCreditsResponse _credit_response = _quotaManager.addQuotaCredits(accountId, domainId, value, CallContext.current().getCallingAccount().getId());
final QuotaCreditsResponse credit_response = _quotaManager.addQuotaCredits(accountId, domainId, value, CallContext.current().getCallingAccount().getId());
setResponseObject(_credit_response);
setResponseObject(credit_response);
}

3
plugins/database/quota/src/org/apache/cloudstack/quota/QuotaManager.java
View File

@ -20,6 +20,7 @@ import java.util.List;
import org.apache.cloudstack.api.command.ListQuotaConfigurationsCmd;
import org.apache.cloudstack.api.response.QuotaConfigurationResponse;
import org.apache.cloudstack.api.response.QuotaCreditsResponse;
import com.cloud.utils.Pair;
import com.cloud.utils.component.PluggableService;
@ -30,4 +31,6 @@ public interface QuotaManager extends PluggableService {
QuotaConfigurationResponse createQuotaConfigurationResponse(QuotaConfigurationVO configuration);
QuotaCreditsResponse addQuotaCredits(Long accountId, Long domainId, Integer amount, Long updatedBy);
}

1
plugins/database/quota/src/org/apache/cloudstack/quota/QuotaManagerImpl.java
View File

@ -92,3 +92,4 @@ public QuotaCreditsResponse addQuotaCredits(Long accountId, Long domainId, Integ
}