Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							4e7b65ef71 
							
						 
					 
					
						
						
							
							VPC: CS-15354 - fixed updateNetworkServiceProvider for VpcVirtualRouter  
						
						 
						
						
						
						
					 
					
						2012-06-25 20:57:37 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							4eee9246d8 
							
						 
					 
					
						
						
							
							VPC: added missing @Implementation to listPrivateGateways  
						
						 
						
						
						
						
					 
					
						2012-06-25 20:57:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							dc04e0b2e5 
							
						 
					 
					
						
						
							
							VPC: listPrivateGateways API implementation  
						
						 
						
						
						
						
					 
					
						2012-06-25 20:57:09 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							11de5d4fbe 
							
						 
					 
					
						
						
							
							Fixed apidoc build  
						
						 
						
						... 
						
						
						
						Conflicts:
	setup/apidoc/gen_toc.py 
						
						
					 
					
						2012-06-25 20:56:45 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							d3ccc3a7de 
							
						 
					 
					
						
						
							
							VPC: fixed NPE in network ACL delete (ip address is null for the rule of this type_  
						
						 
						
						
						
						
					 
					
						2012-06-25 20:55:37 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							030458a37b 
							
						 
					 
					
						
						
							
							VPC: implemented add/delete Private gateway  
						
						 
						
						... 
						
						
						
						Conflicts:
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/dc/DataCenterVO.java
	server/src/com/cloud/network/NetworkManagerImpl.java 
						
						
					 
					
						2012-06-25 20:54:14 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							300110931c 
							
						 
					 
					
						
						
							
							VPC: apply dhcp entries only after all guest nics are plugged  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
						
						
					 
					
						2012-06-25 20:51:09 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							1b1e52ddb0 
							
						 
					 
					
						
						
							
							VPC: apply firewall ACLs as a part of VPC router start/restart and VPC network implement  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java 
						
						
					 
					
						2012-06-25 20:47:29 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							887970690b 
							
						 
					 
					
						
						
							
							Added NicTO to SetSourceNat command, CreateLoadBalancerConfigCommand, SetNetworkACLCommand  
						
						 
						
						
						
						
					 
					
						2012-06-21 10:02:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							ccec9192a2 
							
						 
					 
					
						
						
							
							VPC: implemented delete and list Network ACL(s)  
						
						 
						
						
						
						
					 
					
						2012-06-20 17:20:04 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							374a600746 
							
						 
					 
					
						
						
							
							VPC: initial checkin for network ACLs  
						
						 
						
						... 
						
						
						
						Conflicts:
	client/tomcatconf/commands.properties.in 
						
						
					 
					
						2012-06-20 17:19:49 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							7fda6306b8 
							
						 
					 
					
						
						
							
							VPC: fixed user vm start in case when Implemented network existed w/o VR (it was expunged with DestroyRouter command)  
						
						 
						
						
						
						
					 
					
						2012-06-20 17:19:17 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							19f648f1aa 
							
						 
					 
					
						
						
							
							VPC: plug guest nic on guest network implement, and unplug on shutdown  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
						
						
					 
					
						2012-06-19 10:09:46 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							89d7e54732 
							
						 
					 
					
						
						
							
							Network usage for VPC implementation  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
						
						
					 
					
						2012-06-19 10:08:03 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							214782cc8c 
							
						 
					 
					
						
						
							
							Don't send public/guest nic info when start VR in VPC  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
						
						
					 
					
						2012-06-19 10:05:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							03fe667b75 
							
						 
					 
					
						
						
							
							Changed the command name for adding private gateway  
						
						 
						
						
						
						
					 
					
						2012-06-15 14:33:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							418cbe2e17 
							
						 
					 
					
						
						
							
							VPC : fixed get_domr_version  
						
						 
						
						
						
						
					 
					
						2012-06-15 14:33:43 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							38215583ea 
							
						 
					 
					
						
						
							
							Fixed lock problem when add vm to guest network  
						
						 
						
						
						
						
					 
					
						2012-06-15 14:33:32 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							4707888363 
							
						 
					 
					
						
						
							
							VPC : revert dnsmasq.conf  
						
						 
						
						
						
						
					 
					
						2012-06-15 14:33:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							9ae62d32cd 
							
						 
					 
					
						
						
							
							Isolated non-vpc networks: start router with 3 nics from the very beginning  
						
						 
						
						
						
						
					 
					
						2012-06-15 14:33:14 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							b3985a3b48 
							
						 
					 
					
						
						
							
							Added new capabilities to VPN and Firewall services defining if VPN is S2S or Remote access, and if the Firewall rules should be created per cidr or per public ip address  
						
						 
						
						
						
						
					 
					
						2012-06-15 14:33:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							2deba9bd86 
							
						 
					 
					
						
						
							
							VPC : add vpc_vpn_l2tp.sh  
						
						 
						
						
						
						
					 
					
						2012-06-15 14:32:56 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							e69561b857 
							
						 
					 
					
						
						
							
							VPC : revert some change  
						
						 
						
						
						
						
					 
					
						2012-06-15 14:32:47 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							3e5f391c85 
							
						 
					 
					
						
						
							
							VPC: more changes to ipAssoc  
						
						 
						
						
						
						
					 
					
						2012-06-15 14:32:39 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							10a578db46 
							
						 
					 
					
						
						
							
							VPC : fix nic hot plug script  
						
						 
						
						
						
						
					 
					
						2012-06-15 14:32:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							d51e3443cb 
							
						 
					 
					
						
						
							
							VPC : add nic hot plug script  
						
						 
						
						
						
						
					 
					
						2012-06-15 14:32:10 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							982562b9fb 
							
						 
					 
					
						
						
							
							VPC: ipAssoc consists of 3 parts: plug nic (if needed), associateIp, enableSourceNat(if ip is source nat ip)  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
						
						
					 
					
						2012-06-15 14:31:58 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							a7462bb232 
							
						 
					 
					
						
						
							
							VPC : vpc_ipassosc.sh  
						
						 
						
						
						
						
					 
					
						2012-06-15 14:30:50 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							768463d113 
							
						 
					 
					
						
						
							
							VPC : add new dnsmasq.conf for VPC domr  
						
						 
						
						
						
						
					 
					
						2012-06-15 14:30:39 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							d49210e42b 
							
						 
					 
					
						
						
							
							VPC : add new type vpcrouter in cloud-early-config  
						
						 
						
						
						
						
					 
					
						2012-06-15 14:30:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							c7e440a1de 
							
						 
					 
					
						
						
							
							VPC : revert iptables-router  
						
						 
						
						
						
						
					 
					
						2012-06-15 14:30:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							fb7fc6fd91 
							
						 
					 
					
						
						
							
							VPC : revert change in cloud-early-config  
						
						 
						
						
						
						
					 
					
						2012-06-15 14:30:15 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							d80476b93e 
							
						 
					 
					
						
						
							
							VPC : add new ipassoc.sh for vpc  
						
						 
						
						
						
						
					 
					
						2012-06-15 14:30:07 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							0f5775d446 
							
						 
					 
					
						
						
							
							VPC : revert changes in ipassoc.sh  
						
						 
						
						
						
						
					 
					
						2012-06-15 14:29:56 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							95faedc09f 
							
						 
					 
					
						
						
							
							VPC : bug fix  
						
						 
						
						
						
						
					 
					
						2012-06-15 14:29:47 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							6ab7a6075d 
							
						 
					 
					
						
						
							
							Fixed ip assoc  
						
						 
						
						
						
						
					 
					
						2012-06-15 14:29:27 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Vijayendra Bhamidipati 
							
						 
					 
					
						
						
						
						
							
						
						
							e177b8d6f6 
							
						 
					 
					
						
						
							
							CS-15241: static NAT is not working when provider is set to Juniper SRX  
						
						 
						
						... 
						
						
						
						Description:
	Checking in fix for the exception seen due to the absence of
	the AsyncCommandQueued exception in the map of CSExceptionErrorCode
	which is used to look up the error code corresponding to a
	cloudstack exception. Also printing the stack trace in case
	an exception is not found in the map.
Conflicts:
	utils/src/com/cloud/utils/exception/CSExceptionErrorCode.java 
						
						
					 
					
						2012-06-15 14:29:12 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							c82885021b 
							
						 
					 
					
						
						
							
							More logging to plug nic code  
						
						 
						
						
						
						
					 
					
						2012-06-15 14:27:49 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							aa2b7d2d8c 
							
						 
					 
					
						
						
							
							VPC: fixed guest network shutdown  
						
						 
						
						
						
						
					 
					
						2012-06-15 14:27:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							39422a3138 
							
						 
					 
					
						
						
							
							Release acquired lock for VPC  
						
						 
						
						
						
						
					 
					
						2012-06-15 14:27:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							7e119e4c94 
							
						 
					 
					
						
						
							
							Fixed addDhcpEntry/userdata/password in VPC setup  
						
						 
						
						
						
						
					 
					
						2012-06-15 14:27:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							c6364dfdf0 
							
						 
					 
					
						
						
							
							Fixed create-schema.sql  
						
						 
						
						
						
						
					 
					
						2012-06-15 14:27:14 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							aa84256542 
							
						 
					 
					
						
						
							
							1) Added VpcVirtualNetworkApplianceService interface  
						
						 
						
						... 
						
						
						
						2) Pass dns1/dns2 to setupGuestNetworkCommand
3) Network implement - don't get source nat ip address for Vpc if it already has one 
						
						
					 
					
						2012-06-15 14:27:00 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							f1883e991c 
							
						 
					 
					
						
						
							
							VPC : bug fix  
						
						 
						
						
						
						
					 
					
						2012-06-15 14:26:50 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							edbf4a0ba7 
							
						 
					 
					
						
						
							
							VPC : many debug fix  
						
						 
						
						
						
						
					 
					
						2012-06-15 14:26:41 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							fb72b7e31b 
							
						 
					 
					
						
						
							
							VPC : get correct guest gateway  
						
						 
						
						
						
						
					 
					
						2012-06-15 14:26:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							a4d0f91cfe 
							
						 
					 
					
						
						
							
							VPC : use routerProxy to call l2tpVpn  
						
						 
						
						... 
						
						
						
						Conflicts:
	core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java 
						
						
					 
					
						2012-06-15 14:26:20 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							d70d2f82d4 
							
						 
					 
					
						
						
							
							StartRouter: set only control nic during the initial router start; plug exising public and guest nics after the router is started with control nic  
						
						 
						
						
						
						
					 
					
						2012-06-15 14:25:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							c75fe80125 
							
						 
					 
					
						
						
							
							VPC : use routerProxy to call networkUsage.sh  
						
						 
						
						... 
						
						
						
						Conflicts:
	core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java 
						
						
					 
					
						2012-06-15 14:25:21 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							251a91f5b3 
							
						 
					 
					
						
						
							
							VCP : use routerProxy to call checkrouter script  
						
						 
						
						
						
						
					 
					
						2012-06-15 14:24:18 -07:00