etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,590 Commits 326 Branches 325 Tags 910 MiB
Commit Graph

109 Commits

Author SHA1 Message Date
Abhinandan Prateek 6c246acc16 CLOUDSTACK-8592: fixed various Quota*DaoImpls to use the new Transaction 
callback mechanism
 2015-10-21 14:26:50 +05:30
Abhinandan Prateek cb0fde68f8 CLOUDSTACK-8592: fixed QuotaBalanceDaoImpl to use the new Transaction 2015-10-21 14:26:35 +05:30
Abhinandan Prateek 86e2e279a7 CLOUDSTACK-8592: fixed QuotaTariffDao to use the new Transaction 
callback pattern
 2015-10-21 14:26:05 +05:30
Abhinandan Prateek 677564f7ee CLOUDSTACK-8592: fix sort order for tariff 2015-10-21 14:25:37 +05:30
Abhinandan Prateek 722805e418 CLOUDSTACK-8592: Incorporating PR changes for quota plugin 2015-10-21 14:25:13 +05:30
Rohit Yadav 7a228f66d2 CLOUDSTACK-8592: Incorporate changes from PR in quota framework and plugin 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-10-21 14:24:59 +05:30
Rohit Yadav 892a6ebbe5 CLOUDSTACK-8592: Add more unit tests 
- unit tests for UsageTypes
- unit tests for all Cmd classes
- unit tests for all service and manager impls
- try-catch-finally or try-with-resource in dao impls for failsafe db switching
- remove dead code
- add missing quota calculation case (regression fixed)
- replace tabs with spaces in pom.xmls

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-10-21 14:22:53 +05:30
Abhinandan Prateek 9808321cf3 CLOUDSTACK-8592: Add changes from review 
- added marvin test for quota plugin API
- removed unused commented code
- debug messages in debug enabled check
- checks for nulls, fixed access to member variables and feature
- changes based on PR comments
 2015-10-21 14:22:37 +05:30
Rohit Yadav bf5d388d91 quota: check if quota is enabled, only then expose APIs 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-08-07 10:58:36 +05:30
Abhinandan Prateek ed28e4ff19 Revert "quota: fixes" 
This reverts commit fc95ece6cb.
 2015-08-04 12:07:31 +05:30
Abhinandan Prateek 173f6ba730 quota:fixes 2015-08-04 11:45:25 +05:30
Abhinandan Prateek b38f73805a quota: added checks for quota enforce and threshold per account 2015-08-04 10:29:33 +05:30
Rohit Yadav 57bc5cb904 quota: minor credits ui fixes 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-08-03 15:33:48 +05:30
Abhinandan Prateek fc95ece6cb quota: fixes 2015-08-03 14:15:31 +05:30
Abhinandan Prateek b0a8598c3c quota: even if there is no usage for some resources show them in the 
statement.
 2015-08-03 13:32:00 +05:30
Abhinandan Prateek 8943839380 quota: due to interpackage dependency the account lock functionality is pulled 
into usage
 2015-08-03 11:56:25 +05:30
Abhinandan Prateek bd1d12d830 quota: added min_balance and quota enforce for each account 2015-08-03 09:42:39 +05:30
Abhinandan Prateek 8c81b02d9e quota: fine tuning dates 2015-07-31 12:42:35 +05:30
Rohit Yadav 9d82488342 quota: send currency with add credits response 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-30 17:31:02 +05:30
Abhinandan Prateek 50c579de3d quota: restructured/refactored to make quota run inside the usage server 2015-07-30 16:40:39 +05:30
Abhinandan Prateek 2f7ebc7c54 quota: fixed permisison and date flip 2015-07-29 19:34:14 +05:30
Abhinandan Prateek 7c4c67b520 quota fixed misc boundary conditions 2015-07-29 17:20:58 +05:30
Rohit Yadav 60125d3a4e quota: add quota monthly statement email template 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-29 12:04:23 +05:30
Rohit Yadav b2dd5e1374 quota: fix ui to grab currency from the response 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-29 11:45:31 +05:30
Rohit Yadav def9e90956 quota: add currency to list/readonly apis 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-29 11:35:12 +05:30
Rohit Yadav 7b562b0696 quota: add new template for sending unlocked email account 2015-07-29 11:26:59 +05:30
Rohit Yadav 70aada690b quota: don't lock account, only unlock with adding credits 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-29 11:26:59 +05:30
Abhinandan Prateek e4125a2999 quota: allow locked accounts to be credited 2015-07-29 11:25:52 +05:30
Abhinandan Prateek 7a6b536d4b quota: only add the initial credit entries to the balance as they have 
not yet been accounted for
 2015-07-29 09:58:34 +05:30
Rohit Yadav 9e3dadce41 quota: unlock/lock logic with addCredits api 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-28 17:18:42 +05:30
Abhinandan Prateek 7a55e82563 quota: get last balance api 2015-07-28 16:15:11 +05:30
Rohit Yadav b001bf6dbc quota: for checking/sending email use the new lastQuotaBalance method to get latest balance 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-28 16:13:28 +05:30
Rohit Yadav 19fefbcbd1 quota: on getting enough credits, unlock the account which got new credits 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-28 16:12:55 +05:30
Rohit Yadav d29a4e9646 quota: only lock normal accounts 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-28 15:54:15 +05:30
Abhinandan Prateek b388512191 quota: rename method to lastQuotaBalance 2015-07-28 15:37:18 +05:30
Abhinandan Prateek ca6dfc99ac quota: added a method to get the last balance in balancedao 2015-07-28 15:32:50 +05:30
Abhinandan Prateek b64aee0a5e Merge branch 'quota' of https://github.com/shapeblue/cloudstack into quota 2015-07-28 15:11:07 +05:30
Abhinandan Prateek 2a64e947e2 quota: account for 0 tariff 2015-07-28 15:10:21 +05:30
Rohit Yadav 6d92dadb57 quota: remove unused import 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-28 15:01:59 +05:30
Rohit Yadav fdfcd953d5 quota: fix stuff 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-28 14:59:37 +05:30
Abhinandan Prateek 8df0a53bf8 quota: statement genertaion date should not be in future 2015-07-28 13:53:55 +05:30
Rohit Yadav b08736af48 quota: add logic to send email using a deferred approach 
a deferred bg thread could be later used to send emails

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-27 13:25:50 +05:30
Rohit Yadav d9c38249c7 quota: fix balance api to send result when no debits have been made 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-27 13:25:15 +05:30
Rohit Yadav 38146d87eb quota: fix template update API to increase body/subject size/length 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-27 13:24:46 +05:30
Rohit Yadav 0e0df49d3e quota: remove include column from tariff, fix list tariff api to accept start date 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-24 14:34:39 +05:30
Rohit Yadav 355b2e6330 quota: implement quota email alert methods/classes and template engine to substitute variable options 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-24 12:40:33 +05:30
Rohit Yadav 1725266457 quota: escape javascript, but not html 
people might want to send html emails

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-23 15:33:34 +05:30
Rohit Yadav f5be8aaf8f quota: email template backend and apis 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-23 15:23:35 +05:30
Abhinandan Prateek 15b9a894eb quota: restructuring 2015-07-23 14:38:42 +05:30
Abhinandan Prateek e5ce5e9614 quota: renaming DBUtils to ResponseBuilder as that is what it is 2015-07-23 09:17:26 +05:30