Vijay Venkatachalam 
							
						 
					 
					
						
						
						
						
							
						
						
							527b5c8ee2 
							
						 
					 
					
						
						
							
							Autoscale: Supporting network element independent counter parameters Reviewed-By:Devdeep  
						
						
						
						
					 
					
						2012-11-16 10:57:00 +05:30 
						 
				 
			
				
					
						
							
							
								Vijay Vekatachalam 
							
						 
					 
					
						
						
						
						
							
						
						
							35b0e086d4 
							
						 
					 
					
						
						
							
							enable Autoscale VMs to be named as Autoscale-LB-<lbname>  
						
						
						
						
					 
					
						2012-11-16 10:56:59 +05:30 
						 
				 
			
				
					
						
							
							
								Vijay Venkatachalam 
							
						 
					 
					
						
						
						
						
							
						
						
							58db4d0d88 
							
						 
					 
					
						
						
							
							CS-15729:AutoScale. Aligning the NetScaler response time counter, and correcting duration check against interval  
						
						
						
						
					 
					
						2012-11-16 10:56:57 +05:30 
						 
				 
			
				
					
						
							
							
								Deepak Garg 
							
						 
					 
					
						
						
						
						
							
						
						
							25b853b7d5 
							
						 
					 
					
						
						
							
							CS-16052 Introducing data-base indexes for autoscale db schema  
						
						
						
						
					 
					
						2012-11-16 10:56:56 +05:30 
						 
				 
			
				
					
						
							
							
								Vijay 
							
						 
					 
					
						
						
						
						
							
						
						
							f96810b9ae 
							
						 
					 
					
						
						
							
							AutoScale. Adding default counters  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/server/ConfigurationServerImpl.java
	setup/db/create-schema.sql
	setup/db/db/schema-304to305.sql 
						
						
					 
					
						2012-11-16 10:56:44 +05:30 
						 
				 
			
				
					
						
							
							
								Vijay 
							
						 
					 
					
						
						
						
						
							
						
						
							dda4d39b55 
							
						 
					 
					
						
						
							
							AutoScale changes in Apache master  
						
						
						
						
					 
					
						2012-11-16 10:56:44 +05:30 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							c07d6d28ee 
							
						 
					 
					
						
						
							
							Merge branch 'nicira-l3support'  
						
						... 
						
						
						
						This commit merges the nicira-l3support branch with master. This
effectively adds nicira nvp l3 support to master. The NiciraNVP Provider
can support the following services with this modification: Connectivity,
SourceNat, StaticNat and PortForwarding
Testing done:
Create, Delete network offerings with Nicira Element
Use Gui to add, modify, remove Nicira Element and Provider
Provision, deprovision SourceNat networks
Provision, deprovision Portforwarding and StaticNat rules
Tested with Nicira NVP release 2.1.0, 2.2.0 and 2.2.1 (2.2.x recommended) 
						
						
					 
					
						2012-10-12 14:15:17 +02:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							339aa41442 
							
						 
					 
					
						
						
							
							CLOUDSTACK-304: Synchronization support for createSnapshot command - don't sent more than "concurrent.snapshots.threshold.perhost" createSnapshots commands to the backend host.  
						
						... 
						
						
						
						Conflicts:
	core/src/com/cloud/async/AsyncJobVO.java
	core/src/com/cloud/async/SyncQueueVO.java
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/async/AsyncJobManagerImpl.java
	server/src/com/cloud/async/SyncQueueManager.java
	server/src/com/cloud/async/SyncQueueManagerImpl.java
	server/src/com/cloud/async/dao/SyncQueueDao.java
	server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
	server/test/com/cloud/async/TestSyncQueueManager.java
	setup/db/create-schema.sql 
						
						
					 
					
						2012-10-10 13:40:00 -07:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							dd68a00338 
							
						 
					 
					
						
						
							
							Persist the uuid of the logical router once created  
						
						
						
						
					 
					
						2012-09-27 22:16:11 -07:00 
						 
				 
			
				
					
						
							
							
								Saksham Srivastava 
							
						 
					 
					
						
						
						
						
							
						
						
							a56631bc66 
							
						 
					 
					
						
						
							
							bug CS-15278: Added global setting login.attempts.allowed which defines the maximum incorrect password attempts allowed.  
						
						... 
						
						
						
						Also after the maximum attempts are reached the user account is disabled 
						
						
					 
					
						2012-09-12 19:35:24 +05:30 
						 
				 
			
				
					
						
							
							
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							65eeeaf071 
							
						 
					 
					
						
						
							
							CS-14277  
						
						... 
						
						
						
						Support for local data disk. Currently enable/disable config is at zone level, in subsequent checkins it can be made more granular.
    Following changes are made:
    - Create disk offering API now takes an extra parameter to denote storage type (local or shared). This is similar to storage type in service offering.
    - Create/delete of data volume on local storage
    - Attach/detach for local data volumes. Re-attach is allowed as long as vm host and data volume storage pool host is same.
    - Migration of VM instance is not supported if it uses local root or data volumes.
    - Migrate is not supported for local volumes.
    - Zone level config to enable/disable local storage usage for service and disk offerings.
    - Local storage gets discovered when a host is added/reconnected if zone level config is enabled. When disabled existing local storages are not removed but any new local storage is not added.
    - Deploy VM command validates service and disk offerings based on local storage config.
    - Upgrade uses the global config 'use.local.storage' to set the zone level config for local storage.
(cherry picked from commit 62710aed37606168012a0ed255a876c8e7954010) 
						
						
					 
					
						2012-09-11 17:22:43 +05:30 
						 
				 
			
				
					
						
							
							
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							5629165877 
							
						 
					 
					
						
						
							
							deadlock on host_details: Missed adding the unique key constraint needed on host_details table in create_schema  
						
						
						
						
					 
					
						2012-09-06 16:35:28 -07:00 
						 
				 
			
				
					
						
							
							
								Gavin Lee 
							
						 
					 
					
						
						
						
						
							
						
						
							d3921139ed 
							
						 
					 
					
						
						
							
							Patch from Gavin Lee: Change license to ASL2.0 in server and tools  
						
						... 
						
						
						
						Signed-off-by: Chip Childers <chip.childers@gmail.com> 
						
						
					 
					
						2012-08-30 10:36:29 -04:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							48b46fce5c 
							
						 
					 
					
						
						
							
							S2S VPN: Fix db schema issue  
						
						
						
						
					 
					
						2012-08-13 10:26:34 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							ce9f1afa78 
							
						 
					 
					
						
						
							
							Merge branch 'master' into vpc  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java 
						
						
					 
					
						2012-08-01 19:04:28 -07:00 
						 
				 
			
				
					
						
							
							
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							3f571684aa 
							
						 
					 
					
						
						
							
							CS-15631 : Support for up to 16 VDIs per VM on XS 6.0 and above  
						
						... 
						
						
						
						Support for up to 16 VDIs per VM on XS 6.0 and above (16 VDIs => root + cd + 14 data volumes). Currently in CS number of data disk that can be attached to VM is hard-coded to 6. Made this setting configurable by moving it to hypervisor capabilities. Although XS 6.0 and above supports upto 16 VDIs but while testing on XS 6.0.2 found that only 13 data volumes can be attached to a VM. So for XS 6.0 and 6.0.2 max_data_volumes_limit is set to 13 currently.
Signed-off-by: Koushik Das <Koushik.Das@citrix.com> 
						
						
					 
					
						2012-08-01 19:39:30 +05:30 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							7706a9c32f 
							
						 
					 
					
						
						
							
							Merge branch 'master' into vpc  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java 
						
						
					 
					
						2012-07-31 13:37:28 -07:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							b4b1a38f7e 
							
						 
					 
					
						
						
							
							Fix typo in create-schema.sql. comma at EOL  
						
						
						
						
					 
					
						2012-07-31 16:39:50 +05:30 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							894407caa9 
							
						 
					 
					
						
						
							
							rrq 5839: This table should not have a contraint on device and physical network id. This is dealt with in the code and by using the removed field.  
						
						
						
						
					 
					
						2012-07-30 08:46:56 +02:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							72a4b2f410 
							
						 
					 
					
						
						
							
							S2S VPN: Add name field for customer gateway  
						
						... 
						
						
						
						Easier for user to identify the correct gateway 
						
						
					 
					
						2012-07-27 16:27:36 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							a39fd61249 
							
						 
					 
					
						
						
							
							Merge branch 'master' into vpc  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineGuru.java 
						
						
					 
					
						2012-07-27 13:47:46 -07:00 
						 
				 
			
				
					
						
							
							
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							406fd95d87 
							
						 
					 
					
						
						
							
							Add RBD support for primary storage  
						
						... 
						
						
						
						This patch adds RBD (RADOS Block Device) support for primary storage in combination with KVM.
To get this patch working you need:
- libvirt-java 0.4.8
- libvirt with RBD storage pool support (>0.9.13)
- Qemu with RBD support (>0.14)
The primary storage does not support all the functions of CloudStack yet, for example snapshotting is disabled
due to the fact that backupping up a RBD snapshot is not possible in the way CloudStack wants to do it.
Creating templates from RBD volumes goes well, creating a VM from a template however is still a hit-and-miss.
NFS primary storage is also still required, you are not able to run your System VM's from RBD, they will need
to run on NFS.
Other then these points you can run instances with RBD backed disks. 
						
						
					 
					
						2012-07-26 22:22:26 +02:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							7d68e33323 
							
						 
					 
					
						
						
							
							S2S VPN: Use source NAT ip address for VPN gateway  
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/api/commands/CreateVpnGatewayCmd.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java 
						
						
					 
					
						2012-07-23 14:44:05 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							671475242c 
							
						 
					 
					
						
						
							
							S2S VPN: Add domain and account for VPN  
						
						... 
						
						
						
						Admin can add VPN connection for others
Conflicts:
	api/src/com/cloud/api/commands/CreateVpnConnectionCmd.java
	server/src/com/cloud/api/ApiResponseHelper.java
	setup/db/create-schema.sql 
						
						
					 
					
						2012-07-23 14:40:26 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							52c145dc46 
							
						 
					 
					
						
						
							
							CS-15470: Remove UNIQUE keyword for some fields  
						
						... 
						
						
						
						User can create/delete/create gateway again and again, then it would no longer
be unique. The unique should be guaranteed by API level. 
						
						
					 
					
						2012-07-23 14:36:22 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							a1acfd3bfa 
							
						 
					 
					
						
						
							
							Merge branch 'master' into vpc  
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/network/Network.java
	client/tomcatconf/components.xml.in
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	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/network/guru/GuestNetworkGuru.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
	setup/db/create-schema.sql 
						
						
					 
					
						2012-07-13 13:52:58 -07:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							79c7da07ab 
							
						 
					 
					
						
						
							
							Phase 1 of Nicira integration  
						
						
						
						
					 
					
						2012-07-11 17:16:06 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							7cb4ab5e60 
							
						 
					 
					
						
						
							
							VPC: added State to vpc_gateways  
						
						
						
						
					 
					
						2012-07-11 12:05:42 -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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							d33429783f 
							
						 
					 
					
						
						
							
							Fixed deploydb  
						
						
						
						
					 
					
						2012-07-06 11:18:16 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							78b31bb7db 
							
						 
					 
					
						
						
							
							CS-6840: Add tables for site to site VPN use.  
						
						
						
						
					 
					
						2012-07-02 16:20:53 -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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							374a600746 
							
						 
					 
					
						
						
							
							VPC: initial checkin for network ACLs  
						
						... 
						
						
						
						Conflicts:
	client/tomcatconf/commands.properties.in 
						
						
					 
					
						2012-06-20 17:19:49 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							62d45b9670 
							
						 
					 
					
						
						
							
							Initial checkin for resource tags feature  
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/uuididentity/dao/IdentityDao.java
	server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java
	setup/db/create-schema.sql 
						
						
					 
					
						2012-06-20 15:45:08 -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 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							0a7faa9838 
							
						 
					 
					
						
						
							
							Support for adding private network  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/upgrade/dao/Upgrade2214to30.java 
						
						
					 
					
						2012-06-15 14:20:34 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							9ec8526281 
							
						 
					 
					
						
						
							
							1) Added VPC restart support  - new api command RestartVPC. The purpose of the call is to shutdown and start VPC including VPCVirtualRouter restart, rules re-implement, etc  
						
						... 
						
						
						
						2) Only networks created from offerings with conserveMode=false, can participate in VPC 
						
						
					 
					
						2012-06-15 14:10:09 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							9debd3a5df 
							
						 
					 
					
						
						
							
							1) Added start logic to the VPC  
						
						... 
						
						
						
						2) VirtualRouterManagerImpl - refactored deployVirtualRouter method
3) Added vpcId to domain_router/user_ip_address tables and corresponding vo objects
Conflicts:
	server/src/com/cloud/network/IPAddressVO.java 
						
						
					 
					
						2012-06-15 13:56:05 -07:00