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/9f970b1a Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/9f970b1a Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/9f970b1a Branch: refs/heads/qemu-img Commit: 9f970b1a0e227ff90a5e006ee644adcf7199f0ed Parents: d93582d 0b35f71 Author: Wido den Hollander <[email protected]> Authored: Tue Feb 26 14:45:59 2013 +0100 Committer: Wido den Hollander <[email protected]> Committed: Tue Feb 26 14:45:59 2013 +0100 ---------------------------------------------------------------------- api/src/com/cloud/dc/DataCenter.java | 4 + api/src/com/cloud/network/Network.java | 1 + api/src/com/cloud/network/vpc/VpcService.java | 2 +- api/src/com/cloud/user/AccountService.java | 4 +- api/src/com/cloud/user/DomainService.java | 2 +- api/src/com/cloud/vm/NicProfile.java | 18 + .../org/apache/cloudstack/api/ApiConstants.java | 7 +- .../command/admin/account/CreateAccountCmd.java | 28 +- .../command/admin/account/DeleteAccountCmd.java | 7 - .../command/admin/account/DisableAccountCmd.java | 15 +- .../command/admin/account/EnableAccountCmd.java | 8 +- .../command/admin/account/UpdateAccountCmd.java | 10 +- .../api/command/admin/domain/CreateDomainCmd.java | 16 +- .../api/command/admin/domain/DeleteDomainCmd.java | 7 - .../api/command/admin/domain/UpdateDomainCmd.java | 7 - .../api/command/admin/user/CreateUserCmd.java | 16 +- .../api/command/admin/user/DeleteUserCmd.java | 7 - .../api/command/admin/user/DisableUserCmd.java | 7 - .../api/command/admin/user/EnableUserCmd.java | 7 - .../api/command/admin/user/UpdateUserCmd.java | 7 - .../command/admin/vpc/CreateVPCOfferingCmd.java | 31 +- .../api/command/admin/zone/CreateZoneCmd.java | 14 + .../api/command/admin/zone/UpdateZoneCmd.java | 14 + .../api/response/DomainRouterResponse.java | 22 + .../cloudstack/api/response/ZoneResponse.java | 22 + .../apache/cloudstack/region/RegionService.java | 136 ++-- client/pom.xml | 5 +- client/tomcatconf/componentContext.xml.in | 2 +- client/tomcatconf/nonossComponentContext.xml.in | 11 +- core/src/com/cloud/user/AccountVO.java | 40 +- core/src/com/cloud/user/UserVO.java | 23 +- core/src/com/cloud/vm/UserVmCloneSettingVO.java | 50 + docs/en-US/management-server-install-client.xml | 28 +- docs/en-US/management-server-install-db-local.xml | 59 +- .../en-US/management-server-install-nfs-shares.xml | 2 +- docs/en-US/nfs-shares-on-management-server.xml | 4 +- .../entity/api/db/EngineDataCenterVO.java | 28 +- .../platform/orchestration/CloudOrchestrator.java | 9 +- .../engine/provisioning/test/ProvisioningTest.java | 2 +- .../cloudstack/storage/test/DirectAgentTest.java | 2 +- .../cloudstack/storage/test/volumeServiceTest.java | 2 +- packaging/centos63/cloud.spec | 27 +- .../debian/config/etc/init.d/cloud-early-config | 42 +- .../hypervisor/vmware/manager/VmwareManager.java | 3 + .../vmware/manager/VmwareManagerImpl.java | 18 +- .../hypervisor/vmware/resource/VmwareResource.java | 117 ++- .../xen/discoverer/XcpServerDiscoverer.java | 10 +- .../apache/cloudstack/storage/test/VolumeTest.java | 4 +- scripts/vm/hypervisor/xenserver/xenheartbeat.sh | 46 +- scripts/vm/network/security_group.py | 10 +- server/conf/migration-components.xml | 1 + .../cloud/api/query/dao/DataCenterJoinDaoImpl.java | 2 + .../api/query/dao/DomainRouterJoinDaoImpl.java | 3 + .../com/cloud/api/query/vo/DataCenterJoinVO.java | 22 + .../com/cloud/api/query/vo/DomainRouterJoinVO.java | 20 + server/src/com/cloud/configuration/Config.java | 2 + .../cloud/configuration/ConfigurationManager.java | 4 +- .../configuration/ConfigurationManagerImpl.java | 44 +- server/src/com/cloud/dc/DataCenterVO.java | 30 +- .../ExternalLoadBalancerUsageManagerImpl.java | 263 ++++-- .../src/com/cloud/network/NetworkManagerImpl.java | 6 +- .../network/element/VpcVirtualRouterElement.java | 4 +- .../com/cloud/network/guru/DirectNetworkGuru.java | 2 + .../com/cloud/network/guru/GuestNetworkGuru.java | 2 - .../router/VirtualNetworkApplianceManagerImpl.java | 43 +- server/src/com/cloud/network/vpc/VpcManager.java | 3 +- .../src/com/cloud/network/vpc/VpcManagerImpl.java | 193 +++- .../src/com/cloud/network/vpc/VpcServiceMapVO.java | 90 ++ server/src/com/cloud/network/vpc/dao/VpcDao.java | 5 + .../src/com/cloud/network/vpc/dao/VpcDaoImpl.java | 27 + .../cloud/network/vpc/dao/VpcServiceMapDao.java | 40 + .../network/vpc/dao/VpcServiceMapDaoImpl.java | 115 ++ .../src/com/cloud/projects/ProjectManagerImpl.java | 2 +- .../server/auth/DefaultUserAuthenticator.java | 3 - .../cloud/storage/download/DownloadListener.java | 8 +- .../storage/download/DownloadMonitorImpl.java | 22 +- .../src/com/cloud/upgrade/dao/Upgrade410to420.java | 14 + server/src/com/cloud/user/AccountManager.java | 14 +- server/src/com/cloud/user/AccountManagerImpl.java | 90 +-- server/src/com/cloud/user/DomainManager.java | 2 +- server/src/com/cloud/user/DomainManagerImpl.java | 24 +- server/src/com/cloud/user/dao/AccountDaoImpl.java | 90 +- .../com/cloud/user/dao/UserStatisticsDaoImpl.java | 18 +- server/src/com/cloud/vm/UserVmManagerImpl.java | 243 +++-- .../com/cloud/vm/dao/UserVmCloneSettingDao.java | 37 + .../cloud/vm/dao/UserVmCloneSettingDaoImpl.java | 74 ++ server/src/com/cloud/vm/dao/UserVmDetailsDao.java | 3 - server/src/com/cloud/vm/dao/VMInstanceDao.java | 3 +- server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 14 +- .../apache/cloudstack/region/RegionManager.java | 204 +--- .../cloudstack/region/RegionManagerImpl.java | 822 ++------------- .../cloudstack/region/RegionServiceImpl.java | 230 ++--- .../apache/cloudstack/region/RegionsApiUtil.java | 306 ------ .../com/cloud/user/MockAccountManagerImpl.java | 46 +- .../test/com/cloud/user/MockDomainManagerImpl.java | 38 +- .../vm/dao/UserVmCloneSettingDaoImplTest.java | 62 ++ .../UserVmCloneSettingDaoTestConfiguration.java | 52 + .../cloud/vpc/MockConfigurationManagerImpl.java | 2 +- server/test/com/cloud/vpc/MockVpcManagerImpl.java | 12 +- server/test/com/cloud/vpc/dao/MockVpcDaoImpl.java | 13 +- .../cloudstack/region/RegionManagerTest.java | 35 +- .../test/resources/CloneSettingDaoTestContext.xml | 42 + setup/db/db/schema-40to410.sql | 16 +- setup/db/db/schema-410to420.sql | 29 +- ui/scripts/globalSettings.js | 8 +- ui/scripts/network.js | 15 +- usage/src/com/cloud/usage/UsageManagerImpl.java | 2 +- 107 files changed, 2213 insertions(+), 2266 deletions(-) ----------------------------------------------------------------------
