Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3BCC595B9 for ; Thu, 16 May 2013 17:12:27 +0000 (UTC) Received: (qmail 86754 invoked by uid 500); 16 May 2013 17:12:24 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 86690 invoked by uid 500); 16 May 2013 17:12:24 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 85591 invoked by uid 99); 16 May 2013 17:12:23 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 May 2013 17:12:23 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 48A8814DD2; Thu, 16 May 2013 17:12:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bfederle@apache.org To: commits@cloudstack.apache.org Date: Thu, 16 May 2013 17:13:00 -0000 Message-Id: <4c27e1ad5db645cd801420d83bb844da@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [39/39] git commit: updated refs/heads/ui-vpc-redesign to 8d9a8ca 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/8d9a8ca1 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8d9a8ca1 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8d9a8ca1 Branch: refs/heads/ui-vpc-redesign Commit: 8d9a8ca15ea827592f01d09d8ddc06aa3331ba5a Parents: eb34d91 d078f92 Author: Brian Federle Authored: Thu May 16 10:12:11 2013 -0700 Committer: Brian Federle Committed: Thu May 16 10:12:11 2013 -0700 ---------------------------------------------------------------------- api/src/com/cloud/agent/api/PvlanSetupCommand.java | 121 +++++++++++ api/src/com/cloud/event/EventTypes.java | 1 + api/src/com/cloud/host/Status.java | 1 + api/src/com/cloud/network/Networks.java | 1 + .../org/apache/cloudstack/api/ApiConstants.java | 1 + .../api/command/user/network/CreateNetworkCmd.java | 7 + .../ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java | 2 +- .../ha/gslb/CreateGlobalLoadBalancerRuleCmd.java | 8 +- .../ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java | 4 +- .../ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java | 28 +++- docs/en-US/build-rpm.xml | 8 +- docs/en-US/deployment-architecture-overview.xml | 2 +- docs/en-US/event-framework.xml | 2 +- docs/en-US/gslb.xml | 2 +- docs/en-US/ipv6-support.xml | 2 +- docs/en-US/vmware-cluster-config-dvswitch.xml | 2 +- .../entity/api/db/dao/HostDetailsDaoImpl.java | 43 +++-- .../src/com/cloud/host/dao/HostDetailsDaoImpl.java | 43 +++-- .../src/com/cloud/network/dao/NetworkDao.java | 2 + .../src/com/cloud/network/dao/NetworkDaoImpl.java | 13 ++ .../src/com/cloud/upgrade/dao/Upgrade410to420.java | 96 +++++++-- .../usage/dao/UsageNetworkOfferingDaoImpl.java | 8 +- .../debian/config/etc/init.d/cloud-early-config | 6 + .../kvm/resource/LibvirtComputingResource.java | 76 +++++++ .../hypervisor/kvm/resource/OvsVifDriver.java | 4 +- .../xen/resource/CitrixResourceBase.java | 59 ++++++- .../network/cisco/create-egress-acl-rule.xml | 10 +- .../create-generic-egress-acl-no-protocol-rule.xml | 10 +- .../cisco/create-generic-egress-acl-rule.xml | 10 +- .../cloud/network/cisco/CiscoVnmcConnection.java | 4 +- .../network/cisco/CiscoVnmcConnectionImpl.java | 12 +- .../cloud/network/resource/CiscoVnmcResource.java | 149 ++++++-------- .../cloud/network/element/NetscalerElement.java | 41 +++-- .../cloud/network/resource/NetscalerResource.java | 10 +- scripts/vm/hypervisor/xenserver/ovs-get-bridge.sh | 27 +++ .../vm/hypervisor/xenserver/ovs-get-dhcp-iface.sh | 25 +++ scripts/vm/hypervisor/xenserver/ovs-pvlan | 145 ++++++++++++++ scripts/vm/hypervisor/xenserver/xenserver60/patch | 7 +- scripts/vm/network/ovs-pvlan-cleanup.sh | 23 +++ scripts/vm/network/ovs-pvlan-dhcp-host.sh | 123 ++++++++++++ scripts/vm/network/ovs-pvlan-vm.sh | 99 +++++++++ server/src/com/cloud/api/ApiDBUtils.java | 5 + server/src/com/cloud/api/ApiDispatcher.java | 2 +- server/src/com/cloud/api/ApiResponseHelper.java | 3 +- .../src/com/cloud/api/query/QueryManagerImpl.java | 2 +- .../com/cloud/capacity/CapacityManagerImpl.java | 2 +- .../configuration/ConfigurationManagerImpl.java | 4 +- .../AgentBasedStandaloneConsoleProxyManager.java | 2 +- server/src/com/cloud/network/NetworkManager.java | 3 +- .../src/com/cloud/network/NetworkManagerImpl.java | 35 +++- .../src/com/cloud/network/NetworkServiceImpl.java | 23 ++- .../network/element/VirtualRouterElement.java | 3 +- .../network/guru/ExternalGuestNetworkGuru.java | 2 +- .../router/VirtualNetworkApplianceManager.java | 3 +- .../router/VirtualNetworkApplianceManagerImpl.java | 42 ++++- .../VpcVirtualNetworkApplianceManagerImpl.java | 14 +- .../cloud/network/vpc/NetworkACLServiceImpl.java | 4 +- server/src/com/cloud/network/vpc/VpcManager.java | 2 +- .../src/com/cloud/network/vpc/VpcManagerImpl.java | 14 +- .../src/com/cloud/server/ManagementServerImpl.java | 6 +- .../src/com/cloud/storage/StorageManagerImpl.java | 28 ++-- .../com/cloud/template/TemplateManagerImpl.java | 6 +- server/src/com/cloud/test/DatabaseConfig.java | 4 +- server/src/com/cloud/vm/UserVmManagerImpl.java | 73 +++++++- .../com/cloud/vm/VirtualMachineManagerImpl.java | 2 +- .../gslb/GlobalLoadBalancingRulesServiceImpl.java | 37 ++-- .../region/gslb/GslbServiceProvider.java | 8 +- .../com/cloud/network/MockNetworkManagerImpl.java | 2 +- .../test/com/cloud/vpc/MockNetworkManagerImpl.java | 3 +- server/test/com/cloud/vpc/MockVpcManagerImpl.java | 2 +- .../test/com/cloud/vpc/dao/MockNetworkDaoImpl.java | 5 + .../GlobalLoadBalancingRulesServiceImplTest.java | 3 + test/integration/component/test_accounts.py | 71 ++++---- test/integration/component/test_resource_limits.py | 154 +++++++------- test/integration/component/test_storage_motion.py | 6 + .../integration/component/test_vm_passwdenabled.py | 2 +- test/integration/smoke/test_pvlan.py | 86 ++++++++ tools/appliance/build.sh | 2 +- ui/scripts/system.js | 20 ++- utils/src/com/cloud/utils/net/NetUtils.java | 26 +++ utils/test/com/cloud/utils/net/NetUtilsTest.java | 8 + 81 files changed, 1544 insertions(+), 412 deletions(-) ----------------------------------------------------------------------