Merge branch 'master' into marvin-refactor
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/14c5369e Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/14c5369e Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/14c5369e Branch: refs/heads/marvin-refactor Commit: 14c5369ef800c40c8a230eaebd4f101b02b7955b Parents: b2704ab e1c72bc Author: Prasanna Santhanam <t...@apache.org> Authored: Mon Mar 18 16:12:58 2013 +0530 Committer: Prasanna Santhanam <t...@apache.org> Committed: Mon Mar 18 16:12:58 2013 +0530 ---------------------------------------------------------------------- .gitignore | 1 + LICENSE | 2 +- agent/src/com/cloud/agent/AgentShell.java | 20 +- .../consoleproxy/ConsoleProxyResource.java | 25 +- .../com/cloud/agent/api/BackupSnapshotCommand.java | 7 + .../com/cloud/agent/api/SecurityGroupRulesCmd.java | 37 + .../cloud/agent/api/routing/DhcpEntryCommand.java | 10 + .../api/routing/HealthCheckLBConfigAnswer.java | 42 + .../api/routing/HealthCheckLBConfigCommand.java | 39 + api/src/com/cloud/agent/api/to/LoadBalancerTO.java | 114 +- api/src/com/cloud/agent/api/to/NicTO.java | 11 + api/src/com/cloud/alert/Alert.java | 1 + api/src/com/cloud/domain/Domain.java | 1 - api/src/com/cloud/event/Event.java | 1 + api/src/com/cloud/event/EventTypes.java | 3 +- .../cloud/exception/PermissionDeniedException.java | 4 + .../com/cloud/exception/RequestLimitException.java | 3 +- api/src/com/cloud/network/Network.java | 2 +- api/src/com/cloud/network/NetworkModel.java | 2 + .../element/LoadBalancingServiceProvider.java | 8 +- .../com/cloud/network/lb/LoadBalancingRule.java | 84 +- .../network/lb/LoadBalancingRulesService.java | 32 +- .../com/cloud/network/rules/HealthCheckPolicy.java | 45 + .../network/security/SecurityGroupService.java | 4 +- api/src/com/cloud/server/ManagementService.java | 38 +- .../com/cloud/template/VirtualMachineTemplate.java | 1 + api/src/com/cloud/user/Account.java | 2 - api/src/com/cloud/user/AccountService.java | 4 +- api/src/com/cloud/user/DomainService.java | 2 +- api/src/com/cloud/user/User.java | 1 - api/src/com/cloud/vm/UserVmService.java | 19 +- api/src/com/cloud/vm/VirtualMachine.java | 11 +- api/src/org/apache/cloudstack/acl/APIChecker.java | 3 +- .../org/apache/cloudstack/api/ApiConstants.java | 6 + .../apache/cloudstack/api/ApiConstants.java.orig | 468 --- .../apache/cloudstack/api/ResponseGenerator.java | 7 + .../command/admin/account/CreateAccountCmd.java | 17 +- .../command/admin/account/DeleteAccountCmd.java | 4 +- .../command/admin/account/DisableAccountCmd.java | 2 +- .../command/admin/account/EnableAccountCmd.java | 3 +- .../command/admin/account/UpdateAccountCmd.java | 3 +- .../api/command/admin/domain/CreateDomainCmd.java | 9 +- .../api/command/admin/domain/DeleteDomainCmd.java | 2 +- .../api/command/admin/domain/UpdateDomainCmd.java | 4 +- .../api/command/admin/region/AddRegionCmd.java | 16 +- .../api/command/admin/region/UpdateRegionCmd.java | 15 +- .../command/admin/resource/ArchiveAlertsCmd.java | 100 + .../command/admin/resource/DeleteAlertsCmd.java | 99 + .../api/command/admin/user/CreateUserCmd.java | 9 +- .../api/command/admin/user/DeleteUserCmd.java | 6 +- .../api/command/admin/user/DisableUserCmd.java | 4 +- .../api/command/admin/user/EnableUserCmd.java | 4 +- .../api/command/admin/user/UpdateUserCmd.java | 4 +- .../api/command/admin/vm/AssignVMCmd.java | 8 +- .../command/user/config/ListCapabilitiesCmd.java | 8 +- .../api/command/user/event/ArchiveEventsCmd.java | 105 + .../api/command/user/event/DeleteEventsCmd.java | 105 + .../api/command/user/iso/ListIsosCmd.java | 15 +- .../loadbalancer/CreateLBHealthCheckPolicyCmd.java | 168 + .../loadbalancer/DeleteLBHealthCheckPolicyCmd.java | 116 + .../loadbalancer/ListLBHealthCheckPoliciesCmd.java | 85 + .../command/user/template/ListTemplatesCmd.java | 13 +- .../api/command/user/vm/AddIpToVmNicCmd.java | 31 +- .../api/command/user/vm/RemoveIpFromVmNicCmd.java | 69 +- .../cloudstack/api/command/user/vm/ScaleVMCmd.java | 109 - .../api/command/user/vm/UpgradeVMCmd.java | 4 +- .../api/response/DomainRouterResponse.java | 5 +- .../api/response/LBHealthCheckPolicyResponse.java | 98 + .../api/response/LBHealthCheckResponse.java | 102 + .../api/response/NicSecondaryIpResponse.java | 38 +- .../api/response/SecurityGroupResponse.java | 7 +- .../cloudstack/api/response/UserVmResponse.java | 7 +- .../cloudstack/api/response/VolumeResponse.java | 3 +- api/src/org/apache/cloudstack/region/Region.java | 3 - .../apache/cloudstack/region/RegionService.java | 132 +- .../api/agent/test/BackupSnapshotAnswerTest.java | 2 +- .../api/agent/test/BackupSnapshotCommandTest.java | 4 +- .../cloudstack/api/command/test/RegionCmdTest.java | 4 +- .../WEB-INF/classes/resources/messages.properties | 1 + .../classes/resources/messages_fr_FR.properties | 2446 +++++++-------- client/pom.xml | 4 + client/tomcatconf/applicationContext.xml.in | 7 +- client/tomcatconf/commands.properties.in | 14 +- client/tomcatconf/componentContext.xml.in | 11 +- client/tomcatconf/components-cloudzones.xml.in | 33 - client/tomcatconf/components-nonoss.xml.in | 97 - client/tomcatconf/components.xml.in | 306 -- client/tomcatconf/nonossComponentContext.xml.in | 10 +- .../api/NetworkRulesVmSecondaryIpCommand.java | 71 + .../virtualnetwork/VirtualRoutingResource.java | 52 +- core/src/com/cloud/alert/AlertVO.java | 38 +- core/src/com/cloud/event/EventVO.java | 167 +- core/src/com/cloud/event/dao/EventDao.java | 5 + core/src/com/cloud/event/dao/EventDaoImpl.java | 71 +- .../src/com/cloud/storage/StoragePoolDetailVO.java | 81 - core/src/com/cloud/user/AccountVO.java | 35 +- core/src/com/cloud/user/UserVO.java | 18 +- core/src/com/cloud/vm/VMInstanceVO.java | 26 +- debian/changelog | 6 + debian/cloudstack-agent.install | 1 + debian/cloudstack-agent.postinst | 40 + debian/cloudstack-management.install | 10 +- debian/cloudstack-management.postinst | 8 +- debian/cloudstack-usage.install | 3 +- debian/cloudstack-usage.postinst | 37 + debian/control | 2 +- debian/rules | 150 +- deps/install-non-oss.sh | 11 +- docs/en-US/Developers_Guide.xml | 2 +- docs/en-US/Release_Notes.xml | 4 +- docs/en-US/add-remove-nic.xml | 127 + docs/en-US/added-API-commands-4-1.xml | 28 + docs/en-US/advanced-zone-guest-ip-addresses.xml | 12 +- docs/en-US/autoscale.xml | 6 +- docs/en-US/build-deb.xml | 2 +- docs/en-US/build-rpm.xml | 146 +- docs/en-US/building-marvin.xml | 4 +- docs/en-US/cloudmonkey.xml | 264 ++ docs/en-US/devcloud-usage-mode.xml | 4 +- docs/en-US/getting-release.xml | 40 +- docs/en-US/globally-configured-limits.xml | 2 +- docs/en-US/guest-traffic.xml | 9 +- docs/en-US/networks.xml | 1 + docs/en-US/reserved-ip-addresses-non-csvms.xml | 163 + docs/en-US/source-prereqs.xml | 13 +- docs/en-US/source.xml | 18 +- docs/en-US/tools.xml | 1 + docs/en-US/verifying-source.xml | 2 +- docs/en-US/whats-new.xml | 1 + docs/en-US/working-with-snapshots.xml | 4 + docs/en-US/working-with-usage-data.xml | 1 + docs/pot/build-deb.pot | 2 +- .../storage/datastore/db/PrimaryDataStoreDao.java | 148 +- .../datastore/db/PrimaryDataStoreDaoImpl.java | 544 ++-- .../storage/datastore/db/StoragePoolDetailVO.java | 81 + .../datastore/db/StoragePoolDetailsDao.java | 28 + .../storage/datastore/db/StoragePoolVO.java | 9 +- .../cloud/entity/api/VMEntityManagerImpl.java | 4 +- .../cloud/entity/api/db/dao/VMEntityDaoImpl.java | 8 +- .../entity/api/db/dao/VMReservationDaoImpl.java | 2 +- .../platform/orchestration/CloudOrchestrator.java | 21 +- .../image/store/DefaultImageDataStoreImpl.java | 2 +- .../storage/image/store/TemplateObject.java | 2 +- .../storage/allocator/StorageAllocatorTest.java | 8 +- .../StorageAllocatorTestConfiguration.java | 12 +- .../storage/test/DirectAgentManagerSimpleImpl.java | 6 + .../storage/snapshot/SnapshotObject.java | 2 +- .../snapshot/strategy/AncientSnasphotStrategy.java | 4 +- .../allocator/AbstractStoragePoolAllocator.java | 4 +- .../allocator/ZoneWideStoragePoolAllocator.java | 4 +- .../storage/db/ObjectInDataStoreDaoImpl.java | 2 + .../storage/motion/AncientDataMotionStrategy.java | 4 +- .../storage/volume/db/VolumeDao2Impl.java | 5 +- .../storage/datastore/DefaultPrimaryDataStore.java | 2 +- .../AncientPrimaryDataStoreLifeCycleImpl.java | 2 +- .../storage/volume/VolumeEntityImpl.java | 2 +- .../cloudstack/storage/volume/VolumeObject.java | 2 +- .../storage/volume/VolumeServiceImpl.java | 1 - packaging/centos63/cloud-agent.rc | 98 +- packaging/centos63/cloud-ipallocator.rc | 2 +- packaging/centos63/cloud.spec | 45 +- packaging/centos63/cloudstack-agent.te | 33 + packaging/debian/init/cloud-agent | 8 +- packaging/debian/init/cloud-usage | 18 +- .../debian/config/etc/init.d/cloud-early-config | 36 +- .../debian/config/opt/cloud/bin/vpc_guestnw.sh | 12 + .../debian/config/opt/cloud/bin/vpc_ipassoc.sh | 12 + patches/systemvm/debian/config/root/edithosts.sh | 16 +- patches/systemvm/debian/config/root/func.sh | 7 +- .../config/root/redundant_router/backup.sh.templ | 1 + .../root/redundant_router/check_heartbeat.sh.templ | 2 +- .../discovery/ApiDiscoveryServiceImpl.java | 1 + .../command/admin/ratelimit/ResetApiLimitCmd.java | 9 + .../api/command/user/ratelimit/GetApiLimitCmd.java | 11 + .../cloudstack/ratelimit/ApiRateLimitService.java | 2 + .../ratelimit/ApiRateLimitServiceImpl.java | 21 +- .../cloudstack/ratelimit/ApiRateLimitTest.java | 25 + plugins/hypervisors/kvm/pom.xml | 6 - .../cloud/hypervisor/kvm/resource/KVMHABase.java | 6 +- .../kvm/resource/LibvirtComputingResource.java | 457 ++-- .../hypervisor/kvm/resource/LibvirtVMDef.java | 25 + .../hypervisor/kvm/resource/LibvirtXMLParser.java | 8 +- .../kvm/storage/LibvirtStorageAdaptor.java | 161 +- .../kvm/resource/LibvirtVifDriverTest.java | 226 ++ plugins/hypervisors/vmware/pom.xml | 12 - .../hypervisor/vmware/VmwareServerDiscoverer.java | 125 +- .../vmware/manager/VmwareManagerImpl.java | 57 +- .../vmware/manager/VmwareStorageManagerImpl.java | 359 ++-- .../vmware/resource/VmwareContextFactory.java | 12 +- .../hypervisor/vmware/resource/VmwareResource.java | 266 +- .../VmwareSecondaryStorageContextFactory.java | 31 +- .../VmwareSecondaryStorageResourceHandler.java | 18 +- .../hypervisor/xen/resource/CitrixHelper.java | 41 +- .../xen/resource/CitrixResourceBase.java | 215 +- .../xen/resource/XenServer56FP1Resource.java | 11 +- .../xen/resource/XenServer610Resource.java | 2 +- .../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 | 32 +- .../cloud/network/resource/NetscalerResource.java | 291 ++- pom.xml | 474 ++-- scripts/network/domr/dhcp_entry.sh | 6 +- scripts/storage/qcow2/resizevolume.sh | 4 +- scripts/vm/hypervisor/kvm/patchviasocket.pl | 58 + scripts/vm/hypervisor/kvm/rundomrpre.sh | 147 - .../xenserver/Add-To-VCPUs-Params-Live.sh | 33 - scripts/vm/hypervisor/xenserver/vmops | 212 ++- scripts/vm/hypervisor/xenserver/vmopsSnapshot | 29 +- .../vm/hypervisor/xenserver/xcposs/vmopsSnapshot | 27 +- scripts/vm/hypervisor/xenserver/xenheartbeat.sh | 33 +- scripts/vm/network/security_group.py | 175 +- server/conf/cloudstack-limits.conf.in | 21 + server/conf/cloudstack-sudoers.in | 22 + server/src/com/cloud/agent/AgentManager.java | 2 + .../com/cloud/agent/manager/AgentManagerImpl.java | 10 +- .../src/com/cloud/agent/manager/AgentMonitor.java | 9 +- .../cloud/agent/manager/AgentMonitorService.java | 28 + .../allocator/impl/RecreateHostAllocator.java | 4 +- server/src/com/cloud/alert/dao/AlertDao.java | 7 + server/src/com/cloud/alert/dao/AlertDaoImpl.java | 85 + server/src/com/cloud/api/ApiDBUtils.java | 5 +- server/src/com/cloud/api/ApiDispatcher.java | 14 +- server/src/com/cloud/api/ApiResponseHelper.java | 70 +- server/src/com/cloud/api/ApiServer.java | 64 +- server/src/com/cloud/api/ApiServerService.java | 37 + server/src/com/cloud/api/ApiServlet.java | 2 +- .../src/com/cloud/api/query/QueryManagerImpl.java | 17 +- .../api/query/dao/DomainRouterJoinDaoImpl.java | 23 + .../query/dao/ProjectInvitationJoinDaoImpl.java | 4 +- .../api/query/dao/UserAccountJoinDaoImpl.java | 9 +- server/src/com/cloud/api/query/vo/EventJoinVO.java | 9 + .../api/query/vo/ProjectInvitationJoinVO.java | 3 +- .../cloud/baremetal/BareMetalTemplateAdapter.java | 218 -- .../com/cloud/capacity/dao/CapacityDaoImpl.java | 4 +- .../src/com/cloud/cluster/ClusterManagerImpl.java | 5 +- server/src/com/cloud/configuration/Config.java | 11 +- .../configuration/ConfigurationManagerImpl.java | 19 +- .../configuration/dao/ConfigurationDaoImpl.java | 9 - .../configuration/dao/ResourceCountDaoImpl.java | 9 +- .../consoleproxy/ConsoleProxyManagerImpl.java | 4 +- server/src/com/cloud/dc/dao/DataCenterDaoImpl.java | 10 +- .../com/cloud/dc/dao/DataCenterIpAddressDao.java | 6 + .../dc/dao/DataCenterLinkLocalIpAddressDao.java | 32 + .../dao/DataCenterLinkLocalIpAddressDaoImpl.java | 2 +- server/src/com/cloud/dc/dao/DataCenterVnetDao.java | 38 + .../com/cloud/dc/dao/DataCenterVnetDaoImpl.java | 2 +- server/src/com/cloud/dc/dao/PodVlanDao.java | 30 + server/src/com/cloud/dc/dao/PodVlanDaoImpl.java | 2 +- .../deploy/AbstractDeployPlannerSelector.java | 14 +- server/src/com/cloud/deploy/FirstFitPlanner.java | 4 +- .../cloud/deploy/HypervisorVmPlannerSelector.java | 15 +- server/src/com/cloud/domain/DomainVO.java | 16 +- server/src/com/cloud/ha/RecreatableFencer.java | 8 +- .../com/cloud/hypervisor/HypervisorGuruBase.java | 12 +- .../network/ExternalLoadBalancerDeviceManager.java | 7 +- .../ExternalLoadBalancerDeviceManagerImpl.java | 107 +- .../com/cloud/network/LBHealthCheckPolicyVO.java | 157 + server/src/com/cloud/network/NetworkManager.java | 5 +- .../src/com/cloud/network/NetworkManagerImpl.java | 119 +- server/src/com/cloud/network/NetworkModelImpl.java | 30 +- .../src/com/cloud/network/NetworkServiceImpl.java | 126 +- .../cloud/network/dao/FirewallRulesDaoImpl.java | 5 +- server/src/com/cloud/network/dao/IPAddressDao.java | 2 + .../com/cloud/network/dao/IPAddressDaoImpl.java | 14 +- .../cloud/network/dao/LBHealthCheckPolicyDao.java | 35 + .../network/dao/LBHealthCheckPolicyDaoImpl.java | 71 + .../com/cloud/network/dao/LoadBalancerDaoImpl.java | 2 +- .../com/cloud/network/dao/LoadBalancerVMMapVO.java | 16 +- .../com/cloud/network/dao/NetworkAccountDao.java | 22 + .../cloud/network/dao/NetworkAccountDaoImpl.java | 2 +- .../src/com/cloud/network/dao/NetworkDaoImpl.java | 20 +- server/src/com/cloud/network/dao/NetworkOpDao.java | 26 + .../com/cloud/network/dao/NetworkOpDaoImpl.java | 2 +- .../cloud/network/dao/PhysicalNetworkDaoImpl.java | 2 +- .../com/cloud/network/dao/RouterNetworkDao.java | 26 + .../cloud/network/dao/RouterNetworkDaoImpl.java | 2 +- .../network/dao/Site2SiteVpnConnectionDaoImpl.java | 4 +- .../network/dao/Site2SiteVpnGatewayDaoImpl.java | 2 +- .../network/element/VirtualRouterElement.java | 10 +- .../com/cloud/network/guru/DirectNetworkGuru.java | 18 +- .../com/cloud/network/lb/LBHealthCheckManager.java | 24 + .../cloud/network/lb/LBHealthCheckManagerImpl.java | 110 + .../network/lb/LoadBalancingRulesManager.java | 2 + .../network/lb/LoadBalancingRulesManagerImpl.java | 678 ++++- .../router/VirtualNetworkApplianceManagerImpl.java | 47 +- .../rules/dao/PortForwardingRulesDaoImpl.java | 5 +- .../network/security/SecurityGroupManagerImpl.java | 93 +- .../security/SecurityGroupManagerImpl2.java | 13 +- .../network/security/dao/SecurityGroupDaoImpl.java | 3 +- .../src/com/cloud/network/vpc/VpcManagerImpl.java | 1 - .../cloud/network/vpc/dao/StaticRouteDaoImpl.java | 3 +- .../src/com/cloud/network/vpc/dao/VpcDaoImpl.java | 7 +- .../src/com/cloud/projects/ProjectManagerImpl.java | 3 +- .../src/com/cloud/projects/dao/ProjectDaoImpl.java | 3 +- .../com/cloud/resource/ResourceManagerImpl.java | 11 +- .../resourcelimit/ResourceLimitManagerImpl.java | 2 +- .../com/cloud/server/ConfigurationServerImpl.java | 53 +- .../src/com/cloud/server/ManagementServerImpl.java | 124 +- .../src/com/cloud/servlet/CloudStartupServlet.java | 17 +- .../cloud/storage/LocalStoragePoolListener.java | 4 +- server/src/com/cloud/storage/OCFS2ManagerImpl.java | 4 +- .../src/com/cloud/storage/StorageManagerImpl.java | 2 +- .../src/com/cloud/storage/VolumeManagerImpl.java | 12 +- .../src/com/cloud/storage/dao/SnapshotDaoImpl.java | 12 +- .../src/com/cloud/storage/dao/StoragePoolDao.java | 113 - .../com/cloud/storage/dao/StoragePoolDaoImpl.java | 432 --- .../cloud/storage/dao/StoragePoolDetailsDao.java | 28 - .../storage/dao/StoragePoolDetailsDaoImpl.java | 3 +- .../com/cloud/storage/dao/VMTemplateDaoImpl.java | 161 +- .../src/com/cloud/storage/dao/VolumeDaoImpl.java | 4 +- .../cloud/storage/listener/StoragePoolMonitor.java | 4 +- .../storage/snapshot/SnapshotManagerImpl.java | 4 +- .../cloud/template/HyervisorTemplateAdapter.java | 340 -- .../cloud/template/HypervisorTemplateAdapter.java | 339 ++ .../com/cloud/template/TemplateManagerImpl.java | 4 +- .../src/com/cloud/upgrade/dao/Upgrade40to41.java | 24 - server/src/com/cloud/user/AccountManager.java | 14 +- server/src/com/cloud/user/AccountManagerImpl.java | 64 +- server/src/com/cloud/user/DomainManager.java | 2 +- server/src/com/cloud/user/DomainManagerImpl.java | 31 +- server/src/com/cloud/user/dao/AccountDaoImpl.java | 90 +- server/src/com/cloud/vm/ItWorkVO.java | 3 +- server/src/com/cloud/vm/UserVmManagerImpl.java | 129 +- server/src/com/cloud/vm/VirtualMachineManager.java | 12 - .../com/cloud/vm/VirtualMachineManagerImpl.java | 312 +-- .../src/com/cloud/vm/dao/DomainRouterDaoImpl.java | 12 +- server/src/com/cloud/vm/dao/NicDao.java | 2 + server/src/com/cloud/vm/dao/NicDaoImpl.java | 9 + server/src/com/cloud/vm/dao/UserVmDaoImpl.java | 3 +- .../cloud/vm/snapshot/VMSnapshotManagerImpl.java | 4 +- .../apache/cloudstack/region/RegionManager.java | 100 +- .../cloudstack/region/RegionManagerImpl.java | 151 +- .../cloudstack/region/RegionServiceImpl.java | 80 +- .../src/org/apache/cloudstack/region/RegionVO.java | 27 +- .../apache/cloudstack/region/RegionsApiUtil.java | 306 ++ .../cloudstack/region/dao/RegionSyncDao.java | 24 - .../cloudstack/region/dao/RegionSyncDaoImpl.java | 35 - .../test/com/cloud/agent/MockAgentManagerImpl.java | 6 + .../com/cloud/alert/AlertControlsUnitTest.java | 83 + .../com/cloud/event/EventControlsUnitTest.java | 84 + .../com/cloud/network/MockNetworkManagerImpl.java | 18 +- .../com/cloud/network/MockNetworkModelImpl.java | 6 + .../com/cloud/storage/dao/StoragePoolDaoTest.java | 3 +- .../dao/StoragePoolDaoTestConfiguration.java | 3 +- .../com/cloud/user/MockAccountManagerImpl.java | 8 +- .../test/com/cloud/user/MockDomainManagerImpl.java | 4 +- .../test/com/cloud/vm/MockUserVmManagerImpl.java | 17 +- .../cloud/vm/MockVirtualMachineManagerImpl.java | 15 - .../UserVmCloneSettingDaoTestConfiguration.java | 2 +- .../cloud/vm/snapshot/VMSnapshotManagerTest.java | 4 +- .../test/com/cloud/vpc/MockNetworkManagerImpl.java | 29 +- .../test/com/cloud/vpc/MockNetworkModelImpl.java | 6 + .../cloudstack/region/RegionManagerTest.java | 22 +- .../src/com/cloud/consoleproxy/ConsoleProxy.java | 29 +- .../ConsoleProxyHttpHandlerHelper.java | 8 +- setup/bindir/cloud-setup-databases.in | 2 +- setup/db/db/schema-40to410.sql | 64 +- setup/db/db/schema-410to420.sql | 68 + test/integration/component/test_accounts.py | 5 +- .../component/test_allocation_states.py | 5 +- test/integration/component/test_blocker_bugs.py | 14 +- test/integration/component/test_egress_rules.py | 24 +- test/integration/component/test_eip_elb.py | 6 +- .../integration/component/test_network_offering.py | 10 +- test/integration/component/test_project_configs.py | 4 +- test/integration/component/test_project_limits.py | 8 +- .../component/test_project_resources.py | 16 +- test/integration/component/test_project_usage.py | 22 +- test/integration/component/test_projects.py | 4 +- test/integration/component/test_resource_limits.py | 10 +- test/integration/component/test_routers.py | 10 +- test/integration/component/test_security_groups.py | 16 +- test/integration/component/test_templates.py | 8 +- test/integration/component/test_usage.py | 22 +- test/integration/component/test_volumes.py | 14 +- tools/apidoc/gen_toc.py | 3 + tools/appliance/README.md | 8 +- tools/appliance/build.sh | 12 +- .../appliance/definitions/systemvmtemplate/base.sh | 2 +- .../definitions/systemvmtemplate/definition.rb | 6 +- .../definitions/systemvmtemplate/postinstall.sh | 2 + .../definitions/systemvmtemplate/zerodisk.sh | 3 +- .../definitions/systemvmtemplate64/base.sh | 25 + .../definitions/systemvmtemplate64/cleanup.sh | 21 + .../definitions/systemvmtemplate64/definition.rb | 45 + .../definitions/systemvmtemplate64/postinstall.sh | 220 ++ .../definitions/systemvmtemplate64/preseed.cfg | 357 +++ .../definitions/systemvmtemplate64/zerodisk.sh | 15 + tools/cli/cloudmonkey/cloudmonkey.py | 9 +- tools/cli/cloudmonkey/config.py | 1 + tools/eclipse/set-eclipse-profile.sh | 26 + ui/css/cloudstack3.css | 282 ++- ui/dictionary.jsp | 1 + ui/index.jsp | 1 + ui/scripts/dashboard.js | 75 +- ui/scripts/docs.js | 81 + ui/scripts/events.js | 314 ++ ui/scripts/globalSettings.js | 4 +- ui/scripts/installWizard.js | 4 +- ui/scripts/instanceWizard.js | 14 +- ui/scripts/instances.js | 9 + ui/scripts/network.js | 648 ++--- ui/scripts/system.js | 13 +- ui/scripts/ui-custom/dashboard.js | 8 +- ui/scripts/ui-custom/enableStaticNAT.js | 3 +- ui/scripts/ui-custom/healthCheck.js | 342 ++ ui/scripts/ui-custom/installWizard.js | 4 +- ui/scripts/ui-custom/instanceWizard.js | 27 +- ui/scripts/ui/widgets/detailView.js | 37 +- ui/scripts/ui/widgets/listView.js | 58 +- ui/scripts/ui/widgets/multiEdit.js | 12 +- ui/scripts/ui/widgets/toolTip.js | 2 +- usage/conf/db.properties.in | 29 + usage/pom.xml | 2 +- utils/src/com/cloud/utils/LogUtils.java | 3 +- .../src/com/cloud/utils/component/AdapterBase.java | 2 +- .../cloud/utils/component/ComponentContext.java | 66 +- utils/src/com/cloud/utils/db/GenericDao.java | 2 + utils/src/com/cloud/utils/db/GenericDaoBase.java | 46 +- utils/src/com/cloud/utils/db/QueryBuilder.java | 20 +- utils/src/com/cloud/utils/db/Transaction.java | 4 +- .../cloud/utils/db/TransactionContextBuilder.java | 30 +- .../utils/log/CglibThrowableRendererTest.java | 6 +- vmware-base/pom.xml | 12 - .../src/com/cloud/hypervisor/vmware/mo/BaseMO.java | 74 +- .../com/cloud/hypervisor/vmware/mo/ClusterMO.java | 318 +- .../vmware/mo/CustomFieldsManagerMO.java | 32 +- .../cloud/hypervisor/vmware/mo/DatacenterMO.java | 328 +- .../cloud/hypervisor/vmware/mo/DatastoreMO.java | 186 +- .../vmware/mo/DistributedVirtualSwitchMO.java | 12 +- .../vmware/mo/HostDatastoreBrowserMO.java | 58 +- .../vmware/mo/HostDatastoreSystemMO.java | 92 +- .../hypervisor/vmware/mo/HostFirewallSystemMO.java | 14 +- .../src/com/cloud/hypervisor/vmware/mo/HostMO.java | 486 ++-- .../cloud/hypervisor/vmware/mo/HttpNfcLeaseMO.java | 109 +- .../hypervisor/vmware/mo/HypervisorHostHelper.java | 285 +- .../com/cloud/hypervisor/vmware/mo/NetworkMO.java | 15 +- .../cloud/hypervisor/vmware/mo/PerfManagerMO.java | 85 +- .../src/com/cloud/hypervisor/vmware/mo/TaskMO.java | 24 +- .../hypervisor/vmware/mo/VirtualDiskManagerMO.java | 126 +- .../hypervisor/vmware/mo/VirtualMachineMO.java | 1276 ++++---- .../hypervisor/vmware/mo/VirtualSwitchType.java | 8 +- .../cloud/hypervisor/vmware/util/VmwareClient.java | 580 ++++ .../hypervisor/vmware/util/VmwareContext.java | 364 ++-- .../vmware/util/VmwareGuestOsMapper.java | 282 +- .../cloud/hypervisor/vmware/util/VmwareHelper.java | 269 +- .../vmware/mo/TestVmwareContextFactory.java | 14 +- .../cloud/hypervisor/vmware/mo/TestVmwareMO.java | 1 - vmware-base/test/com/cloud/vmware/TestVMWare.java | 7 +- 451 files changed, 16361 insertions(+), 10197 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/14c5369e/tools/apidoc/gen_toc.py ---------------------------------------------------------------------- diff --cc tools/apidoc/gen_toc.py index c127328,6292c53..3f2d576 --- a/tools/apidoc/gen_toc.py +++ b/tools/apidoc/gen_toc.py @@@ -131,8 -131,10 +131,11 @@@ known_categories = 'Counter': 'AutoScale', 'Condition': 'AutoScale', 'Api': 'API Discovery', + 'Simulator': 'Simulator', 'Region': 'Region', + 'addIpToNic': 'Nic', + 'removeIpFromNic': 'Nic', + 'listNics':'Nic', }
