Merge branch 'master' into rbd-snap-clone
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2355a81f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2355a81f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2355a81f Branch: refs/heads/rbd-snap-clone Commit: 2355a81fe0581fa951a7eb8e090f7122e113711c Parents: 1b1f59f 80a3c05 Author: Wido den Hollander <[email protected]> Authored: Thu May 23 16:29:43 2013 +0200 Committer: Wido den Hollander <[email protected]> Committed: Thu May 23 16:29:43 2013 +0200 ---------------------------------------------------------------------- api/src/com/cloud/async/AsyncJob.java | 1 + .../cloud/configuration/ConfigurationService.java | 13 + api/src/com/cloud/event/EventTypes.java | 5 + api/src/com/cloud/network/IpAddress.java | 4 +- .../cloud/network/NetworkMigrationResponder.java | 70 ++ api/src/com/cloud/network/NetworkService.java | 5 + .../cloud/network/vpn/RemoteAccessVpnService.java | 2 +- .../org/apache/cloudstack/api/ApiConstants.java | 2 + .../apache/cloudstack/api/ResponseGenerator.java | 9 +- .../api/command/admin/cluster/AddClusterCmd.java | 36 +- .../command/admin/cluster/UpdateClusterCmd.java | 6 +- .../admin/region/CreatePortableIpRangeCmd.java | 156 +++ .../admin/region/DeletePortableIpRangeCmd.java | 93 ++ .../admin/region/ListPortableIpRangesCmd.java | 109 ++ .../command/user/address/AssociateIPAddrCmd.java | 28 +- .../user/address/DisassociateIPAddrCmd.java | 12 +- .../api/command/user/nat/EnableStaticNatCmd.java | 6 + .../command/user/vpn/DeleteRemoteAccessVpnCmd.java | 2 +- .../cloudstack/api/response/ClusterResponse.java | 27 +- .../cloudstack/api/response/IPAddressResponse.java | 7 + .../api/response/PortableIpRangeResponse.java | 93 ++ .../api/response/PortableIpResponse.java | 106 ++ .../org/apache/cloudstack/region/PortableIp.java | 58 ++ .../apache/cloudstack/region/PortableIpRange.java | 38 + .../com/cloud/bridge/service/EC2MainServlet.java | 2 +- .../com/cloud/bridge/service/EC2RestServlet.java | 428 ++++++--- .../cloud/bridge/service/EC2SoapServiceImpl.java | 259 +++-- .../service/core/ec2/EC2AddressFilterSet.java | 16 +- .../core/ec2/EC2AvailabilityZonesFilterSet.java | 9 +- .../bridge/service/core/ec2/EC2DescribeImages.java | 10 + .../cloud/bridge/service/core/ec2/EC2Engine.java | 764 ++++++++++----- .../bridge/service/core/ec2/EC2GroupFilterSet.java | 9 +- .../cloud/bridge/service/core/ec2/EC2Image.java | 63 +- .../bridge/service/core/ec2/EC2ImageFilterSet.java | 168 ++++ .../service/core/ec2/EC2InstanceFilterSet.java | 8 +- .../service/core/ec2/EC2KeyPairFilterSet.java | 16 +- .../core/ec2/EC2ModifyInstanceAttribute.java | 64 ++ .../bridge/service/core/ec2/EC2RegisterImage.java | 5 +- .../service/core/ec2/EC2SnapshotFilterSet.java | 10 +- .../bridge/service/core/ec2/EC2TagsFilterSet.java | 9 +- .../service/core/ec2/EC2VolumeFilterSet.java | 9 +- .../service/exception/EC2ServiceException.java | 120 ++-- awsapi/src/com/cloud/stack/CloudStackClient.java | 5 +- client/tomcatconf/applicationContext.xml.in | 2 + client/tomcatconf/commands.properties.in | 6 + client/tomcatconf/nonossComponentContext.xml.in | 2 +- .../storage/CreateEntityDownloadURLCommand.java | 1 - .../src/com/cloud/network/DnsMasqConfigurator.java | 2 +- debian/rules | 2 + docs/en-US/Release_Notes.xml | 53 +- docs/en-US/added-API-commands-4.2.xml | 16 + docs/en-US/elastic-ip.xml | 161 ++-- docs/en-US/portable-ip.xml | 30 + .../subsystem/api/storage/AbstractScope.java | 6 +- .../cloud/entity/api/db/VolumeReservationVO.java | 22 +- .../api/db/dao/VolumeReservationDaoImpl.java | 2 +- .../src/com/cloud/alert/dao/AlertDaoImpl.java | 8 + .../cloud/configuration/dao/ResourceCountDao.java | 2 + .../configuration/dao/ResourceCountDaoImpl.java | 16 + .../cloud/configuration/dao/ResourceLimitDao.java | 2 + .../configuration/dao/ResourceLimitDaoImpl.java | 14 + .../src/com/cloud/event/dao/EventDaoImpl.java | 5 + .../network/dao/ExternalLoadBalancerDeviceVO.java | 2 +- .../src/com/cloud/network/dao/IPAddressVO.java | 24 + framework/jobs/pom.xml | 1 + .../debian/config/etc/init.d/cloud-early-config | 5 +- .../kvm/resource/LibvirtComputingResource.java | 48 +- .../kvm/resource/LibvirtComputingResourceTest.java | 4 +- .../xen/discoverer/XcpServerDiscoverer.java | 110 ++- .../hypervisor/xen/resource/CitrixHelper.java | 4 +- .../xen/resource/CitrixResourceBase.java | 40 +- .../xen/resource/XcpServer16Resource.java | 32 + .../hypervisor/xen/resource/XcpServerResource.java | 120 ++- .../xen/resource/XenServer56FP1Resource.java | 100 ++- .../motion/XenServerStorageMotionStrategy.java | 10 +- .../xen/resource/CitrixResourceBaseTest.java | 5 +- .../cloud/network/cisco/CiscoVnmcConnection.java | 22 +- .../network/cisco/CiscoVnmcConnectionImpl.java | 112 +-- .../cloud/network/resource/CiscoVnmcResource.java | 20 +- .../network/resource/CiscoVnmcResourceTest.java | 22 +- .../cloud/network/element/MidoNetElementTest.java | 3 +- .../response/NetscalerLoadBalancerResponse.java | 21 + .../cloud/network/element/NetscalerElement.java | 4 + .../cloud/network/nicira/DestinationNatRule.java | 105 ++ .../src/com/cloud/network/nicira/Match.java | 146 +--- .../src/com/cloud/network/nicira/NatRule.java | 363 ++----- .../src/com/cloud/network/nicira/NiciraNvpApi.java | 67 +- .../com/cloud/network/nicira/SourceNatRule.java | 123 +++ .../cloud/network/resource/NiciraNvpResource.java | 57 +- .../test/com/cloud/network/nicira/NatRuleTest.java | 43 +- .../network/resource/NiciraNvpResourceTest.java | 113 ++- scripts/vm/hypervisor/xenserver/xcposs/patch | 2 + scripts/vm/hypervisor/xenserver/xcpserver/patch | 4 +- scripts/vm/hypervisor/xenserver/xenserver56/patch | 4 +- .../vm/hypervisor/xenserver/xenserver56fp1/patch | 4 +- scripts/vm/hypervisor/xenserver/xenserver60/patch | 4 +- server/src/com/cloud/api/ApiResponseHelper.java | 80 ++- .../src/com/cloud/api/query/QueryManagerImpl.java | 2 +- .../com/cloud/capacity/CapacityManagerImpl.java | 20 +- .../configuration/ConfigurationManagerImpl.java | 165 +++- .../deploy/DeploymentPlanningManagerImpl.java | 24 +- .../com/cloud/hypervisor/HypervisorGuruBase.java | 6 +- server/src/com/cloud/network/NetworkManager.java | 43 +- .../src/com/cloud/network/NetworkManagerImpl.java | 336 +++++++- server/src/com/cloud/network/NetworkModelImpl.java | 8 +- .../src/com/cloud/network/NetworkServiceImpl.java | 105 ++- server/src/com/cloud/network/addr/PublicIp.java | 9 + .../network/element/VirtualRouterElement.java | 70 ++- .../router/VirtualNetworkApplianceManager.java | 2 +- .../router/VirtualNetworkApplianceManagerImpl.java | 34 +- .../com/cloud/network/rules/RulesManagerImpl.java | 43 + .../cloud/network/vpc/NetworkACLServiceImpl.java | 4 +- .../network/vpn/RemoteAccessVpnManagerImpl.java | 4 +- server/src/com/cloud/resource/DiscovererBase.java | 1 + .../com/cloud/resource/ResourceManagerImpl.java | 12 +- .../src/com/cloud/server/ManagementServerImpl.java | 86 ++- .../src/com/cloud/storage/VolumeManagerImpl.java | 22 +- server/src/com/cloud/user/AccountManagerImpl.java | 19 +- server/src/com/cloud/user/DomainManagerImpl.java | 15 +- server/src/com/cloud/vm/UserVmManager.java | 1 + server/src/com/cloud/vm/UserVmManagerImpl.java | 16 +- .../com/cloud/vm/VirtualMachineManagerImpl.java | 15 +- .../com/cloud/vm/VirtualMachineProfileImpl.java | 34 +- .../apache/cloudstack/region/PortableIpDao.java | 39 + .../cloudstack/region/PortableIpDaoImpl.java | 131 +++ .../cloudstack/region/PortableIpRangeDao.java | 30 + .../cloudstack/region/PortableIpRangeDaoImpl.java | 65 ++ .../cloudstack/region/PortableIpRangeVO.java | 119 +++ .../org/apache/cloudstack/region/PortableIpVO.java | 222 +++++ .../com/cloud/network/MockNetworkManagerImpl.java | 69 ++- .../test/com/cloud/vm/MockUserVmManagerImpl.java | 6 + .../cloud/vpc/MockConfigurationManagerImpl.java | 58 ++ .../test/com/cloud/vpc/MockNetworkManagerImpl.java | 89 ++- .../vpc/MockVpcVirtualNetworkApplianceManager.java | 6 + .../networkoffering/ChildTestConfiguration.java | 7 + services/secondary-storage/scripts/ssvm-check.sh | 4 +- setup/db/db/schema-410to420.sql | 43 +- test/integration/component/test_accounts.py | 2 +- test/integration/component/test_custom_hostname.py | 369 +++++++ .../component/test_high_availability.py | 28 +- .../component/test_host_high_availability.py | 14 +- test/integration/component/test_ldap.py | 365 +++++++ test/integration/component/test_project_limits.py | 5 +- test/integration/component/test_projects.py | 34 +- .../integration/component/test_redundant_router.py | 120 ++-- test/integration/component/test_stopped_vm.py | 70 +- test/integration/component/test_tags.py | 110 +- test/integration/component/test_vpc.py | 124 ++-- .../component/test_vpc_host_maintenance.py | 44 +- test/integration/component/test_vpc_network.py | 108 +- .../component/test_vpc_network_lbrules.py | 18 +- .../component/test_vpc_network_pfrules.py | 18 +- .../component/test_vpc_network_staticnatrule.py | 18 +- test/integration/component/test_vpc_offerings.py | 52 +- test/integration/component/test_vpc_routers.py | 93 +-- .../component/test_vpc_vm_life_cycle.py | 98 +- .../component/test_vpc_vms_deployment.py | 154 ++-- test/integration/component/test_vpn_users.py | 4 +- test/integration/smoke/test_deploy_vm.py | 3 + .../smoke/test_deploy_vm_with_userdata.py | 8 +- ...st_deploy_vms_with_varied_deploymentplanners.py | 414 +++++--- test/integration/smoke/test_iso.py | 10 +- test/integration/smoke/test_network.py | 69 +- test/integration/smoke/test_nic.py | 51 +- test/integration/smoke/test_portable_publicip.py | 236 +++++ test/integration/smoke/test_public_ip_range.py | 6 +- test/integration/smoke/test_pvlan.py | 1 + test/integration/smoke/test_templates.py | 11 +- test/integration/smoke/test_vm_life_cycle.py | 145 ++-- test/integration/smoke/test_vm_snapshots.py | 618 ++++++------ tools/apidoc/gen_toc.py | 1 + tools/marvin/marvin/integration/lib/base.py | 36 + ui/scripts/configuration.js | 199 ++++- ui/scripts/docs.js | 9 + ui/scripts/network.js | 2 +- ui/scripts/system.js | 389 ++++++++- ui/scripts/zoneWizard.js | 2 +- .../com/cloud/utils/db/GenericSearchBuilder.java | 18 +- utils/src/com/cloud/utils/net/NetUtils.java | 13 + 179 files changed, 8165 insertions(+), 2946 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2355a81f/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java ----------------------------------------------------------------------
