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 2582910F41 for ; Tue, 23 Jul 2013 18:42:39 +0000 (UTC) Received: (qmail 97413 invoked by uid 500); 23 Jul 2013 18:42:39 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 97220 invoked by uid 500); 23 Jul 2013 18:42:38 -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 97209 invoked by uid 99); 23 Jul 2013 18:42:38 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Jul 2013 18:42:38 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4F26A8B23EF; Tue, 23 Jul 2013 18:42:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ilya@apache.org To: commits@cloudstack.apache.org Date: Tue, 23 Jul 2013 18:42:39 -0000 Message-Id: <8f2543d33b244a4d93a47bf8ed82adb6@git.apache.org> In-Reply-To: <805955efcd994692a7a4fbb40f84ee22@git.apache.org> References: <805955efcd994692a7a4fbb40f84ee22@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: updated refs/heads/master to cfad797 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cfad7975 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cfad7975 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cfad7975 Branch: refs/heads/master Commit: cfad7975f6b4fdfc3893cce325bb8a86de249856 Parents: 47e346a c02e802 Author: ilya musayev Authored: Tue Jul 23 14:42:02 2013 -0400 Committer: ilya musayev Committed: Tue Jul 23 14:42:02 2013 -0400 ---------------------------------------------------------------------- api/src/com/cloud/agent/api/to/S3TO.java | 10 +- .../agent/manager/allocator/HostAllocator.java | 6 +- .../cloud/deploy/DeploymentClusterPlanner.java | 6 +- api/src/com/cloud/deploy/DeploymentPlanner.java | 7 +- api/src/com/cloud/ha/FenceBuilder.java | 31 + api/src/com/cloud/ha/Investigator.java | 33 + .../com/cloud/hypervisor/HypervisorGuru.java | 2 +- .../network/NetworkMigrationResponder.java | 6 +- api/src/com/cloud/network/Networks.java | 81 +- .../network/element/DhcpServiceProvider.java | 4 +- .../cloud/network/element/NetworkElement.java | 4 +- .../element/UserDataServiceProvider.java | 8 +- api/src/com/cloud/network/guru/NetworkGuru.java | 8 +- api/src/com/cloud/vm/VirtualMachine.java | 71 +- api/src/com/cloud/vm/VirtualMachineProfile.java | 8 +- .../affinity/AffinityGroupProcessor.java | 5 +- .../affinity/AffinityProcessorBase.java | 5 +- .../user/resource/ListResourceLimitsCmd.java | 19 +- .../apache/cloudstack/context/CallContext.java | 14 +- api/test/com/cloud/network/NetworksTest.java | 76 ++ docs/en-US/changed-API-commands-4.2.xml | 1134 +++++++++++++++++- docs/en-US/gsoc-midsummer-ian.xml | 319 ++++- docs/en-US/gsoc-midsummer.xml | 4 +- .../images/add-ldap-configuration-failure.png | Bin 0 -> 27841 bytes docs/en-US/images/add-ldap-configuration.png | Bin 0 -> 27393 bytes .../delete-ldap-configuration-failure.png | Bin 0 -> 29262 bytes docs/en-US/images/delete-ldap.png | Bin 0 -> 27832 bytes docs/en-US/images/jenkins-pipeline.png | Bin 0 -> 29136 bytes docs/en-US/images/ldap-account-addition.png | Bin 0 -> 69225 bytes docs/en-US/images/ldap-configuration.png | Bin 0 -> 33360 bytes docs/en-US/images/ldap-global-settings.png | Bin 0 -> 31145 bytes docs/en-US/images/ldap-list-users.png | Bin 0 -> 56047 bytes docs/en-US/images/list-ldap-configuration.png | Bin 0 -> 30977 bytes docs/en-US/removed-api-4.2.xml | 144 +++ docs/en-US/whats-new.xml | 2 + .../api/storage/StoragePoolAllocator.java | 3 +- .../cloud/entity/api/VMEntityManagerImpl.java | 32 +- .../com/cloud/offerings/NetworkOfferingVO.java | 4 + .../com/cloud/upgrade/dao/Upgrade410to420.java | 44 +- .../src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 4 + .../motion/AncientDataMotionStrategy.java | 34 +- .../storage/image/TemplateDataFactoryImpl.java | 9 +- .../allocator/AbstractStoragePoolAllocator.java | 10 +- .../ClusterScopeStoragePoolAllocator.java | 10 +- .../GarbageCollectingStoragePoolAllocator.java | 2 +- .../allocator/LocalStoragePoolAllocator.java | 2 +- .../allocator/UseLocalForRootAllocator.java | 2 +- .../allocator/ZoneWideStoragePoolAllocator.java | 2 +- .../endpoint/DefaultEndPointSelector.java | 3 +- .../storage/volume/VolumeServiceImpl.java | 9 +- .../debian/config/opt/cloud/bin/vpc_ipassoc.sh | 3 +- .../affinity/ExplicitDedicationProcessor.java | 5 +- .../affinity/HostAntiAffinityProcessor.java | 4 +- .../cloud/deploy/ImplicitDedicationPlanner.java | 4 +- .../implicitplanner/ImplicitPlannerTest.java | 16 +- .../deploy/UserConcentratedPodPlanner.java | 4 +- .../com/cloud/deploy/UserDispersingPlanner.java | 4 +- .../manager/allocator/impl/RandomAllocator.java | 6 +- .../cloud/baremetal/manager/BareMetalGuru.java | 11 +- .../baremetal/manager/BareMetalPlanner.java | 16 +- .../BareMetalPingServiceImpl.java | 20 +- .../networkservice/BaremetaNetworkGuru.java | 4 +- .../networkservice/BaremetalDhcpElement.java | 8 +- .../networkservice/BaremetalDhcpManager.java | 2 +- .../BaremetalDhcpManagerImpl.java | 2 +- .../BaremetalKickStartServiceImpl.java | 10 +- .../networkservice/BaremetalPxeElement.java | 4 +- .../networkservice/BaremetalPxeManager.java | 11 +- .../networkservice/BaremetalPxeManagerImpl.java | 13 +- .../networkservice/BaremetalPxeService.java | 14 +- .../BaremetalUserdataElement.java | 14 +- .../src/com/cloud/ovm/hypervisor/OvmFencer.java | 7 +- .../src/com/cloud/ovm/hypervisor/OvmGuru.java | 6 +- .../src/com/cloud/simulator/SimulatorGuru.java | 9 +- .../com/cloud/ucs/database/UcsManagerVO.java | 13 +- .../com/cloud/ucs/manager/UcsManagerImpl.java | 86 +- .../cloudstack/api/ListUcsManagerCmd.java | 3 +- .../vmware/src/com/cloud/ha/VmwareFencer.java | 11 +- .../src/com/cloud/ha/VmwareInvestigator.java | 10 +- .../com/cloud/hypervisor/guru/VMwareGuru.java | 2 +- .../vmware/resource/VmwareResource.java | 233 ++-- .../network/element/CiscoNexusVSMElement.java | 4 +- .../xen/src/com/cloud/ha/XenServerFencer.java | 7 +- .../src/com/cloud/hypervisor/XenServerGuru.java | 6 +- .../xen/discoverer/XcpServerDiscoverer.java | 2 +- .../xen/resource/CitrixResourceBase.java | 79 -- .../network/element/BigSwitchVnsElement.java | 4 +- .../guru/BigSwitchVnsGuestNetworkGuru.java | 4 +- .../cloud/network/element/CiscoVnmcElement.java | 4 +- .../cloudstack/network/element/DnsNotifier.java | 4 +- .../element/ElasticLoadBalancerElement.java | 4 +- .../lb/ElasticLoadBalancerManagerImpl.java | 48 +- .../element/F5ExternalLoadBalancerElement.java | 4 +- .../element/InternalLoadBalancerElement.java | 4 +- .../lb/InternalLoadBalancerVMManagerImpl.java | 56 +- .../InternalLBVMServiceTest.java | 30 - .../JuniperSRXExternalFirewallElement.java | 4 +- .../cloud/network/element/MidoNetElement.java | 8 +- .../network/guru/MidoNetGuestNetworkGuru.java | 4 +- .../network/guru/MidoNetPublicNetworkGuru.java | 10 +- .../network/element/MidoNetElementTest.java | 4 +- .../cloud/network/element/NetscalerElement.java | 4 +- .../cloud/network/element/NiciraNvpElement.java | 4 +- .../network/guru/NiciraNvpGuestNetworkGuru.java | 4 +- .../com/cloud/network/element/OvsElement.java | 4 +- .../com/cloud/network/ovs/OvsTunnelManager.java | 2 +- .../cloud/network/ovs/OvsTunnelManagerImpl.java | 2 +- .../cloudstack/network/element/SspElement.java | 10 +- .../network/guru/SspGuestNetworkGuru.java | 10 +- .../allocator/RandomStoragePoolAllocator.java | 2 +- .../com/cloud/agent/manager/AgentAttache.java | 12 - .../cloud/agent/manager/AgentManagerImpl.java | 4 +- .../allocator/impl/FirstFitAllocator.java | 6 +- .../impl/FirstFitRoutingAllocator.java | 2 +- .../allocator/impl/RecreateHostAllocator.java | 2 +- .../allocator/impl/TestingAllocator.java | 6 +- .../src/com/cloud/alert/AlertManagerImpl.java | 29 +- server/src/com/cloud/api/ApiServer.java | 63 +- server/src/com/cloud/api/ApiServlet.java | 17 +- .../com/cloud/api/query/QueryManagerImpl.java | 24 +- .../cloud/api/query/dao/VolumeJoinDaoImpl.java | 4 +- .../com/cloud/api/query/vo/VolumeJoinVO.java | 34 +- server/src/com/cloud/configuration/Config.java | 5 +- .../configuration/ConfigurationManagerImpl.java | 115 +- .../consoleproxy/ConsoleProxyManagerImpl.java | 49 +- .../cloud/deploy/DeploymentPlanningManager.java | 5 +- .../deploy/DeploymentPlanningManagerImpl.java | 14 +- .../src/com/cloud/deploy/FirstFitPlanner.java | 20 +- .../deploy/dao/PlannerHostReservationDao.java | 2 + .../dao/PlannerHostReservationDaoImpl.java | 15 +- .../com/cloud/ha/CheckOnAgentInvestigator.java | 8 +- server/src/com/cloud/ha/FenceBuilder.java | 31 - .../cloud/ha/HighAvailabilityManagerImpl.java | 171 +-- server/src/com/cloud/ha/Investigator.java | 33 - server/src/com/cloud/ha/KVMFencer.java | 6 +- .../ha/ManagementIPSystemVMInvestigator.java | 12 +- server/src/com/cloud/ha/RecreatableFencer.java | 8 +- .../com/cloud/ha/UserVmDomRInvestigator.java | 9 +- .../src/com/cloud/ha/XenServerInvestigator.java | 9 +- .../cloud/hypervisor/HypervisorGuruBase.java | 2 +- server/src/com/cloud/hypervisor/KVMGuru.java | 4 +- server/src/com/cloud/hypervisor/LXCGuru.java | 4 +- .../src/com/cloud/network/NetworkManager.java | 49 +- .../com/cloud/network/NetworkManagerImpl.java | 43 +- .../com/cloud/network/NetworkServiceImpl.java | 7 +- .../element/CloudZonesNetworkElement.java | 31 +- .../network/element/SecurityGroupElement.java | 4 +- .../network/element/VirtualRouterElement.java | 36 +- .../element/VpcVirtualRouterElement.java | 2 +- .../cloud/network/guru/ControlNetworkGuru.java | 8 +- .../cloud/network/guru/DirectNetworkGuru.java | 10 +- .../network/guru/DirectPodBasedNetworkGuru.java | 6 +- .../network/guru/ExternalGuestNetworkGuru.java | 8 +- .../cloud/network/guru/GuestNetworkGuru.java | 8 +- .../cloud/network/guru/PodBasedNetworkGuru.java | 8 +- .../cloud/network/guru/PrivateNetworkGuru.java | 8 +- .../cloud/network/guru/PublicNetworkGuru.java | 10 +- .../cloud/network/guru/StorageNetworkGuru.java | 8 +- .../router/VirtualNetworkApplianceManager.java | 12 +- .../VirtualNetworkApplianceManagerImpl.java | 145 +-- .../VpcVirtualNetworkApplianceManagerImpl.java | 88 +- .../com/cloud/resource/ResourceManagerImpl.java | 14 +- .../cloud/server/ConfigurationServerImpl.java | 4 +- .../com/cloud/server/ManagementServerImpl.java | 102 +- .../com/cloud/servlet/ConsoleProxyServlet.java | 28 +- .../com/cloud/storage/StorageManagerImpl.java | 2 +- .../storage/StoragePoolAutomationImpl.java | 209 +--- server/src/com/cloud/storage/VolumeManager.java | 13 +- .../com/cloud/storage/VolumeManagerImpl.java | 31 +- .../storage/download/DownloadMonitorImpl.java | 9 + .../secondary/SecondaryStorageManagerImpl.java | 52 +- .../storage/snapshot/SnapshotManagerImpl.java | 6 + .../src/com/cloud/user/AccountManagerImpl.java | 6 +- .../src/com/cloud/vm/SystemVmLoadScanner.java | 7 +- server/src/com/cloud/vm/UserVmManager.java | 8 +- server/src/com/cloud/vm/UserVmManagerImpl.java | 301 ++++- server/src/com/cloud/vm/VirtualMachineGuru.java | 19 +- .../src/com/cloud/vm/VirtualMachineManager.java | 24 +- .../com/cloud/vm/VirtualMachineManagerImpl.java | 292 +++-- .../com/cloud/vm/VirtualMachineProfileImpl.java | 20 +- .../vm/snapshot/VMSnapshotManagerImpl.java | 39 +- .../cloud/network/MockNetworkManagerImpl.java | 962 --------------- ...cVirtualNetworkApplianceManagerImplTest.java | 121 -- server/test/com/cloud/vm/UserVmManagerTest.java | 6 - .../cloud/vm/VirtualMachineManagerImplTest.java | 6 +- .../com/cloud/vpc/MockNetworkManagerImpl.java | 62 +- .../MockVpcVirtualNetworkApplianceManager.java | 12 +- server/test/resources/VpcVirtNetAppContext.xml | 41 - .../resource/NfsSecondaryStorageResource.java | 158 +-- setup/db/db/schema-410to420.sql | 127 +- test/integration/component/test_accounts.py | 43 +- .../component/test_netscaler_nw_off.py | 96 +- .../component/test_project_configs.py | 6 +- .../integration/component/test_project_usage.py | 5 +- .../component/test_shared_networks.py | 126 +- test/integration/component/test_snapshots.py | 12 +- test/integration/component/test_tags.py | 12 +- test/integration/component/test_vpc.py | 385 +++--- test/integration/component/test_vpc_network.py | 11 +- .../component/test_vpc_network_lbrules.py | 17 +- .../component/test_vpc_network_pfrules.py | 101 +- .../component/test_vpc_network_staticnatrule.py | 20 +- .../component/test_vpc_vms_deployment.py | 14 +- test/integration/smoke/test_loadbalance.py | 54 +- test/integration/smoke/test_vm_snapshots.py | 2 +- tools/devcloud-kvm/devcloud-kvm-advanced.cfg | 3 +- tools/devcloud-kvm/devcloud-kvm.cfg | 3 +- tools/marvin/marvin/cloudstackTestCase.py | 16 - tools/marvin/marvin/cloudstackTestClient.py | 17 +- tools/marvin/marvin/codegenerator.py | 40 +- tools/marvin/marvin/integration/lib/base.py | 184 ++- tools/marvin/marvin/integration/lib/utils.py | 7 +- tools/marvin/marvin/marvinPlugin.py | 16 +- ui/css/cloudstack3.css | 13 +- ui/scripts/autoscaler.js | 32 +- ui/scripts/instances.js | 8 +- ui/scripts/storage.js | 15 +- ui/scripts/system.js | 158 +-- ui/scripts/ui-custom/installWizard.js | 10 + ui/scripts/ui/widgets/listView.js | 22 +- utils/src/com/cloud/utils/StringUtils.java | 16 +- utils/test/com/cloud/utils/StringUtilsTest.java | 104 +- 222 files changed, 4591 insertions(+), 3938 deletions(-) ----------------------------------------------------------------------