Commit Graph

48 Commits

Author SHA1 Message Date
Kishan Kavala a1fdb0c2d4 CLOUDSTACK-241: Remove API sync. Merge changes from 4.1 branch. Converted tabs to spaces. 2013-03-08 19:02:41 +05:30
Wei Zhou fc3905fb57 CLOUDSTACK-962:setAggBytesSent/setAggBytesReceived in NetworkUsageTask when not in case of dailyor hourly
Removed duplicate userstatsdao injection
2013-02-26 16:27:59 +05:30
Kishan Kavala e37fdce125 CLOUDSTACK-241: Removed API based account sync. Removed all the related API changes and RegionsAPIUtil.
Converted tabs to spaces in the related files.
Verified account, user and domain APIs.
2013-02-26 14:21:21 +05:30
Kelven Yang 7b75f0d990 Sync master to javelin one more time 2013-02-01 11:37:33 -08:00
Kishan Kavala 8b1a5b1de2 - Separated RegionServiceImpl and RegionManagerImpl
- Added comments
- Changed package name to org.apache.cloudstack.region
2013-01-31 18:08:20 +05:30
Kelven Yang 1450547987 Put usage server under Spring 2013-01-25 23:00:55 -08:00
Kelven Yang af67d87662 Fix issues with @DB support in Spring environment 2013-01-15 12:35:03 -08:00
Kelven Yang aab02e2743 Add Spring annotation to major components 2012-11-07 14:53:39 -08:00
Kishan Kavala f0f33bf4da Added Mock ApiServer, Regions API calls with api keys 2012-10-17 14:16:36 +05:30
Kishan Kavala 89779cceb8 Merge branch 'master' into regions
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/ResponseGenerator.java
	client/tomcatconf/commands.properties.in
	core/src/com/cloud/user/UserVO.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/user/AccountManagerImpl.java
	setup/db/create-schema.sql
2012-10-03 14:09:01 +05:30
Kishan Kavala 4fcf64dd74 updated regions branch with changes from master 2012-09-27 17:04:59 +05:30
Likitha Shetty 8c3450b503 CS-14770. ec2-run-instances and ec2-describe-instances don't return keypair information. Component: AWSAPI. 2012-08-28 13:52:42 -07:00
kishan 4ea36b82e9 propogate account changes to other Regions 2012-08-24 15:59:59 +05:30
Mice Xia 42fbf24f86 Remove @author tag from non third-party source files in server folder 2012-08-13 15:17:31 +08:00
kishan f2bbf62d9d Added getUser API to get user details using API key. Services like S3 can user this API to authenticate. API is admin only. 2012-07-18 14:20:04 -07:00
kishan 6a1b0f3ecf Add Region APIs 2012-07-03 13:05:19 -07:00
David Nalley e87558256c Patch from Chip Childers
https://reviews.apache.org/r/5704/
License header updates for the server folder
2012-07-02 09:51:21 -04:00
David Nalley 59436be4ee fixing line endings in server 2012-04-07 20:13:10 -04:00
frank 2f634c0913 Switch to Apache license 2012-04-03 04:50:05 -07:00
Alena Prokharchyk fa0e25d146 bug 14080: do EQ instead of LIKE search when search for duplicated users during the user update
status 14080: resolved fixed
2012-03-01 15:11:46 -08:00
kishan 3503c37f68 updated license 2011-12-15 16:51:55 +05:30
kishan c3ed426837 bug 12206: Added op_user_stats_log table to store historic user stats. Network stats update thread will update aggregate bytes and log the entry in this table. Mgmt server with min id will run this job.
status 12206: resolved fixed
reviewed-by: Nitin
2011-12-15 16:46:41 +05:30
Alena Prokharchyk a4773b7080 bug 12291: listVms - show non-project resources only if no projectId specified
status 12291: resolved fixed
2011-12-02 15:17:50 -08:00
kishan af0cf90b2b bug 12208,12238: Do not encrypt user password and api key
status 12208,12238 : resolved fixed
reviewed-by: Abhi
2011-12-01 23:37:37 +05:30
Abhinandan Prateek 655a9805f3 bug 11966: added findNonDisabledAccount 2011-11-24 13:43:12 +05:30
Abhinandan Prateek 16e342836e bug 11966: chnaged the findActiveAccount method to return only the accounts which are active 2011-11-24 13:12:28 +05:30
kishan b1f78bca25 bug 5822, 10783: Use encryption/decryption for queries which use sql directly
status 5822, 10783: resolved fixed
2011-11-01 19:30:00 +05:30
kishan 284ee3909e bug 9842: Added task to update user stats agg bytes in sync with aggregation range
status 9842: resolved fixed
2011-10-31 17:15:36 +05:30
alena bddc2b9e45 bug 11487: catch all exceptions in cleanupAccount, and mark the account for cleanup when the exception is caught.
status 11487: resolved fixed

Reviewed-by: will@cloud.com
2011-09-20 10:33:06 -07:00
alena 8f9b929e3f Don't remove the domain when it has accounts that are removed, but require cleanup 2011-08-30 14:09:01 -07:00
alena 50dce6d5a0 bug 10438: always return success on disableAccount when it got disabled successfully in the DB. If his vms failed to stop on the backend, mark account for cleanup and let background thread to do the cleanup job
status 10438: resolved fixed
2011-07-11 17:45:50 -07:00
alena 1f087371e0 bug 9620: fixed updateUser api to make updates only for the fields that are specified in the request
status 9620: resolved fixed
2011-06-20 11:48:32 -07:00
Murali Reddy b625bb1d27 bug 9419: implement api to reset resource count 2011-06-13 16:32:26 +05:30
Murali Reddy 6310991bdc bug 9419: implement api to reset resource count
added a command to reset resource count for account/domain based on real usage of resources
2011-06-13 10:55:57 +05:30
keshav 5d5363965d Changed usage code to look up stats by network ID. 2011-05-16 14:41:47 -07:00
will 633d024b7c - Merge all CloudZones Registration feature into master 2011-04-28 16:05:36 -07:00
Frank 92155522f2 Add license header to files 2011-04-14 11:23:14 -07:00
nit debe236a8d bug 8710: CONTD....Introducing a new user role in cloudstack called RESOURCE_DOMAIN_ADMIN. The role would have all the domain_admin rights and the rights to list zone,pods,clusters and so on. More info in the bug 2011-04-11 19:40:37 +05:30
kishan f138552f36 bug 8603: Included netwrok_id in network usage records
status 8603: resolved fixed
2011-02-24 15:31:59 +05:30
kishan 003787a69a bug 8613: Added accountId to listUsageRecords API, use active account incase of multiple account with same name
status 8613: resolved fixed
2011-02-21 19:38:08 +05:30
kishan 60ecb564ea bug 8613: Added accountId to listUsageRecords API, use active account incase of multiple account with same name
status 8613: resolved fixed
2011-02-21 19:07:41 +05:30
kishan 77719be46a bug 8465: track network usage per router in user_statistics table
status 8465: resolved fixed
2011-02-09 18:38:41 +05:30
kishan 92bf106ab9 including host type in network stats 2011-01-31 19:36:32 +05:30
kishan d3b85f8dca bug 8231: Added network usage records by host
status 8231: resolved fixed
2011-01-27 17:35:44 +05:30
Ragnar B. Johannsson 32c68e1583 API cmds for SSH-keys manipulation and VM passwds retrieval.
These include five new API cmds as well as changes to deployVirtualMachine to
specify an optional name of an SSH key to pass to the VM when starting. When
an SSH key is specified with a password-enabled template the newly created
password is encrypted with the SSH public key and can be retrieved via the
getVMPassword cmd. It is then the user's responsibility to decrypt retrieved
passwords with the correct SSH private key.
2011-01-06 13:34:07 +00:00
keshav 3da09345c9 Changed schema to keep track of which public IP address and host a user statistics entry is for 2010-12-29 19:14:35 -08:00
Alex Huang 544fa7ff1b remote access vpn, user ip address changes 2010-12-29 09:32:54 -08:00
Alex Huang d38f7fd56d Moved DAO to server 2010-11-22 07:40:41 -08:00