Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							3e0b2164be 
							
						 
					 
					
						
						
							
							api_refactor: refactor template apis  
						
						 
						
						... 
						
						
						
						- Fix refactored apis, fix mapping in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-03 23:05:44 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							e0b4430070 
							
						 
					 
					
						
						
							
							api_refactor: refactor iso apis  
						
						 
						
						... 
						
						
						
						- Fix refactored apis, fix mapping in commands*.in
- Fix comments etc.
- Note: copyIso uses copyTemplate, refactor copyTemplate
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-03 23:01:29 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							cea8f3bf37 
							
						 
					 
					
						
						
							
							Switch inject annotation to javax and let ComponentLocator to recognize both the new and original inject annotation  
						
						 
						
						
						
						
					 
					
						2012-11-07 15:03:22 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							73cc474157 
							
						 
					 
					
						
						
							
							add secondary storage provider  
						
						 
						
						
						
						
					 
					
						2012-09-02 19:26:20 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							a32f675875 
							
						 
					 
					
						
						
							
							CS-14237 GC commands only sent to UP host  
						
						 
						
						... 
						
						
						
						resolved fixed 
						
						
					 
					
						2012-05-16 17:21:36 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							2f634c0913 
							
						 
					 
					
						
						
							
							Switch to Apache license  
						
						 
						
						
						
						
					 
					
						2012-04-03 04:50:05 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							93ff791497 
							
						 
					 
					
						
						
							
							Bug 13314 - acton-bet3:vmware/xen:fail to attach "VMware Tools Installer ISO" to instance  
						
						 
						
						... 
						
						
						
						Changes:
- 'sameOwner' check cannot be used for ISO's
- So need to make two access checks: See if caller has access to VM and ISO and also check if the VM's owner has access to the ISO. 
						
						
					 
					
						2012-01-26 16:02:52 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							6297820981 
							
						 
					 
					
						
						
							
							bug 12830: propagate ISO to other zone on demand  
						
						 
						
						... 
						
						
						
						status 12830: resolved fixed 
						
						
					 
					
						2012-01-20 11:44:01 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							83400cd15f 
							
						 
					 
					
						
						
							
							bug 12776: if there are multiple objects involved in resource creation, verify that they belong to the same account  
						
						 
						
						... 
						
						
						
						status 12776: resolved fixed 
						
						
					 
					
						2012-01-17 13:40:37 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							c581506103 
							
						 
					 
					
						
						
							
							bug 12306: list* command revamp  
						
						 
						
						
						
						
					 
					
						2012-01-09 10:07:42 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							49608d8fdc 
							
						 
					 
					
						
						
							
							SWIFT : fixed install path  
						
						 
						
						
						
						
					 
					
						2011-12-28 12:09:09 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							1f7a811bac 
							
						 
					 
					
						
						
							
							SWIFT : sync swift with secondary storage  
						
						 
						
						
						
						
					 
					
						2011-12-28 11:47:55 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							6e259b2cb1 
							
						 
					 
					
						
						
							
							SWIFT : check swift in storage allocator  
						
						 
						
						
						
						
					 
					
						2011-12-23 15:45:29 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							d462e14e01 
							
						 
					 
					
						
						
							
							SWIFT : remove template_zone_ref when delete template  
						
						 
						
						
						
						
					 
					
						2011-12-22 17:53:18 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							646d95a846 
							
						 
					 
					
						
						
							
							bug 12364:  fixed export template with swift  
						
						 
						
						... 
						
						
						
						status 12364: resolved fixed 
						
						
					 
					
						2011-12-21 16:07:06 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							2d2505d449 
							
						 
					 
					
						
						
							
							bug 12322: SWIFT, update template_zone_ref after update template to swift  
						
						 
						
						... 
						
						
						
						status 12322: resolved fixed 
						
						
					 
					
						2011-12-21 11:20:38 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							b675a01741 
							
						 
					 
					
						
						
							
							bug 12113: DeployVm: when template download from Secondary to Primary storage fails try a couple of times first and then fail.  
						
						 
						
						... 
						
						
						
						Reviewed by : Kishan. 
						
						
					 
					
						2011-12-21 11:33:30 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							1bde4520e1 
							
						 
					 
					
						
						
							
							SWIFT : export volume  
						
						 
						
						
						
						
					 
					
						2011-12-19 20:04:45 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							a85864e160 
							
						 
					 
					
						
						
							
							SWIFT : do not sync template to swift if it is marked as destroyed in secondry stoarge  
						
						 
						
						
						
						
					 
					
						2011-12-16 21:28:39 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							23f22259ed 
							
						 
					 
					
						
						
							
							SWIFT: disable copy template in API level in Swift setup  
						
						 
						
						
						
						
					 
					
						2011-12-14 20:11:07 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							fb0f77711f 
							
						 
					 
					
						
						
							
							SWIFT: fixed delete template/iso  
						
						 
						
						
						
						
					 
					
						2011-12-14 19:53:56 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							3305498bd3 
							
						 
					 
					
						
						
							
							bug 12113: DeployVm: when template download from Secondary to Primary storage fails, we retry the number of hosts in that cluster. Instead try on 1 host on each retry attempt and shuddle the hosts for every attempt.  
						
						 
						
						... 
						
						
						
						Reviewed by : Kishan. 
						
						
					 
					
						2011-12-14 13:16:41 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							cdd94c1b9a 
							
						 
					 
					
						
						
							
							bug 11811: Introduce a global config to disable extraction altogether for all users except root admin. Make changes so that volumes are based out of ISO. Take care of upgrade as well for this global config.  
						
						 
						
						... 
						
						
						
						Reviewed by : Kishan. 
						
						
					 
					
						2011-11-24 00:12:24 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							ec3a00a230 
							
						 
					 
					
						
						
							
							bug 10281: Template/ISO APIs should throw an exception in failure case for the events to be registered as failure.  
						
						 
						
						... 
						
						
						
						Reviewed by : Kishan.
status 10281: resolved fixed 
						
						
					 
					
						2011-11-21 18:58:06 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							b4f8c85f20 
							
						 
					 
					
						
						
							
							Swift: add Swift Manager  
						
						 
						
						
						
						
					 
					
						2011-11-02 18:45:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							46dac852fa 
							
						 
					 
					
						
						
							
							Merge branch 'swift'  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/agent/AgentManager.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/host/dao/HostDao.java
	server/src/com/cloud/host/dao/HostDaoImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/download/DownloadMonitorImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java 
						
						
					 
					
						2011-10-31 15:04:48 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							9a668416f8 
							
						 
					 
					
						
						
							
							Swift: List ISO fix  
						
						 
						
						
						
						
					 
					
						2011-10-31 11:10:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							4a3deefd02 
							
						 
					 
					
						
						
							
							Swift : template sync fix  
						
						 
						
						
						
						
					 
					
						2011-10-28 16:49:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							2b039530c0 
							
						 
					 
					
						
						
							
							Swift : list Template  
						
						 
						
						
						
						
					 
					
						2011-10-28 16:07:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							4116d0d4e4 
							
						 
					 
					
						
						
							
							Swift :  bug fix  
						
						 
						
						
						
						
					 
					
						2011-10-27 16:04:18 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							cef30956e9 
							
						 
					 
					
						
						
							
							Merge branch 'newagentmgr'  
						
						 
						
						... 
						
						
						
						Conflicts:
	agent-simulator/src/com/cloud/api/commands/ConfigureSimulator.java
	ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/capacity/CapacityManagerImpl.java
	server/src/com/cloud/network/F5BigIpManagerImpl.java
	server/src/com/cloud/network/JuniperSrxManagerImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/db/GenericDao.java 
						
						
					 
					
						2011-10-27 11:09:56 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							510d1dbef7 
							
						 
					 
					
						
						
							
							Swift : upload template to Swift and sync between Swift and secondary storage  
						
						 
						
						
						
						
					 
					
						2011-10-24 18:48:16 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							25c2734e03 
							
						 
					 
					
						
						
							
							More stuff to Projects feature - added support for adding resources (vms, templates, isos) to the project  
						
						 
						
						
						
						
					 
					
						2011-10-05 13:24:25 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							683113cc38 
							
						 
					 
					
						
						
							
							Bug 11522 - New agent manager  
						
						 
						
						... 
						
						
						
						get rid of all secondary storage interface from HostDao, instead, put them in
SecondaryStorageVmManager using SearchCriteria2 with decent name 
						
						
					 
					
						2011-10-03 11:21:34 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							9f9b60a287 
							
						 
					 
					
						
						
							
							1) Added resource limits for the Projects - the same as for the account  
						
						 
						
						... 
						
						
						
						2) Added "Project" limit type for the Domain object 
						
						
					 
					
						2011-09-21 17:09:49 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							a1331d1cfc 
							
						 
					 
					
						
						
							
							Intermidiate checkin to Project feature:  
						
						 
						
						... 
						
						
						
						1) Introduce new managers - ProjectManager and DomainManager. Moved all domain related code from AccountManager to DomainManager.
2) Moved some code from ManagementServerImpl to the correct managers.
3) New resource limit for Domain - Project 
						
						
					 
					
						2011-09-20 18:35:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							459b32cc6a 
							
						 
					 
					
						
						
							
							bug 11493: no need to do cross domain checks for the templates as domain level templates are not supported. We support only public (everybody can see and use) and private (only owner can see and use unless changed with updateTemplatePermissions call)  
						
						 
						
						... 
						
						
						
						status 11493: resolved fixed
Reviewed-by: will@cloud.com  
						
						
					 
					
						2011-09-20 10:31:57 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							4423da06a2 
							
						 
					 
					
						
						
							
							1. added timeout in Command Class,  then each command can configure itself timeout, if timeout is not configed, use the default timeout , which is 30 minute  
						
						 
						
						... 
						
						
						
						2. added following configurable timeout
       PrimaryStorageDownloadWait("Storage", TemplateManager.class, Integer.class, "primary.storage.download.wait", "10800", "In second, timeout for download template to primary storage", null),
       CreateVolumeFromSnapshotWait("Storage", StorageManager.class, Integer.class, "create.volume.from.snapshot.wait", "10800", "In second, timeout for create template from snapshot", null),
       CopyVolumeWait("Storage", StorageManager.class, Integer.class, "copy.volume.wait", "10800", "In second, timeout for copy volume command", null),
       CreatePrivateTemplateFromVolumeWait("Storage", UserVmManager.class, Integer.class, "create.private.template.from.volume.wait", "10800", "In second, timeout for CreatePrivateTemplateFromVolumeCommand", null),
       CreatePrivateTemplateFromSnapshotWait("Storage", UserVmManager.class, Integer.class, "create.private.template.from.snapshot.wait", "10800", "In second, timeout for CreatePrivateTemplateFromSnapshotCommand", null),
       BackupSnapshotWait("Storage", StorageManager.class, Integer.class, "backup.snapshot.wait", "10800", "In second, timeout for BackupSnapshotCommand", null), 
						
						
					 
					
						2011-09-07 19:17:54 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							eb9b5c1f65 
							
						 
					 
					
						
						
							
							bug 11259: ROOT admin can extract template/iso even when it's not mark as extractable  
						
						 
						
						... 
						
						
						
						status 11259: resolved fixed 
						
						
					 
					
						2011-09-02 12:37:15 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							482528ce8c 
							
						 
					 
					
						
						
							
							Fixed the bug in extractTemplate - do ignoreCase comparison when verify the download mode.  
						
						 
						
						
						
						
					 
					
						2011-08-26 10:11:30 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							16986c01c8 
							
						 
					 
					
						
						
							
							Bug 9921 - template tags  
						
						 
						
						... 
						
						
						
						-Added missing import statement. 
						
						
					 
					
						2011-08-25 12:16:09 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							05440f0905 
							
						 
					 
					
						
						
							
							Bug 9921 - template tags  
						
						 
						
						... 
						
						
						
						Changes:
- CreateTemplate and RegisterTemplate now support adding a template tag. It is a string value. This is root-admin only action - only admin can add template tags.
- ListTemplates will return the template tag in response.
- HostAllocator changed to use template tag along with the existing tag on service offering. If both tags are present, allocator now finds hosts satisfying both tags. If no hosts have both tags, allocation will fail.
- DB changes to add new column to vm_template table.
- DB upgrade changes for upgrade from 2.2.10 to 2.2.11 
						
						
					 
					
						2011-08-25 12:03:59 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							e3f179844e 
							
						 
					 
					
						
						
							
							bug 11236: domainAdmin/regularUser can edit/delete/copy/extract Public template/iso only if it was created by them. They still can use/see public template/iso when execute list/deploy/attachIso commands.  Root admin can operate with other people templates w/o any restrictions.  
						
						 
						
						... 
						
						
						
						status 11236: resolved fixed 
						
						
					 
					
						2011-08-24 14:48:35 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							2c1df02ba1 
							
						 
					 
					
						
						
							
							Removed unused imports  
						
						 
						
						
						
						
					 
					
						2011-08-18 15:02:04 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							56ce65710d 
							
						 
					 
					
						
						
							
							bug 5370: copy Template/Iso - generating the started and completed events.  
						
						 
						
						... 
						
						
						
						status 5370: resolved fixed 
						
						
					 
					
						2011-08-11 16:14:27 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							bf13273889 
							
						 
					 
					
						
						
							
							adjust to merged changes  
						
						 
						
						
						
						
					 
					
						2011-08-08 18:46:00 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							02e64f90de 
							
						 
					 
					
						
						
							
							Add prepareTemplate command(admin only) to allow pre-loading template into primary storage  
						
						 
						
						
						
						
					 
					
						2011-08-08 18:45:47 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							50a2fc7111 
							
						 
					 
					
						
						
							
							private template may be downloaded to multiple secondary storage in a zone,  
						
						 
						
						... 
						
						
						
						fixed it 
						
						
					 
					
						2011-07-29 17:34:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							79cb5b7c19 
							
						 
					 
					
						
						
							
							bug 10834: fix step 2. Sending command to pool now only picks hosts that are in UP state  
						
						 
						
						
						
						
					 
					
						2011-07-28 14:32:28 -07:00