Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							79d277c30d 
							
						 
					 
					
						
						
							
							VPC: fixed listPrivateGateways by id  
						
						
						
						
					 
					
						2012-07-11 13:22:50 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							7cb4ab5e60 
							
						 
					 
					
						
						
							
							VPC: added State to vpc_gateways  
						
						
						
						
					 
					
						2012-07-11 12:05:42 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							f59b935da5 
							
						 
					 
					
						
						
							
							VPC: CS-15519 - fixed ipAssoc when only zoneId parameter is passed in to the API call  
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/api/commands/AssociateIPAddrCmd.java
	server/src/com/cloud/network/ExternalLoadBalancerUsageManagerImpl.java 
						
						
					 
					
						2012-07-10 15:20:39 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							ade3ae4e3c 
							
						 
					 
					
						
						
							
							CS-15512: Fix delete vpn connection  
						
						
						
						
					 
					
						2012-07-10 14:47:50 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							c2f9417de4 
							
						 
					 
					
						
						
							
							VPC: CS-15345 - fixed regression in ipRelease happening as a part of cleanupNetworkResources method  
						
						
						
						
					 
					
						2012-07-10 14:35:50 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							911ed25fbc 
							
						 
					 
					
						
						
							
							Merge branch 'master' into vpc  
						
						
						
						
					 
					
						2012-07-09 18:31:28 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							21519070fc 
							
						 
					 
					
						
						
							
							VPC: added vpc_id to private_ip_address table to indicate which vpc the ip belongs to  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManager.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java 
						
						
					 
					
						2012-07-09 18:23:35 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							8404dba5e0 
							
						 
					 
					
						
						
							
							CS-15452: Fix wrong repsonse ID for s2s vpn  
						
						
						
						
					 
					
						2012-07-09 16:21:21 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							f6aea09a16 
							
						 
					 
					
						
						
							
							CS-15498: Fix delete s2s vpn NPE  
						
						
						
						
					 
					
						2012-07-09 12:04:57 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							a6086dc806 
							
						 
					 
					
						
						
							
							Removed @author tag from bunch of resources  
						
						
						
						
					 
					
						2012-07-06 17:25:36 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							63d6941bdc 
							
						 
					 
					
						
						
							
							ResourceTags: respect tag parameter in listTemplates/listIsos commands  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/storage/dao/VMTemplateDao.java
	server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java 
						
						
					 
					
						2012-07-06 16:59:14 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							5be0a3eeb1 
							
						 
					 
					
						
						
							
							VPC: fixed listNetworkACLs by networkId  
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/api/commands/ListNetworkACLsCmd.java 
						
						
					 
					
						2012-07-06 16:43:39 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							85677b71fe 
							
						 
					 
					
						
						
							
							Resource tags: CS-15473 - fixed delete/list by resourceId when UUID is specified as a value  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/vpc/Dao/StaticRouteDaoImpl.java
	server/src/com/cloud/network/vpc/Dao/VpcDaoImpl.java
	server/src/com/cloud/projects/dao/ProjectDaoImpl.java 
						
						
					 
					
						2012-07-06 11:43:31 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							710fa36bfd 
							
						 
					 
					
						
						
							
							CS-15474: fixed response name for the deleteTags API  
						
						
						
						
					 
					
						2012-07-06 11:43:31 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							7044fa695d 
							
						 
					 
					
						
						
							
							VPC: CS-15469: createNetworkACL - startPort is not accepted if protocol is ICMP  
						
						
						
						
					 
					
						2012-07-06 11:11:36 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							83f566cfe7 
							
						 
					 
					
						
						
							
							VPC: added "forVpc" (boolean) parameter to listRouters call - filter by the fact if router belongs to VPC or not  
						
						
						
						
					 
					
						2012-07-06 11:08:48 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							234ae447ee 
							
						 
					 
					
						
						
							
							VPC: added field networkacl_service_provided to physical_network_service_providers table  
						
						
						
						
					 
					
						2012-07-06 11:08:39 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							540ea34f57 
							
						 
					 
					
						
						
							
							VPC: removed NetworkACL interface; added getTrafficType() to Firewall  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java 
						
						
					 
					
						2012-07-06 11:08:00 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							81afcabdb2 
							
						 
					 
					
						
						
							
							Added missing package name mistakenly removed by headers cleanup checkin  
						
						
						
						
					 
					
						2012-07-05 11:12:02 -07:00 
						 
				 
			
				
					
						
							
							
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							a77b6756fc 
							
						 
					 
					
						
						
							
							more cleanups of license headers and attribution  
						
						
						
						
					 
					
						2012-07-04 21:48:07 -04:00 
						 
				 
			
				
					
						
							
							
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							c0d5f86356 
							
						 
					 
					
						
						
							
							a bit more license header cleanup  
						
						
						
						
					 
					
						2012-07-04 19:53:04 -04:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							f2078afbd8 
							
						 
					 
					
						
						
							
							VPC: added zoneName to the VPC api response  
						
						
						
						
					 
					
						2012-07-03 17:28:20 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							da6d876cd4 
							
						 
					 
					
						
						
							
							VPC: added "forVpc" parameter to listNetworkOfferings command. If true, the offeirng can be used for vpc networks only  
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	server/src/com/cloud/api/ApiDBUtils.java 
						
						
					 
					
						2012-07-03 17:23:40 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							40a3482f13 
							
						 
					 
					
						
						
							
							VPC: multiple fixes:  
						
						... 
						
						
						
						* Separate service for NetworkACL - "NetworkACL" service
* allow having just one network supporting LB in the VPC
* perform check against VPC when upgrade network to the new network offering (the same set of checks when you add new network to the VPC) 
						
						
					 
					
						2012-07-02 17:44:54 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							183633cf70 
							
						 
					 
					
						
						
							
							VPC: createPrivateGateway - consists of plug nic + ipassoc (no setsource nat is needed)  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java 
						
						
					 
					
						2012-07-02 17:44:54 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							b565f63e42 
							
						 
					 
					
						
						
							
							VPC: listPrivateGateways command is available for regular user too (he needs to know the gatewayId for the static route creation)  
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/api/ResponseGenerator.java
	server/src/com/cloud/api/ApiResponseHelper.java 
						
						
					 
					
						2012-07-02 17:44:28 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							8d16d7f94f 
							
						 
					 
					
						
						
							
							Fix build after merge site to site vpn  
						
						
						
						
					 
					
						2012-07-02 16:39:41 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							1d97af3abf 
							
						 
					 
					
						
						
							
							CS-6840: Add status checking for site 2 site VPN  
						
						
						
						
					 
					
						2012-07-02 16:29:23 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							d9688f74ba 
							
						 
					 
					
						
						
							
							CS-6840: List all objects without require parameter  
						
						
						
						
					 
					
						2012-07-02 16:29:10 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							8d4079d477 
							
						 
					 
					
						
						
							
							CS-6840: Add hypervisor commands for site-to-site vpn  
						
						... 
						
						
						
						Conflicts:
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java 
						
						
					 
					
						2012-07-02 16:28:44 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							0ce1e78364 
							
						 
					 
					
						
						
							
							CS-6840: Add Site2SiteVpnServiceProvider  
						
						
						
						
					 
					
						2012-07-02 16:27:09 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							24c480f9e6 
							
						 
					 
					
						
						
							
							CS-6840: Add commands for site-to-site vpn  
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/api/ResponseGenerator.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	utils/test/com/cloud/utils/net/NetUtilsTest.java 
						
						
					 
					
						2012-07-02 16:26:34 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							9bb65b1126 
							
						 
					 
					
						
						
							
							CS-6840: Add data structure for site-to-site vpn tables  
						
						
						
						
					 
					
						2012-07-02 16:20:58 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							1f01d923ca 
							
						 
					 
					
						
						
							
							Merge branch 'master' into vpc  
						
						
						
						
					 
					
						2012-06-28 17:44:08 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							634cd78baa 
							
						 
					 
					
						
						
							
							Merge branch 'master' into vpc  
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/api/ResponseGenerator.java
	api/src/com/cloud/api/commands/ListNetworksCmd.java
	api/src/com/cloud/api/response/NetworkResponse.java
	api/src/com/cloud/event/EventTypes.java
	api/src/com/cloud/network/NetworkService.java
	client/tomcatconf/commands.properties.in
	scripts/network/domr/getDomRVersion.sh
	scripts/network/domr/ipassoc.sh
	scripts/network/domr/l2tp_vpn.sh
	scripts/network/domr/networkUsage.sh
	scripts/network/domr/router_proxy.sh
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/IPAddressDao.java
	server/src/com/cloud/network/dao/IPAddressDaoImpl.java
	setup/apidoc/gen_toc.py
	setup/db/create-schema.sql
	wscript 
						
						
					 
					
						2012-06-28 17:41:40 -07:00 
						 
				 
			
				
					
						
							
							
								Murali reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							c41094154d 
							
						 
					 
					
						
						
							
							moving out OVS code to plugins/network-elements/ovs  
						
						
						
						
					 
					
						2012-06-28 17:23:41 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							377b03acde 
							
						 
					 
					
						
						
							
							VPC: when add guest network to VPC, verify that the list of network services is within the list of services supported by VPC offering  
						
						
						
						
					 
					
						2012-06-28 17:18:27 -07: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 
							
						 
					 
					
						
						
						
						
							
						
						
							c19639e4a2 
							
						 
					 
					
						
						
							
							Static route can be created for generic VpcGateway now, not just Private gateway  
						
						
						
						
					 
					
						2012-06-28 17:17:44 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							b03265bc76 
							
						 
					 
					
						
						
							
							VPC: implemented vpc cleanup thread that cleans up Inactive VPCs (that were failed to delete)  
						
						
						
						
					 
					
						2012-06-28 10:18:14 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							c8ec262dea 
							
						 
					 
					
						
						
							
							VPC: as there is no support for FirewallRules/remoteAccessVPN in the VPC, removed the networkId from the list of parameters for corresponding api calls  
						
						
						
						
					 
					
						2012-06-28 10:17:53 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							fcdf6f2bec 
							
						 
					 
					
						
						
							
							Fixed @Implementation for the api commands - responseObject field should be the instance of BaseResponse  
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/api/commands/UpdateStorageNetworkIpRangeCmd.java 
						
						
					 
					
						2012-06-28 10:15:43 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							1140f081df 
							
						 
					 
					
						
						
							
							VPC: fixed getEntityOwnerId() in AssociateIpAddress command to return vpc owner if vpcId is passed in. Added action events for create/delete privateGateway/staticRoutes  
						
						
						
						
					 
					
						2012-06-28 10:13:36 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							a78fcedb5e 
							
						 
					 
					
						
						
							
							VPC: added vpcId to SetStaticNatRule and CreateLoadBalancerConfig commands  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/element/NetscalerElement.java 
						
						
					 
					
						2012-06-28 10:13:19 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							1a232171eb 
							
						 
					 
					
						
						
							
							VPC: implementation for Add/delete/list StaticRoute. Agent implementation is yet to be done  
						
						
						
						
					 
					
						2012-06-28 10:11:41 -07:00 
						 
				 
			
				
					
						
							
							
								Murali reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							8197f1f07c 
							
						 
					 
					
						
						
							
							moving out VMWAre and Nexus VSM support code into plugins/hypervisors/vmware  
						
						
						
						
					 
					
						2012-06-26 19:48:55 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							ce876e24de 
							
						 
					 
					
						
						
							
							VPC: intermidiate checkin to Static Routes  
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/api/ApiConstants.java 
						
						
					 
					
						2012-06-25 21:00:57 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							d35eb73c9b 
							
						 
					 
					
						
						
							
							VPC: initial checkin for Static Routes  
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
						
						
					 
					
						2012-06-25 20:59:33 -07:00