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

25579 Commits

Author SHA1 Message Date
Rohit Yadav 7ecb45487a CLOUDSTACK-8592: Incorporate changes from PR in usage 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-10-21 14:23:08 +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
Abhinandan Prateek fb94a67cca quota: to maintain idempotency the alter table statement is moved to 
java upgrade code. In case the column already exists the code will
ignore the error.
 2015-08-12 15:52:57 +05:30
Abhinandan Prateek 43c893cc31 quota: by default make the global quota enforement flag as false. fix 
the condition so that the uasage generated records are picked up in
quota calc cycle
 2015-08-07 12:34:18 +05:30
Rohit Yadav 73cedf127f quota: remove quotaRefresh 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-08-07 11:01:13 +05:30
Rohit Yadav 74c34d797a quota;e2etesting 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-08-07 10:58:36 +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 32c5004381 quota: though default value for quota_calculated is 0, the usage server 
makes it null while entering usage entries. Flipping the condition so
as to acocunt for that.
 2015-08-07 10:12:35 +05:30
Abhinandan Prateek d3f65ae90c quota: code cleanup 2015-08-06 08:47:09 +05:30
Abhinandan Prateek 731d9b80d6 quota: +send last month statement at the start of the month 2015-08-05 14:29:19 +05:30
Abhinandan Prateek f0467c8a2b quota: streamlined emailing 2015-08-04 16:24:14 +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
Rohit Yadav e2c2e0696d quota: show ui balance if start/end balance are defined (any values) 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-08-04 10:39:21 +05:30
Abhinandan Prateek b38f73805a quota: added checks for quota enforce and threshold per account 2015-08-04 10:29:33 +05:30
Abhinandan Prateek d5eabfb7b2 quota: refactored email code and pulled it into ALertManager that will 
run after Quta calc's are done
 2015-08-03 17:20:55 +05:30
Rohit Yadav eafefb0368 quota: fix database 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-08-03 16:17:55 +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
Rohit Yadav a39b6cddc9 quota ui: add min threshold and checkbox to enforce locking 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-08-03 11:36:37 +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 92269d2636 quota: fixing warped up db 2015-08-01 22:12:34 +05:30
Abhinandan Prateek eaf3d21b55 quota: tariff fix 2015-08-01 18:57:54 +05:30
Abhinandan Prateek 5535e81c8b quota: fixing account bean 2015-08-01 16:13:30 +05:30
Abhinandan Prateek 9deed58fad quota: added quota_account 2015-07-31 17:39:14 +05:30
Rohit Yadav e123f2aa79 quota/usage: fix license 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-31 15:10:36 +05:30
Rohit Yadav 124d1da209 quota: fix stuff 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-31 15:05:10 +05:30
Abhinandan Prateek 8c81b02d9e quota: fine tuning dates 2015-07-31 12:42:35 +05:30
Abhinandan Prateek 1590b66700 quota: adding book keeping columns in accounts table 2015-07-31 12:27:10 +05:30
Rohit Yadav 40914ed0bb quota: improve css and element usage; align inputs below labels 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-30 17:31:02 +05:30
Rohit Yadav 53f3b3c304 quota: fix css of the ui, make element similar to other cloudstack UI elements 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-30 17:31:02 +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 ddba6d5b51 quota: run the calculations after the usage server is done collecting 
usage
 2015-07-30 17:22:51 +05:30
Abhinandan Prateek 50c579de3d quota: restructured/refactored to make quota run inside the usage server 2015-07-30 16:40:39 +05:30
Rohit Yadav 8483c4a3ce quota: add currency in case of users too 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-30 14:35:54 +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
Rohit Yadav a4e8301941 quota ui: grab current date in the browser's tariff 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-28 17:10:23 +05:30
Abhinandan Prateek 7a55e82563 quota: get last balance api 2015-07-28 16:15:11 +05:30