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 
							
						 
					 
					
						
						
						
						
							
						
						
							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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							c56998e876 
							
						 
					 
					
						
						
							
							Support for IPAssoc inside VPC  
						
						 
						
						
						
						
					 
					
						2012-06-15 14:10:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							f28cefc4c3 
							
						 
					 
					
						
						
							
							Added support for network shutdown in VPC guest networks  
						
						 
						
						
						
						
					 
					
						2012-06-15 14:07:59 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							d9fd7e02a5 
							
						 
					 
					
						
						
							
							Plug nic support  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java 
						
						
					 
					
						2012-06-15 14:07:46 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							f4060c3c1d 
							
						 
					 
					
						
						
							
							1) Added new element - VpcVirtualRouterElement. Extends VirtualRouter + has plug/unplug nics support  
						
						 
						
						... 
						
						
						
						2) Added services api support for plugging/unplugging the nics to VpcElement
Conflicts:
	api/src/com/cloud/network/NetworkService.java
	core/src/com/cloud/vm/VMInstanceVO.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java 
						
						
					 
					
						2012-06-15 14:04:09 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							ab680bc30c 
							
						 
					 
					
						
						
							
							Start Virtual Router as a part of VPC start  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java 
						
						
					 
					
						2012-06-15 13:57:00 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							7092532ae8 
							
						 
					 
					
						
						
							
							CS-15220: fixed db upgrade for networks using external devices  
						
						 
						
						... 
						
						
						
						Reviewed-by: Sheng Yang
Conflicts:
	server/test/com/cloud/network/MockNetworkManagerImpl.java
Conflicts:
	server/src/com/cloud/upgrade/dao/Upgrade2214to30.java 
						
						
					 
					
						2012-06-05 15:10:49 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sateesh Chodapuneedi 
							
						 
					 
					
						
						
						
						
							
						
						
							c59d5415ad 
							
						 
					 
					
						
						
							
							CS-9919 Support for Nexus Swiches (Cisco Vswitches)  
						
						 
						
						... 
						
						
						
						Description:
	Portprofile shaping policies will be fetched
	from nexus vswitch instead of vcenter.
	ACLs and Policies won't be synced to vCenter.
	Get physical network label while adding cluster.
	Cleanup.
Conflicts:
	core/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java 
						
						
					 
					
						2012-05-25 17:44:02 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							d11dceaccc 
							
						 
					 
					
						
						
							
							CS-14904  
						
						 
						
						... 
						
						
						
						Fixed the bug where vm_instance.ha_enabled wasn't updated during service offering upgrade
Conflicts:
	server/src/com/cloud/server/ManagementServerImpl.java 
						
						
					 
					
						2012-05-15 12:36:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Salvatore Orlando 
							
						 
					 
					
						
						
						
						
							
						
						
							2bf0c7f7ff 
							
						 
					 
					
						
						
							
							CS-14605: OVS cleanup  
						
						 
						
						... 
						
						
						
						Fix syntax errors in ConfigurationManager and Resource Manager test 
						
						
					 
					
						2012-04-25 10:53:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							a678988f33 
							
						 
					 
					
						
						
							
							CS-14622: fixed adding vlan range per account - associate it with the Guest network, not public  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java 
						
						
					 
					
						2012-04-24 11:44:00 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							59436be4ee 
							
						 
					 
					
						
						
							
							fixing line endings in server  
						
						 
						
						
						
						
					 
					
						2012-04-07 20:13:10 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							2d1a6b0b35 
							
						 
					 
					
						
						
							
							bug 14615: deployVm can work 2 diff ways now: 1) Default way - create and start the vm. 2) Create the vm without starting it. Note that vm's volumes stay in Allocated state -not created on the backend till the point where vm starts  
						
						 
						
						... 
						
						
						
						status 14615: resolved fixed 
						
						
					 
					
						2012-04-06 11:30:48 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							1dc99a17eb 
							
						 
					 
					
						
						
							
							Fixed unittest  
						
						 
						
						
						
						
					 
					
						2012-04-04 16:13:51 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							2f634c0913 
							
						 
					 
					
						
						
							
							Switch to Apache license  
						
						 
						
						
						
						
					 
					
						2012-04-03 04:50:05 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							0f34744c9e 
							
						 
					 
					
						
						
							
							bug 14301: Decouple synchronized crosss management server call with clustering transport. Reviewed-by: Kelven  
						
						 
						
						
						
						
					 
					
						2012-03-27 16:01:54 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							ce8e9a9f51 
							
						 
					 
					
						
						
							
							bug 14500: set default value for is_system field as a part of 3.0 to 3.0.1 upgrade  
						
						 
						
						... 
						
						
						
						status 14500: resolved fixed
reviwed-by: Frank Zhang
Conflicts:
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	setup/db/db/schema-30to301.sql 
						
						
					 
					
						2012-03-26 10:27:15 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							3773b52b2f 
							
						 
					 
					
						
						
							
							add cleanup.sql to DB upgrade test  
						
						 
						
						
						
						
					 
					
						2012-03-19 14:36:57 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							c01ed2f754 
							
						 
					 
					
						
						
							
							Added upgrade path from 3.0.x to 3.0.1  
						
						 
						
						
						
						
					 
					
						2012-03-19 13:38:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							ea007f833f 
							
						 
					 
					
						
						
							
							use fake.sql for db upgrade test  
						
						 
						
						
						
						
					 
					
						2012-03-19 13:06:43 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							4f741c833c 
							
						 
					 
					
						
						
							
							bug 14170: issues #1-#3 are fixed  
						
						 
						
						
						
						
					 
					
						2012-03-07 13:37:16 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							637b228130 
							
						 
					 
					
						
						
							
							Bug 14081: Added 3.0.0 templtae upgrade support. Added unit test case and DB dump  
						
						 
						
						... 
						
						
						
						Status 14081: resolved fixed
Reviewed-By: Abhi 
						
						
					 
					
						2012-03-05 17:25:38 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							fa0e25d146 
							
						 
					 
					
						
						
							
							bug 14080: do EQ instead of LIKE search when search for duplicated users during the user update  
						
						 
						
						... 
						
						
						
						status 14080: resolved fixed 
						
						
					 
					
						2012-03-01 15:11:46 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							5aade501dc 
							
						 
					 
					
						
						
							
							fix merge conflicts  
						
						 
						
						
						
						
					 
					
						2012-02-28 17:06:23 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							52ebf15e7c 
							
						 
					 
					
						
						
							
							Console proxy refactoring incremental check-in - new VNC protocol implementation  
						
						 
						
						
						
						
					 
					
						2012-02-28 17:03:38 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							2eaefc4aa8 
							
						 
					 
					
						
						
							
							Fixed unittest and some issues with 2.2.14-3.0 upgrade  
						
						 
						
						
						
						
					 
					
						2012-02-28 15:17:14 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							2e9511e2ae 
							
						 
					 
					
						
						
							
							Changed isElastic to isSystem for the publicIpAddress assigned during the vm deployment in EIP enabled network  
						
						 
						
						... 
						
						
						
						Reviewed-by: Chiradeep 
						
						
					 
					
						2012-02-21 15:39:49 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							13f4d92d2a 
							
						 
					 
					
						
						
							
							bug 13813: fixed network offering search to use traffic type when locate physical network in the zone  
						
						 
						
						... 
						
						
						
						status 13813: resolved fixed
Reviewed-by: Frank 
						
						
					 
					
						2012-02-16 10:40:00 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							3a37ab6772 
							
						 
					 
					
						
						
							
							bug 13715: Modify changeCidr parameter of updateNetwork API  
						
						 
						
						... 
						
						
						
						We expect user to use following sequence when update virtual router provided
network offering to external firewall devices offering:
1. Shutdown all the user VMs.
2. Modify network to new offering.
3. Click "Allow CIDR change" in the pop-up dialog, which would pass
changeCidr=true to the updateNetwork API.
We would shutdown guest network before we update the network for new
offering(with changeCidr = true), in order to re-implement the network.
status 13715: resolved fixed
Reviewed-by: Alex 
						
						
					 
					
						2012-02-14 19:34:23 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							5e9a15c07d 
							
						 
					 
					
						
						
							
							bug 13708: make a search by traffic type when locate physical network in the zone  
						
						 
						
						... 
						
						
						
						status 13708: resolved fixed
reviewed-by: Prachi Damle 
						
						
					 
					
						2012-02-14 12:47:33 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							d0e63bc377 
							
						 
					 
					
						
						
							
							Bug 13099 - table physical-network-traffic-types needs to be updated when xen network device setting is modified in the global settings  
						
						 
						
						... 
						
						
						
						Changes:
- DB upgrade changes
-- make the global setting hidden.
-- During upgrade set network labels from global config 
						
						
					 
					
						2012-02-07 18:41:29 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							78f6fc9e43 
							
						 
					 
					
						
						
							
							bug 12361: Inermediate checkin to 2.2.14-3.0 db upgrade  
						
						 
						
						
						
						
					 
					
						2012-02-01 16:46:56 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							2f17d465dc 
							
						 
					 
					
						
						
							
							Fixed 2.2.14-3.0 db upgrade for usage  
						
						 
						
						... 
						
						
						
						Added unittest as well 
						
						
					 
					
						2012-02-01 13:33:53 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							9219d4c41d 
							
						 
					 
					
						
						
							
							bug 12361: more fixes to DB upgrade for network_offerings table  
						
						 
						
						... 
						
						
						
						Added unittest for testing network offerings db upgrade 
						
						
					 
					
						2012-01-30 11:20:13 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							8eed9004cd 
							
						 
					 
					
						
						
							
							Fixed broken unittest  
						
						 
						
						
						
						
					 
					
						2012-01-27 14:44:34 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							6325d21c50 
							
						 
					 
					
						
						
							
							Get new elasticIp when releaseIpAddress is called for elasticIP of the vm  
						
						 
						
						
						
						
					 
					
						2012-01-19 13:58:35 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							a8758d292e 
							
						 
					 
					
						
						
							
							ElasticLB support in Basic zone.  
						
						 
						
						... 
						
						
						
						When elb capability is enabled on the network offering, we:
1) on each createLB command:
* associate ip address to the LB rule owner
* create LB rule
2) on each deleteLb command:
* delete the rule
* disassociate ip address
The rule belongs to the owner, so proper usage events are generated 
						
						
					 
					
						2012-01-19 13:57:37 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							804cfaec46 
							
						 
					 
					
						
						
							
							Fix some testcases  
						
						 
						
						
						
						
					 
					
						2012-01-11 13:51:43 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							adaea570e4 
							
						 
					 
					
						
						
							
							bug 12934: added name to physical network  
						
						 
						
						... 
						
						
						
						status 12934: resolved fixed 
						
						
					 
					
						2012-01-09 14:20:37 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							d4e0fbda83 
							
						 
					 
					
						
						
							
							bug 12686: added search by zoneId to the listNetworkOfferings  
						
						 
						
						
						
						
					 
					
						2012-01-04 12:31:59 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							ba1f21c29e 
							
						 
					 
					
						
						
							
							Unittest for db upgrade  
						
						 
						
						
						
						
					 
					
						2011-12-28 10:34:29 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							6fd49a265c 
							
						 
					 
					
						
						
							
							Fixed unittest  
						
						 
						
						
						
						
					 
					
						2011-12-27 15:34:54 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							ceb0a918a1 
							
						 
					 
					
						
						
							
							createTemplate/createSnapshot for project - allow to execute for Projects in Active state only  
						
						 
						
						
						
						
					 
					
						2011-12-19 16:20:40 -08:00