Merge branch 'master' into ui-vpc-redesign
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7167bf4e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7167bf4e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7167bf4e Branch: refs/heads/ui-vpc-redesign Commit: 7167bf4e67d2963aa8654092f2f9ccab2e8ca14d Parents: 93e046a 5646f5e Author: Brian Federle <[email protected]> Authored: Fri May 17 10:13:31 2013 -0700 Committer: Brian Federle <[email protected]> Committed: Fri May 17 10:13:31 2013 -0700 ---------------------------------------------------------------------- .../com/cloud/deploy/DeploymentClusterPlanner.java | 45 + api/src/com/cloud/deploy/DeploymentPlanner.java | 33 +- api/src/com/cloud/event/EventTypes.java | 5 +- api/src/com/cloud/offering/ServiceOffering.java | 2 + api/src/com/cloud/resource/ResourceService.java | 4 +- api/src/com/cloud/server/ManagementService.java | 14 +- api/src/com/cloud/vm/UserVmService.java | 2 +- .../org/apache/cloudstack/api/ApiConstants.java | 2 + .../admin/config/ListDeploymentPlannersCmd.java | 71 + .../admin/host/FindHostsForMigrationCmd.java | 2 +- .../admin/host/ReleaseHostReservationCmd.java | 105 ++ .../network/ListNetworkIsolationMethodsCmd.java | 2 +- .../admin/offering/CreateServiceOfferingCmd.java | 22 + .../command/admin/systemvm/ScaleSystemVMCmd.java | 131 ++ .../cloudstack/api/command/user/vm/ScaleVMCmd.java | 23 +- .../api/response/ServiceOfferingResponse.java | 12 + .../api/command/test/ScaleVMCmdTest.java | 30 +- .../bridge/persist/dao/CloudStackUserDaoImpl.java | 12 +- client/pom.xml | 5 + client/tomcatconf/applicationContext.xml.in | 34 +- client/tomcatconf/commands.properties.in | 3 + client/tomcatconf/componentContext.xml.in | 1 + core/src/com/cloud/agent/api/PlugNicCommand.java | 9 +- docs/en-US/elastic-ip.xml | 161 ++- .../com/cloud/migration/ServiceOffering21VO.java | 5 + .../cloud/service/ServiceOfferingDetailsVO.java | 73 + .../src/com/cloud/service/ServiceOfferingVO.java | 44 + .../com/cloud/service/dao/ServiceOfferingDao.java | 2 + .../cloud/service/dao/ServiceOfferingDaoImpl.java | 19 +- .../service/dao/ServiceOfferingDetailsDao.java | 29 + .../service/dao/ServiceOfferingDetailsDaoImpl.java | 98 ++ .../src/com/cloud/upgrade/dao/Upgrade410to420.java | 60 +- .../schema/src/com/cloud/vm/dao/VMInstanceDao.java | 28 +- .../src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 147 ++- .../ClusterScopeStoragePoolAllocator.java | 18 +- .../allocator/LocalStoragePoolAllocator.java | 21 +- .../allocator/ZoneWideStoragePoolAllocator.java | 25 +- .../storage/volume/VolumeServiceImpl.java | 4 +- .../implicit-dedication/pom.xml | 29 + .../cloud/deploy/ImplicitDedicationPlanner.java | 249 ++++ .../implicitplanner/ImplicitPlannerTest.java | 586 ++++++++ .../cloud/deploy/UserConcentratedPodPlanner.java | 34 +- .../com/cloud/deploy/UserDispersingPlanner.java | 14 +- .../manager/BaremetalPlannerSelector.java | 39 - .../kvm/resource/LibvirtComputingResource.java | 14 +- .../hypervisor/vmware/resource/VmwareResource.java | 121 ++- plugins/pom.xml | 1 + server/pom.xml | 5 + .../manager/allocator/impl/FirstFitAllocator.java | 110 +- .../api/query/dao/ServiceOfferingJoinDaoImpl.java | 1 + .../cloud/api/query/vo/ServiceOfferingJoinVO.java | 11 + .../com/cloud/capacity/CapacityManagerImpl.java | 38 + server/src/com/cloud/configuration/Config.java | 3 + .../cloud/configuration/ConfigurationManager.java | 4 +- .../configuration/ConfigurationManagerImpl.java | 178 ++-- .../deploy/AbstractDeployPlannerSelector.java | 84 -- .../com/cloud/deploy/DeployPlannerSelector.java | 24 - .../deploy/DeploymentPlanningManagerImpl.java | 1026 ++++++++++++++- server/src/com/cloud/deploy/FirstFitPlanner.java | 617 ++------- .../cloud/deploy/HypervisorVmPlannerSelector.java | 54 - .../com/cloud/deploy/PlannerHostReservationVO.java | 117 ++ .../deploy/dao/PlannerHostReservationDao.java | 30 + .../deploy/dao/PlannerHostReservationDaoImpl.java | 63 + .../src/com/cloud/network/NetworkManagerImpl.java | 116 +- .../cloud/network/StorageNetworkManagerImpl.java | 5 +- .../VpcVirtualNetworkApplianceManagerImpl.java | 45 +- .../com/cloud/resource/ResourceManagerImpl.java | 43 + server/src/com/cloud/server/ManagementServer.java | 6 + .../src/com/cloud/server/ManagementServerImpl.java | 179 ++-- server/src/com/cloud/vm/UserVmManager.java | 6 +- server/src/com/cloud/vm/UserVmManagerImpl.java | 48 +- .../gslb/GlobalLoadBalancingRulesServiceImpl.java | 4 +- .../cloud/resource/MockResourceManagerImpl.java | 6 + .../vm/DeploymentPlanningManagerImplTest.java | 359 +++++ .../test/com/cloud/vm/MockUserVmManagerImpl.java | 9 +- .../cloud/vpc/MockConfigurationManagerImpl.java | 2 +- .../networkoffering/ChildTestConfiguration.java | 99 +- setup/bindir/cloud-sysvmadm.in | 50 +- setup/db/db/schema-410to420.sql | 72 +- .../integration/component/test_implicit_planner.py | 232 ++++ ...st_deploy_vms_with_varied_deploymentplanners.py | 164 +++ test/integration/smoke/test_routers.py | 16 +- test/integration/smoke/test_volumes.py | 84 +- tools/apidoc/gen_toc.py | 1 + tools/marvin/marvin/cloudstackConnection.py | 6 +- tools/marvin/marvin/integration/lib/base.py | 5 + .../vmware/mo/DistributedVirtualSwitchMO.java | 77 ++ .../hypervisor/vmware/mo/HypervisorHostHelper.java | 152 ++- 88 files changed, 5094 insertions(+), 1447 deletions(-) ----------------------------------------------------------------------
