Merge branch '4.4' 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/c02c6349 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c02c6349 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c02c6349 Branch: refs/heads/resize-root Commit: c02c634945c9937fce42803ec393b2352663e663 Parents: f52c743 1db329f Author: Marcus Sorensen <mar...@betterservers.com> Authored: Fri Mar 14 02:27:26 2014 -0600 Committer: Marcus Sorensen <mar...@betterservers.com> Committed: Fri Mar 14 02:27:26 2014 -0600 ---------------------------------------------------------------------- api/src/com/cloud/agent/api/to/NicTO.java | 8 + api/src/com/cloud/network/Network.java | 7 +- api/src/com/cloud/network/NetworkProfile.java | 8 + .../network/lb/LoadBalancingRulesService.java | 2 +- api/src/com/cloud/network/vpc/Vpc.java | 12 + api/src/com/cloud/network/vpc/VpcOffering.java | 9 + .../network/vpc/VpcProvisioningService.java | 7 +- api/src/com/cloud/offering/NetworkOffering.java | 2 + api/src/com/cloud/vm/VirtualMachine.java | 1 + .../org/apache/cloudstack/api/ApiConstants.java | 7 +- .../command/admin/vpc/CreateVPCOfferingCmd.java | 10 +- .../AssignToLoadBalancerRuleCmd.java | 47 +- .../api/command/user/vm/ListVMsCmd.java | 3 +- .../api/command/user/vpc/CreateVPCCmd.java | 2 +- .../api/response/NetworkOfferingResponse.java | 7 + .../api/response/StoragePoolResponse.java | 8 + .../api/response/VpcOfferingResponse.java | 16 + .../cloudstack/api/response/VpcResponse.java | 16 + build/simulator.properties | 28 - .../cloud/agent/api/GetRouterAlertsAnswer.java | 62 ++ .../agent/api/MigrateWithStorageCommand.java | 16 + .../agent/api/ModifyVmNicConfigCommand.java | 7 + .../api/routing/GetRouterAlertsCommand.java | 46 ++ .../virtualnetwork/VirtualRoutingResource.java | 45 +- .../subsystem/api/storage/StorageAction.java | 3 +- .../src/com/cloud/capacity/CapacityManager.java | 2 +- .../com/cloud/vm/VirtualMachineManagerImpl.java | 13 +- .../spring-engine-schema-core-daos-context.xml | 1 + .../src/com/cloud/host/dao/HostDaoImpl.java | 77 +-- .../cloud/network/dao/LoadBalancerVMMapDao.java | 2 + .../network/dao/LoadBalancerVMMapDaoImpl.java | 8 + .../cloud/network/dao/LoadBalancerVMMapVO.java | 19 + .../src/com/cloud/network/dao/NetworkVO.java | 12 + .../network/dao/OpRouterMonitorServiceDao.java | 25 + .../dao/OpRouterMonitorServiceDaoImpl.java | 28 + .../network/dao/OpRouterMonitorServiceVO.java | 69 +++ .../com/cloud/network/vpc/VpcOfferingVO.java | 21 +- .../schema/src/com/cloud/network/vpc/VpcVO.java | 23 +- .../com/cloud/offerings/NetworkOfferingVO.java | 11 +- .../src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 54 +- ...ngine-storage-datamotion-storage-context.xml | 3 +- .../motion/AncientDataMotionStrategy.java | 2 +- .../endpoint/DefaultEndPointSelector.java | 9 + .../storage/volume/VolumeServiceImpl.java | 10 +- .../jobs/impl/AsyncJobManagerImpl.java | 18 +- .../HypervResource/CloudStackTypes.cs | 51 +- .../HypervResource/HypervResourceController.cs | 153 ++++- .../HypervResource/IWmiCallsV2.cs | 3 + .../ServerResource/HypervResource/WmiCallsV2.cs | 165 ++++- ...tion.v2.Msvm_StorageAllocationSettingData.cs | 2 +- .../src/com/cloud/ha/HypervInvestigator.java | 4 +- .../discoverer/HypervServerDiscoverer.java | 5 +- .../hypervisor/hyperv/guru/HypervGuru.java | 45 +- .../resource/HypervDirectConnectResource.java | 145 ++++- .../motion/HypervStorageMotionStrategy.java | 179 ++++++ .../kvm/resource/LibvirtComputingResource.java | 81 ++- .../xen/resource/CitrixResourceBase.java | 126 +++- .../management/ContrailManagerImpl.java | 2 +- .../cloudstack/ovs/spring-ovs-context.xml | 2 +- .../cloud/agent/api/OvsCreateTunnelCommand.java | 19 +- .../agent/api/OvsDestroyBridgeCommand.java | 10 +- .../agent/api/OvsDestroyTunnelCommand.java | 10 +- .../cloud/agent/api/OvsSetupBridgeCommand.java | 10 +- .../OvsVpcPhysicalTopologyConfigCommand.java | 130 ++++ .../api/OvsVpcRoutingPolicyConfigCommand.java | 123 ++++ .../com/cloud/network/element/OvsElement.java | 24 +- .../cloud/network/guru/OvsGuestNetworkGuru.java | 18 +- .../network/ovs/OvsNetworkTopologyGuru.java | 64 ++ .../network/ovs/OvsNetworkTopologyGuruImpl.java | 240 ++++++++ .../com/cloud/network/ovs/OvsTunnelManager.java | 16 +- .../cloud/network/ovs/OvsTunnelManagerImpl.java | 615 +++++++++++++++---- .../com/cloud/network/ovs/dao/OvsTunnel.java | 24 + .../network/ovs/dao/OvsTunnelNetworkVO.java | 2 +- .../xenserver/cloudstack_pluginlib.py | 260 +++++++- .../vm/hypervisor/xenserver/ovs-vif-flows.py | 143 ++++- scripts/vm/hypervisor/xenserver/ovstunnel | 122 +++- scripts/vm/network/vnet/cloudstack_pluginlib.py | 226 +++++++ scripts/vm/network/vnet/ovstunnel.py | 86 ++- server/src/com/cloud/api/ApiResponseHelper.java | 5 + .../api/query/dao/StoragePoolJoinDaoImpl.java | 4 +- .../cloud/capacity/StorageCapacityListener.java | 2 +- .../configuration/ConfigurationManagerImpl.java | 54 +- .../cloud/hypervisor/HypervisorGuruBase.java | 7 + .../com/cloud/network/NetworkServiceImpl.java | 22 +- .../cloud/network/as/AutoScaleManagerImpl.java | 2 +- .../network/guru/ExternalGuestNetworkGuru.java | 8 + .../lb/LoadBalancingRulesManagerImpl.java | 101 ++- .../VirtualNetworkApplianceManagerImpl.java | 67 ++ .../network/vpc/NetworkACLManagerImpl.java | 12 +- .../com/cloud/network/vpc/VpcManagerImpl.java | 305 +++++++-- .../cloud/server/ConfigurationServerImpl.java | 6 +- server/src/com/cloud/server/StatsCollector.java | 4 +- .../com/cloud/storage/StorageManagerImpl.java | 25 +- server/src/com/cloud/vm/UserVmManagerImpl.java | 5 +- .../cloud/network/CreatePrivateNetworkTest.java | 2 +- .../com/cloud/vpc/MockNetworkManagerImpl.java | 2 +- .../com/cloud/vpc/NetworkACLManagerTest.java | 6 + server/test/com/cloud/vpc/VpcApiUnitTest.java | 2 +- .../test/com/cloud/vpc/dao/MockVpcDaoImpl.java | 4 +- setup/db/db/schema-430to440.sql | 20 +- .../config/opt/cloud/bin/getRouterAlerts.sh | 70 +++ .../debian/config/root/monitorServices.py | 3 + .../component/test_base_image_updation.py | 19 +- test/integration/component/test_region_vpc.py | 517 ++++++++++++++++ .../test_vpc_distributed_routing_offering.py | 512 +++++++++++++++ .../smoke/test_VirtualRouter_alerts.py | 244 ++++++++ .../integration/smoke/test_over_provisioning.py | 107 ++++ tools/marvin/marvin/integration/lib/base.py | 15 + 108 files changed, 5510 insertions(+), 533 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c02c6349/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c02c6349/server/src/com/cloud/vm/UserVmManagerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c02c6349/tools/marvin/marvin/integration/lib/base.py ----------------------------------------------------------------------
