Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							14613415e1 
							
						 
					 
					
						
						
							
							VPN users API -- WIP  
						
						
						
						
					 
					
						2010-11-03 14:02:13 -07:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							b6d3b3c184 
							
						 
					 
					
						
						
							
							users for vpn -- data model  
						
						
						
						
					 
					
						2010-11-03 14:02:12 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							abb8f45667 
							
						 
					 
					
						
						
							
							1) Return embedded object for upgradeRouter command  
						
						... 
						
						
						
						2) Build response objects in ApiResponseHelper for stop/start/reboot/list router/systemVm commands 
						
						
					 
					
						2010-11-02 19:47:14 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							5fe5450abc 
							
						 
					 
					
						
						
							
							even more refactoring  
						
						
						
						
					 
					
						2010-11-02 15:25:07 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							560d7a275e 
							
						 
					 
					
						
						
							
							Removed InternalErrorException.  Renamed the lock methods on the DAO objects to be more understandable.  
						
						
						
						
					 
					
						2010-11-02 12:25:08 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							6311644e08 
							
						 
					 
					
						
						
							
							Successful creation of domr and uservm with all programming done correctly.....yahooo  
						
						
						
						
					 
					
						2010-11-02 12:25:08 -07:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							ff91abbb86 
							
						 
					 
					
						
						
							
							fix build break  
						
						
						
						
					 
					
						2010-11-01 11:05:22 -07:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							1e0eb04442 
							
						 
					 
					
						
						
							
							Add VPN apis, some systemvm changes for vpn  
						
						
						
						
					 
					
						2010-11-01 10:27:49 -07:00 
						 
				 
			
				
					
						
							
							
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							3a0f30a049 
							
						 
					 
					
						
						
							
							bug 6408: remove security groups/port forwarding service in virtual network case  
						
						... 
						
						
						
						status 6408: resolved fixed 
						
						
					 
					
						2010-11-01 14:28:03 +05:30 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							14f80f2e13 
							
						 
					 
					
						
						
							
							domain router up and running...now on to patching through the network between the domain router and the vm  
						
						
						
						
					 
					
						2010-10-29 12:16:58 -07:00 
						 
				 
			
				
					
						
							
							
								Kris McQueen 
							
						 
					 
					
						
						
						
						
							
						
						
							c9d9a18ace 
							
						 
					 
					
						
						
							
							bug 6746: use loadbalancer name rather than the command's name for updating the load balancer; use the load balancer's account id rather than the load balancer id when searching for the load balancer owner  
						
						... 
						
						
						
						status 6746: resolved fixed 
						
						
					 
					
						2010-10-26 17:40:29 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							4f9f249218 
							
						 
					 
					
						
						
							
							make console proxy work again with the new network configuration  
						
						
						
						
					 
					
						2010-10-26 17:37:29 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							f58063911e 
							
						 
					 
					
						
						
							
							deploy vm completed  
						
						
						
						
					 
					
						2010-10-26 09:35:24 -07:00 
						 
				 
			
				
					
						
							
							
								Kris McQueen 
							
						 
					 
					
						
						
						
						
							
						
						
							d229877cd8 
							
						 
					 
					
						
						
							
							bug 6710: rebootRouter was supposed to return the rebooted router, not success/failure  
						
						... 
						
						
						
						status 6710: resolved fixed 
						
						
					 
					
						2010-10-25 15:01:50 -07:00 
						 
				 
			
				
					
						
							
							
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							8ae5a70b06 
							
						 
					 
					
						
						
							
							bug 6395: corrected net rule event error description  
						
						... 
						
						
						
						status 6395: resolved fixed 
						
						
					 
					
						2010-10-25 13:11:50 +05:30 
						 
				 
			
				
					
						
							
							
								Kris McQueen 
							
						 
					 
					
						
						
						
						
							
						
						
							4a96e1f633 
							
						 
					 
					
						
						
							
							bug 6662:  handle a null ip forwarding rule in the API response as 'the rule already exists' since other errors will result in thrown exceptions.  Also, fix up detection of network conflicts and duplicate rules by adding a list of used protocols to the port mappings  
						
						... 
						
						
						
						status 6662: resolved fixed 
						
						
					 
					
						2010-10-22 11:47:52 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							d5d8f27cad 
							
						 
					 
					
						
						
							
							Added more changes to the api  
						
						
						
						
					 
					
						2010-10-21 15:11:49 -07:00 
						 
				 
			
				
					
						
							
							
								Kris McQueen 
							
						 
					 
					
						
						
						
						
							
						
						
							f4e21787b6 
							
						 
					 
					
						
						
							
							bug 6658:  fix managing load balancer instances by removing some of the 'pending' status code.  
						
						... 
						
						
						
						status 6658: resolved fixed 
						
						
					 
					
						2010-10-20 17:27:08 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							2da8035bd1 
							
						 
					 
					
						
						
							
							more changes for the rewrite  
						
						
						
						
					 
					
						2010-10-19 11:52:02 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							794ca16a65 
							
						 
					 
					
						
						
							
							Added code to start domR  
						
						
						
						
					 
					
						2010-10-19 11:52:01 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							84d2a0c842 
							
						 
					 
					
						
						
							
							reverted back most of my changes to merge in Kris stuff.  Thanks much to Anthony who caused my XenServer to reboot all the time which caused me unable to unit test stuff and unlike Kris, I do not check in code untested so now I have to do all this stuff.  
						
						
						
						
					 
					
						2010-10-15 07:10:16 -07:00 
						 
				 
			
				
					
						
							
							
								Kris McQueen 
							
						 
					 
					
						
						
						
						
							
						
						
							8e086d7a21 
							
						 
					 
					
						
						
							
							resolving merge conflicts between 2.1.refactor and master  
						
						
						
						
					 
					
						2010-10-12 16:28:16 -07:00 
						 
				 
			
				
					
						
							
							
								Kris McQueen 
							
						 
					 
					
						
						
						
						
							
						
						
							2740ba6c40 
							
						 
					 
					
						
						
							
							final merge of master->2.1.refactor preparing for merge back into master  
						
						
						
						
					 
					
						2010-10-12 14:46:24 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							ce091de3d2 
							
						 
					 
					
						
						
							
							more changes for refactor  
						
						
						
						
					 
					
						2010-10-12 07:17:47 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							9d1270b35f 
							
						 
					 
					
						
						
							
							console proxy started completely and running  
						
						
						
						
					 
					
						2010-10-06 17:22:35 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							94a26d2038 
							
						 
					 
					
						
						
							
							Still needs to add mac address allocation but basically console proxy is started and running  
						
						
						
						
					 
					
						2010-10-06 10:18:09 -07:00 
						 
				 
			
				
					
						
							
							
								Kris McQueen 
							
						 
					 
					
						
						
						
						
							
						
						
							9c593352d0 
							
						 
					 
					
						
						
							
							Fixing events for async jobs so that there's a scheduled event recorded with appropriate type/description whenever the API framework schedules the async command to run.  A few miscellaneous fixes as well uncovered during regression testing (router response was not parsed correctly by UI, etc.)  
						
						
						
						
					 
					
						2010-10-05 20:26:18 -07:00 
						 
				 
			
				
					
						
							
							
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							d370ae6a32 
							
						 
					 
					
						
						
							
							Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss  
						
						
						
						
					 
					
						2010-10-04 14:48:40 -07:00 
						 
				 
			
				
					
						
							
							
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							3d9f25e903 
							
						 
					 
					
						
						
							
							bug 1974: add upgraderoutercmd to upgrade router vm's service offering  
						
						... 
						
						
						
						status 1974: resolved fixed
It's a synced API, which just update router vm's service offering,
parameter: router id, service offering id,
return: ture on successfull, otherwise false 
						
						
					 
					
						2010-10-04 14:45:28 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							652d86956c 
							
						 
					 
					
						
						
							
							more files checked in  
						
						
						
						
					 
					
						2010-10-04 12:04:59 -07:00 
						 
				 
			
				
					
						
							
							
								Kris McQueen 
							
						 
					 
					
						
						
						
						
							
						
						
							24bd6a39e6 
							
						 
					 
					
						
						
							
							Fix the type of the id attribute in BaseAsyncCmd (it should be Long), deleteNetworkRuleConfig is async command again (this was a regression), misc event and account verification fixes  
						
						
						
						
					 
					
						2010-10-04 10:36:44 -07:00 
						 
				 
			
				
					
						
							
							
								nit 
							
						 
					 
					
						
						
						
						
							
						
						
							25b78d962f 
							
						 
					 
					
						
						
							
							bug 5356: Adding Started event for ROUTER.DESTROY when we destroy a domR as a part of account delete.  
						
						... 
						
						
						
						status 5356: resolved fixed 
						
						
					 
					
						2010-10-04 17:51:41 +05:30 
						 
				 
			
				
					
						
							
							
								Kris McQueen 
							
						 
					 
					
						
						
						
						
							
						
						
							41a16a478a 
							
						 
					 
					
						
						
							
							Fixes required for regressions found running automated tests.  (1) method signatures that weren't properly refactored to new API framework (2) API request parameter types should always be specified lest they default to String which may or may not be desired (3) better exception handling with regard to Queued commands and generic exceptions (4) fix eventing to pass the proper accountId where neccessary  
						
						
						
						
					 
					
						2010-10-01 14:11:18 -07:00 
						 
				 
			
				
					
						
							
							
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							26807bc701 
							
						 
					 
					
						
						
							
							bug 6362: Need to call guestos.getDisplayName to the guest os name now.  
						
						... 
						
						
						
						status 6362: resolved fixed 
						
						
					 
					
						2010-09-30 12:26:37 -07:00 
						 
				 
			
				
					
						
							
							
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							9e0f57bc0e 
							
						 
					 
					
						
						
							
							change code for new UI  
						
						
						
						
					 
					
						2010-09-29 18:40:52 -07:00 
						 
				 
			
				
					
						
							
							
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							8943cc6745 
							
						 
					 
					
						
						
							
							create volume  
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/vm/VmCharacteristics.java
	core/src/com/cloud/dc/ClusterVO.java
	core/src/com/cloud/server/ManagementServer.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/storage/allocator/AbstractStoragePoolAllocator.java 
						
						
					 
					
						2010-09-29 18:40:51 -07:00 
						 
				 
			
				
					
						
							
							
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							3aef9f408e 
							
						 
					 
					
						
						
							
							step1  
						
						
						
						
					 
					
						2010-09-29 18:40:47 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							bca96b1079 
							
						 
					 
					
						
						
							
							pass guest OS name instead of guest ID when start system VM  
						
						
						
						
					 
					
						2010-09-29 17:18:27 -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 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							c443867f28 
							
						 
					 
					
						
						
							
							more changes  
						
						
						
						
					 
					
						2010-09-27 15:14:38 -07:00 
						 
				 
			
				
					
						
							
							
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							6c683e733a 
							
						 
					 
					
						
						
							
							bug 5851,6312: fixed start event ids for router start/stop events  
						
						... 
						
						
						
						status 5851,6312: resolved fixed 
						
						
					 
					
						2010-09-27 18:32:09 +05:30 
						 
				 
			
				
					
						
							
							
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							6e4fa7fcd1 
							
						 
					 
					
						
						
							
							bug 6176: Included domR name in networkUsage command  
						
						... 
						
						
						
						status 6176: resolved fixed 
						
						
					 
					
						2010-09-27 16:26:56 +05:30 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							42986f43ba 
							
						 
					 
					
						
						
							
							removed service offering from storageallocator  
						
						
						
						
					 
					
						2010-09-24 10:27:02 -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 
						 
				 
			
				
					
						
							
							
								root 
							
						 
					 
					
						
						
						
						
							
						
						
							979fcf8b78 
							
						 
					 
					
						
						
							
							finalized guru design  
						
						
						
						
					 
					
						2010-09-22 10:44:00 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							c0d8422d69 
							
						 
					 
					
						
						
							
							more changes  
						
						
						
						
					 
					
						2010-09-22 10:43:59 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							22652e7ace 
							
						 
					 
					
						
						
							
							got the vm created  
						
						
						
						
					 
					
						2010-09-22 10:43:59 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							8acba8fbd1 
							
						 
					 
					
						
						
							
							more checkins  
						
						
						
						
					 
					
						2010-09-22 10:43:59 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							286e78c849 
							
						 
					 
					
						
						
							
							moved account id, service offering id, and domain id into isntance  
						
						
						
						
					 
					
						2010-09-22 10:43:59 -07:00