Commit Graph

72 Commits

Author SHA1 Message Date
Alex Huang 2bc938c3f8 checkins for problems. 2010-10-26 09:35:24 -07:00
Alex Huang d5d8f27cad Added more changes to the api 2010-10-21 15:11:49 -07:00
abhishek 7c11c04427 reverting the change for bug 6361; this was an accidental push instead of commit 2010-10-19 15:21:01 -07:00
abhishek 7cc8087fa6 bug 6361: more name changes from network group to security group 2010-10-19 15:21:01 -07:00
abhishek 523862f571 bug 6361: further name changes from network to security group 2010-10-19 14:35:17 -07:00
abhishek 6bd7caa9c2 bug 6361: first part of incremental checkin to rename network group to security grou[ 2010-10-19 14:35:17 -07:00
Kris McQueen 8e086d7a21 resolving merge conflicts between 2.1.refactor and master 2010-10-12 16:28:16 -07:00
Alex Huang ce091de3d2 more changes for refactor 2010-10-12 07:17:47 -07:00
Kris McQueen 848ce60097 Merging master into 2.1.refactor, resolve the merge conflicts as best I can. New commands related to extracting template/iso/volume and related to instance groups were refactored to the new API framework. 2010-09-28 15:47:14 -07:00
Kris McQueen 2a4ddac41a Change getResponse() to return a ResponseObject so that the caller can choose how to serialize. This in in preparation for serializing the async commands to the database with class information and deserializing them into the ResponseObject itself when queryAsyncJobResult is called. Once the ResponseObject is deserialized, the proper string can be returned to the caller.
The previous behavior had the JSON response from the command embedded into the queryAsyncJobResult response as a string rather than a JSON object which prevented the client from being able to read the response.  With this new behavior an actual JSON object should be returned which can then be parsed on the client side.
2010-09-23 17:34:28 -07:00
alena 0f2f356874 bug 6277: listVirtualMachines with group=-1 would return all vms that don't belong to any group. As a part of the fix, changed Dao layer to be able to make different types of Joins - Inner, Right, Left, etc.
status 6277: resolved fixed
2010-09-23 10:43:17 -07:00
Kris McQueen c32d6e7524 Template id is not a required parameter when listing templates. The proper serialized name for the async job id is jobid, not id. Sadly, ctxAccoutId != ctxAccountId, ugh, no wonder the UserContext wasn't getting set up correctly. Clean up some miscellaneous unnecessary casts. 2010-09-21 17:00:50 -07:00
root 76e5cf3321 renamed dao methods to correctly reflect what they do 2010-09-09 18:01:50 -07:00
Alex Huang 7249f168d5 more file changes 2010-09-09 13:27:20 -07:00
alena 75483e4e05 Modified AuthorizeNetworkGroupIngress/DeleteNetworkGroupIngress to new api framework 2010-09-09 11:41:33 -07:00
Kris McQueen fbcb02cd9e Refactoring listNetworkGroups to new API framework. The search is done entirely within NetworkGroupManager, and this is one instances of a response with nested data (the ingress rules are nested within the groups). Some work will need to be done to serialize this response properly. 2010-09-01 14:05:39 -07:00
abhishek 3198abd8c1 Refactoring network ingress group command 2010-08-18 17:52:55 -07:00
Alex Huang b250b985ec changes 2010-08-18 12:19:22 -07:00
alena e2950eb5a1 Merge branch '2.1.refactor' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 2.1.refactor
Conflicts:
	server/src/com/cloud/api/BaseCmd.java
	server/src/com/cloud/network/security/NetworkGroupManagerImpl.java
2010-08-18 11:36:05 -07:00
alena 3d85fdf687 API refactor 2010-08-18 11:24:29 -07:00
Kris McQueen 21ab91dc2c refactoring CreateNetworkGroup API command to new API framework 2010-08-17 19:07:00 -07:00
Manuel Amador (Rudd-O) 05c020e1f6 Source code committed 2010-08-11 09:13:29 -07:00