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 
							
						 
					 
					
						
						
						
						
							
						
						
							6fd49a265c 
							
						 
					 
					
						
						
							
							Fixed unittest  
						
						
						
						
					 
					
						2011-12-27 15:34:54 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							96843be30a 
							
						 
					 
					
						
						
							
							Pass cleanup parametet to shutdown() method of the networkElement. Based on this parameter, the element can decide if it wants to destroy the instances, or just shut them down  
						
						
						
						
					 
					
						2011-10-25 18:48:59 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							525a0a7675 
							
						 
					 
					
						
						
							
							1)Changed implementation for restart network: call shutdown/implement methods as a part of it  
						
						... 
						
						
						
						2)Re-apply all existing firewall rules as a part of implement call. TODO: Cleanup all existing rules from the backend (leave them in the DB) as a part of shutdown call 
						
						
					 
					
						2011-10-25 18:24:24 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							f6717e0a23 
							
						 
					 
					
						
						
							
							1) Method name change  
						
						... 
						
						
						
						2) Rely on SourceNatService when decide if DirectNetworkGuru and GuestNetworkGuru should handle the network 
						
						
					 
					
						2011-10-24 17:30:14 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							219978a9be 
							
						 
					 
					
						
						
							
							Create network using physical network id  
						
						
						
						
					 
					
						2011-10-20 18:25:13 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							ceda05298e 
							
						 
					 
					
						
						
							
							Deprecate guestIpType in networkOffering api. Use type (Shared/Isolated) instead  
						
						
						
						
					 
					
						2011-10-19 16:38:39 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							c00058adc2 
							
						 
					 
					
						
						
							
							Added type (Shared/Isolated) to the networkOffering/networks  
						
						
						
						
					 
					
						2011-10-13 17:33:41 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							25c2734e03 
							
						 
					 
					
						
						
							
							More stuff to Projects feature - added support for adding resources (vms, templates, isos) to the project  
						
						
						
						
					 
					
						2011-10-05 13:24:25 -07:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							3947c9a126 
							
						 
					 
					
						
						
							
							Bug 11522 - New agent manager  
						
						... 
						
						
						
						Initailize SearchCriteria2 in order to replace search interface of DAO 
						
						
					 
					
						2011-10-03 10:32:27 -07:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							9b424a762d 
							
						 
					 
					
						
						
							
							fix compilation of mocks  
						
						
						
						
					 
					
						2011-09-13 09:22:52 -07:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							3cb4ad4934 
							
						 
					 
					
						
						
							
							Add more detail when unable to schedule cleanup  
						
						... 
						
						
						
						clean up tests for security group manager v2
move interval to listener -- allows it to be configurable if needed
fix mocks
Enhanced logging for security group manager (from zucchini)
fix merge issues
merge issues 
						
						
					 
					
						2011-09-12 18:22:55 -07:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							2fc782b8ba 
							
						 
					 
					
						
						
							
							Add basic Mocks for some managers  
						
						
						
						
					 
					
						2011-09-12 18:20:22 -07:00