Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							966c1b0ad8 
							
						 
					 
					
						
						
							
							VPC: when VPC router gets destroyed and recreated, plug public nic for each Vlan where VPC public ips belong to  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java 
						
						
					 
					
						2012-07-20 17:12:34 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							5a64d4fbb1 
							
						 
					 
					
						
						
							
							VPC: CS-15638: Plug nic for the public ip address if the ip address from the diff vlan range than sourceNat ip  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java 
						
						
					 
					
						2012-07-20 17:12:34 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							d48d4c24e7 
							
						 
					 
					
						
						
							
							VPC: CS-15569/CS-15568 - release ip address from VPC when fail to enable static nat  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/rules/RulesManagerImpl.java 
						
						
					 
					
						2012-07-13 13:34:19 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							ad80f426a0 
							
						 
					 
					
						
						
							
							VPC: CS-15553 and CS-15549 - more checks during automatic ip assoc to VPC network  
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java 
						
						
					 
					
						2012-07-13 13:32:14 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							353423acec 
							
						 
					 
					
						
						
							
							Merge branch 'master' into vpc  
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
	api/src/com/cloud/api/response/FirewallResponse.java
	api/src/com/cloud/api/response/IPAddressResponse.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/dao/NetworkDaoImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java 
						
						
					 
					
						2012-07-06 12:04:10 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							7acf8585b1 
							
						 
					 
					
						
						
							
							Resource tags: 1) Remove tag records when correspdonding cloudStack object gets removed  
						
						... 
						
						
						
						2) added "tags" request parameter to the banch of list* Api commands (listVirtualMachines, listSnapshots - all commands are listed in the resource tags functional spec)
Conflicts:
	api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
	api/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java
	api/src/com/cloud/api/commands/ListPublicIpAddressesCmd.java
	api/src/com/cloud/api/commands/ListSecurityGroupsCmd.java
	api/src/com/cloud/api/commands/ListSnapshotsCmd.java
	api/src/com/cloud/api/commands/ListVolumesCmd.java
	api/src/com/cloud/api/response/FirewallResponse.java
	api/src/com/cloud/api/response/IPAddressResponse.java
	api/src/com/cloud/api/response/VolumeResponse.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
	server/src/com/cloud/vm/dao/UserVmDaoImpl.java 
						
						
					 
					
						2012-07-06 11:43:31 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							31f9d718fb 
							
						 
					 
					
						
						
							
							Merge branch 'master' into vpc  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java 
						
						
					 
					
						2012-07-03 17:32:50 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							2dc1a286f6 
							
						 
					 
					
						
						
							
							VPC: set networkId to be null for IP address when the last PF/LB rule is removed for it and the IP belongs to VPC  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/rules/RulesManagerImpl.java 
						
						
					 
					
						2012-07-02 17:44:27 -07:00 
						 
				 
			
				
					
						
							
							
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							e87558256c 
							
						 
					 
					
						
						
							
							Patch from Chip Childers  
						
						... 
						
						
						
						https://reviews.apache.org/r/5704/ 
License header updates for the server folder 
					
						2012-07-02 09:51:21 -04:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							24772bcb4e 
							
						 
					 
					
						
						
							
							VPC: createPF/createLBrule: 1) don't allow to pass openFirewall=true 2) when no openFirewall is passed in, defaulted to false if the public ip belongs to VPC  
						
						
						
						
					 
					
						2012-06-28 17:18:15 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							8be74c033f 
							
						 
					 
					
						
						
							
							VPC: update ip address object after the ip is associated with the network  
						
						
						
						
					 
					
						2012-06-25 21:00:12 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							96c273ad55 
							
						 
					 
					
						
						
							
							VPC: finilize start for the VR - send ip assoc commands only after plug nic is done for all public nics  
						
						
						
						
					 
					
						2012-06-25 21:00:00 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							929997f54e 
							
						 
					 
					
						
						
							
							AssociateIpAddress to VPC - the ip gets associated to the network only when the first rule for the ip gets created.  
						
						... 
						
						
						
						When the last rule is removed for vpc ip, networkId is set to null
Conflicts:
	api/src/com/cloud/api/commands/AssociateIPAddrCmd.java
	api/src/com/cloud/api/commands/EnableStaticNatCmd.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/network/rules/RulesService.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java 
						
						
					 
					
						2012-06-15 14:18:24 -07:00 
						 
				 
			
				
					
						
							
							
								Murali reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							a4b0759c52 
							
						 
					 
					
						
						
							
							bug CS-14862: EIP/ELB - SSVM and CPVM should be given an ip address from the public ip address range.  
						
						... 
						
						
						
						With this fix  both SSVM and CPVM will get public IP's in case of basic zone with EIP service.
A static NAT rule is implicitly configured on the EIP service provider to map public IP to a
guest IP address associated with SSVM/CPVM 
						
						
					 
					
						2012-05-21 20:18:37 +05:30 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							2f634c0913 
							
						 
					 
					
						
						
							
							Switch to Apache license  
						
						
						
						
					 
					
						2012-04-03 04:50:05 -07:00 
						 
				 
			
				
					
						
							
							
								Vijayendra Bhamidipati 
							
						 
					 
					
						
						
						
						
							
						
						
							005ba5e2b5 
							
						 
					 
					
						
						
							
							Bug 13127: API error text refer to database ids instead of uuids  
						
						... 
						
						
						
						Description:
	Adding overloaded addProxyObject() function to CloudException
	and RuntimeCloudException classes and using this function
	to stuff exceptions with IDs, to reduce code footprint. 
						
						
					 
					
						2012-03-15 16:27:52 -07:00 
						 
				 
			
				
					
						
							
							
								Vijayendra Bhamidipati 
							
						 
					 
					
						
						
						
						
							
						
						
							b1bb0afad4 
							
						 
					 
					
						
						
							
							Bug 13127: API error text refer to database ids instead of uuids  
						
						... 
						
						
						
						Description:
	Modifying the API functions' exception handling to call
	addProxyObject() wherever applicable, and removing some
	wrong calls to addProxyObject() that were put in in an
	earlier commit for this bug.
	With this commit, we cover many API functions to use the
	new exception handling code, but some pieces may still be
	left out. These will be covered as work in progress, when
	making changes to the CS API code. 
						
						
					 
					
						2012-03-12 18:05:45 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							e2c7fe5f4f 
							
						 
					 
					
						
						
							
							Fix debug messages in RulesManagerImpl  
						
						... 
						
						
						
						Reviewed-by: Edison 
						
						
					 
					
						2012-02-23 10:58:57 -08:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							2992c608c4 
							
						 
					 
					
						
						
							
							bug 13919: do includingRemoved Nic search when remove firewall rules during the vm expunge  
						
						... 
						
						
						
						status 13919: resolved fixed
Reviewed-by: Sheng Yang 
						
						
					 
					
						2012-02-21 18:02:44 -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 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							99b7b73d7f 
							
						 
					 
					
						
						
							
							bug 12747: release ip when no static nat rule existed  
						
						... 
						
						
						
						status 12747: resolved fixed 
						
						
					 
					
						2012-02-08 15:54:03 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							7ea3c8933d 
							
						 
					 
					
						
						
							
							bug 13305: don't allow to create ip forwarding rules when elasticIP is enabled for the network offering  
						
						... 
						
						
						
						status 13305: resolved fixed
Reviewed-by: Will Chan 
						
						
					 
					
						2012-01-25 10:57:34 -08:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							5307d21210 
							
						 
					 
					
						
						
							
							DisableStaticNat: if elasticIP service is enabled for the network offering, always allocate new elastic ip and create static nat rule for it when disableStaticNat is called  
						
						
						
						
					 
					
						2012-01-24 14:06:01 -08:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							03cce245cf 
							
						 
					 
					
						
						
							
							Fail to create vm when corresponding elastic ip failed to apply on the backend  
						
						
						
						
					 
					
						2012-01-19 14:13:49 -08:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							d4d345a587 
							
						 
					 
					
						
						
							
							Don't retry to re-create the vm when failed to allocate public ip  
						
						
						
						
					 
					
						2012-01-19 14:00:07 -08:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							a9e4af0866 
							
						 
					 
					
						
						
							
							Can't release/disable static nat for IP when the IP is elastic  
						
						
						
						
					 
					
						2012-01-19 13:58:36 -08:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							4f46c3b160 
							
						 
					 
					
						
						
							
							Mark ip as not elastic when disable static nat is called on it  
						
						
						
						
					 
					
						2012-01-19 13:58:36 -08:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							212c22b256 
							
						 
					 
					
						
						
							
							Added isElastic flag to ip address  
						
						
						
						
					 
					
						2012-01-19 13:58:35 -08:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							1d0ffc4575 
							
						 
					 
					
						
						
							
							EnableStaticNat for newly allocated address - if eIp is enabled, and the target vm already assigned to the ip, reassign the vm to the new ip  
						
						
						
						
					 
					
						2012-01-19 13:58:35 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							6deeb7ddc9 
							
						 
					 
					
						
						
							
							Firewall service is enabled in default elb/eip network offering  
						
						... 
						
						
						
						Also added more handling for error cases scenarios 
						
						
					 
					
						2012-01-19 13:58:35 -08:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							0e8104cca1 
							
						 
					 
					
						
						
							
							Disassociate ip address - always allocate a new IP and enable static nat for it when elactic IP is enabled  
						
						
						
						
					 
					
						2012-01-19 13:58:35 -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 
						 
				 
			
				
					
						
							
							
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							474543d623 
							
						 
					 
					
						
						
							
							Bug 10284: Throw exception instead of returnning false for firewall API commands  
						
						... 
						
						
						
						Status 10284: resolved fixed
Reviewed-By: Nitin 
						
						
					 
					
						2012-01-12 19:03:34 +05:30 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							e6080436cf 
							
						 
					 
					
						
						
							
							bug 12926: fixed regression in enableStaticNat code introduced by preserve ip fix  
						
						
						
						
					 
					
						2012-01-10 12:17:13 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							4f54b5e9d3 
							
						 
					 
					
						
						
							
							Fixed error message  
						
						
						
						
					 
					
						2011-11-21 17:53:40 -08:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							b2a5e26c06 
							
						 
					 
					
						
						
							
							bug 10792: add default system wide firewall rule  
						
						... 
						
						
						
						status 10792: resolved fixed 
						
						
					 
					
						2011-11-15 16:51:30 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							f6fcaa49ec 
							
						 
					 
					
						
						
							
							Merge complete except for virtualnetworkappliancemanager  
						
						
						
						
					 
					
						2011-11-10 15:18:16 -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 
						 
				 
			
				
					
						
							
							
								Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							62e89dc132 
							
						 
					 
					
						
						
							
							bug 11778: Make sure that there exist no PF/LB rules before enabling static nat on an ip and vice versa. Reviewed by - Jana  
						
						... 
						
						
						
						status 11778: resolved fixed 
						
						
					 
					
						2011-11-07 17:11:15 +05:30 
						 
				 
			
				
					
						
							
							
								Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							0d1f89f507 
							
						 
					 
					
						
						
							
							bug 10530: Add vmid in the logs  
						
						
						
						
					 
					
						2011-10-28 23:36:07 +05:30 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							95bac58076 
							
						 
					 
					
						
						
							
							Cleanup firewall/pf/lb/vpn rules as a part of networkShutdown  
						
						
						
						
					 
					
						2011-10-26 18:00:22 -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