Repository: cloudstack Updated Branches: refs/heads/resize-root 944d75fb6 -> dd4f6bfac
Merge branch 'master' into resize-root Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dd4f6bfa Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dd4f6bfa Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dd4f6bfa Branch: refs/heads/resize-root Commit: dd4f6bfacf8788cbd1c61a03754c02c3eb078027 Parents: 944d75f 36558e4 Author: Marcus Sorensen <[email protected]> Authored: Mon Feb 10 20:12:56 2014 -0700 Committer: Marcus Sorensen <[email protected]> Committed: Mon Feb 10 20:12:56 2014 -0700 ---------------------------------------------------------------------- api/src/com/cloud/agent/api/to/GPUDeviceTO.java | 56 +++++ .../cloud/agent/api/to/VirtualMachineTO.java | 9 + api/src/com/cloud/event/EventTypes.java | 1 + api/src/com/cloud/gpu/GPU.java | 49 ++++ .../org/apache/cloudstack/api/ApiConstants.java | 5 + .../offering/CreateServiceOfferingCmd.java | 18 +- .../cloudstack/api/response/GpuResponse.java | 46 ++++ .../cloudstack/api/response/HostResponse.java | 8 + .../cloudstack/api/response/UserVmResponse.java | 10 + .../cloudstack/api/response/VgpuResponse.java | 52 +++++ .../classes/resources/messages.properties | 2 +- .../classes/resources/messages_ja_JP.properties | 2 +- .../classes/resources/messages_zh_CN.properties | 2 +- .../com/cloud/agent/api/GetGPUStatsAnswer.java | 36 +++ .../com/cloud/agent/api/GetGPUStatsCommand.java | 47 ++++ .../cloud/agent/api/StartupRoutingCommand.java | 9 + core/src/com/cloud/agent/api/StopCommand.java | 9 + .../src/com/cloud/resource/ResourceManager.java | 41 ++++ .../com/cloud/vm/VirtualMachineManagerImpl.java | 18 ++ .../spring-engine-schema-core-daos-context.xml | 2 + .../src/com/cloud/gpu/HostGpuGroupsVO.java | 70 ++++++ .../schema/src/com/cloud/gpu/VGPUTypesVO.java | 82 +++++++ .../src/com/cloud/gpu/dao/HostGpuGroupsDao.java | 60 +++++ .../com/cloud/gpu/dao/HostGpuGroupsDaoImpl.java | 94 ++++++++ .../src/com/cloud/gpu/dao/VGPUTypesDao.java | 48 ++++ .../src/com/cloud/gpu/dao/VGPUTypesDaoImpl.java | 95 ++++++++ engine/schema/src/com/cloud/host/HostVO.java | 13 ++ .../src/com/cloud/host/dao/HostDaoImpl.java | 18 ++ .../cloud/service/ServiceOfferingDetailsVO.java | 4 + .../hypervisor/hyperv/guru/HypervGuru.java | 9 +- .../resource/HypervDirectConnectResource.java | 216 +++++++++++++++++- .../kvm/resource/LibvirtComputingResource.java | 4 + .../network/element/CiscoNexusVSMElement.java | 5 +- .../xen/resource/CitrixResourceBase.java | 108 +++++++++ .../allocator/impl/FirstFitAllocator.java | 17 +- server/src/com/cloud/api/ApiDBUtils.java | 30 +++ server/src/com/cloud/api/ApiDispatcher.java | 9 +- server/src/com/cloud/api/ApiServer.java | 11 +- .../cloud/api/query/dao/HostJoinDaoImpl.java | 25 ++ .../cloud/api/query/dao/UserVmJoinDaoImpl.java | 6 + .../configuration/ConfigurationManagerImpl.java | 54 ++++- .../deploy/DeploymentPlanningManagerImpl.java | 14 +- .../src/com/cloud/event/ActionEventUtils.java | 8 +- .../cloud/hypervisor/HypervisorGuruBase.java | 15 ++ .../cloud/network/NetworkUsageManagerImpl.java | 4 + .../com/cloud/network/vpc/VpcManagerImpl.java | 1 + .../com/cloud/resource/ResourceManagerImpl.java | 97 +++++++- .../com/cloud/server/ManagementServerImpl.java | 12 + server/src/com/cloud/server/StatsCollector.java | 21 ++ .../com/cloud/storage/VolumeApiServiceImpl.java | 8 + server/src/com/cloud/vm/UserVmManagerImpl.java | 10 + .../cloud/resource/MockResourceManagerImpl.java | 31 +++ .../vm/DeploymentPlanningManagerImplTest.java | 12 + server/test/resources/createNetworkOffering.xml | 4 +- setup/db/db/schema-430to440.sql | 18 ++ .../debian/config/etc/init.d/cloud-early-config | 8 +- .../smoke/test_deploy_vgpu_enabled_vm.py | 227 +++++++++++++++++++ tools/marvin/marvin/configGenerator.py | 5 +- tools/marvin/marvin/integration/lib/base.py | 3 + .../marvin/sandbox/advanced/advanced_env.py | 23 +- .../marvin/sandbox/advancedsg/advancedsg_env.py | 18 +- tools/marvin/marvin/sandbox/basic/basic_env.py | 16 +- .../sandbox/demo/simulator/simulator_setup.py | 16 +- ui/scripts/configuration.js | 73 ++++++ ui/scripts/instances.js | 4 +- ui/scripts/ui/widgets/multiEdit.js | 2 +- utils/src/com/cloud/utils/ReflectUtil.java | 13 ++ 67 files changed, 1972 insertions(+), 91 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd4f6bfa/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd4f6bfa/server/src/com/cloud/storage/VolumeApiServiceImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd4f6bfa/server/src/com/cloud/vm/UserVmManagerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd4f6bfa/tools/marvin/marvin/integration/lib/base.py ----------------------------------------------------------------------
