frank 
							
						 
					 
					
						
						
						
						
							
						
						
							0d7dc40189 
							
						 
					 
					
						
						
							
							Bug 11689 - Templates need a ssh key enabled attribute  
						
						 
						
						... 
						
						
						
						status 11689: resolved fixed 
						
						
					 
					
						2011-12-02 14:20:08 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							09905b641b 
							
						 
					 
					
						
						
							
							bug 10617: merge code from branch bug10617.  
						
						 
						
						
						
						
					 
					
						2011-12-01 14:17:52 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							e4b5a62402 
							
						 
					 
					
						
						
							
							bug 10796: merging code from branch  
						
						 
						
						
						
						
					 
					
						2011-11-30 15:03:43 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							628ca6c6d7 
							
						 
					 
					
						
						
							
							bug 11018: removed private_netmask from vm_instance table  
						
						 
						
						... 
						
						
						
						status 11018: resolved fixed 
						
						
					 
					
						2011-11-28 14:15:14 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							beb38c8310 
							
						 
					 
					
						
						
							
							making devices enabled independent of config commands  
						
						 
						
						... 
						
						
						
						adding default device capacity when admin does not specify a vlaue
fixed bug in device allocation logic 
						
						
					 
					
						2011-11-22 19:52:07 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							a8ffd0ea06 
							
						 
					 
					
						
						
							
							Added unique constraint on providername <-> physical network mapping.  
						
						 
						
						
						
						
					 
					
						2011-11-22 13:11:02 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							54f4ebf08c 
							
						 
					 
					
						
						
							
							changes for SRX add/config commands for UI integration  
						
						 
						
						
						
						
					 
					
						2011-11-21 16:57:41 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							c9b2031fa9 
							
						 
					 
					
						
						
							
							changes in add/configure API commands for F5 & Netscaler for UI integration  
						
						 
						
						
						
						
					 
					
						2011-11-21 13:31:54 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							284e72fd02 
							
						 
					 
					
						
						
							
							Fix colon in COMMENT of db schema which makes cloud-setup-database failed  
						
						 
						
						
						
						
					 
					
						2011-11-18 14:09:42 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							71ff88f211 
							
						 
					 
					
						
						
							
							bug 12067: set 'extractable' field default value to 0 as a part of 2.2.13 to 2.2.14 db upgrade  
						
						 
						
						... 
						
						
						
						status 12067: resolved fixed
Conflicts:
	server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
	server/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java
	setup/db/create-schema.sql 
						
						
					 
					
						2011-11-18 13:44:59 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							e39498f1e7 
							
						 
					 
					
						
						
							
							bug 11997: Introduce created and update_time in the op_host_capacity table.  
						
						 
						
						... 
						
						
						
						status 11997: resolved fixed 
						
						
					 
					
						2011-11-17 18:10:59 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							b2a5e26c06 
							
						 
					 
					
						
						
							
							bug 10792: add default system wide firewall rule  
						
						 
						
						... 
						
						
						
						status 10792: resolved fixed 
						
						
					 
					
						2011-11-15 16:51:30 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							277c60e4f6 
							
						 
					 
					
						
						
							
							bug 11814: Allow template to have details info in key/value pairs.  
						
						 
						
						
						
						
					 
					
						2011-11-15 15:01:46 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							0b05badaaa 
							
						 
					 
					
						
						
							
							bug 11817: NAAS external network device support  
						
						 
						
						... 
						
						
						
						-made Netscaler, SRX, F5 network elements as pluggable service
   -added abstract load balancer device manager ExternaLoadBalancerDeviceManager
   -made both F5 and Netscaler pluggable service to extend ExternaLoadBalancerDeviceManager
   -added abstract firewall device manager ExternalFirewallDeviceManager
   -made SRX pluugable service to extende ExternalFirewallDeviceManager
   -added API's to configure and manage netscaler devices 
						
						
					 
					
						2011-11-15 12:18:59 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							bb2a8cf7ea 
							
						 
					 
					
						
						
							
							NaaS: added "subdomainAccess" parameter to domain level network object. The parameter defines whether the network can be accessed from the subdomains. If the parameter is not specified, it would be defaulted to allow.subdomain.network.access Global Config param  
						
						 
						
						
						
						
					 
					
						2011-11-14 18:13:47 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							d7ae15beea 
							
						 
					 
					
						
						
							
							- Fixed missing UUId in listNetworkServiceProviders API  
						
						 
						
						... 
						
						
						
						- BroadcastDomainRange will be 'POD' for 'basic' zone and 'ZONE' for an advance zone. 
						
						
					 
					
						2011-11-14 17:39:09 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							cdfac9a5e1 
							
						 
					 
					
						
						
							
							NaaS: Fix UUID of virtual router providers  
						
						 
						
						
						
						
					 
					
						2011-11-11 13:42:19 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							da846e9c08 
							
						 
					 
					
						
						
							
							Adding UUID to new entities and API commands. PhysicalNetwork, PhysicalNetworkTrafficType, PhysicalNetworkServiceProviders changed.  
						
						 
						
						
						
						
					 
					
						2011-11-11 13:23:23 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							f1b99f4f07 
							
						 
					 
					
						
						
							
							Revert "bug 10617: merging code from branch bug10617"  
						
						 
						
						... 
						
						
						
						This reverts commit 8bc33448b9220534ba0ddc6c642ffb1e69d5844e.
Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java 
						
						
					 
					
						2011-11-11 20:23:26 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							039e09ce93 
							
						 
					 
					
						
						
							
							* Introduced aclType parameter for createNetwork command (can hold 2 values now: Account and Domain). This parameter defines the access control type to the network object. If it's account -  
						
						 
						
						... 
						
						
						
						only owner of the network can access it; if it's domain - all accounts in the domain and domain children can have an access.
* aclType replaces 2 old fields: isShared and isDomainSpecific.
* All 2.2.x account specific networks will have aclType=Account; 2.2.x Domain specific networks - aclType=domain; 2.2.x Zone level networks - aclType=Domain with domainId = Root domain id 
						
						
					 
					
						2011-11-10 18:34:56 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							bde1f6d2de 
							
						 
					 
					
						
						
							
							Merge branch 'networkasservice'  
						
						 
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/api/commands/CreateRedundantVirtualRouterElementCmd.java
	api/src/com/cloud/api/commands/CreateVirtualRouterElementCmd.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	setup/db/create-schema.sql 
						
						
					 
					
						2011-11-10 16:36:08 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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