Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							f7c1b711ad 
							
						 
					 
					
						
						
							
							merge to master  
						
						
						
						
					 
					
						2013-05-16 23:56:20 -07:00 
						 
				 
			
				
					
						
							
							
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							ca0d2ef8c2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2085: VM weight on xen remain same as before vmscaleup ;because "Add-To-VCPUs-Params-Live.sh" is not getting copied on xs host  
						
						... 
						
						
						
						Fixed by updating the patch files that has
 entries to copy scipts on xenserver. Here we added
 Add-To-VCPUs-Params-Live.sh
Added a check on Host params whether host restricts Dynamic memory control(DMC) to able to allow scale up VM.
If DMC is not enabled then static max and min are set to SO.
Signed Off by - Nitin Mehta <nitin.mehta@citrix.com> 
						
						
					 
					
						2013-05-15 19:41:48 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							2d2c0c48cd 
							
						 
					 
					
						
						
							
							Merge branch 'pvlan'  
						
						... 
						
						
						
						Conflicts:
	scripts/vm/hypervisor/xenserver/xenserver60/patch
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java 
						
						
					 
					
						2013-05-15 16:08:08 -07:00 
						 
				 
			
				
					
						
							
							
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							ffe90c0059 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2085: VM weight on xen remain same as before vmscaleup ;because "Add-To-VCPUs-Params-Live.sh" is not getting copied on xs host  
						
						... 
						
						
						
						Fixed by updating the patch files that has
 entries to copy scipts on xenserver. Here we added
 Add-To-VCPUs-Params-Live.sh
Added a check on Host params whether host restricts Dynamic memory control(DMC) to able to allow scale up VM.
If DMC is not enabled then static max and min are set to SO.
Signed Off by - Nitin Mehta <nitin.mehta@citrix.com> 
						
						
					 
					
						2013-05-15 16:17:21 +05:30 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							a0c3d280b4 
							
						 
					 
					
						
						
							
							merge to master  
						
						
						
						
					 
					
						2013-05-15 00:40:53 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							879a954b98 
							
						 
					 
					
						
						
							
							delete snapshot at the backend  
						
						
						
						
					 
					
						2013-05-14 21:58:07 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							68ffe1c706 
							
						 
					 
					
						
						
							
							fix bug in create volume from snapshot  
						
						
						
						
					 
					
						2013-05-14 16:38:02 -07:00 
						 
				 
			
				
					
						
							
							
								Jayapal Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							2d950e2858 
							
						 
					 
					
						
						
							
							CLOUDSTACK-768: ACL on private gateway  
						
						
						
						
					 
					
						2013-05-13 19:24:23 +05:30 
						 
				 
			
				
					
						
							
							
								Bharat Kumar 
							
						 
					 
					
						
						
						
						
							
						
						
							052c24c4d1 
							
						 
					 
					
						
						
							
							CLOUDSTACK-702: Multiple ip ranges in different subnets.  
						
						... 
						
						
						
						This feature enables adding of guest ip ranges (public ips)  form different subnets.
In order to provide the dhcp service to a different subnet we create an ipalias on the router. This allows the router to listen to the dhcp request from the guest vms and respond accordingly. Every time a vm is deployed in the new subnet we configure an ip alias on the router. Cloudstack uses dnsmasq to provide dhcp service. We need to configure the dnsmasq to issue ips on the new subnets. Added a new class dnsmasqconfigurator which generates the dnsmasq confg file, this file replaces the old config in the router.
The details of the alias ips are stored in db in the nic_ip_alias table. Every time a new subnet is added one of the ip from the subnet is used to configure the ip alias.
I have pushed the code to  https://github.com/bvbharatk/cloud-stack/tree/Cloudstack-702  , also rebased the code with master.
I need to test the code for advanced sg enabled network using kvm.
I have added the unit test
Marvin tests are at https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=53e4965 
Also accomodated some of the changes suggested by koushik.
corrected the import statements. renamed the IpAlias command to createIpAlias command.
This feature supports only ipv4 
						
						
					 
					
						2013-05-13 17:06:44 +05:30 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							e8259e38c2 
							
						 
					 
					
						
						
							
							integration test is passed again  
						
						
						
						
					 
					
						2013-05-12 14:41:06 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							993187622e 
							
						 
					 
					
						
						
							
							fix compile, after rebase to master  
						
						
						
						
					 
					
						2013-05-10 20:39:02 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							342624e0eb 
							
						 
					 
					
						
						
							
							Merged with head  
						
						
						
						
					 
					
						2013-05-10 16:33:57 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							3047929367 
							
						 
					 
					
						
						
							
							Merged  
						
						
						
						
					 
					
						2013-05-10 16:21:43 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							42e25a22fc 
							
						 
					 
					
						
						
							
							refactor kvm/vmware resource code  
						
						
						
						
					 
					
						2013-05-09 23:10:05 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							738d35a61d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1907: Debian Squeeze 6.0 (64-bit) is not experimental any more  
						
						
						
						
					 
					
						2013-05-08 19:54:54 +01:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							ac7be218d5 
							
						 
					 
					
						
						
							
							creat template from volume/snapshot, and then create vm from template works now  
						
						
						
						
					 
					
						2013-05-07 20:18:19 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							5aeca646ae 
							
						 
					 
					
						
						
							
							make create template from volume/snapshot work  
						
						
						
						
					 
					
						2013-05-07 20:18:19 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							9f7bad2cef 
							
						 
					 
					
						
						
							
							fix creating snapshot  
						
						
						
						
					 
					
						2013-05-06 18:27:15 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							2d544e7127 
							
						 
					 
					
						
						
							
							volume related operation works  
						
						
						
						
					 
					
						2013-05-06 18:27:15 -07:00 
						 
				 
			
				
					
						
							
							
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							1f1467974f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1828 Source Nat on private gateway feature  
						
						
						
						
					 
					
						2013-05-02 15:40:15 +05:30 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							4d992fd18f 
							
						 
					 
					
						
						
							
							fix template download to primary storage  
						
						
						
						
					 
					
						2013-05-01 17:51:24 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							8a5bd9e8f8 
							
						 
					 
					
						
						
							
							Fix a sql bug in selecting end point to send message.  
						
						
						
						
					 
					
						2013-05-01 16:04:40 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							40386fc4cb 
							
						 
					 
					
						
						
							
							PVLAN: Add network label parameter to PvlanSetupCommand  
						
						... 
						
						
						
						We need it to find the real bridge/switch to program on the OVS. 
						
						
					 
					
						2013-05-01 13:23:09 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							142f3b30f4 
							
						 
					 
					
						
						
							
							PVLAN: Remove bridge parameter in PvlanSetupCommand  
						
						... 
						
						
						
						Bridge is hypervisor dependent, shouldn't appear in PvlanSetupCommand. 
						
						
					 
					
						2013-05-01 13:23:08 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							05885457ec 
							
						 
					 
					
						
						
							
							PVLAN: Simplify OVS policy  
						
						... 
						
						
						
						We can resubmit the packet against the flow table to get simplier result.
Now we don't need to check if VM is in the same host as DHCP server or not. 
						
						
					 
					
						2013-05-01 13:23:08 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							b64039bafd 
							
						 
					 
					
						
						
							
							Implement PVLAN on Xen  
						
						... 
						
						
						
						Start/stop vm/dhcp server are done. Not done with VM migration.
A new command(PvlanSetupCommand) is sent for setting up PVLAN for vms. Currently
it's focus on OVS implementation. Need to be more abstruct and add vSwitch part. 
						
						
					 
					
						2013-05-01 13:23:08 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							9c9e2ec9cc 
							
						 
					 
					
						
						
							
							PVLAN: Add pvlan in createNetworkCommand  
						
						
						
						
					 
					
						2013-05-01 13:23:08 -07:00 
						 
				 
			
				
					
						
							
							
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							ac23f7aae6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2296: Support for Windows 8 and Windows Server 2012 as VM Guest OS on Xenserver  
						
						
						
						
					 
					
						2013-04-30 16:23:41 +05:30 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							2f689171e0 
							
						 
					 
					
						
						
							
							refactor snapshot  
						
						
						
						
					 
					
						2013-04-29 18:51:14 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							37cbe8890f 
							
						 
					 
					
						
						
							
							refactor snapshot  
						
						
						
						
					 
					
						2013-04-29 18:51:13 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							4029e7af44 
							
						 
					 
					
						
						
							
							refactor data motion service for volumes  
						
						
						
						
					 
					
						2013-04-24 18:53:57 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							7543f314a7 
							
						 
					 
					
						
						
							
							Remove more VMTemplateHostDao references.  
						
						
						
						
					 
					
						2013-04-23 17:12:21 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							b8c5c67fbc 
							
						 
					 
					
						
						
							
							add copycommand at resouce side  
						
						
						
						
					 
					
						2013-04-22 19:12:50 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							29687663e8 
							
						 
					 
					
						
						
							
							Rename SnapshotStrategy to SnapshotService to have consistent naming  
						
						... 
						
						
						
						convention for Template, Snapshot, Volume. Also rename CopyCmd to
CopyCommand to follow internal command naming convention. 
						
						
					 
					
						2013-04-22 16:15:57 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							abf40435f3 
							
						 
					 
					
						
						
							
							refactor downloadlistener, sync system vm templates when adding a new image store  
						
						
						
						
					 
					
						2013-04-21 22:46:02 -07:00 
						 
				 
			
				
					
						
							
							
								Devdeep Singh 
							
						 
					 
					
						
						
						
						
							
						
						
							21ce3befc8 
							
						 
					 
					
						
						
							
							Storage motion for Xenserver changes: 1. Implemented Api findStoragePoolsForMigration. Added a new response objects to list storage pools available for migration. 2. Updated migrateVolume api for allowing migrating volumes of running vms. These changes are integrated into the latest storage refactoring changes. 3. Added the implementation for findHostsForMigration api. It lists the hosts to which an instance can be migrated, including hosts from within and across clusters to which an instance may be migrated with storage motion. The work of migrating a volume of a running vm is also done in copyAsync. 4. Updated the listHosts api for backward compatibility. 5. Added the implementation for migrateVirtualMachineWithVolume api. It migrates an instance with its volumes within a cluster and also across clusters. Also introduced a new XenServerStorageMotionStrategy for migrating volumes of a vm. When a vm is being migrated with its volumes, the vm is put in migrating state and a request is send to the volume manager to migrate the vm and its volumes. Volume manager calls into the volume service which forwards the request to data motion service after moving all the volumes to migrating state. Data motion service enumerates the strategies and the request reaches the XenServerStorageMotionStrategy. It calls in to the resource to complete the operation. 6. Resolved an issue where storage xenmotion of 2nd VM created from the same template to a host was failing with duplicate_vm exception. Made changes to remove the mac_seed key value pair from other_config when vms are created. This is was storage motion to fail. 7. Updated the db upgrade schema script. 8. Added the right permissions in commands.properties 9. Marvin tests for testing storage motion. Following scenarios are tested. 9.1. A virtual machine is migrated to another host. Its volumes are also migrated to another storage pool. 9.2. Just the volumes of a vm are migrated to another storage pool while the vm continues to run on the same host. 10. Unit tests for testing migration of a vm with its volumes.  
						
						... 
						
						
						
						Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2013-04-19 11:36:42 +05:30 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							1fe5d7c886 
							
						 
					 
					
						
						
							
							need to download image to cache storage from s3/swift on mgt server for default system vm templates  
						
						
						
						
					 
					
						2013-04-18 01:56:34 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							2dd8e2cb97 
							
						 
					 
					
						
						
							
							add getStoreTO into each DataStoreDriver, and add implementation for 3  
						
						... 
						
						
						
						data store plugins. 
						
						
					 
					
						2013-04-12 18:22:23 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							2ff01a79ca 
							
						 
					 
					
						
						
							
							Rename TemplateTO/VolumeTO in cloud-engine-storage to  
						
						... 
						
						
						
						TemplateObjectTO/VolumeObjectTO to avoid name conflicting with the one
in cloud-api. 
						
						
					 
					
						2013-04-12 17:10:19 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							b81fa6d9ea 
							
						 
					 
					
						
						
							
							add copy template to cache store  
						
						
						
						
					 
					
						2013-04-12 16:03:30 -07:00 
						 
				 
			
				
					
						
							
							
								Pascal Borreli 
							
						 
					 
					
						
						
						
						
							
						
						
							95cbb790f3 
							
						 
					 
					
						
						
							
							Fixed Primary typo  
						
						
						
						
					 
					
						2013-04-12 16:20:11 +01:00 
						 
				 
			
				
					
						
							
							
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							3b35063adf 
							
						 
					 
					
						
						
							
							Revert "Fixed Primary typo"  
						
						... 
						
						
						
						This reverts commit 4e5a8a0f8adcc665755229ee3d18f40913d15913. 
						
						
					 
					
						2013-04-12 15:18:02 +01:00 
						 
				 
			
				
					
						
							
							
								Pascal Borreli 
							
						 
					 
					
						
						
						
						
							
						
						
							4e5a8a0f8a 
							
						 
					 
					
						
						
							
							Fixed Primary typo  
						
						... 
						
						
						
						Conflicts:
	client/WEB-INF/classes/resources/messages_de_DE.properties 
						
						
					 
					
						2013-04-12 14:14:44 +01:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							bb64672715 
							
						 
					 
					
						
						
							
							Refactor DownloadMonitorImpl code, move some functionalities to  
						
						... 
						
						
						
						TemplateServiceImpl and VolumeServiceImpl. 
						
						
					 
					
						2013-04-11 18:09:42 -07:00 
						 
				 
			
				
					
						
							
							
								Mice Xia 
							
						 
					 
					
						
						
						
						
							
						
						
							bd7a38957a 
							
						 
					 
					
						
						
							
							1)use vmsnapshot.create.wait to control vmsnapshot timeout 2)remove global configuration vmsnapshot.expunge.interval and vmsnapshot.expunge.workers since vmsnapshot expunge is synchronous  
						
						
						
						
					 
					
						2013-04-10 11:35:58 +08:00 
						 
				 
			
				
					
						
							
							
								Mice Xia 
							
						 
					 
					
						
						
						
						
							
						
						
							4edef1fd30 
							
						 
					 
					
						
						
							
							fix CLOUDSTACK-1700  
						
						
						
						
					 
					
						2013-04-02 17:36:51 +08:00 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							3e4430d811 
							
						 
					 
					
						
						
							
							CLOUDSTACK-658 - Scaleup vm support for Xenserver  
						
						... 
						
						
						
						Added the framweork so that it can be extended for vmware and kvm as well.
Added unitests and marvin tests. 
						
						
					 
					
						2013-03-28 16:43:37 +05:30 
						 
				 
			
				
					
						
							
							
								Deepti Dohare 
							
						 
					 
					
						
						
						
						
							
						
						
							d5cb32f159 
							
						 
					 
					
						
						
							
							Multiple Secondary Storage Issue  
						
						
						
						
					 
					
						2013-03-14 21:08:27 -04:00 
						 
				 
			
				
					
						
							
							
								Jayapal Uradi 
							
						 
					 
					
						
						
						
						
							
						
						
							a49261c3b1 
							
						 
					 
					
						
						
							
							CLOUDSTACK-24: mipn feature for basiczone  
						
						... 
						
						
						
						Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2013-03-13 10:24:22 +05:30 
						 
				 
			
				
					
						
							
							
								Dennis Lawler 
							
						 
					 
					
						
						
						
						
							
						
						
							e173aa16f6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1620: getXenServer602GuestOsType -> getXenServer610GuestOsType Fixing XenServer 6.1 OS types incompatible with XS6.0  
						
						
						
						
					 
					
						2013-03-11 10:01:46 -04:00