Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							d9fd7e02a5 
							
						 
					 
					
						
						
							
							Plug nic support  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java 
						
						
					 
					
						2012-06-15 14:07:46 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							f4060c3c1d 
							
						 
					 
					
						
						
							
							1) Added new element - VpcVirtualRouterElement. Extends VirtualRouter + has plug/unplug nics support  
						
						... 
						
						
						
						2) Added services api support for plugging/unplugging the nics to VpcElement
Conflicts:
	api/src/com/cloud/network/NetworkService.java
	core/src/com/cloud/vm/VMInstanceVO.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java 
						
						
					 
					
						2012-06-15 14:04:09 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							ab680bc30c 
							
						 
					 
					
						
						
							
							Start Virtual Router as a part of VPC start  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java 
						
						
					 
					
						2012-06-15 13:57:00 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							7092532ae8 
							
						 
					 
					
						
						
							
							CS-15220: fixed db upgrade for networks using external devices  
						
						... 
						
						
						
						Reviewed-by: Sheng Yang
Conflicts:
	server/test/com/cloud/network/MockNetworkManagerImpl.java
Conflicts:
	server/src/com/cloud/upgrade/dao/Upgrade2214to30.java 
						
						
					 
					
						2012-06-05 15:10:49 -07:00 
						 
				 
			
				
					
						
							
							
								Sateesh Chodapuneedi 
							
						 
					 
					
						
						
						
						
							
						
						
							c59d5415ad 
							
						 
					 
					
						
						
							
							CS-9919 Support for Nexus Swiches (Cisco Vswitches)  
						
						... 
						
						
						
						Description:
	Portprofile shaping policies will be fetched
	from nexus vswitch instead of vcenter.
	ACLs and Policies won't be synced to vCenter.
	Get physical network label while adding cluster.
	Cleanup.
Conflicts:
	core/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java 
						
						
					 
					
						2012-05-25 17:44:02 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							a678988f33 
							
						 
					 
					
						
						
							
							CS-14622: fixed adding vlan range per account - associate it with the Guest network, not public  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java 
						
						
					 
					
						2012-04-24 11:44:00 -07:00 
						 
				 
			
				
					
						
							
							
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							59436be4ee 
							
						 
					 
					
						
						
							
							fixing line endings in server  
						
						
						
						
					 
					
						2012-04-07 20:13:10 -04:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							2f634c0913 
							
						 
					 
					
						
						
							
							Switch to Apache license  
						
						
						
						
					 
					
						2012-04-03 04:50:05 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							ce8e9a9f51 
							
						 
					 
					
						
						
							
							bug 14500: set default value for is_system field as a part of 3.0 to 3.0.1 upgrade  
						
						... 
						
						
						
						status 14500: resolved fixed
reviwed-by: Frank Zhang
Conflicts:
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	setup/db/db/schema-30to301.sql 
						
						
					 
					
						2012-03-26 10:27:15 -07:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							5aade501dc 
							
						 
					 
					
						
						
							
							fix merge conflicts  
						
						
						
						
					 
					
						2012-02-28 17:06:23 -08:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							52ebf15e7c 
							
						 
					 
					
						
						
							
							Console proxy refactoring incremental check-in - new VNC protocol implementation  
						
						
						
						
					 
					
						2012-02-28 17:03:38 -08:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							2eaefc4aa8 
							
						 
					 
					
						
						
							
							Fixed unittest and some issues with 2.2.14-3.0 upgrade  
						
						
						
						
					 
					
						2012-02-28 15:17:14 -08:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							2e9511e2ae 
							
						 
					 
					
						
						
							
							Changed isElastic to isSystem for the publicIpAddress assigned during the vm deployment in EIP enabled network  
						
						... 
						
						
						
						Reviewed-by: Chiradeep 
						
						
					 
					
						2012-02-21 15:39:49 -08:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							13f4d92d2a 
							
						 
					 
					
						
						
							
							bug 13813: fixed network offering search to use traffic type when locate physical network in the zone  
						
						... 
						
						
						
						status 13813: resolved fixed
Reviewed-by: Frank 
						
						
					 
					
						2012-02-16 10:40:00 -08:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							3a37ab6772 
							
						 
					 
					
						
						
							
							bug 13715: Modify changeCidr parameter of updateNetwork API  
						
						... 
						
						
						
						We expect user to use following sequence when update virtual router provided
network offering to external firewall devices offering:
1. Shutdown all the user VMs.
2. Modify network to new offering.
3. Click "Allow CIDR change" in the pop-up dialog, which would pass
changeCidr=true to the updateNetwork API.
We would shutdown guest network before we update the network for new
offering(with changeCidr = true), in order to re-implement the network.
status 13715: resolved fixed
Reviewed-by: Alex 
						
						
					 
					
						2012-02-14 19:34:23 -08:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							5e9a15c07d 
							
						 
					 
					
						
						
							
							bug 13708: make a search by traffic type when locate physical network in the zone  
						
						... 
						
						
						
						status 13708: resolved fixed
reviewed-by: Prachi Damle 
						
						
					 
					
						2012-02-14 12:47:33 -08:00 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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