You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/05/21 21:34:48 UTC
[50/50] [abbrv] git commit: updated refs/heads/ui-vpc-redesign to
e35f144
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/e35f1443
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e35f1443
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e35f1443
Branch: refs/heads/ui-vpc-redesign
Commit: e35f14439aa4eb9bab2eeaca00d5a5e37cbfabac
Parents: 0eceb0d a75cf9a
Author: Brian Federle <bf...@gmail.com>
Authored: Tue May 21 12:30:01 2013 -0700
Committer: Brian Federle <bf...@gmail.com>
Committed: Tue May 21 12:30:01 2013 -0700
----------------------------------------------------------------------
api/src/com/cloud/async/AsyncJob.java | 1 +
.../cloud/configuration/ConfigurationService.java | 13 +
api/src/com/cloud/event/EventTypes.java | 5 +
.../InsufficientServerCapacityException.java | 11 +
api/src/com/cloud/network/IpAddress.java | 4 +-
.../cloud/network/NetworkMigrationResponder.java | 70 +++
api/src/com/cloud/network/NetworkService.java | 5 +
.../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 +
.../api/command/user/vm/DeployVMCmd.java | 11 +-
.../cloudstack/api/command/user/vm/StartVMCmd.java | 14 +-
.../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/EC2RestServlet.java | 104 ++++-
.../cloud/bridge/service/EC2SoapServiceImpl.java | 176 +++++---
.../bridge/service/core/ec2/EC2DescribeImages.java | 10 +
.../cloud/bridge/service/core/ec2/EC2Engine.java | 53 ++-
.../cloud/bridge/service/core/ec2/EC2Image.java | 63 ++-
.../bridge/service/core/ec2/EC2ImageFilterSet.java | 168 +++++++
client/tomcatconf/applicationContext.xml.in | 2 +
client/tomcatconf/commands.properties.in | 6 +
.../storage/CreateEntityDownloadURLCommand.java | 1 -
.../src/com/cloud/network/DnsMasqConfigurator.java | 2 +-
debian/rules | 2 +
.../subsystem/api/storage/AbstractScope.java | 6 +-
.../cloud/entity/api/VMEntityManagerImpl.java | 18 +-
.../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 +
.../affinity/HostAntiAffinityProcessor.java | 31 +-
.../kvm/resource/LibvirtDomainXMLParser.java | 57 ++-
.../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 | 97 +++--
.../xen/resource/CitrixResourceBaseTest.java | 5 +-
.../cloud/network/element/MidoNetElementTest.java | 3 +-
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 +++-
.../com/cloud/capacity/CapacityManagerImpl.java | 20 +-
.../configuration/ConfigurationManagerImpl.java | 165 +++++++-
.../com/cloud/hypervisor/HypervisorGuruBase.java | 6 +-
server/src/com/cloud/network/NetworkManager.java | 43 ++-
.../src/com/cloud/network/NetworkManagerImpl.java | 334 +++++++++++++-
.../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 | 32 +-
.../com/cloud/network/rules/RulesManagerImpl.java | 43 ++
.../cloud/network/vpc/NetworkACLServiceImpl.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 | 17 +
server/src/com/cloud/user/DomainManagerImpl.java | 15 +-
server/src/com/cloud/vm/UserVmManager.java | 1 +
server/src/com/cloud/vm/UserVmManagerImpl.java | 22 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 47 ++-
.../com/cloud/vm/VirtualMachineProfileImpl.java | 34 +-
.../affinity/AffinityGroupServiceImpl.java | 9 +
.../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 +
setup/db/db/schema-410to420.sql | 41 ++
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 +-
.../smoke/test_deploy_vm_with_userdata.py | 8 +-
test/integration/smoke/test_iso.py | 10 +-
test/integration/smoke/test_portable_publicip.py | 236 +++++++++
test/integration/smoke/test_public_ip_range.py | 6 +-
test/integration/smoke/test_templates.py | 11 +-
test/integration/smoke/test_vm_life_cycle.py | 145 +++---
tools/apidoc/gen_toc.py | 1 +
tools/marvin/marvin/integration/lib/base.py | 36 ++
utils/src/com/cloud/utils/net/NetUtils.java | 13 +
129 files changed, 5338 insertions(+), 1159 deletions(-)
----------------------------------------------------------------------