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

2319 Commits

Author SHA1 Message Date
Rohit Yadav df2687aca8 quota: fix db quota usage 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-22 15:12:05 +05:30
Rohit Yadav c991b08be6 quota: fix tariff update cmd to accept start date, update effective/start date in db 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-22 15:12:05 +05:30
Abhinandan Prateek 6c944dc409 quota: fix tariff type 2015-07-22 14:45:18 +05:30
Abhinandan Prateek cf003cb744 quotq: optimizing tariff retrival while calculating quota usage. 2015-07-22 12:45:58 +05:30
Abhinandan Prateek 22dccd1be6 quota: make tariff plans updatable and schedulable 2015-07-22 12:28:13 +05:30
Abhinandan Prateek f51eb1b396 quota: adding config initialization to quota manager and taking care of boundary conditions 2015-07-21 17:33:00 +05:30
Rohit Yadav 3008502440 quota: add apache commons 3.4 lang3 library for using StrSubstitutor for email templates 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-21 15:24:30 +05:30
Abhinandan Prateek 945103b1f7 quota: for quota calc from start date to end date, adjust the credits/debits done during this period 2015-07-21 15:23:27 +05:30
Abhinandan Prateek 6688220cb2 quota: fixed transaction, boundary conditions 2015-07-21 14:11:43 +05:30
Rohit Yadav c13b329df7 quota: fix quota credits api, NPE 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-21 12:51:07 +05:30
Abhinandan Prateek c99346c30e quota: added checks for boundary cases 2015-07-21 12:40:38 +05:30
Abhinandan Prateek ccde3cfca9 CLOUDSTACK-8592: splitting out quotamanager into quotamanager and quotaservice 2015-07-21 12:40:38 +05:30
Rohit Yadav 02234778d7 quota: add quota balance/credit statement in the statement tab 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-21 12:34:59 +05:30
Rohit Yadav 6f1736404e quota: fix quota statement api, db schema and implement UI tab for statement generation 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-20 17:21:01 +05:30
Abhinandan Prateek a4dac9abea CLOUDSTACK-8592: added current balance and balance on a date 2015-07-20 11:54:49 +05:30
Abhinandan Prateek a9e71c7d2b CLOUDSTACK-8592: in responses print values rounded to two decimal places 2015-07-17 10:36:46 +05:30
Abhinandan Prateek a2143e3f98 CLOUDSTACK-8592: calculating balance, adjusting credits and API commands for getting quota statement and balances 2015-07-16 17:40:35 +05:30
Rohit Yadav 7c10013bd7 quota: rename/refactor quota mapping usage to quotaTariff 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-15 17:32:38 +05:30
Rohit Yadav d28365b882 quota: refactor and fix code around quota tariff 
quota mapping is now called quota tariff
fixed db usage

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-15 17:21:51 +05:30
Abhinandan Prateek f4226a7219 iCLOUDSTACK-8592: Incremental update for credits and balance 2015-07-15 15:49:24 +05:30
Abhinandan Prateek 13b04557fa CLOUDSTACK-8592: put a limit on number of usage records read for processing 2015-07-15 11:21:34 +05:30
Rohit Yadav c8473d2f3a quota: remove unwanted changes 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-14 18:04:54 +05:30
Abhinandan Prateek af2cccf0a1 CLOUDSTACK-8592: formatting 2015-07-14 17:22:36 +05:30
Abhinandan Prateek 2a8bb5f4aa CLOUDSTACK-8592: close transactions used for swicthing DBs 2015-07-14 17:18:04 +05:30
Abhinandan Prateek 26c3628fda CLOUDSTACK-8592: added quota balance command that aggregates quota line items and balance information 2015-07-14 16:24:20 +05:30
Abhinandan Prateek 47ffa60f9e iCLOUDSTACK-8592: adding accountid and domainid to quota statement 2015-07-14 16:22:21 +05:30
Rohit Yadav 82d9a6ac76 quota: inject quota balance dao to quota db utils to be used later 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-14 15:10:06 +05:30
Rohit Yadav c8cfb383da quota: for BigDecimal use String in API cmd and responses 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-14 14:54:54 +05:30
Rohit Yadav c4d82f0a60 quota: take value as string in add credit cmd 
API was not working, using strign param we can create a BigDecimal value

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-14 14:23:55 +05:30
Rohit Yadav 473496b1d0 quota: use uniform response names 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-14 14:13:02 +05:30
Rohit Yadav 829bb17f7c quota: rename quotamapping to quotamappingcmd 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-14 14:07:56 +05:30
Rohit Yadav ccbe8decb3 quota: fix quota refresh API, reuse success response 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-14 13:53:12 +05:30
Rohit Yadav 9dc60bba61 quota: fix quotaRefresh API response keys 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-14 13:43:16 +05:30
Abhinandan Prateek ae0eb6e334 CLOUDSTACK-8592: first cut implementation of quota statement 2015-07-14 12:18:25 +05:30
Abhinandan Prateek 135af2ceed CLOUDSTACK-8592: calculation of quota 2015-07-14 11:35:52 +05:30
Abhinandan Prateek 1b579afaeb CLOUDSTACK-8592: refactoring, cleanup 2015-07-14 11:35:52 +05:30
Abhinandan Prateek 53c22f6ba7 CLOUDSTACK-8592: adding QuotaEditResourceMappingCmd 2015-07-14 11:35:52 +05:30
Abhinandan Prateek b5e016288a CLOUDSTACK-8592: keep track of quota job runs - adding schema and daos 2015-07-14 11:35:52 +05:30
Abhinandan Prateek a558afae57 CLOUDSTACK-8592: Adding new APIs and implementing the API stubs 2015-07-14 11:35:52 +05:30
Abhinandan Prateek 65618bbac2 CLOUDSTACK-8592: adding corresponding DAOs with stubs 2015-07-14 11:35:52 +05:30
Abhinandan Prateek d160da07cf CLOUDSTACK-8592: adding corresponding DAOs with stubs 2015-07-14 11:35:52 +05:30
Abhinandan Prateek 6c4dea7bb8 CLOUDSTACK-8592: creating respective VO objects 2015-07-14 11:35:52 +05:30
Abhinandan Prateek 3103dcf7bc CLOUDSTACK-8592: updated quota email templates 2015-07-14 11:35:52 +05:30
Abhinandan Prateek 1345b9fbfb CLOUDSTACK-8592: Adding email management APIs 2015-07-14 11:35:51 +05:30
Rohit Yadav 1f75299016 quota: fix db bean issue 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-14 11:35:51 +05:30
Abhinandan Prateek 46be58d602 raised the version to 4.5.2 in pom 2015-07-14 11:35:51 +05:30
Abhinandan Prateek c9770e7777 merging fixes 2015-07-14 11:35:51 +05:30
Abhinandan Prateek 1da4271b17 adding quota credit api 2015-07-14 11:35:51 +05:30
Abhinandan Prateek 605239df72 quota: initial commit 2015-07-14 11:35:51 +05:30
Rohit Yadav 3938b43c4d CLOUDSTACK-8457: SAML UI enhancements 
Add option to authorize SAML SSO for user when adding user. Appends a domain to
user/account name if global setting is enabled, useful in case of multiple IDP
server. By default the setting is set to false (keep as it is).

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

This closes #575

(cherry picked from commit 7d11c7bc70)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-14 10:23:11 +05:30