prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							d0e63bc377 
							
						 
					 
					
						
						
							
							Bug 13099 - table physical-network-traffic-types needs to be updated when xen network device setting is modified in the global settings  
						
						 
						
						... 
						
						
						
						Changes:
- DB upgrade changes
-- make the global setting hidden.
-- During upgrade set network labels from global config 
						
						
					 
					
						2012-02-07 18:41:29 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							cad392cd68 
							
						 
					 
					
						
						
							
							bug 13335: fixed listProjectInvitations by projectId  
						
						 
						
						... 
						
						
						
						status 13335: resolved fixed 
						
						
					 
					
						2012-02-07 13:16:27 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							1490e45a1c 
							
						 
					 
					
						
						
							
							Fixed format style in a bunch of files (replaced tabs with spaces as a part of it)  
						
						 
						
						
						
						
					 
					
						2012-02-03 13:49:11 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							78f6fc9e43 
							
						 
					 
					
						
						
							
							bug 12361: Inermediate checkin to 2.2.14-3.0 db upgrade  
						
						 
						
						
						
						
					 
					
						2012-02-01 16:46:56 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							2f17d465dc 
							
						 
					 
					
						
						
							
							Fixed 2.2.14-3.0 db upgrade for usage  
						
						 
						
						... 
						
						
						
						Added unittest as well 
						
						
					 
					
						2012-02-01 13:33:53 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							9219d4c41d 
							
						 
					 
					
						
						
							
							bug 12361: more fixes to DB upgrade for network_offerings table  
						
						 
						
						... 
						
						
						
						Added unittest for testing network offerings db upgrade 
						
						
					 
					
						2012-01-30 11:20:13 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							8eed9004cd 
							
						 
					 
					
						
						
							
							Fixed broken unittest  
						
						 
						
						
						
						
					 
					
						2012-01-27 14:44:34 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							6325d21c50 
							
						 
					 
					
						
						
							
							Get new elasticIp when releaseIpAddress is called for elasticIP of the vm  
						
						 
						
						
						
						
					 
					
						2012-01-19 13:58:35 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							a8758d292e 
							
						 
					 
					
						
						
							
							ElasticLB support in Basic zone.  
						
						 
						
						... 
						
						
						
						When elb capability is enabled on the network offering, we:
1) on each createLB command:
* associate ip address to the LB rule owner
* create LB rule
2) on each deleteLb command:
* delete the rule
* disassociate ip address
The rule belongs to the owner, so proper usage events are generated 
						
						
					 
					
						2012-01-19 13:57:37 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							f0c4980dff 
							
						 
					 
					
						
						
							
							bug 13110: use Ternary data structure when build search criteria  
						
						 
						
						... 
						
						
						
						status 13110: resolved fixed 
						
						
					 
					
						2012-01-16 14:15:28 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							804cfaec46 
							
						 
					 
					
						
						
							
							Fix some testcases  
						
						 
						
						
						
						
					 
					
						2012-01-11 13:51:43 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							adaea570e4 
							
						 
					 
					
						
						
							
							bug 12934: added name to physical network  
						
						 
						
						... 
						
						
						
						status 12934: resolved fixed 
						
						
					 
					
						2012-01-09 14:20:37 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							c581506103 
							
						 
					 
					
						
						
							
							bug 12306: list* command revamp  
						
						 
						
						
						
						
					 
					
						2012-01-09 10:07:42 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							89ca2fe48e 
							
						 
					 
					
						
						
							
							bug 12656: Add restriction for network update and new rules  
						
						 
						
						... 
						
						
						
						status 12656: resolved fixed 
						
						
					 
					
						2012-01-05 21:08:41 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							d4e0fbda83 
							
						 
					 
					
						
						
							
							bug 12686: added search by zoneId to the listNetworkOfferings  
						
						 
						
						
						
						
					 
					
						2012-01-04 12:31:59 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							ba1f21c29e 
							
						 
					 
					
						
						
							
							Unittest for db upgrade  
						
						 
						
						
						
						
					 
					
						2011-12-28 10:34:29 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							6fd49a265c 
							
						 
					 
					
						
						
							
							Fixed unittest  
						
						 
						
						
						
						
					 
					
						2011-12-27 15:34:54 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							ceb0a918a1 
							
						 
					 
					
						
						
							
							createTemplate/createSnapshot for project - allow to execute for Projects in Active state only  
						
						 
						
						
						
						
					 
					
						2011-12-19 16:20:40 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							dac505194c 
							
						 
					 
					
						
						
							
							Changes to PhysicalNetworkTrafficType to accomodate the simulator hypervisor type  
						
						 
						
						
						
						
					 
					
						2011-12-15 19:12:21 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							bab29c4207 
							
						 
					 
					
						
						
							
							Bug 12361  DB upgrade from 2.2 to Acton  
						
						 
						
						... 
						
						
						
						- Changes to schema file schema-2214to30.sql: moved out cleanup to separate file, added some NAAS changes
- Added physicalNetwork setup to Upgrade2214to30.java data migration
- Unit test and sample file 
						
						
					 
					
						2011-12-10 00:01:15 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							7b8287d323 
							
						 
					 
					
						
						
							
							bug 10804: Api and middle layer support for default route feature  
						
						 
						
						
						
						
					 
					
						2011-12-05 14:53:45 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							a4773b7080 
							
						 
					 
					
						
						
							
							bug 12291: listVms - show non-project resources only if no projectId specified  
						
						 
						
						... 
						
						
						
						status 12291: resolved fixed 
						
						
					 
					
						2011-12-02 15:17:50 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							0effb82f82 
							
						 
					 
					
						
						
							
							bug 12295: fixed associateIpAddress for projects  
						
						 
						
						... 
						
						
						
						status 12295: resolved fixed 
						
						
					 
					
						2011-12-02 12:08:01 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							554946fe8b 
							
						 
					 
					
						
						
							
							Allow networkDomain update for Shared networks  
						
						 
						
						
						
						
					 
					
						2011-11-30 10:34:58 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							c2448b7bd4 
							
						 
					 
					
						
						
							
							list Providers by name and state  
						
						 
						
						
						
						
					 
					
						2011-11-29 09:59:43 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							102f460458 
							
						 
					 
					
						
						
							
							Fixed updateConfiguration - updateHostDetails used to swallow the exceptions  
						
						 
						
						
						
						
					 
					
						2011-11-28 11:52:45 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							00f6738e24 
							
						 
					 
					
						
						
							
							bug 12105: don't generate corresponding firewall rule for the pf/staticNat/lb rule in revoke state  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/user/MockAccountManagerImpl.java
	server/test/com/cloud/vm/MockUserVmManagerImpl.java 
						
						
					 
					
						2011-11-21 16:34:55 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							337c07c0d1 
							
						 
					 
					
						
						
							
							Default gateway service to sourceNat service in the API  
						
						 
						
						
						
						
					 
					
						2011-11-17 16:28:10 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							0a10e32d69 
							
						 
					 
					
						
						
							
							Fixed test client  
						
						 
						
						
						
						
					 
					
						2011-11-17 16:25:54 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							5571afa471 
							
						 
					 
					
						
						
							
							Virtual router elements: prepare nics only when VirtualRouter is a provider for at least one service in the network  
						
						 
						
						
						
						
					 
					
						2011-11-17 14:33:22 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							0bb325ac12 
							
						 
					 
					
						
						
							
							Call implement() and shutdown() methods for providers only when the provider serves a service for the network  
						
						 
						
						
						
						
					 
					
						2011-11-17 13:53:53 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							790b33bdfc 
							
						 
					 
					
						
						
							
							More validation to network and network offering creation/upgrade  
						
						 
						
						
						
						
					 
					
						2011-11-16 14:53:38 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							450b19532a 
							
						 
					 
					
						
						
							
							Fixed unit test  
						
						 
						
						
						
						
					 
					
						2011-11-16 13:20:53 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							87f5150e38 
							
						 
					 
					
						
						
							
							Basic zone is fixed and works with new NaaS now  
						
						 
						
						
						
						
					 
					
						2011-11-14 10:46:05 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							f9b31e895a 
							
						 
					 
					
						
						
							
							Fixed unittest  
						
						 
						
						
						
						
					 
					
						2011-11-11 14:32:25 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							2b04d0f6ff 
							
						 
					 
					
						
						
							
							Fixed test client  
						
						 
						
						
						
						
					 
					
						2011-11-11 14:32:25 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							ddbcd01f56 
							
						 
					 
					
						
						
							
							fixed up unit test  
						
						 
						
						
						
						
					 
					
						2011-11-11 14:15:13 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							f6fcaa49ec 
							
						 
					 
					
						
						
							
							Merge complete except for virtualnetworkappliancemanager  
						
						 
						
						
						
						
					 
					
						2011-11-10 15:18:16 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							76a3bb7581 
							
						 
					 
					
						
						
							
							Fixed unittest  
						
						 
						
						
						
						
					 
					
						2011-11-07 16:28:31 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							17a7b7cda4 
							
						 
					 
					
						
						
							
							listNetworkOfferings: added an ability to filter based on the Services supported  
						
						 
						
						
						
						
					 
					
						2011-11-07 10:53:28 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							a32c4f1ec6 
							
						 
					 
					
						
						
							
							Fixed unit tests  
						
						 
						
						
						
						
					 
					
						2011-11-03 14:02:53 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							7e9b210d5c 
							
						 
					 
					
						
						
							
							bug 6745: Fix problems in Async create commands  
						
						 
						
						
						
						
					 
					
						2011-11-03 07:34:02 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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