frank 
							
						 
					 
					
						
						
						
						
							
						
						
							92edf56ccc 
							
						 
					 
					
						
						
							
							Bug 7883 - Add support to allow admins to sort templates, isos, offerings...  
						
						 
						
						... 
						
						
						
						status 7883: resolved fixed 
						
						
					 
					
						2011-11-03 10:54:00 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							9e753c2157 
							
						 
					 
					
						
						
							
							specifyVlan is true for Shared (Direct) network offering  
						
						 
						
						
						
						
					 
					
						2011-11-03 10:53:19 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							9e5a733a34 
							
						 
					 
					
						
						
							
							Fixed NPE in updateNetwork - userCaller wasn't passed in to restartNetworkElements call  
						
						 
						
						
						
						
					 
					
						2011-11-03 10:53:19 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							f5d56b3d5d 
							
						 
					 
					
						
						
							
							Fix problems caused by merging  
						
						 
						
						
						
						
					 
					
						2011-11-03 10:35:25 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							7e9b210d5c 
							
						 
					 
					
						
						
							
							bug 6745: Fix problems in Async create commands  
						
						 
						
						
						
						
					 
					
						2011-11-03 07:34:02 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							79e39c20fb 
							
						 
					 
					
						
						
							
							Fixes on merged result  
						
						 
						
						
						
						
					 
					
						2011-11-03 07:34:01 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							924e556c95 
							
						 
					 
					
						
						
							
							bug 6745: Using UUID instead of integers - for all commands  
						
						 
						
						
						
						
					 
					
						2011-11-03 07:34:00 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							8d8775b533 
							
						 
					 
					
						
						
							
							bug 6745: Using UUID instead of integers - for Async Jobs  
						
						 
						
						
						
						
					 
					
						2011-11-03 07:33:58 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							6f14bdc361 
							
						 
					 
					
						
						
							
							bug 6745: Using UUID instead of integers - for System VM s  
						
						 
						
						
						
						
					 
					
						2011-11-03 07:33:57 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							fa2dd8e93a 
							
						 
					 
					
						
						
							
							bug 6745: Using UUID instead of integers - for VM instances  
						
						 
						
						
						
						
					 
					
						2011-11-03 07:33:56 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							fab2d1f880 
							
						 
					 
					
						
						
							
							bug 11678: added vm.destory.forcestop config var to set force when destroying a vm  
						
						 
						
						
						
						
					 
					
						2011-11-03 15:51:02 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							267b12d015 
							
						 
					 
					
						
						
							
							bug 11709: saving encrypted password in db  
						
						 
						
						... 
						
						
						
						status 11709: resolved fixed 
						
						
					 
					
						2011-11-03 15:40:20 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							4a960f2912 
							
						 
					 
					
						
						
							
							NaaS: Update VirtualRouterElement on StaticNat and PortForwarding services  
						
						 
						
						
						
						
					 
					
						2011-11-02 19:26:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							29b19db152 
							
						 
					 
					
						
						
							
							NaaS: Fix createNetworkOffering with multiply service providers  
						
						 
						
						
						
						
					 
					
						2011-11-02 19:08:49 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							b646f07f9c 
							
						 
					 
					
						
						
							
							NaaS: Add back service offering ID for network offering  
						
						 
						
						... 
						
						
						
						It would be used to adjust service offering of virtual router 
						
						
					 
					
						2011-11-02 19:08:37 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							b4f8c85f20 
							
						 
					 
					
						
						
							
							Swift: add Swift Manager  
						
						 
						
						
						
						
					 
					
						2011-11-02 18:45:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							6841e265d3 
							
						 
					 
					
						
						
							
							bug 10330: finally merge Rommer's CLVM patch  
						
						 
						
						... 
						
						
						
						status 10330: resolved fixed 
						
						
					 
					
						2011-11-02 18:03:58 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							3e20c60d6d 
							
						 
					 
					
						
						
							
							Fixed vm deployment in Basic zone  
						
						 
						
						
						
						
					 
					
						2011-11-02 17:02:44 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							f42c9e434f 
							
						 
					 
					
						
						
							
							Basic zone: the System Guest network offering can be created from any Shared Guest network offering.  
						
						 
						
						... 
						
						
						
						Limitation:
* in order to make the networkOffering choice, only one Shared network has to be Enabled at the moment when Basic zone is being created 
						
						
					 
					
						2011-11-02 15:44:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							3fc9b149e4 
							
						 
					 
					
						
						
							
							NaaS: Add portforwarding and staticnat service provider  
						
						 
						
						... 
						
						
						
						Make them service rather than capability of firewall. Now firewall only means
open/close the port. 
						
						
					 
					
						2011-11-02 15:18:39 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							b643a9a4be 
							
						 
					 
					
						
						
							
							Bug 11808 - Allow additional non-default virtual networks  
						
						 
						
						... 
						
						
						
						completed Java code change, need UI change in line with 
						
						
					 
					
						2011-11-02 14:36:45 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							4ce2bf2f89 
							
						 
					 
					
						
						
							
							SourceNat service is supported for Isolated network offerings only  
						
						 
						
						
						
						
					 
					
						2011-11-02 11:52:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							765e46d3a7 
							
						 
					 
					
						
						
							
							bug 11770: throw error when account is not found in default root domain  
						
						 
						
						... 
						
						
						
						status 11770: resolved fixed 
						
						
					 
					
						2011-11-02 15:11:47 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							09d89b3dc3 
							
						 
					 
					
						
						
							
							add more logs  
						
						 
						
						
						
						
					 
					
						2011-11-01 19:34:39 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							086e7cf7b8 
							
						 
					 
					
						
						
							
							Bug 11646 - OVM - volume > download volume failed for both ROOT and DATA volumes  
						
						 
						
						... 
						
						
						
						return volume name instead of full path to ingratiate mgmt server's bad name convention 
						
						
					 
					
						2011-11-01 18:14:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							6aa743165a 
							
						 
					 
					
						
						
							
							Changes  to support Enable/ Disable services of a service provider added to physical network:  
						
						 
						
						... 
						
						
						
						- ListSupportedNetworkServiceProvidersCmd will now return Providers along with its element's services and boolean 'canEnableIndividualServices' that indicates if for this Provider services can be enabled/disabled
- add & update NetworkServiceProvider changed to take in the list of services to enable. While adding a provider, if list is null then all services supported by the element are enabled by default.
- ListNetworkServices enhanced to take in a provider name and returns services of that specific provider. 
						
						
					 
					
						2011-11-01 18:03:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							2250dff349 
							
						 
					 
					
						
						
							
							1) Removed tags from the network object  
						
						 
						
						... 
						
						
						
						2) Get hypervisor tags from the physical network instead. 
						
						
					 
					
						2011-11-01 17:42:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							da78937d30 
							
						 
					 
					
						
						
							
							Removed some useless methods  
						
						 
						
						
						
						
					 
					
						2011-11-01 16:57:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							45b41e4603 
							
						 
					 
					
						
						
							
							Disable baremetal fullsync  
						
						 
						
						... 
						
						
						
						*    Disable sync until we find a way that only tracks status but not does action
   *
   *    The scenario is: Baremetal will reboot host when creating template. Given most
   *    servers take a long time to boot up, there would be a period that mgmt server finds
   *    the host is stopped through fullsync. Then mgmt server updates database with marking the host as
   *    stopped, after that, the host comes up and full sync then indicates it's running. Because
   *    in database the host is already stopped, mgmt server sends out a stop command.
   *    As a result, creating image gets never happened. 
						
						
					 
					
						2011-11-01 16:46:19 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							9560e92015 
							
						 
					 
					
						
						
							
							physicalNetworkId is optional in createNetwork api. Works as follows:  
						
						 
						
						... 
						
						
						
						* can be specified for Shared network only
* if not specified for the Shared networks, try to locate it based on the zoneId and tags. If tags is not null, pick up first physicalNetwork from the zone that has matching tags. If tags is null, and there are none/more than 1 physical netwroks in the zone, error out. 
						
						
					 
					
						2011-11-01 15:49:39 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							56d3d04db4 
							
						 
					 
					
						
						
							
							Baremetal: bypass HA, only track VM status  
						
						 
						
						
						
						
					 
					
						2011-11-01 15:14:16 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							caefd11d2c 
							
						 
					 
					
						
						
							
							Network offering upgrade is allowed for Isolated networks only  
						
						 
						
						
						
						
					 
					
						2011-11-01 13:13:01 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							be21a5e37c 
							
						 
					 
					
						
						
							
							Don't allow enabling securityGroup service for Isolated networks  
						
						 
						
						
						
						
					 
					
						2011-11-01 13:09:14 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							346a6fe80a 
							
						 
					 
					
						
						
							
							Fixed NPE.  
						
						 
						
						
						
						
					 
					
						2011-11-01 12:07:32 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							80dc2c0b1a 
							
						 
					 
					
						
						
							
							Don't send security group commands to the backend when 1) securtiy group service is disabled in the network offering and 2) security group service provider is supported on the physical network  
						
						 
						
						
						
						
					 
					
						2011-11-01 12:07:32 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							a4e5e4de45 
							
						 
					 
					
						
						
							
							bug 11796: Catch all exceptions in network usage task and never exit the thread  
						
						 
						
						... 
						
						
						
						status 11796: resolved fixed 
						
						
					 
					
						2011-11-01 20:36:29 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							b40742fdae 
							
						 
					 
					
						
						
							
							30 premium upgrade should extend regular upgrade  
						
						 
						
						
						
						
					 
					
						2011-11-01 18:51:04 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							18ef8ca3b4 
							
						 
					 
					
						
						
							
							bug 11173: Added usage for VPN users  
						
						 
						
						... 
						
						
						
						status 11173: resolved fixed 
						
						
					 
					
						2011-11-01 17:01:48 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							a43364f0a4 
							
						 
					 
					
						
						
							
							NaaS: Rename virtual_router_elements to virtual_router_provider  
						
						 
						
						
						
						
					 
					
						2011-10-31 15:59:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							cd3fbf0548 
							
						 
					 
					
						
						
							
							NaaS: Create AddVirtualRouterElementCmd  
						
						 
						
						... 
						
						
						
						As DhcpElement/VirtualRouterElement/RedundantVirtualRouterElement is decided to
be the service provider of the physical network, this API should be called to
add a new element, with correlated network service provider ID.
Then e.g. ConfigureVirtualRouterElementCmd should be called to configure and
enable the element. 
						
						
					 
					
						2011-10-31 15:59:44 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							00bb63ac67 
							
						 
					 
					
						
						
							
							NaaS: Remove separate configuration fields for virtual router elements  
						
						 
						
						... 
						
						
						
						The fields are duplicated with network offerings. 
						
						
					 
					
						2011-10-31 15:59:36 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							928fc64ebc 
							
						 
					 
					
						
						
							
							NaaS: Enable VirtualRouterElement to deal with service separately  
						
						 
						
						
						
						
					 
					
						2011-10-31 15:59:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							09fc1be631 
							
						 
					 
					
						
						
							
							revert wrong fix of 24bcb4ddf210fbd4ca6032bb5aa6bd02f7480a73 that built-in templates can not be found  
						
						 
						
						... 
						
						
						
						The root cause is we didn't return SSVM in connecting status when doing template sync 
						
						
					 
					
						2011-10-31 15:26:44 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							2f1e5504fb 
							
						 
					 
					
						
						
							
							Revert "handle empty snapshot correctly"  
						
						 
						
						... 
						
						
						
						This reverts commit 99f985783e960d1ef8712c8ff724862f688b461e. 
						
						
					 
					
						2011-10-31 14:30:09 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							549c7d2ef9 
							
						 
					 
					
						
						
							
							Added NetworkElement API's isReady() and shutdownProviderInstances() called by NetworkMgr while enabling/shutdown the service provider.  
						
						 
						
						
						
						
					 
					
						2011-10-31 13:09:54 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							42a3f0041a 
							
						 
					 
					
						
						
							
							handle empty snapshot correctly  
						
						 
						
						
						
						
					 
					
						2011-10-31 11:42:58 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							9a668416f8 
							
						 
					 
					
						
						
							
							Swift: List ISO fix  
						
						 
						
						
						
						
					 
					
						2011-10-31 11:10:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							818df189c5 
							
						 
					 
					
						
						
							
							changes to Create Vlan & Public IPs  
						
						 
						
						
						
						
					 
					
						2011-10-31 09:53:25 -07:00