etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,472 Commits 343 Branches 328 Tags 808 MiB
Commit Graph

25472 Commits

Author SHA1 Message Date
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
Rohit Yadav 82b176b47d quota-ui: fix settings view 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-14 17:15:55 +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 fe422de985 client: fix label and usage 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-14 14:08:19 +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
Rohit Yadav 25cbdcc4f3 setup/db: fix schema issues, put quota stuff in cloud_usage db 
Add missing column to cloud_usage

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-14 13:14:47 +05:30
Rohit Yadav 46931f92bc setup/db: fix schema issues, put quota stuff in cloud_usage db 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-14 13:02:47 +05:30
Abhinandan Prateek ae0eb6e334 CLOUDSTACK-8592: first cut implementation of quota statement 2015-07-14 12:18:25 +05:30
Abhinandan Prateek 7dd68a1493 CLOUDSTACK-8592: Schema updates 2015-07-14 12:13:05 +05:30
Rohit Yadav b08f228a28 setup/db: fix saml sql files, and create quota tables only if that don't exist 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-14 12:04:00 +05:30
Abhinandan Prateek df79834df9 CLOUDSTACK-8592: reverting debug statement 2015-07-14 11:35:52 +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
Rohit Yadav f6e7c52c12 ui/scripts/cloudStack: simplify plugin loop and display check 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-14 11:35:52 +05:30
Rohit Yadav 0b64910e09 ui/plugins: Add initial Quota plugin 
- Adds a stub
- Adds a Quota tab on the user's page

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-14 11:35:52 +05:30
Rohit Yadav dec8928749 ui: Allow plugins to be shown on navigation bar, if they want to 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 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 2c37ddb48b CLOUDSTACK-8592: adding quota usaage and balance tables 2015-07-14 11:35:52 +05:30
Abhinandan Prateek dbee0a9a2d adding pom dependencies for usage 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
Rohit Yadav bf57cb6580 apidoc: add section for quota APIs 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-14 11:35:51 +05:30
Rohit Yadav 389b041994 schema-451to452: Re-add SAML SQL changes reverted in 5ea1a89 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-14 11:35:51 +05:30
Abhinandan Prateek 56707ad01f CLOUDSTACK-8592: add quota email template management commands 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 38f26e9b9b updating sql scripts 2015-07-14 11:35:51 +05:30
Abhinandan Prateek aee049297a adding quota API to commands.properties 2015-07-14 11:35:51 +05:30
Abhinandan Prateek 605239df72 quota: initial commit 2015-07-14 11:35:51 +05:30
Rohit Yadav d2e5bc6649 CLOUDSTACK-8457: SAML UI Dialog fixes to use local $form 
This uses local selector to access the DOM elements, the previous commit
would find a global element which is not in the context and fail changing the
element in the opened dialog.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-07-14 11:31:27 +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
Rohit Yadav 5f51a6431d CLOUDSTACK-8622: Reinstate working sessions in browser 
- Login is based on sessionkey HttpOnly Cookie
- ApiServlet does login verification using sessionKey from both the request cookies
  and the API parameters. In both cases, if either or both are passed they should
  match the sessionKey stored in the current session of the HttpRequest
- UI: it no longer needs to read or set sessionkey cookie
- UI: it no longer needs to return g_sessionKey value in the API requests, though
  to support a sso mechanism g_sessionKey is still passed in the API is not null
- Secure jsessionid cookie is set to be HttpOnly and Secure
- SAML login should also set HttpOnly cookie before redirecting to UI
- SAML: listIdps & getSPMetadata APIs are readonly now, won't log out a logged in user

Performed tests (login, saml login if applicable, page refreshes, opening
multiple tabs, logout) with following combinations:
- SAML disabled, normal auth as admin, domain-admin and user
- SAML enabled, normal auth as admin, domain-admin and user; and saml sso as
  admin, domain-admin and user

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

This closes #574
This closes #308

(cherry picked from commit 12edad3e20)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/api/ApiServlet.java
	utils/src/com/cloud/utils/HttpUtils.java
 2015-07-14 10:22:40 +05:30