Merge branch 'master' into ui-mixed-zone-management
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/355b9101 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/355b9101 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/355b9101 Branch: refs/heads/master Commit: 355b910173799d52124ee46efd4cef489775e68c Parents: e044303 4a3a9df Author: Brian Federle <[email protected]> Authored: Fri Apr 19 10:23:15 2013 -0700 Committer: Brian Federle <[email protected]> Committed: Fri Apr 19 10:23:15 2013 -0700 ---------------------------------------------------------------------- .../cloud/agent/api/MigrateWithStorageAnswer.java | 39 ++ .../cloud/agent/api/MigrateWithStorageCommand.java | 45 ++ .../api/MigrateWithStorageCompleteAnswer.java | 38 ++ .../api/MigrateWithStorageCompleteCommand.java | 36 ++ .../agent/api/MigrateWithStorageReceiveAnswer.java | 55 +++ .../api/MigrateWithStorageReceiveCommand.java | 45 ++ .../agent/api/MigrateWithStorageSendAnswer.java | 39 ++ .../agent/api/MigrateWithStorageSendCommand.java | 58 +++ .../agent/api/storage/MigrateVolumeAnswer.java | 38 ++ .../agent/api/storage/MigrateVolumeCommand.java | 51 ++ .../cloud/hypervisor/HypervisorCapabilities.java | 2 + api/src/com/cloud/network/element/IpDeployer.java | 6 +- api/src/com/cloud/server/ManagementService.java | 19 +- api/src/com/cloud/vm/UserVmService.java | 27 ++ .../org/apache/cloudstack/api/ApiConstants.java | 2 + .../apache/cloudstack/api/ResponseGenerator.java | 6 + .../api/command/admin/config/ListCfgsByCmd.java | 24 +- .../api/command/admin/config/UpdateCfgCmd.java | 22 +- .../admin/host/FindHostsForMigrationCmd.java | 107 +++++ .../api/command/admin/host/ListHostsCmd.java | 7 +- .../storage/FindStoragePoolsForMigrationCmd.java | 98 ++++ .../vm/MigrateVirtualMachineWithVolumeCmd.java | 160 +++++++ .../api/command/user/volume/MigrateVolumeCmd.java | 8 + .../api/response/ConfigurationResponse.java | 12 + .../api/response/HostForMigrationResponse.java | 365 +++++++++++++++ .../cloudstack/api/response/HostResponse.java | 1 - .../response/StoragePoolForMigrationResponse.java | 248 ++++++++++ .../api/response/StoragePoolResponse.java | 3 - .../api/command/test/ListCfgCmdTest.java | 89 ++++ .../api/command/test/UpdateCfgCmdTest.java | 116 +++++ client/tomcatconf/applicationContext.xml.in | 1 + client/tomcatconf/commands.properties.in | 3 + .../cloud/hypervisor/HypervisorCapabilitiesVO.java | 24 +- docs/en-US/build-nonoss.xml | 49 ++ docs/en-US/source.xml | 1 + .../troubleshooting-working-with-server-logs.xml | 6 +- .../api/storage/ObjectInDataStoreStateMachine.java | 2 + .../subsystem/api/storage/VolumeService.java | 7 +- .../datastore/db/StoragePoolDetailsDao.java | 1 + .../image/motion/DefaultImageMotionStrategy.java | 18 + .../storage/test/MockStorageMotionStrategy.java | 19 + .../storage/motion/AncientDataMotionStrategy.java | 84 ++++- .../storage/motion/DataMotionService.java | 9 + .../storage/motion/DataMotionServiceImpl.java | 16 + .../storage/motion/DataMotionStrategy.java | 10 + .../cloudstack/storage/volume/VolumeObject.java | 2 + .../storage/volume/VolumeServiceImpl.java | 174 +++++++- .../debian/config/etc/init.d/cloud-early-config | 53 +-- .../manager/allocator/impl/RandomAllocator.java | 56 +++ .../xen/resource/CitrixResourceBase.java | 4 +- .../xen/resource/XenServer56FP1Resource.java | 1 + .../xen/resource/XenServer610Resource.java | 359 ++++++++++++++- .../motion/XenServerStorageMotionStrategy.java | 239 ++++++++++ .../cloud/network/element/NiciraNvpElement.java | 5 + .../network/element/NiciraNvpElementTest.java | 238 +++++++--- .../agent/manager/allocator/HostAllocator.java | 23 +- .../manager/allocator/impl/FirstFitAllocator.java | 47 ++ .../manager/allocator/impl/TestingAllocator.java | 7 + server/src/com/cloud/api/ApiDBUtils.java | 19 + server/src/com/cloud/api/ApiResponseHelper.java | 27 +- .../com/cloud/api/query/ViewResponseHelper.java | 37 ++ .../src/com/cloud/api/query/dao/HostJoinDao.java | 5 + .../com/cloud/api/query/dao/HostJoinDaoImpl.java | 135 ++++++- .../cloud/api/query/dao/StoragePoolJoinDao.java | 6 + .../api/query/dao/StoragePoolJoinDaoImpl.java | 59 +++- server/src/com/cloud/configuration/Config.java | 54 ++- .../cloud/configuration/ConfigurationManager.java | 2 +- .../configuration/ConfigurationManagerImpl.java | 51 ++- .../cloud/configuration/dao/ConfigurationDao.java | 1 + server/src/com/cloud/dc/dao/VlanDao.java | 2 + server/src/com/cloud/dc/dao/VlanDaoImpl.java | 19 + .../src/com/cloud/network/NetworkManagerImpl.java | 20 +- .../src/com/cloud/network/NetworkServiceImpl.java | 6 +- .../router/VirtualNetworkApplianceManagerImpl.java | 5 +- .../src/com/cloud/server/ConfigurationServer.java | 5 + .../com/cloud/server/ConfigurationServerImpl.java | 93 ++++- .../src/com/cloud/server/ManagementServerImpl.java | 308 +++++++++++-- server/src/com/cloud/storage/VolumeManager.java | 8 + .../src/com/cloud/storage/VolumeManagerImpl.java | 112 +++++- .../storage/dao/StoragePoolDetailsDaoImpl.java | 9 + server/src/com/cloud/vm/UserVmManagerImpl.java | 123 +++++ server/src/com/cloud/vm/VirtualMachineManager.java | 4 + .../com/cloud/vm/VirtualMachineManagerImpl.java | 233 +++++++++- .../test/com/cloud/vm/MockUserVmManagerImpl.java | 8 + .../cloud/vm/MockVirtualMachineManagerImpl.java | 10 + .../cloud/vm/VirtualMachineManagerImplTest.java | 231 +++++++++- .../cloud/vpc/MockConfigurationManagerImpl.java | 5 +- setup/db/db/schema-410to420.sql | 2 + test/integration/component/test_storage_motion.py | 298 ++++++++++++ test/integration/smoke/test_UpdateCfg.py | 85 ++++ .../definitions/systemvmtemplate/cleanup.sh | 1 - .../definitions/systemvmtemplate64/cleanup.sh | 1 - tools/marvin/marvin/integration/lib/base.py | 22 + ui/css/cloudstack3.css | 11 + ui/scripts/instances.js | 66 ++- ui/scripts/storage.js | 73 +++- 96 files changed, 5111 insertions(+), 269 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/355b9101/ui/css/cloudstack3.css ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/355b9101/ui/scripts/storage.js ----------------------------------------------------------------------
