Merge branch 'master' into scaleupvm
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2423d4a5 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2423d4a5 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2423d4a5 Branch: refs/heads/scaleupvm Commit: 2423d4a579f3b2d51ee254909cac493338219f1f Parents: 5b2f57c 359b931 Author: Nitin Mehta <nitin.me...@citrix.com> Authored: Wed Mar 27 16:33:42 2013 +0530 Committer: Nitin Mehta <nitin.me...@citrix.com> Committed: Wed Mar 27 16:33:42 2013 +0530 ---------------------------------------------------------------------- CHANGES | 2 +- INSTALL.md | 4 +- LICENSE | 2 +- README.md | 10 +- README.tools.md | 2 +- .../api/routing/HealthCheckLBConfigAnswer.java | 42 + .../api/routing/HealthCheckLBConfigCommand.java | 39 + api/src/com/cloud/agent/api/to/LoadBalancerTO.java | 114 ++- api/src/com/cloud/event/EventTypes.java | 2 + api/src/com/cloud/network/Network.java | 3 + api/src/com/cloud/network/NetworkModel.java | 2 + .../element/LoadBalancingServiceProvider.java | 8 +- .../com/cloud/network/lb/LoadBalancingRule.java | 92 ++- .../network/lb/LoadBalancingRulesService.java | 32 +- .../com/cloud/network/rules/HealthCheckPolicy.java | 45 + .../cloud/storage/DataStoreProviderApiService.java | 28 + api/src/com/cloud/storage/StoragePool.java | 2 +- .../org/apache/cloudstack/api/ApiConstants.java | 5 + api/src/org/apache/cloudstack/api/BaseCmd.java | 2 + .../apache/cloudstack/api/ResponseGenerator.java | 7 + .../api/command/admin/region/RemoveRegionCmd.java | 2 +- .../admin/storage/CreateStoragePoolCmd.java | 8 +- .../admin/storage/ListStorageProvidersCmd.java | 72 ++ .../api/command/admin/vm/AssignVMCmd.java | 8 +- .../loadbalancer/CreateLBHealthCheckPolicyCmd.java | 168 +++ .../loadbalancer/DeleteLBHealthCheckPolicyCmd.java | 116 ++ .../loadbalancer/ListLBHealthCheckPoliciesCmd.java | 85 ++ .../api/response/LBHealthCheckPolicyResponse.java | 98 ++ .../api/response/LBHealthCheckResponse.java | 102 ++ .../api/response/StorageProviderResponse.java | 62 + .../cloudstack/api/response/VpnUsersResponse.java | 10 + .../api/agent/test/BackupSnapshotCommandTest.java | 2 +- .../api/agent/test/SnapshotCommandTest.java | 2 +- .../agent/api/test/ResizeVolumeCommandTest.java | 2 +- awsapi-setup/setup/cloud-setup-bridge | 2 +- .../util/EncryptionSecretKeyCheckerUtil.java | 2 +- .../WEB-INF/classes/resources/messages.properties | 1 + client/pom.xml | 31 +- client/tomcatconf/commands.properties.in | 4 + client/tomcatconf/componentContext.xml.in | 35 +- client/tomcatconf/log4j-cloud.xml.in | 25 + client/tomcatconf/nonossComponentContext.xml.in | 21 +- core/src/com/cloud/alert/AlertManager.java | 41 +- debian/cloudstack-agent.install | 4 +- debian/cloudstack-management.install | 2 + debian/cloudstack-management.postinst | 19 +- debian/rules | 9 +- developer/pom.xml | 240 +++-- docs/en-US/Installation_Guide.xml | 1 + docs/en-US/Release_Notes.xml | 4 +- docs/en-US/about-password-encryption.xml | 2 +- docs/en-US/about-regions.xml | 49 + docs/en-US/about-zones.xml | 10 +- docs/en-US/added-API-commands-4-1.xml | 7 +- docs/en-US/api-calls.xml | 3 +- docs/en-US/api-reference.xml | 2 +- docs/en-US/api-throttling.xml | 67 + docs/en-US/aws-ec2-user-setup.xml | 2 +- docs/en-US/best-practices.xml | 82 ++ docs/en-US/building-with-maven-steps.xml | 2 +- docs/en-US/castor-with-cs.xml | 3 +- docs/en-US/changed-apicommands-4.1.xml | 157 +++- docs/en-US/cloud-infrastructure-concepts.xml | 3 +- docs/en-US/cloudmonkey.xml | 84 +- docs/en-US/configure-package-repository.xml | 2 +- docs/en-US/extracting-source.xml | 4 +- docs/en-US/feature-overview.xml | 4 +- docs/en-US/getting-release.xml | 3 +- .../en-US/guest-nw-usage-with-traffic-sentinel.xml | 7 +- docs/en-US/images/region-overview.png | Bin 0 -> 22835 bytes docs/en-US/ip-forwarding-firewalling.xml | 8 +- docs/en-US/ipv6-support.xml | 191 +++ .../en-US/management-server-install-multi-node.xml | 3 +- docs/en-US/management-server-lb.xml | 7 +- docs/en-US/provisioning-steps-overview.xml | 13 +- docs/en-US/provisioning-steps.xml | 3 +- docs/en-US/region-add.xml | 128 ++ docs/en-US/response-formats.xml | 2 + docs/en-US/sys-reliability-and-ha.xml | 4 +- docs/en-US/whats-new.xml | 3 +- .../datacenter/entity/api/StorageEntity.java | 1 + .../subsystem/api/storage/AbstractScope.java | 30 + .../engine/subsystem/api/storage/ClusterScope.java | 2 +- .../subsystem/api/storage/DataStoreLifeCycle.java | 6 +- .../subsystem/api/storage/DataStoreProvider.java | 13 +- .../api/storage/DataStoreProviderManager.java | 6 +- .../engine/subsystem/api/storage/HostScope.java | 2 +- .../api/storage/ImageDataStoreProvider.java | 24 + .../api/storage/PrimaryDataStoreParameters.java | 220 ++++ .../api/storage/PrimaryDataStoreProvider.java | 4 + .../engine/subsystem/api/storage/Scope.java | 1 + .../engine/subsystem/api/storage/ZoneScope.java | 2 +- .../storage/datastore/db/StoragePoolVO.java | 12 +- .../engine/subsystem/api/storage/ScopeTest.java | 59 + .../image/manager/ImageDataStoreManagerImpl.java | 14 +- .../image/store/AncientImageDataStoreProvider.java | 47 +- .../image/store/DefaultImageDataStoreImpl.java | 2 +- .../image/store/DefaultImageDataStoreProvider.java | 35 +- .../lifecycle/DefaultImageDataStoreLifeCycle.java | 11 +- .../storage/allocator/StorageAllocatorTest.java | 4 +- .../cloudstack/storage/test/volumeServiceTest.java | 12 +- .../datastore/PrimaryDataStoreEntityImpl.java | 8 +- .../datastore/PrimaryDataStoreProviderManager.java | 4 +- .../provider/DataStoreProviderManagerImpl.java | 108 +- .../datastore/provider/ImageDataStoreProvider.java | 25 - .../provider/PrimaryDataStoreProvider.java | 23 - .../image/datastore/ImageDataStoreHelper.java | 4 +- .../storage/image/db/ImageDataStoreVO.java | 12 +- .../volume/datastore/PrimaryDataStoreHelper.java | 172 +++- .../storage/datastore/DefaultPrimaryDataStore.java | 19 +- .../driver/AncientPrimaryDataStoreDriverImpl.java | 362 ------ .../AncientPrimaryDataStoreLifeCycleImpl.java | 963 --------------- .../DefaultPrimaryDataStoreLifeCycleImpl.java | 18 +- ...DefaultPrimaryDataStoreProviderManagerImpl.java | 16 +- .../AncientPrimaryDataStoreProviderImpl.java | 78 -- .../DefaultPrimaryDatastoreProviderImpl.java | 32 +- .../storage/volume/test/ConfiguratorTest.java | 2 +- packaging/centos63/cloud.spec | 50 +- packaging/centos63/cloudstack-agent.te | 33 + packaging/centos63/package.sh | 140 ++- packaging/debian/init/cloud-management | 8 +- packaging/debian/replace.properties | 2 +- .../debian/config/etc/init.d/cloud-early-config | 23 +- plugins/alert-handlers/snmp-alerts/pom.xml | 45 + .../cloudstack/alert/snmp/CsSnmpConstants.java | 45 + .../alert/snmp/SnmpEnhancedPatternLayout.java | 107 ++ .../apache/cloudstack/alert/snmp/SnmpHelper.java | 106 ++ .../cloudstack/alert/snmp/SnmpTrapAppender.java | 207 +++ .../apache/cloudstack/alert/snmp/SnmpTrapInfo.java | 90 ++ .../alert/snmp/SnmpEnhancedPatternLayoutTest.java | 90 ++ .../alert/snmp/SnmpTrapAppenderTest.java | 86 ++ .../resources/security_group_agent/setup.py | 2 +- .../kvm/resource/LibvirtComputingResource.java | 77 +- .../hypervisor/kvm/storage/KVMStoragePool.java | 2 + .../kvm/storage/LibvirtStorageAdaptor.java | 2 + .../hypervisor/kvm/storage/LibvirtStoragePool.java | 10 + .../kvm/resource/LibvirtComputingResourceTest.java | 14 +- .../resource/SimulatorSecondaryDiscoverer.java | 2 +- .../vmware/manager/VmwareStorageManagerImpl.java | 13 +- .../dns-notifier/resources/components-example.xml | 2 + .../element/ElasticLoadBalancerElement.java | 7 + .../network/lb/ElasticLoadBalancerManagerImpl.java | 9 +- .../element/F5ExternalLoadBalancerElement.java | 8 + .../cloud/network/element/NetscalerElement.java | 25 +- .../cloud/network/resource/NetscalerResource.java | 318 +++++- plugins/pom.xml | 2 + plugins/storage/volume/default/pom.xml | 56 + .../CloudStackPrimaryDataStoreDriverImpl.java | 362 ++++++ .../CloudStackPrimaryDataStoreLifeCycleImpl.java | 542 ++++++++ .../CloudStackPrimaryDataStoreProviderImpl.java | 80 ++ .../apache/cloudstack/storage/test/VolumeTest.java | 2 +- pom.xml | 171 +--- python/lib/cloudutils/serviceConfigServer.py | 4 +- python/lib/cloudutils/utilities.py | 2 +- server/src/com/cloud/alert/AlertManagerImpl.java | 6 + server/src/com/cloud/api/ApiResponseHelper.java | 62 + .../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 2 + .../src/com/cloud/api/query/vo/UserVmJoinVO.java | 13 + server/src/com/cloud/configuration/Config.java | 6 +- .../configuration/ConfigurationManagerImpl.java | 23 +- .../cloud/deploy/HypervisorVmPlannerSelector.java | 8 + .../com/cloud/event/ActionEventInterceptor.java | 15 +- .../network/ExternalFirewallDeviceManagerImpl.java | 48 +- .../network/ExternalLoadBalancerDeviceManager.java | 7 +- .../ExternalLoadBalancerDeviceManagerImpl.java | 137 ++- .../com/cloud/network/LBHealthCheckPolicyVO.java | 157 +++ server/src/com/cloud/network/NetworkManager.java | 3 + .../src/com/cloud/network/NetworkManagerImpl.java | 216 ++-- server/src/com/cloud/network/NetworkModelImpl.java | 32 +- .../src/com/cloud/network/NetworkServiceImpl.java | 5 + .../cloud/network/dao/LBHealthCheckPolicyDao.java | 35 + .../network/dao/LBHealthCheckPolicyDaoImpl.java | 71 ++ .../com/cloud/network/dao/LoadBalancerVMMapVO.java | 16 +- .../network/element/VirtualRouterElement.java | 10 +- .../network/element/VpcVirtualRouterElement.java | 4 +- .../com/cloud/network/guru/DirectNetworkGuru.java | 92 ++- .../network/guru/DirectPodBasedNetworkGuru.java | 37 +- .../com/cloud/network/lb/LBHealthCheckManager.java | 24 + .../cloud/network/lb/LBHealthCheckManagerImpl.java | 110 ++ .../network/lb/LoadBalancingRulesManager.java | 3 + .../network/lb/LoadBalancingRulesManagerImpl.java | 729 +++++++++--- .../router/VirtualNetworkApplianceManagerImpl.java | 44 +- .../network/vpn/RemoteAccessVpnManagerImpl.java | 4 +- .../com/cloud/server/ConfigurationServerImpl.java | 32 +- .../src/com/cloud/server/ManagementServerImpl.java | 21 +- server/src/com/cloud/server/StatsCollector.java | 12 + .../src/com/cloud/storage/StorageManagerImpl.java | 68 +- .../com/cloud/storage/StoragePoolAutomation.java | 26 + .../cloud/storage/StoragePoolAutomationImpl.java | 456 +++++++ .../src/com/cloud/storage/VolumeManagerImpl.java | 75 +- .../com/cloud/upgrade/DatabaseUpgradeChecker.java | 4 + .../src/com/cloud/upgrade/dao/Upgrade410to420.java | 38 + server/src/com/cloud/user/AccountManagerImpl.java | 11 +- server/src/com/cloud/vm/dao/NicDao.java | 3 + server/src/com/cloud/vm/dao/NicDaoImpl.java | 8 + .../com/cloud/network/MockNetworkManagerImpl.java | 7 + .../com/cloud/network/MockNetworkModelImpl.java | 9 +- .../test/com/cloud/vpc/MockNetworkManagerImpl.java | 13 + .../test/com/cloud/vpc/MockNetworkModelImpl.java | 9 +- .../networkoffering/ChildTestConfiguration.java | 333 +++++ .../networkoffering/CreateNetworkOfferingTest.java | 179 +++ server/test/resources/createNetworkOffering.xml | 44 + .../ConsoleProxyHttpHandlerHelper.java | 14 +- setup/db/db/schema-40to410.sql | 5 +- setup/db/db/schema-410to420.sql | 22 +- setup/db/templates.simulator.sql | 8 +- test/integration/component/test_project_usage.py | 2 +- test/integration/component/test_usage.py | 2 +- test/integration/component/test_volumes.py | 2 +- test/integration/smoke/test_iso.py | 4 +- test/integration/smoke/test_nic.py | 2 +- test/integration/smoke/test_vm_life_cycle.py | 2 +- tools/apidoc/gen_toc.py | 2 + tools/appliance/README.md | 4 +- tools/appliance/definitions/devcloud/base.sh | 12 + tools/appliance/definitions/devcloud/cleanup.sh | 21 + tools/appliance/definitions/devcloud/definition.rb | 45 + .../appliance/definitions/devcloud/postinstall.sh | 60 + tools/appliance/definitions/devcloud/preseed.cfg | 357 ++++++ tools/appliance/definitions/devcloud/zerodisk.sh | 11 + .../definitions/systemvmtemplate/postinstall.sh | 4 +- .../definitions/systemvmtemplate/zerodisk.sh | 2 +- .../definitions/systemvmtemplate64/postinstall.sh | 4 +- tools/cli/cloudmonkey/__init__.py | 4 +- tools/cli/cloudmonkey/cachemaker.py | 9 +- tools/cli/cloudmonkey/cloudmonkey.py | 48 +- tools/cli/cloudmonkey/config.py | 20 +- tools/cli/setup.py | 34 +- .../marvin/sandbox/demo/simulator/simulator.cfg | 4 +- tools/marvin/pom.xml | 219 ++-- ui/css/cloudstack3.css | 86 ++ ui/dictionary.jsp | 2 + ui/index.jsp | 1 + ui/scripts/accounts.js | 36 +- ui/scripts/cloud.core.callbacks.js | 25 +- ui/scripts/cloudStack.js | 20 +- ui/scripts/dashboard.js | 71 +- ui/scripts/instances.js | 7 +- ui/scripts/network.js | 11 + ui/scripts/regions.js | 65 +- ui/scripts/sharedFunctions.js | 37 +- ui/scripts/system.js | 65 +- ui/scripts/ui-custom/healthCheck.js | 342 +++++ ui/scripts/ui-custom/instanceWizard.js | 8 +- ui/scripts/ui-custom/login.js | 12 + ui/scripts/ui-custom/regions.js | 36 +- ui/scripts/ui/dialog.js | 46 +- ui/scripts/ui/widgets/listView.js | 32 +- ui/scripts/ui/widgets/toolTip.js | 2 +- ui/scripts/zoneWizard.js | 36 +- .../src/com/cloud/usage/UsageAlertManagerImpl.java | 13 +- .../src/com/cloud/utils/component/AdapterBase.java | 4 +- .../utils/component/ComponentMethodProxyCache.java | 90 ++ .../utils/component/SpringComponentScanUtils.java | 1 - .../utils/crypt/EncryptionSecretKeyChanger.java | 2 +- .../utils/crypt/EncryptionSecretKeyChecker.java | 2 +- .../cloud/utils/db/TransactionContextBuilder.java | 14 +- utils/src/com/cloud/utils/net/NetUtils.java | 2 +- 258 files changed, 9786 insertions(+), 3045 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2423d4a5/api/src/com/cloud/event/EventTypes.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2423d4a5/client/tomcatconf/commands.properties.in ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2423d4a5/server/src/com/cloud/configuration/Config.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2423d4a5/server/src/com/cloud/server/ManagementServerImpl.java ----------------------------------------------------------------------
