cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [8/8] git commit: updated refs/heads/master to 24d0609
Date Mon, 07 Dec 2015 18:25:38 GMT
Merge pull request #768 from shapeblue/quota-master

Implement Quota serviceThis pull request is for quota service implementation, divided into
following commits:

Quota server side implementation
a. Quota Framework plugin containing Daos
b. Quota database plugin for quota APIs
c. Quota Usage server enhancements
d. Quota UI plugin
e. Tests

* pr/768:
  CLOUDSTACK-8592: Implement Quota service

Signed-off-by: Remi Bergsma <github@remi.nl>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/24d06099
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/24d06099
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/24d06099

Branch: refs/heads/master
Commit: 24d06099ff2ac64d753c5be20d9b6e7c4e16c91e
Parents: f30fbe9 987fcbd
Author: Remi Bergsma <github@remi.nl>
Authored: Mon Dec 7 19:23:33 2015 +0100
Committer: Remi Bergsma <github@remi.nl>
Committed: Mon Dec 7 19:23:33 2015 +0100

----------------------------------------------------------------------
 .../org/apache/cloudstack/api/ApiConstants.java |   1 +
 api/src/org/apache/cloudstack/api/BaseCmd.java  |   2 +-
 .../command/admin/usage/GetUsageRecordsCmd.java |  24 +
 .../org/apache/cloudstack/usage/UsageTypes.java |   1 +
 .../api/command/test/UsageCmdTest.java          |  19 +
 .../classes/resources/messages.properties       |  41 +
 client/pom.xml                                  |  10 +
 client/tomcatconf/commands.properties.in        |  11 +
 .../com/cloud/upgrade/dao/Upgrade452to460.java  |   2 +-
 .../com/cloud/upgrade/dao/Upgrade461to470.java  |  17 +
 engine/schema/src/com/cloud/usage/UsageVO.java  |  83 +-
 .../src/com/cloud/usage/dao/UsageDao.java       |   4 +
 .../src/com/cloud/usage/dao/UsageDaoImpl.java   |  68 +-
 .../db/src/com/cloud/utils/db/Transaction.java  |  33 +-
 framework/pom.xml                               |   1 +
 framework/quota/pom.xml                         |  73 ++
 .../quota/spring-framework-quota-context.xml    |  34 +
 .../cloudstack/quota/QuotaAlertManager.java     |  26 +
 .../cloudstack/quota/QuotaAlertManagerImpl.java | 418 ++++++++
 .../apache/cloudstack/quota/QuotaManager.java   |  25 +
 .../cloudstack/quota/QuotaManagerImpl.java      | 464 +++++++++
 .../apache/cloudstack/quota/QuotaStatement.java |  26 +
 .../cloudstack/quota/QuotaStatementImpl.java    | 376 +++++++
 .../cloudstack/quota/constant/QuotaConfig.java  |  57 ++
 .../cloudstack/quota/constant/QuotaTypes.java   | 103 ++
 .../cloudstack/quota/dao/QuotaAccountDao.java   |  35 +
 .../quota/dao/QuotaAccountDaoImpl.java          |  74 ++
 .../cloudstack/quota/dao/QuotaBalanceDao.java   |  43 +
 .../quota/dao/QuotaBalanceDaoImpl.java          | 189 ++++
 .../cloudstack/quota/dao/QuotaCreditsDao.java   |  32 +
 .../quota/dao/QuotaCreditsDaoImpl.java          |  78 ++
 .../quota/dao/QuotaEmailTemplatesDao.java       |  27 +
 .../quota/dao/QuotaEmailTemplatesDaoImpl.java   |  74 ++
 .../cloudstack/quota/dao/QuotaTariffDao.java    |  37 +
 .../quota/dao/QuotaTariffDaoImpl.java           | 133 +++
 .../cloudstack/quota/dao/QuotaUsageDao.java     |  35 +
 .../cloudstack/quota/dao/QuotaUsageDaoImpl.java | 116 +++
 .../quota/dao/ServiceOfferingDao.java           |  25 +
 .../quota/dao/ServiceOfferingDaoImpl.java       |  84 ++
 .../cloudstack/quota/dao/UserVmDetailsDao.java  |  27 +
 .../quota/dao/UserVmDetailsDaoImpl.java         |  59 ++
 .../cloudstack/quota/vo/QuotaAccountVO.java     | 149 +++
 .../cloudstack/quota/vo/QuotaBalanceVO.java     | 133 +++
 .../cloudstack/quota/vo/QuotaCreditsVO.java     | 116 +++
 .../quota/vo/QuotaEmailTemplatesVO.java         | 109 +++
 .../cloudstack/quota/vo/QuotaTariffVO.java      | 170 ++++
 .../cloudstack/quota/vo/QuotaUsageVO.java       | 177 ++++
 .../cloudstack/quota/vo/ServiceOfferingVO.java  | 336 +++++++
 .../cloudstack/quota/vo/UserVmDetailVO.java     |  83 ++
 .../quota/QuotaAlertManagerImplTest.java        | 197 ++++
 .../cloudstack/quota/QuotaManagerImplTest.java  | 200 ++++
 .../cloudstack/quota/QuotaStatementTest.java    | 255 +++++
 .../quota/constant/QuotaTypesTest.java          |  48 +
 plugins/database/quota/pom.xml                  |  99 ++
 .../META-INF/cloudstack/quota/module.properties |  18 +
 .../cloudstack/quota/spring-quota-context.xml   |  31 +
 .../cloudstack/api/command/QuotaBalanceCmd.java | 125 +++
 .../cloudstack/api/command/QuotaCreditsCmd.java | 147 +++
 .../api/command/QuotaEmailTemplateListCmd.java  |  60 ++
 .../command/QuotaEmailTemplateUpdateCmd.java    | 122 +++
 .../api/command/QuotaStatementCmd.java          | 141 +++
 .../cloudstack/api/command/QuotaSummaryCmd.java | 110 +++
 .../api/command/QuotaTariffListCmd.java         |  95 ++
 .../api/command/QuotaTariffUpdateCmd.java       | 102 ++
 .../cloudstack/api/command/QuotaUpdateCmd.java  |  72 ++
 .../api/response/QuotaBalanceResponse.java      | 153 +++
 .../api/response/QuotaCreditsResponse.java      |  91 ++
 .../response/QuotaEmailTemplateResponse.java    |  90 ++
 .../api/response/QuotaResponseBuilder.java      |  65 ++
 .../api/response/QuotaResponseBuilderImpl.java  | 516 ++++++++++
 .../response/QuotaStatementItemResponse.java    | 118 +++
 .../api/response/QuotaStatementResponse.java    | 130 +++
 .../api/response/QuotaSummaryResponse.java      | 155 +++
 .../api/response/QuotaTariffResponse.java       | 134 +++
 .../api/response/QuotaTypeResponse.java         |  58 ++
 .../api/response/QuotaUpdateResponse.java       |  38 +
 .../apache/cloudstack/quota/QuotaService.java   |  39 +
 .../cloudstack/quota/QuotaServiceImpl.java      | 299 ++++++
 .../api/command/QuotaBalanceCmdTest.java        |  65 ++
 .../api/command/QuotaCreditsCmdTest.java        |  87 ++
 .../command/QuotaEmailTemplateListCmdTest.java  |  50 +
 .../QuotaEmailTemplateUpdateCmdTest.java        |  68 ++
 .../api/command/QuotaStatementCmdTest.java      |  53 +
 .../api/command/QuotaTariffListCmdTest.java     |  62 ++
 .../api/command/QuotaTariffUpdateCmdTest.java   |  67 ++
 .../response/QuotaResponseBuilderImplTest.java  | 228 +++++
 .../cloudstack/quota/QuotaServiceImplTest.java  | 183 ++++
 plugins/hypervisors/ovm3/pom.xml                |   2 +-
 plugins/network-elements/nuage-vsp/pom.xml      |   2 +-
 plugins/pom.xml                                 |   1 +
 pom.xml                                         |  16 +-
 .../cloud/api/dispatch/ParamProcessWorker.java  |   8 +
 .../src/com/cloud/user/AccountManagerImpl.java  |   3 +-
 .../api/dispatch/ParamProcessWorkerTest.java    |   5 +
 setup/db/db/schema-421to430-cleanup.sql         |   1 -
 setup/db/db/schema-461to470.sql                 | 110 +++
 test/integration/smoke/test_quota.py            | 204 ++++
 tools/apidoc/gen_toc.py                         |   2 +
 ui/dictionary.jsp                               |  44 +
 ui/plugins/plugins.js                           |   3 +-
 ui/plugins/quota/config.js                      |  25 +
 ui/plugins/quota/icon.png                       | Bin 0 -> 3289 bytes
 ui/plugins/quota/quota.css                      |  68 ++
 ui/plugins/quota/quota.js                       | 971 +++++++++++++++++++
 ui/scripts/ui/dialog.js                         |   4 +-
 ui/scripts/ui/widgets/detailView.js             |  24 +-
 ui/scripts/ui/widgets/listView.js               |  20 +-
 usage/pom.xml                                   |   9 +-
 usage/resources/usageApplicationContext.xml     |  47 +-
 usage/src/com/cloud/usage/UsageManagerImpl.java |  31 +-
 110 files changed, 10350 insertions(+), 81 deletions(-)
----------------------------------------------------------------------



Mime
View raw message