You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2013/02/22 15:01:10 UTC
[54/58] [abbrv] git commit: refs/heads/qemu-img - Merge branch
'master' into qemu-img
Merge branch 'master' into qemu-img
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/6bc2f981
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/6bc2f981
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/6bc2f981
Branch: refs/heads/qemu-img
Commit: 6bc2f981ff29ecda469a65afff11beb13590aee2
Parents: 593b367 ea3db2f
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Fri Feb 22 14:39:22 2013 +0100
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Fri Feb 22 14:39:22 2013 +0100
----------------------------------------------------------------------
agent/pom.xml | 2 +-
agent/src/com/cloud/agent/AgentShell.java | 3 +
api/pom.xml | 2 +-
.../agent/api/CreateVolumeFromSnapshotCommand.java | 1 +
.../cloud/configuration/ConfigurationService.java | 2 +
api/src/com/cloud/network/Network.java | 13 +-
api/src/com/cloud/network/NetworkProfile.java | 7 +
api/src/com/cloud/network/NetworkService.java | 4 +-
api/src/com/cloud/network/vpc/VpcService.java | 2 +-
api/src/com/cloud/offering/ServiceOffering.java | 5 +
api/src/com/cloud/storage/Snapshot.java | 20 +-
api/src/com/cloud/storage/StoragePool.java | 9 +-
api/src/com/cloud/storage/StoragePoolStatus.java | 9 +-
api/src/com/cloud/storage/StorageService.java | 53 -
api/src/com/cloud/storage/Volume.java | 17 +-
api/src/com/cloud/storage/VolumeApiService.java | 81 +
api/src/com/cloud/template/TemplateService.java | 10 +
api/src/com/cloud/vm/UserVmService.java | 41 -
.../org/apache/cloudstack/api/ApiConstants.java | 5 +
api/src/org/apache/cloudstack/api/BaseCmd.java | 3 +-
.../api/command/admin/ldap/LDAPConfigCmd.java | 61 +-
.../admin/offering/CreateServiceOfferingCmd.java | 11 +-
.../admin/storage/CreateStoragePoolCmd.java | 17 +
.../api/command/user/iso/RegisterIsoCmd.java | 8 +
.../api/command/user/network/UpdateNetworkCmd.java | 11 +-
.../command/user/template/CreateTemplateCmd.java | 4 +-
.../command/user/template/RegisterTemplateCmd.java | 10 +-
.../api/command/user/vm/DeployVMCmd.java | 4 +-
.../api/command/user/vm/RestoreVMCmd.java | 10 +-
.../api/command/user/volume/AttachVolumeCmd.java | 2 +-
.../api/command/user/volume/CreateVolumeCmd.java | 4 +-
.../api/command/user/volume/DeleteVolumeCmd.java | 2 +-
.../api/command/user/volume/DetachVolumeCmd.java | 2 +-
.../api/command/user/volume/MigrateVolumeCmd.java | 2 +-
.../api/command/user/volume/ResizeVolumeCmd.java | 2 +-
.../api/command/user/volume/UploadVolumeCmd.java | 10 +-
.../api/response/LDAPConfigResponse.java | 2 +-
.../cloudstack/api/response/NetworkResponse.java | 16 +-
.../api/agent/test/BackupSnapshotCommandTest.java | 6 +-
.../api/agent/test/SnapshotCommandTest.java | 12 +-
.../agent/api/test/ResizeVolumeCommandTest.java | 6 +-
awsapi/pom.xml | 2 +-
.../cloud/bridge/service/core/ec2/EC2Engine.java | 72 +-
.../service/core/ec2/EC2InstanceFilterSet.java | 3 +
client/WEB-INF/web.xml | 8 +
client/pom.xml | 29 +-
client/tomcatconf/commands.properties.in | 3 +
client/tomcatconf/componentContext.xml.in | 58 +-
client/tomcatconf/log4j-cloud.xml.in | 2 +-
client/tomcatconf/nonossComponentContext.xml.in | 46 +-
client/tomcatconf/tomcat6-nonssl.conf.in | 2 +-
client/tomcatconf/tomcat6-ssl.conf.in | 2 +-
core/pom.xml | 8 +-
core/src/com/cloud/storage/SnapshotVO.java | 5 +-
.../com/cloud/storage/StoragePoolDiscoverer.java | 2 +
core/src/com/cloud/storage/StoragePoolVO.java | 346 --
core/src/com/cloud/storage/VMTemplateHostVO.java | 41 +-
.../com/cloud/storage/VMTemplateStoragePoolVO.java | 43 +-
core/src/com/cloud/storage/VMTemplateVO.java | 70 +-
core/src/com/cloud/storage/VolumeHostVO.java | 41 +-
core/src/com/cloud/storage/VolumeVO.java | 8 +-
debian/rules | 2 +-
deps/XenServerJava/pom.xml | 2 +-
developer/pom.xml | 2 +-
docs/en-US/site-to-site-vpn.xml | 3 +
docs/en-US/verifying-source.xml | 2 +-
docs/pot/verifying-source.pot | 2 +-
engine/api/pom.xml | 4 +-
.../engine/subsystem/api/storage/ClusterScope.java | 14 +-
.../subsystem/api/storage/CopyCommandResult.java | 10 +-
.../engine/subsystem/api/storage/DataObject.java | 1 +
.../subsystem/api/storage/DataObjectInStore.java | 27 +
.../engine/subsystem/api/storage/DataStore.java | 3 +
.../subsystem/api/storage/DataStoreDriver.java | 1 +
.../subsystem/api/storage/DataStoreLifeCycle.java | 14 +-
.../subsystem/api/storage/DataStoreManager.java | 31 +
.../subsystem/api/storage/DataStoreProvider.java | 30 +
.../api/storage/DataStoreProviderManager.java | 31 +
.../subsystem/api/storage/DataStoreStatus.java | 23 +
.../engine/subsystem/api/storage/HostScope.java | 6 +-
.../api/storage/HypervisorHostListener.java | 24 +
.../subsystem/api/storage/ImageDataFactory.java | 26 +
.../engine/subsystem/api/storage/ImageService.java | 29 +
.../api/storage/ObjectInDataStoreStateMachine.java | 56 +
.../api/storage/PrimaryDataStoreDriver.java | 26 +
.../api/storage/PrimaryDataStoreInfo.java | 14 +-
.../engine/subsystem/api/storage/Scope.java | 2 +-
.../subsystem/api/storage/SnapshotDataFactory.java | 26 +
.../engine/subsystem/api/storage/SnapshotInfo.java | 28 +
.../subsystem/api/storage/SnapshotStrategy.java | 27 +
.../subsystem/api/storage/TemplateEvent.java | 26 +
.../engine/subsystem/api/storage/TemplateInfo.java | 22 +
.../subsystem/api/storage/TemplateState.java | 27 +
.../subsystem/api/storage/VolumeDataFactory.java | 26 +
.../engine/subsystem/api/storage/VolumeInfo.java | 9 +-
.../subsystem/api/storage/VolumeService.java | 80 +
.../engine/subsystem/api/storage/ZoneScope.java | 6 +-
.../storage/datastore/db/DataStoreProviderDao.java | 25 +
.../datastore/db/DataStoreProviderDaoImpl.java | 38 +
.../storage/datastore/db/DataStoreProviderVO.java | 60 +
.../storage/datastore/db/PrimaryDataStoreDao.java | 116 +
.../datastore/db/PrimaryDataStoreDaoImpl.java | 360 ++
.../datastore/db/PrimaryDataStoreDetailVO.java | 79 +
.../datastore/db/PrimaryDataStoreDetailsDao.java | 27 +
.../db/PrimaryDataStoreDetailsDaoImpl.java | 71 +
.../storage/datastore/db/StoragePoolVO.java | 304 +
engine/components-api/pom.xml | 2 +-
engine/compute/pom.xml | 2 +-
engine/network/pom.xml | 2 +-
engine/orchestration/pom.xml | 2 +-
.../cloud/entity/api/VMEntityManagerImpl.java | 23 +-
engine/pom.xml | 2 +-
engine/schema/pom.xml | 2 +-
engine/service/pom.xml | 2 +-
engine/storage/backup/pom.xml | 2 +-
.../cloudstack/storage/backup/BackupService.java | 2 +-
engine/storage/image/pom.xml | 2 +-
.../storage/image/ImageDataFactoryImpl.java | 56 +-
.../cloudstack/storage/image/ImageServiceImpl.java | 95 +-
.../storage/image/downloader/ImageDownloader.java | 2 +-
.../driver/AncientImageDataStoreDriverImpl.java | 250 +
.../driver/DefaultImageDataStoreDriverImpl.java | 13 +-
.../storage/image/manager/ImageDataManager.java | 8 +-
.../image/manager/ImageDataManagerImpl.java | 12 +-
.../image/manager/ImageDataStoreManagerImpl.java | 38 +-
.../image/store/AncientImageDataStoreProvider.java | 92 +
.../image/store/DefaultImageDataStoreImpl.java | 145 +
.../image/store/DefaultImageDataStoreProvider.java | 2 -
.../storage/image/store/HttpDataStoreImpl.java | 144 -
.../storage/image/store/TemplateObject.java | 82 +-
.../lifecycle/DefaultImageDataStoreLifeCycle.java | 23 +-
engine/storage/imagemotion/pom.xml | 2 +-
.../image/motion/DefaultImageMotionStrategy.java | 15 +-
.../image/motion/ImageMotionServiceImpl.java | 12 +-
engine/storage/integration-test/pom.xml | 2 +-
.../storage/test/ChildTestConfiguration.java | 58 +-
.../storage/test/MockStorageMotionStrategy.java | 42 +
.../cloudstack/storage/test/volumeServiceTest.java | 65 +-
.../integration-test/test/resource/component.xml | 201 +
.../test/resource/storageContext.xml | 1 +
engine/storage/pom.xml | 2 +-
engine/storage/snapshot/pom.xml | 10 +-
.../storage/snapshot/SnapshotDataFactoryImpl.java | 53 +-
.../storage/snapshot/SnapshotObject.java | 163 +-
.../storage/snapshot/SnapshotServiceImpl.java | 7 +
.../snapshot/SnapshotStateMachineManager.java | 26 +
.../snapshot/SnapshotStateMachineManagerImpl.java | 54 +
.../snapshot/strategy/AncientSnasphotStrategy.java | 608 ++
.../snapshot/strategy/HypervisorBasedSnapshot.java | 44 -
.../snapshot/strategy/StorageBasedSnapshot.java | 42 -
.../test/resource/SnapshotManagerTestContext.xml | 42 +
.../snapshot/test/src/SnapshotDataFactoryTest.java | 50 +
.../storage/datastore/DataObjectManagerImpl.java | 76 +-
.../storage/datastore/DataStoreManager.java | 29 -
.../storage/datastore/DataStoreManagerImpl.java | 20 +
.../storage/datastore/DataStoreStatus.java | 23 -
.../datastore/ObjectInDataStoreManager.java | 18 +-
.../datastore/ObjectInDataStoreManagerImpl.java | 185 +-
.../storage/datastore/PrimaryDataStore.java | 25 +-
.../datastore/PrimaryDataStoreEntityImpl.java | 23 +-
.../datastore/PrimaryDataStoreProviderManager.java | 5 +-
.../storage/datastore/VolumeDataFactory.java | 26 -
.../storage/datastore/db/DataStoreProviderDao.java | 25 -
.../datastore/db/DataStoreProviderDaoImpl.java | 38 -
.../storage/datastore/db/DataStoreProviderVO.java | 60 -
.../storage/datastore/db/PrimaryDataStoreDao.java | 116 -
.../datastore/db/PrimaryDataStoreDaoImpl.java | 360 --
.../datastore/db/PrimaryDataStoreDetailVO.java | 79 -
.../datastore/db/PrimaryDataStoreDetailsDao.java | 28 -
.../db/PrimaryDataStoreDetailsDaoImpl.java | 71 -
.../storage/datastore/db/PrimaryDataStoreVO.java | 267 -
.../datastore/provider/DataStoreProvider.java | 32 -
.../provider/DataStoreProviderManager.java | 30 -
.../provider/DataStoreProviderManagerImpl.java | 30 +-
.../datastore/provider/ImageDataStoreProvider.java | 2 +
.../provider/PrimaryDataStoreProvider.java | 2 +
.../storage/db/ObjectInDataStoreDao.java | 6 +-
.../storage/db/ObjectInDataStoreDaoImpl.java | 11 +-
.../cloudstack/storage/db/ObjectInDataStoreVO.java | 39 +-
.../cloudstack/storage/image/ImageDataFactory.java | 25 -
.../cloudstack/storage/image/ImageService.java | 28 -
.../storage/image/TemplateEntityImpl.java | 1 +
.../cloudstack/storage/image/TemplateEvent.java | 26 -
.../cloudstack/storage/image/TemplateInfo.java | 27 -
.../cloudstack/storage/image/TemplateState.java | 27 -
.../storage/image/datastore/ImageDataStore.java | 4 +-
.../image/datastore/ImageDataStoreHelper.java | 16 +-
.../image/datastore/ImageDataStoreManager.java | 5 +
.../cloudstack/storage/image/db/ImageDataDao.java | 85 -
.../storage/image/db/ImageDataDaoImpl.java | 975 ---
.../cloudstack/storage/image/db/ImageDataVO.java | 450 --
.../storage/image/motion/ImageMotionService.java | 2 +-
.../storage/motion/AncientDataMotionStrategy.java | 725 +++
.../storage/snapshot/SnapshotDataFactory.java | 25 -
.../storage/snapshot/SnapshotEntityImpl.java | 13 +-
.../cloudstack/storage/snapshot/SnapshotInfo.java | 26 -
.../storage/snapshot/SnapshotService.java | 1 +
.../storage/snapshot/SnapshotStrategy.java | 23 -
.../cloudstack/storage/to/PrimaryDataStoreTO.java | 4 +-
.../apache/cloudstack/storage/to/TemplateTO.java | 2 +-
.../volume/ObjectInDataStoreStateMachine.java | 54 -
.../storage/volume/PrimaryDataStoreDriver.java | 29 -
.../volume/TemplateOnPrimaryDataStoreInfo.java | 2 +-
.../cloudstack/storage/volume/VolumeService.java | 91 -
.../volume/datastore/PrimaryDataStoreHelper.java | 28 +-
.../volume/db/TemplatePrimaryDataStoreDao.java | 2 +-
.../volume/db/TemplatePrimaryDataStoreDaoImpl.java | 6 +-
.../volume/db/TemplatePrimaryDataStoreVO.java | 4 +-
engine/storage/volume/pom.xml | 2 +-
.../storage/datastore/DefaultPrimaryDataStore.java | 191 +-
.../driver/AncientPrimaryDataStoreDriverImpl.java | 362 ++
.../driver/DefaultPrimaryDataStoreDriverImpl.java | 25 +-
.../AncientPrimaryDataStoreLifeCyclImpl.java | 958 +++
.../DefaultPrimaryDataStoreLifeCycleImpl.java | 31 +-
...DefaultPrimaryDataStoreProviderManagerImpl.java | 36 +-
.../storage/datastore/manager/data model.ucls | 38 +-
.../AncientPrimaryDataStoreProviderImpl.java | 78 +
.../datastore/provider/DefaultHostListener.java | 90 +
.../DefaultPrimaryDatastoreProviderImpl.java | 6 +-
.../storage/volume/TemplateInstallStrategy.java | 2 +-
.../volume/TemplateInstallStrategyImpl.java | 33 +-
.../storage/volume/VolumeDataFactoryImpl.java | 42 +-
.../storage/volume/VolumeEntityImpl.java | 11 +-
.../cloudstack/storage/volume/VolumeManager.java | 45 -
.../storage/volume/VolumeManagerImpl.java | 112 -
.../cloudstack/storage/volume/VolumeObject.java | 204 +-
.../storage/volume/VolumeServiceImpl.java | 463 ++-
framework/api/pom.xml | 42 +
.../framework/async/AsyncCallFuture.java | 84 +
.../framework/async/AsyncCompletionCallback.java | 23 +
framework/events/pom.xml | 2 +-
framework/ipc/pom.xml | 6 +-
.../framework/async/AsyncCallFuture.java | 84 -
.../framework/async/AsyncCompletionCallback.java | 23 -
framework/jobs/pom.xml | 2 +-
framework/pom.xml | 3 +-
framework/rest/pom.xml | 2 +-
packaging/centos63/cloud-agent.rc | 5 +-
packaging/centos63/cloud-usage.rc | 5 +-
packaging/centos63/cloud.spec | 2 +-
packaging/centos63/package.sh | 10 +-
patches/pom.xml | 2 +-
plugins/acl/static-role-based/pom.xml | 2 +-
plugins/api/discovery/pom.xml | 2 +-
.../discovery/ApiDiscoveryServiceImpl.java | 6 +-
plugins/api/rate-limit/pom.xml | 2 +-
.../user-concentrated-pod/pom.xml | 2 +-
.../deployment-planners/user-dispersing/pom.xml | 2 +-
plugins/event-bus/rabbitmq/pom.xml | 2 +-
plugins/file-systems/netapp/pom.xml | 2 +-
plugins/host-allocators/random/pom.xml | 2 +-
plugins/hypervisors/baremetal/pom.xml | 2 +-
.../cloud/baremetal/database/BaremetalCmdbDao.java | 25 -
.../baremetal/database/BaremetalCmdbDaoImpl.java | 32 -
.../cloud/baremetal/database/BaremetalCmdbVO.java | 104 -
.../baremetal/manager/AddBaremetalHostCmd.java | 9 +-
.../baremetal/manager/BareMetalDiscoverer.java | 8 +
.../cloud/baremetal/manager/BareMetalPlanner.java | 167 +
.../cloud/baremetal/manager/BaremetalManager.java | 3 +-
.../baremetal/manager/BaremetalManagerImpl.java | 9 +
.../manager/BaremetalPlannerSelector.java | 39 +
.../networkservice/AddBaremetalDhcpCmd.java | 9 +-
.../AddBaremetalKickStartPxeCmd.java | 3 +-
.../networkservice/AddBaremetalPxeCmd.java | 8 +-
.../AddBaremetalPxePingServerCmd.java | 2 +
.../networkservice/BareMetalPingServiceImpl.java | 6 +
.../networkservice/BaremetalDhcpManagerImpl.java | 5 +-
.../networkservice/BaremetalDhcpResponse.java | 4 +
.../BaremetalKickStartPxeResource.java | 9 +-
.../BaremetalKickStartServiceImpl.java | 5 +
.../networkservice/BaremetalPxeElement.java | 6 +-
.../BaremetalPxeKickStartResponse.java | 5 +-
.../networkservice/BaremetalPxeManagerImpl.java | 22 +-
.../networkservice/BaremetalPxePingResponse.java | 4 +-
.../networkservice/BaremetalPxeService.java | 2 +
.../networkservice/BaremetalUserdataElement.java | 8 +-
.../networkservice/ListBaremetalDhcpCmd.java | 3 +-
.../ListBaremetalPxePingServersCmd.java | 3 +-
plugins/hypervisors/kvm/pom.xml | 2 +-
plugins/hypervisors/ovm/pom.xml | 2 +-
plugins/hypervisors/simulator/pom.xml | 2 +-
.../cloud/agent/manager/MockAgentManagerImpl.java | 2 +
.../agent/manager/MockStorageManagerImpl.java | 2 +
.../com/cloud/agent/manager/MockVmManagerImpl.java | 61 +-
.../cloud/agent/manager/SimulatorManagerImpl.java | 76 +-
.../com/cloud/resource/SimulatorDiscoverer.java | 2 +-
.../resource/SimulatorSecondaryDiscoverer.java | 2 +
.../src/com/cloud/simulator/SimulatorGuru.java | 7 +-
.../simulator/dao/MockConfigurationDaoImpl.java | 13 +-
.../com/cloud/simulator/dao/MockHostDaoImpl.java | 6 +-
.../cloud/simulator/dao/MockSecStorageDaoImpl.java | 6 +-
.../simulator/dao/MockSecurityRulesDaoImpl.java | 14 +-
.../simulator/dao/MockStoragePoolDaoImpl.java | 6 +-
.../src/com/cloud/simulator/dao/MockVMDaoImpl.java | 17 +-
.../com/cloud/simulator/dao/MockVolumeDaoImpl.java | 9 +-
plugins/hypervisors/ucs/pom.xml | 4 +-
.../com/cloud/ucs/database/UcsBladeDaoImpl.java | 5 +-
.../com/cloud/ucs/database/UcsManagerDaoImpl.java | 5 +-
plugins/hypervisors/vmware/pom.xml | 2 +-
.../src/com/cloud/hypervisor/guru/VMwareGuru.java | 12 +
.../hypervisor/vmware/VmwareServerDiscoverer.java | 2 +-
.../hypervisor/vmware/manager/VmwareManager.java | 2 +
.../vmware/manager/VmwareManagerImpl.java | 5 +
plugins/hypervisors/xen/pom.xml | 2 +-
.../xen/discoverer/XcpServerDiscoverer.java | 3 +-
.../xen/resource/CitrixResourceBase.java | 52 +-
.../xen/resource/XenServerStorageResource.java | 5 +
plugins/network-elements/bigswitch-vns/pom.xml | 2 +-
plugins/network-elements/dns-notifier/pom.xml | 2 +-
.../network-elements/elastic-loadbalancer/pom.xml | 2 +-
plugins/network-elements/f5/pom.xml | 2 +-
plugins/network-elements/juniper-srx/pom.xml | 2 +-
plugins/network-elements/netscaler/pom.xml | 2 +-
plugins/network-elements/nicira-nvp/pom.xml | 2 +-
.../network/guru/NiciraNvpGuestNetworkGuru.java | 7 +-
.../guru/NiciraNvpGuestNetworkGuruTest.java | 4 +-
plugins/network-elements/ovs/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/storage-allocators/random/pom.xml | 2 +-
.../allocator/RandomStoragePoolAllocator.java | 5 +-
plugins/storage/image/s3/pom.xml | 2 +-
plugins/storage/volume/solidfire/pom.xml | 2 +-
.../driver/SolidfirePrimaryDataStoreDriver.java | 24 +-
plugins/user-authenticators/ldap/pom.xml | 2 +-
.../cloud/server/auth/LDAPUserAuthenticator.java | 9 +-
plugins/user-authenticators/md5/pom.xml | 2 +-
plugins/user-authenticators/plain-text/pom.xml | 2 +-
plugins/user-authenticators/sha256salted/pom.xml | 2 +-
pom.xml | 4 +-
scripts/network/ping/baremetal_user_data.py | 104 +
scripts/network/ping/prepare_kickstart_bootfile.py | 78 +
.../ping/prepare_kickstart_kernel_initrd.py | 70 +
server/pom.xml | 2 +-
.../src/com/cloud/agent/manager/AgentMonitor.java | 32 +-
server/src/com/cloud/alert/AlertManagerImpl.java | 6 +-
server/src/com/cloud/api/ApiDBUtils.java | 17 +-
server/src/com/cloud/api/ApiResponseHelper.java | 41 +-
server/src/com/cloud/api/ApiServer.java | 9 +-
.../api/query/dao/DomainRouterJoinDaoImpl.java | 8 +-
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 6 +
.../com/cloud/api/query/vo/DomainRouterJoinVO.java | 51 +
.../src/com/cloud/api/query/vo/UserVmJoinVO.java | 47 +
.../com/cloud/baremetal/BareMetalDiscoverer.java | 245 -
server/src/com/cloud/baremetal/BareMetalGuru.java | 59 -
.../cloud/baremetal/BareMetalPingServiceImpl.java | 199 -
.../cloud/baremetal/BareMetalPxeServiceBase.java | 56 -
.../com/cloud/baremetal/BareMetalResourceBase.java | 630 --
.../cloud/baremetal/BareMetalTemplateAdapter.java | 4 +-
.../com/cloud/baremetal/BareMetalVmManager.java | 22 -
.../cloud/baremetal/BareMetalVmManagerImpl.java | 551 --
.../com/cloud/baremetal/DhcpServerResponse.java | 35 -
server/src/com/cloud/baremetal/DhcpdResource.java | 133 -
.../src/com/cloud/baremetal/DnsmasqResource.java | 123 -
.../cloud/baremetal/ExternalDhcpEntryListener.java | 44 -
.../com/cloud/baremetal/ExternalDhcpManager.java | 54 -
.../cloud/baremetal/ExternalDhcpManagerImpl.java | 250 -
.../cloud/baremetal/ExternalDhcpResourceBase.java | 198 -
.../src/com/cloud/baremetal/HttpCallException.java | 28 -
.../com/cloud/baremetal/PingPxeServerResource.java | 196 -
.../src/com/cloud/baremetal/PxeServerManager.java | 54 -
.../com/cloud/baremetal/PxeServerManagerImpl.java | 145 -
.../src/com/cloud/baremetal/PxeServerProfile.java | 90 -
.../com/cloud/baremetal/PxeServerResourceBase.java | 185 -
.../src/com/cloud/baremetal/PxeServerResponse.java | 35 -
.../src/com/cloud/baremetal/PxeServerService.java | 35 -
server/src/com/cloud/capacity/CapacityManager.java | 3 +-
.../com/cloud/capacity/CapacityManagerImpl.java | 29 +-
.../com/cloud/capacity/dao/CapacityDaoImpl.java | 2 +-
server/src/com/cloud/configuration/Config.java | 9 +-
.../cloud/configuration/ConfigurationManager.java | 3 +-
.../configuration/ConfigurationManagerImpl.java | 47 +-
.../consoleproxy/ConsoleProxyManagerImpl.java | 16 +-
.../deploy/AbstractDeployPlannerSelector.java | 74 +
server/src/com/cloud/deploy/BareMetalPlanner.java | 163 -
.../com/cloud/deploy/DeployPlannerSelector.java | 24 +
server/src/com/cloud/deploy/FirstFitPlanner.java | 9 +-
.../cloud/deploy/HypervisorVmPlannerSelector.java | 33 +
.../com/cloud/ha/HighAvailabilityManagerImpl.java | 6 +-
server/src/com/cloud/host/dao/HostDaoImpl.java | 2 +-
.../com/cloud/migration/ServiceOffering21VO.java | 5 +
.../network/ExternalNetworkDeviceManagerImpl.java | 84 +-
.../src/com/cloud/network/NetworkManagerImpl.java | 4 +-
server/src/com/cloud/network/NetworkModelImpl.java | 28 +-
.../src/com/cloud/network/NetworkServiceImpl.java | 115 +-
server/src/com/cloud/network/dao/NetworkVO.java | 21 +-
.../cloud/network/element/BareMetalElement.java | 128 -
.../cloud/network/element/ExternalDhcpElement.java | 152 -
.../com/cloud/network/guru/GuestNetworkGuru.java | 7 +-
.../VpcVirtualNetworkApplianceManagerImpl.java | 4 +-
.../src/com/cloud/network/vpc/VpcManagerImpl.java | 14 +-
server/src/com/cloud/resource/DiscovererBase.java | 1 +
.../com/cloud/resource/ResourceManagerImpl.java | 20 +-
server/src/com/cloud/server/ManagementServer.java | 3 +-
.../src/com/cloud/server/ManagementServerImpl.java | 26 +-
server/src/com/cloud/server/StatsCollector.java | 11 +-
.../src/com/cloud/service/ServiceOfferingVO.java | 30 +-
.../cloud/storage/LocalStoragePoolListener.java | 66 +-
server/src/com/cloud/storage/OCFS2ManagerImpl.java | 1 +
.../com/cloud/storage/RegisterVolumePayload.java | 43 +
.../src/com/cloud/storage/ResizeVolumePayload.java | 31 +
server/src/com/cloud/storage/StorageManager.java | 173 +-
.../src/com/cloud/storage/StorageManagerImpl.java | 4206 +++----------
server/src/com/cloud/storage/TemplateProfile.java | 10 +-
server/src/com/cloud/storage/VolumeManager.java | 99 +
.../src/com/cloud/storage/VolumeManagerImpl.java | 2452 ++++++++
.../allocator/AbstractStoragePoolAllocator.java | 14 +-
.../allocator/FirstFitStoragePoolAllocator.java | 9 +-
.../allocator/LocalStoragePoolAllocator.java | 5 +-
.../com/cloud/storage/dao/LaunchPermissionDao.java | 1 +
server/src/com/cloud/storage/dao/SnapshotDao.java | 2 +-
.../src/com/cloud/storage/dao/SnapshotDaoImpl.java | 2 +-
.../src/com/cloud/storage/dao/StoragePoolDao.java | 3 +-
.../com/cloud/storage/dao/StoragePoolDaoImpl.java | 2 +-
.../src/com/cloud/storage/dao/VMTemplateDao.java | 6 +-
.../com/cloud/storage/dao/VMTemplateDaoImpl.java | 59 +-
.../com/cloud/storage/dao/VMTemplateHostDao.java | 8 +-
.../cloud/storage/dao/VMTemplateHostDaoImpl.java | 57 +
.../com/cloud/storage/dao/VMTemplatePoolDao.java | 7 +-
.../cloud/storage/dao/VMTemplatePoolDaoImpl.java | 49 +
.../src/com/cloud/storage/dao/VolumeDaoImpl.java | 3 +-
.../src/com/cloud/storage/dao/VolumeHostDao.java | 6 +-
.../com/cloud/storage/dao/VolumeHostDaoImpl.java | 56 +-
.../cloud/storage/download/DownloadListener.java | 2 +-
.../cloud/storage/download/DownloadMonitor.java | 1 +
.../storage/download/DownloadMonitorImpl.java | 53 +-
.../storage/listener/SnapshotStateListener.java | 28 +-
.../cloud/storage/listener/StoragePoolMonitor.java | 14 +-
.../resource/DummySecondaryStorageResource.java | 2 +-
server/src/com/cloud/storage/s3/S3Manager.java | 1 +
server/src/com/cloud/storage/s3/S3ManagerImpl.java | 2 +-
.../secondary/SecondaryStorageManagerImpl.java | 2 +-
.../cloud/storage/snapshot/SnapshotManager.java | 98 +-
.../storage/snapshot/SnapshotManagerImpl.java | 765 +--
.../com/cloud/storage/upload/UploadMonitor.java | 1 +
.../com/cloud/tags/dao/ResourceTagsDaoImpl.java | 1 +
.../cloud/template/HyervisorTemplateAdapter.java | 31 +-
server/src/com/cloud/template/TemplateAdapter.java | 3 +-
.../com/cloud/template/TemplateAdapterBase.java | 43 +-
server/src/com/cloud/template/TemplateManager.java | 28 +-
.../com/cloud/template/TemplateManagerImpl.java | 703 +++-
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 45 +-
.../src/com/cloud/upgrade/dao/Upgrade2214to30.java | 11 +
.../src/com/cloud/upgrade/dao/Upgrade410to420.java | 4 +-
server/src/com/cloud/user/AccountManagerImpl.java | 5 +-
server/src/com/cloud/vm/UserVmManager.java | 13 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 1223 +----
server/src/com/cloud/vm/VirtualMachineManager.java | 1 +
.../com/cloud/vm/VirtualMachineManagerImpl.java | 39 +-
.../com/cloud/vm/VirtualMachineProfileImpl.java | 1 +
.../cloud/vm/snapshot/VMSnapshotManagerImpl.java | 7 +-
.../com/cloud/network/MockNetworkManagerImpl.java | 2 +-
.../test/com/cloud/vm/MockUserVmManagerImpl.java | 50 +-
server/test/com/cloud/vm/UserVmManagerTest.java | 182 +
.../cloud/vpc/MockConfigurationManagerImpl.java | 11 +-
.../test/com/cloud/vpc/MockNetworkManagerImpl.java | 6 +-
server/test/com/cloud/vpc/MockVpcManagerImpl.java | 12 +-
services/console-proxy/plugin/pom.xml | 2 +-
services/console-proxy/pom.xml | 2 +-
services/console-proxy/server/pom.xml | 2 +-
.../console-proxy/server/systemvm-descriptor.xml | 14 +-
services/pom.xml | 2 +-
setup/db/create-schema.sql | 18 +-
setup/db/db/schema-40to410.sql | 79 +-
setup/db/db/schema-410to420.sql | 57 +
setup/db/templates.sql | 32 +-
test/pom.xml | 2 +-
test/selenium/ReadMe.txt | 52 +
test/selenium/lib/Global_Locators.py | 224 +
test/selenium/lib/initialize.py | 31 +
test/selenium/smoke/Login_and_Accounts.py | 253 +
test/selenium/smoke/Service_Offering.py | 426 ++
test/selenium/smoke/TemplatesAndISO.py | 244 +
test/selenium/smoke/VM_lifeCycle.py | 613 ++
test/selenium/smoke/main.py | 145 +
tools/apidoc/pom.xml | 4 +-
tools/appliance/README.md | 17 +-
tools/appliance/build.sh | 38 +-
.../definitions/systemvmtemplate/config.dat | 878 ---
.../definitions/systemvmtemplate/definition.rb | 2 +-
tools/cli/pom.xml | 2 +-
tools/devcloud-kvm/pom.xml | 2 +-
tools/devcloud/pom.xml | 6 +-
tools/marvin/pom.xml | 2 +-
tools/pom.xml | 4 +-
tools/whisker/LICENSE | 4741 +--------------
tools/whisker/NOTICE | 8 +
tools/whisker/descriptor-for-packaging.xml | 43 +
ui/css/cloudstack3.css | 34 +-
ui/images/sample-wizard/step1.png | Bin 52950 -> 0 bytes
ui/images/sample-wizard/step2.png | Bin 42277 -> 0 bytes
ui/images/sample-wizard/step3.png | Bin 44303 -> 0 bytes
ui/images/sample-wizard/step4.png | Bin 37188 -> 0 bytes
ui/images/sample-wizard/step5.png | Bin 41363 -> 0 bytes
ui/images/sample-wizard/step6.png | Bin 39897 -> 0 bytes
ui/images/screens/Dashboard.jpg | Bin 69188 -> 0 bytes
ui/images/screens/Dashboard2.jpg | Bin 150035 -> 0 bytes
ui/images/screens/Events-Details.jpg | Bin 35278 -> 0 bytes
ui/images/screens/Events.jpg | Bin 37224 -> 0 bytes
ui/images/screens/MultiEdit.jpg | Bin 14080 -> 0 bytes
ui/images/screens/Network-Details.jpg | Bin 40540 -> 0 bytes
ui/images/screens/Network.jpg | Bin 39980 -> 0 bytes
ui/images/screens/ProjectDashboard.png | Bin 97769 -> 0 bytes
ui/images/screens/Projects-Details.jpg | Bin 63045 -> 0 bytes
ui/images/screens/Projects.jpg | Bin 37662 -> 0 bytes
ui/images/screens/Storage-Details.jpg | Bin 37152 -> 0 bytes
ui/images/screens/Storage.jpg | Bin 39991 -> 0 bytes
ui/images/screens/Templates-Details.jpg | Bin 37459 -> 0 bytes
ui/images/screens/Templates.jpg | Bin 41406 -> 0 bytes
ui/images/screens/ZoneWizard-AddCluster.jpg | Bin 13883 -> 0 bytes
ui/images/screens/ZoneWizard-AddHost.jpg | Bin 21496 -> 0 bytes
ui/images/screens/ZoneWizard-AddPrimaryStorage.jpg | Bin 19489 -> 0 bytes
.../screens/ZoneWizard-AddSecondaryStorage.jpg | Bin 11123 -> 0 bytes
ui/images/screens/ZoneWizard-SetupGuestTraffic.jpg | Bin 15217 -> 0 bytes
ui/images/screens/ZoneWizard-StorageTraffic.jpg | Bin 41681 -> 0 bytes
ui/scripts/configuration.js | 13 +
ui/scripts/globalSettings.js | 124 +
ui/scripts/installWizard.js | 1 +
ui/scripts/instances.js | 310 +-
ui/scripts/storage.js | 16 +
ui/scripts/system.js | 16 +-
ui/scripts/ui/widgets/detailView.js | 103 +-
ui/scripts/zoneWizard.js | 84 +-
usage/pom.xml | 2 +-
utils/pom.xml | 2 +-
utils/src/com/cloud/utils/net/NetUtils.java | 6 +
utils/test/com/cloud/utils/net/NetUtilsTest.java | 5 +
vmware-base/pom.xml | 2 +-
527 files changed, 17280 insertions(+), 20879 deletions(-)
----------------------------------------------------------------------