You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/04/19 13:28:49 UTC
[35/35] git commit: updated refs/heads/marvin_refactor to 4abd929
Merge branch 'master' into marvin_refactor
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4abd9292
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4abd9292
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4abd9292
Branch: refs/heads/marvin_refactor
Commit: 4abd92922803bb92e08162ec049a7b7e365424cb
Parents: da464aa b01f631
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Fri Apr 19 16:57:41 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Fri Apr 19 16:57:41 2013 +0530
----------------------------------------------------------------------
.../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/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/Release_Notes.xml | 270 +++++++++--
.../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 +++++++-
packaging/debian/init/cloud-management | 2 +-
packaging/debian/replace.properties | 2 +-
.../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 ++++++++++
pom.xml | 16 +
.../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 | 29 +-
.../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 | 12 +-
.../network/element/VirtualRouterElement.java | 2 +-
.../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/build/build_asf.sh | 2 +-
tools/marvin/marvin/integration/lib/oldbase.py | 22 +
ui/css/cloudstack3.css | 18 +-
ui/index.jsp | 5 +-
ui/modules/modules.js | 20 +
ui/scripts/instances.js | 2 +-
ui/scripts/plugins.js | 95 +++--
ui/scripts/ui-custom/pluginListing.js | 109 +++++
ui/scripts/ui-custom/plugins.js | 109 -----
ui/scripts/zoneWizard.js | 2 +-
100 files changed, 5177 insertions(+), 357 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4abd9292/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4abd9292/server/src/com/cloud/network/NetworkServiceImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4abd9292/server/src/com/cloud/storage/VolumeManagerImpl.java
----------------------------------------------------------------------