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

25602 Commits

Author SHA1 Message Date
Vadim Kimlaychuk 85e1eb7741 CLOUDSTACK-8231: Fixed UI empty drop-down list for LB rules 
This closes #271
This closes #302

(cherry picked from commit f8e1ff12ab)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-10-30 10:37:43 +05:30
Rohit Yadav abecb36aae CLOUDSTACK-8701: Allow users to switch across SAML account/domains from topbar 
Moves the previous switch account logic to its own ui-custom module

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-10-30 10:37:43 +05:30
Rohit Yadav 65f6851603 CLOUDSTACK-8701: Allow SAML users to switch accounts 
SAML authorized accounts might be across various domains, this allows for
switching of accounts only in case of SAML authenticated user accounts across
other accounts with the same SAML uid/username.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit d3bc159784835b112027a7460647f8750588770a)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-10-30 10:37:43 +05:30
Rohit Yadav 91c7962f75 CLOUDSTACK-8702: Add/refactor sessionkey checking code to HttpUtils 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 72e3954c9b18a053055abbe5d7ee800e8b11ae24)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-10-30 10:37:43 +05:30
Rohit Yadav 5571b76cda CLOUDSTACK-8505: Don't allow non-POST requests for default login API 
We add a new contract to pass Http request to authentication plugin system. In
the default login API, we disallow non-POST requests.

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

Conflicts:
	plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/SAML2LoginAPIAuthenticatorCmd.java
	server/src/com/cloud/api/ApiServlet.java

(cherry picked from commit 8b9b4832f483797c8ab123bf27262634430efcb9)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-10-30 10:37:43 +05:30
Abhinandan Prateek c909df56e9 CLOUDSTACK-8592: reverting test code 2015-10-29 20:19:21 +05:30
Abhinandan Prateek b3592b2073 CLOUDSTACK-8592: bootstrapping the balance entries 2015-10-29 19:18:09 +05:30
Abhinandan Prateek fe21b4ddb6 CLOUDSTACK-8592:removing test code 2015-10-29 12:40:30 +05:30
Abhinandan Prateek 5161da6abf CLOUDSTACK-8592: misc fixes, mainly related to review comments on db 
transactions
 2015-10-29 12:40:17 +05:30
Abhinandan Prateek a84f1e4fdf CLOUDSTACK-8592: fixing db switching 2015-10-29 12:19:31 +05:30
Abhinandan Prateek 75ea734809 CLOUDSTACK-8592: safer handling of transaction 2015-10-24 18:26:16 +05:30
Abhinandan Prateek 59d99915bb CLOUDSTACK-8592: removing use of deprecated methods 2015-10-21 14:47:09 +05:30
Abhinandan Prateek c3364324e6 CLOUDSTACK-8592: further review fixes 2015-10-21 14:27:05 +05:30
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 f6c1073106 CLOUDSTACK-8592: Added database switch to Transaction and fixed 
QuotaTariffDao to use the callback.
 2015-10-21 14:25:55 +05:30
Abhinandan Prateek a77b9a9603 CLOUDSTACK-8592: fix send date 2015-10-21 14:25:48 +05:30
Abhinandan Prateek 677564f7ee CLOUDSTACK-8592: fix sort order for tariff 2015-10-21 14:25:37 +05:30
Abhinandan Prateek 298924d519 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-10-21 14:25:28 +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 15c862a10d CLOUDSTACK-8592: Fix messages and exception throwing logic in engine/schema 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-10-21 14:24:42 +05:30
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