Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							d6c22c42fe 
							
						 
					 
					
						
						
							
							Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss  
						
						 
						
						
						
						
					 
					
						2011-11-10 15:26:39 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							f6fcaa49ec 
							
						 
					 
					
						
						
							
							Merge complete except for virtualnetworkappliancemanager  
						
						 
						
						
						
						
					 
					
						2011-11-10 15:18:16 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							122b62066a 
							
						 
					 
					
						
						
							
							bug 11817: NAAS: device allocation logic  
						
						 
						
						... 
						
						
						
						- adding a allocation state to device
 - change device allocation logic based on network offering  and device state 
						
						
					 
					
						2011-11-10 09:55:23 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							02adbd4bd3 
							
						 
					 
					
						
						
							
							bug 10617: merging code from branch bug10617  
						
						 
						
						
						
						
					 
					
						2011-11-10 15:23:48 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							47114af94b 
							
						 
					 
					
						
						
							
							NaaS: Add redundant capability for Gateway service  
						
						 
						
						
						
						
					 
					
						2011-11-09 17:09:46 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							db991dd8f6 
							
						 
					 
					
						
						
							
							NAAS : adding support for service capabilities to be specified as part of network offering  
						
						 
						
						
						
						
					 
					
						2011-11-08 13:01:44 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							8836a08e60 
							
						 
					 
					
						
						
							
							Added tp the table op_dc_vnet_alloc foreign key references to physical_network & data_center  
						
						 
						
						
						
						
					 
					
						2011-11-08 11:23:37 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							3a845d2d75 
							
						 
					 
					
						
						
							
							Keep Service/Provider map per network as well as per networkOffering (to handle the case when there are multiple providers defined for the same service in the network offering, and only one is picked when the network is created)  
						
						 
						
						
						
						
					 
					
						2011-11-07 16:16:03 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							d6db4a686e 
							
						 
					 
					
						
						
							
							Bug 11313 - Add an account param/detail/map in the XXXAccount API calls  
						
						 
						
						... 
						
						
						
						status 11313: resolved fixed 
						
						
					 
					
						2011-11-07 14:24:36 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							5f93665a30 
							
						 
					 
					
						
						
							
							- Send network labels to hypervisor recource during processConnect  
						
						 
						
						... 
						
						
						
						- Create Default physicalnetwork and add traffic types while creating a zone
- DeleteProvider should error out if there are networks using the provider.
- Other validations 
						
						
					 
					
						2011-11-04 17:57:05 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							2b6f3d458e 
							
						 
					 
					
						
						
							
							UUID support for XML responses  
						
						 
						
						
						
						
					 
					
						2011-11-04 17:38:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							f58eab684f 
							
						 
					 
					
						
						
							
							bug 11817: NAAS: extenal LB/firewall device support  
						
						 
						
						... 
						
						
						
						- guest network to device mapping using first fit allocation when there are multiple instance of provider in a physical network 
						
						
					 
					
						2011-11-03 18:04:51 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							3de3fc69d2 
							
						 
					 
					
						
						
							
							NaaS: Implement shutdownProviderInstances for virtual router  
						
						 
						
						
						
						
					 
					
						2011-11-03 13:44:26 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							7b51782163 
							
						 
					 
					
						
						
							
							bug 11817: NAAS: extenal LB/firewall device support  
						
						 
						
						... 
						
						
						
						-introducing the notion of capacity of LB device
 -managing network to device mapping 
						
						
					 
					
						2011-11-03 11:19:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							fa2dd8e93a 
							
						 
					 
					
						
						
							
							bug 6745: Using UUID instead of integers - for VM instances  
						
						 
						
						
						
						
					 
					
						2011-11-03 07:33:56 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							818df189c5 
							
						 
					 
					
						
						
							
							changes to Create Vlan & Public IPs  
						
						 
						
						
						
						
					 
					
						2011-10-31 09:53:25 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							6d5601a84d 
							
						 
					 
					
						
						
							
							Added commands and framework for PhysicalNetwork trafficTypes  
						
						 
						
						
						
						
					 
					
						2011-10-27 17:32:15 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							171e11a89b 
							
						 
					 
					
						
						
							
							fix deploydb due to new agent manager merge  
						
						 
						
						
						
						
					 
					
						2011-10-27 17:18:18 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							d315e57b0e 
							
						 
					 
					
						
						
							
							Renamed "type" to "guestType"  
						
						 
						
						
						
						
					 
					
						2011-10-27 16:51:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							fe0b685e95 
							
						 
					 
					
						
						
							
							Security group is a service now  
						
						 
						
						
						
						
					 
					
						2011-10-27 16:49:20 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							4116d0d4e4 
							
						 
					 
					
						
						
							
							Swift :  bug fix  
						
						 
						
						
						
						
					 
					
						2011-10-27 16:04:18 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							b369e45c78 
							
						 
					 
					
						
						
							
							NaaS: Remove some configure items for virtual router  
						
						 
						
						... 
						
						
						
						DHCP range, domain name, etc. are the property of network, not virtual router
specific.
The focus of virtual router configuration would on separate enable/disable each
service it provided. 
						
						
					 
					
						2011-10-27 11:55:03 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							d1141aff7d 
							
						 
					 
					
						
						
							
							Swift : add Swift api  
						
						 
						
						
						
						
					 
					
						2011-10-27 11:48:48 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							f85d558b6e 
							
						 
					 
					
						
						
							
							bug 10774: Introduce percentage in list commands and cluster id in alert table  
						
						 
						
						
						
						
					 
					
						2011-10-27 11:23:57 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							1883afeaa3 
							
						 
					 
					
						
						
							
							Bug 11522 - New agent manager  
						
						 
						
						... 
						
						
						
						add update count into host table in order to make agent status update atomic 
						
						
					 
					
						2011-10-26 16:14:57 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							a48ee9c568 
							
						 
					 
					
						
						
							
							add support for multiple provider instanes per physical network  
						
						 
						
						... 
						
						
						
						refactor NetworkDevicemanager and ExternalnetworkdeviceManager in to one single manager 
						
						
					 
					
						2011-10-27 03:07:30 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							07591807af 
							
						 
					 
					
						
						
							
							Removing isolationMethods from UpdatePhysicalNetwork API.  
						
						 
						
						
						
						
					 
					
						2011-10-25 11:39:41 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							75c8e33226 
							
						 
					 
					
						
						
							
							Removed guestIpType from network/networkOffering  
						
						 
						
						
						
						
					 
					
						2011-10-24 17:05:00 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							92eaf49f29 
							
						 
					 
					
						
						
							
							Add storage migration  
						
						 
						
						
						
						
					 
					
						2011-10-24 15:59:47 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							6c5c24dd6b 
							
						 
					 
					
						
						
							
							swift:  create volume from template works  
						
						 
						
						
						
						
					 
					
						2011-10-21 12:53:58 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							0d7ddb5d58 
							
						 
					 
					
						
						
							
							Changes:  
						
						 
						
						... 
						
						
						
						- Make all API commands Async and add events
- Make BroadcatsDomainRange case insensitive
- Process all _networkElements to build the Service -> Provider map during NetworkMgr::configure() 
						
						
					 
					
						2011-10-20 17:11:30 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							fdc354adb5 
							
						 
					 
					
						
						
							
							NaaS: Add VirtualRouterElements table  
						
						 
						
						... 
						
						
						
						It would cover the configuration of DHCPElement, VirtualRouterElement and
RedundantVirtualRouterElement.
Also add foreign key in domain_router table to reflect the domain_router is
created from which element and use what configuration. 
						
						
					 
					
						2011-10-20 13:59:02 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							654eaec663 
							
						 
					 
					
						
						
							
							NAAS: Configuring Zone  
						
						 
						
						... 
						
						
						
						- Create Zone changes and changes to data_center table to remove vlan, securityGroup fields
- Physical Network lifecycle APIs
- Physical Network Service Provider APIs
- DB schema changes 
						
						
					 
					
						2011-10-19 22:44:03 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							c97010a160 
							
						 
					 
					
						
						
							
							BackupSnapshot to Swift  
						
						 
						
						
						
						
					 
					
						2011-10-18 18:11:09 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							c00058adc2 
							
						 
					 
					
						
						
							
							Added type (Shared/Isolated) to the networkOffering/networks  
						
						 
						
						
						
						
					 
					
						2011-10-13 17:33:41 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							7433d5314a 
							
						 
					 
					
						
						
							
							1) Refactored networkOfferings:  
						
						 
						
						... 
						
						
						
						* moved all services to the separate table, map them to the network_offering+provider.
* added state/securityGroupEnabled properties for the networkOffering
* added ability to list by state/securityGroupEnabled in listNetworkOfferings api command
2) New service: SourceNat 
						
						
					 
					
						2011-10-12 16:38:59 -07:00