etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/api/src/com/cloud
History
Murali Reddy f82c6a8431 Merge branch 'master' into portablepublicip 
Conflicts:
	api/src/com/cloud/network/IpAddress.java
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/test/org/apache/cloudstack/affinity/AffinityApiTestConfiguration.java
	server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java
	setup/db/db/schema-410to420.sql
 		2013-05-11 23:32:13 +05:30
..
agent/api Moved agent commands to core and out of api 2013-05-06 16:34:20 -07:00
alert Removed files that are no longer used and further separated out the files in the core project 2013-05-06 16:34:21 -07:00
api/commands CLOUDSTACK-797: Removing cmds CreatePrivateNetworkCmd and DestroyConsoleProxyCmd 2013-04-10 13:21:24 +05:30
async Merge branch 'master' into portablepublicip 2013-05-11 23:32:13 +05:30
capacity api: Entities will extend InternalIdentity and Identity 2012-12-26 19:11:15 -08:00
cluster api: Entities will extend InternalIdentity and Identity 2012-12-26 19:11:15 -08:00
configuration Merge branch 'master' into portablepublicip 2013-05-11 23:32:13 +05:30
dao CLOUDSTACK-786, CLOUDSTACK-1014: Moved usage APIs to cloud-api. Removed ManagementServerExt. Usage API related implementation is added to UsageServiceImpl 2013-02-05 16:49:34 +05:30
dc CLOUDSTACK-1332: Pass IPv6 DNS to VR 2013-02-25 16:08:15 -08:00
deploy api_refactor: refactor project apis 2012-12-03 22:10:32 -08:00
domain CLOUDSTACK-1636: Removed the concept of owner region. 2013-03-14 11:53:40 +05:30
event Merge branch 'master' into portablepublicip 2013-05-11 23:32:13 +05:30
exception Moved agent commands to core and out of api 2013-05-06 16:34:20 -07:00
host Merge latest master into javelin 2013-01-31 11:34:49 -08:00
hypervisor fix CLOUDSTACK-2157 On VMWare ESXi host deployment: Expunged VMs are not getting cleaned up from the host 2013-04-25 14:25:03 +08:00
info Moved most of the VOs and DAOs from server package into engine-schema as well 2013-05-06 16:34:26 -07:00
network Merge branch 'master' into portablepublicip 2013-05-11 23:32:13 +05:30
offering CLOUDSTACK-747: Internal LB between VPC tiers support 2013-05-09 11:54:41 -07:00
org fixed unit tests from merge 2013-01-18 15:58:55 -08:00
projects fixed unit tests from merge 2013-01-18 15:58:55 -08:00
region/ha CLOUDSTACK-1958: List GSLB response should have the GSLB site (zone load 2013-04-24 21:03:26 +05:30
resource Moved agent commands to core and out of api 2013-05-06 16:34:20 -07:00
serializer api_refactor: refactor project apis 2012-12-03 22:10:32 -08:00
server 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. 2013-04-19 11:36:42 +05:30
storage Moved agent commands to core and out of api 2013-05-06 16:34:20 -07:00
template updateTemplatePermissions should allow user to be able to see 2013-03-11 17:32:26 -07:00
user CLOUDSTACK-1941: introduced "default" flag to account/user objects. Admin/System accounts that come with the CS install are default, and can never be removed. All accounts created by the CS admin, have default flag set to false, and can be removed at any time. 2013-04-17 12:04:18 -07:00
uservm fixed unit tests from merge 2013-01-18 15:58:55 -08:00
vm CLOUDSTACK-747: Internal LB between VPC tiers support 2013-05-09 11:54:41 -07:00