cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wid...@apache.org
Subject [50/50] [abbrv] git commit: updated refs/heads/disk-cache to c3569db
Date Tue, 17 Sep 2013 14:02:11 GMT
Merge branch 'master' into disk-cache


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c3569db0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c3569db0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c3569db0

Branch: refs/heads/disk-cache
Commit: c3569db04801ae76b1964192feb38c797636d57f
Parents: 72f2f12 59c6fb7
Author: Wido den Hollander <wido@widodh.nl>
Authored: Tue Sep 17 12:01:56 2013 +0200
Committer: Wido den Hollander <wido@widodh.nl>
Committed: Tue Sep 17 12:01:56 2013 +0200

----------------------------------------------------------------------
 api/pom.xml                                     |    5 +
 api/src/com/cloud/agent/api/to/VolumeTO.java    |    4 +
 api/src/com/cloud/dc/DedicatedResources.java    |    2 +-
 api/src/com/cloud/network/NetworkModel.java     |    7 -
 .../com/cloud/network/NetworkRuleApplier.java   |   28 +
 api/src/com/cloud/network/guru/NetworkGuru.java |    4 +-
 .../com/cloud/network/router/VirtualRouter.java |    2 +-
 .../com/cloud/network/rules/RulesService.java   |    6 -
 api/src/com/cloud/network/vpc/VpcService.java   |   71 +-
 .../network/vpn/RemoteAccessVpnService.java     |    1 +
 .../cloudstack/affinity/AffinityGroup.java      |    2 +
 .../affinity/AffinityGroupProcessor.java        |   30 +
 .../affinity/AffinityGroupService.java          |    7 +
 .../affinity/AffinityProcessorBase.java         |   21 +
 .../admin/vpc/CreatePrivateGatewayCmd.java      |   11 +-
 .../user/address/AssociateIPAddrCmd.java        |    2 +-
 .../firewall/DeletePortForwardingRuleCmd.java   |    8 +-
 .../user/nat/DeleteIpForwardingRuleCmd.java     |    8 +-
 .../user/network/CreateNetworkACLListCmd.java   |   17 +-
 .../api/command/user/vm/DeployVMCmd.java        |    3 +
 .../command/user/vpc/CreateStaticRouteCmd.java  |   11 +-
 .../api/command/user/vpc/CreateVPCCmd.java      |   14 +-
 .../user/vpn/CreateVpnConnectionCmd.java        |   13 +-
 .../command/user/vpn/CreateVpnGatewayCmd.java   |    7 +-
 .../apache/cloudstack/config/Configuration.java |   84 -
 .../cloudstack/test/utils/SpringUtils.java      |    1 +
 awsapi/conf/applicationContext.xml.in           |    2 +-
 client/tomcatconf/applicationContext.xml.in     |    9 +-
 client/tomcatconf/componentContext.xml.in       |    1 +
 client/tomcatconf/nonossComponentContext.xml.in |    1 +
 .../tomcatconf/simulatorComponentContext.xml.in |    1 +
 core/src/com/cloud/agent/Listener.java          |  119 -
 debian/cloudstack-usage.postinst                |   12 +-
 debian/rules                                    |    3 +-
 docs/en-US/Release_Notes.xml                    | 7426 +++++-------------
 docs/en-US/advanced-zone-configuration.xml      |   17 +-
 docs/en-US/basic-zone-configuration.xml         |  414 +-
 docs/en-US/configure-vpn.xml                    |    2 +-
 docs/en-US/global-config.xml                    |  356 +-
 docs/en-US/hypervisor-host-install-libvirt.xml  |    5 -
 docs/en-US/images/Workloads.png                 |  Bin 0 -> 39846 bytes
 docs/en-US/images/edit-traffic-type.png         |  Bin 0 -> 93662 bytes
 docs/en-US/images/traffic-type.png              |  Bin 0 -> 19159 bytes
 docs/en-US/manage-cloud.xml                     |    2 +-
 docs/en-US/portable-ip.xml                      |    5 +-
 docs/en-US/removed-api-4.2.xml                  |    2 +-
 docs/en-US/using-vpn-with-mac.xml               |    2 +-
 docs/en-US/using-vpn-with-windows.xml           |    2 +-
 docs/en-US/vmware-cluster-config-dvswitch.xml   |   78 +-
 docs/en-US/vpn.xml                              |   57 +-
 engine/api/pom.xml                              |    5 +
 .../src/com/cloud/network/NetworkManager.java   |  230 -
 .../service/NetworkOrchestrationService.java    |  216 +
 .../service/VolumeOrchestrationService.java     |    5 +
 .../subsystem/api/storage/TemplateService.java  |    2 +
 engine/components-api/pom.xml                   |   15 +
 .../src/com/cloud/agent/AgentManager.java       |  148 +
 .../src/com/cloud/agent/Listener.java           |  119 +
 .../src/com/cloud/alert/AlertManager.java       |   69 +
 .../src/com/cloud/capacity/CapacityManager.java |   78 +
 .../configuration/ConfigurationManager.java     |  242 +
 .../cloud/deploy/DeploymentPlanningManager.java |   50 +
 .../src/com/cloud/event/UsageEventUtils.java    |  168 +
 .../com/cloud/ha/HighAvailabilityManager.java   |  114 +
 .../cloud/hypervisor/HypervisorGuruManager.java |   27 +
 .../src/com/cloud/network/IpAddressManager.java |  187 +
 .../com/cloud/network/NetworkStateListener.java |  107 +
 .../src/com/cloud/network/addr/PublicIp.java    |  235 +
 .../network/lb/LoadBalancingRulesManager.java   |   62 +
 .../cloud/network/rules/FirewallManager.java    |   89 +
 .../com/cloud/network/rules/RulesManager.java   |   66 +
 .../cloud/network/rules/StaticNatRuleImpl.java  |  147 +
 .../cloud/network/vpc/NetworkACLManager.java    |  155 +
 .../src/com/cloud/network/vpc/VpcManager.java   |  177 +
 .../src/com/cloud/resource/Discoverer.java      |   51 +
 .../src/com/cloud/resource/ResourceManager.java |  138 +
 .../cloud/resource/ResourceStateAdapter.java    |   63 +
 .../src/com/cloud/template/TemplateManager.java |  119 +
 .../com/cloud/vm/ReservationContextImpl.java    |   96 +
 .../com/cloud/vm/VirtualMachineProfileImpl.java |  258 +
 .../cloud/vm/snapshot/VMSnapshotManager.java    |   47 +
 engine/orchestration/pom.xml                    |   10 +-
 .../com/cloud/agent/manager/AgentAttache.java   |  519 ++
 .../cloud/agent/manager/AgentManagerImpl.java   | 1584 ++++
 .../agent/manager/ClusteredAgentAttache.java    |  260 +
 .../manager/ClusteredAgentManagerImpl.java      | 1421 ++++
 .../manager/ClusteredDirectAgentAttache.java    |   69 +
 .../agent/manager/ConnectedAgentAttache.java    |   95 +
 .../cloud/agent/manager/DirectAgentAttache.java |  219 +
 .../com/cloud/agent/manager/DummyAttache.java   |   48 +
 .../src/com/cloud/agent/manager/Routable.java   |   29 +
 .../agent/manager/SynchronousListener.java      |  135 +
 .../cluster/ClusteredAgentRebalanceService.java |   30 +
 .../agentlb/AgentLoadBalancerPlanner.java       |   29 +
 .../ClusterBasedAgentLoadBalancerPlanner.java   |  150 +
 .../com/cloud/vm/VirtualMachineManagerImpl.java |  467 +-
 .../engine/orchestration/CloudOrchestrator.java |    1 -
 .../orchestration/NetworkOrchestrator.java      | 3087 ++++++++
 .../orchestration/VolumeOrchestrator.java       |  217 +-
 .../cloud/vm/VirtualMachineManagerImplTest.java |   30 +-
 engine/schema/pom.xml                           |    7 +-
 .../src/com/cloud/dc/ClusterDetailsDaoImpl.java |   19 +-
 .../src/com/cloud/dc/dao/DcDetailsDaoImpl.java  |   21 +-
 .../src/com/cloud/dc/dao/VlanDaoImpl.java       |    2 +-
 .../src/com/cloud/host/dao/HostDaoImpl.java     |    2 +-
 .../cloud/network/vpc/NetworkACLItemDao.java    |   37 +
 .../com/cloud/network/vpc/NetworkACLItemVO.java |  237 +
 .../src/com/cloud/network/vpc/NetworkACLVO.java |   79 +
 .../cloud/network/vpc/dao/NetworkACLDao.java    |   23 +
 .../network/vpc/dao/NetworkACLDaoImpl.java      |   35 +
 .../network/vpc/dao/NetworkACLItemDaoImpl.java  |  113 +
 .../cloud/storage/dao/GuestOSHypervisorDao.java |   27 +
 .../storage/dao/GuestOSHypervisorDaoImpl.java   |   49 +
 .../storage/dao/StoragePoolDetailsDaoImpl.java  |   19 +-
 .../cloud/storage/dao/VMTemplateDaoImpl.java    |   11 +-
 .../com/cloud/storage/dao/VolumeDetailsDao.java |   36 +
 .../cloud/storage/dao/VolumeDetailsDaoImpl.java |  114 +
 .../com/cloud/upgrade/dao/Upgrade410to420.java  |  231 +-
 .../com/cloud/upgrade/dao/VersionDaoImpl.java   |    1 +
 .../src/com/cloud/user/AccountDetailsDao.java   |    3 +-
 .../com/cloud/user/AccountDetailsDaoImpl.java   |  104 +-
 engine/schema/src/com/cloud/user/AccountVO.java |    6 +-
 engine/schema/src/com/cloud/vm/NicDetailVO.java |   85 +
 .../schema/src/com/cloud/vm/dao/NicDaoImpl.java |    1 +
 .../src/com/cloud/vm/dao/NicDetailDao.java      |   35 +
 .../src/com/cloud/vm/dao/NicDetailDaoImpl.java  |  110 +
 .../src/com/cloud/vm/dao/NicIpAliasDao.java     |   60 +
 .../src/com/cloud/vm/dao/NicIpAliasDaoImpl.java |  177 +
 .../src/com/cloud/vm/dao/NicIpAliasVO.java      |  226 +
 .../affinity/AffinityGroupDomainMapVO.java      |   73 +
 .../cloudstack/affinity/AffinityGroupVO.java    |   15 +-
 .../affinity/dao/AffinityGroupDao.java          |   10 +-
 .../affinity/dao/AffinityGroupDaoImpl.java      |   66 +-
 .../affinity/dao/AffinityGroupDomainMapDao.java |   31 +
 .../dao/AffinityGroupDomainMapDaoImpl.java      |   67 +
 .../apache/cloudstack/region/PortableIpDao.java |   39 +
 .../cloudstack/region/PortableIpDaoImpl.java    |  131 +
 .../cloudstack/region/PortableIpRangeDao.java   |   30 +
 .../region/PortableIpRangeDaoImpl.java          |   65 +
 .../cloudstack/region/PortableIpRangeVO.java    |  119 +
 .../apache/cloudstack/region/PortableIpVO.java  |  222 +
 .../storage/datastore/db/StoragePoolVO.java     |    3 +-
 .../motion/AncientDataMotionStrategy.java       |   19 +-
 .../storage/image/TemplateServiceImpl.java      |   17 +
 .../storage/allocator/StorageAllocatorTest.java |    2 +-
 .../test/DirectAgentManagerSimpleImpl.java      |   32 +-
 .../storage/test/EndpointSelectorTest.java      |   78 +-
 .../storage/snapshot/SnapshotObject.java        |   14 +
 .../storage/snapshot/SnapshotServiceImpl.java   |    1 -
 .../datastore/protocol/DataStoreProtocol.java   |    2 +-
 .../storage/datastore/PrimaryDataStoreImpl.java |    6 +-
 .../storage/volume/VolumeServiceImpl.java       |    6 +-
 .../src/com/cloud/cluster/ClusterManager.java   |   11 +-
 .../com/cloud/cluster/ClusterManagerImpl.java   |   42 +-
 .../cloud/cluster/ClusterManagerMBeanImpl.java  |   68 +-
 .../cloud/cluster/ClusterServiceAdapter.java    |    6 +-
 .../cluster/ClusterServiceServletAdapter.java   |  146 +-
 .../cluster/ClusterServiceServletImpl.java      |   84 +-
 framework/config/pom.xml                        |   12 -
 .../apache/cloudstack/config/Configuration.java |   84 +
 .../framework/config/ConfigDepot.java           |    5 +-
 .../framework/config/ConfigDepotImpl.java       |  106 -
 .../cloudstack/framework/config/ConfigKey.java  |  119 +-
 .../framework/config/ConfigValue.java           |   78 -
 .../framework/config/Configurable.java          |    8 +
 .../framework/config/ConfigurationVO.java       |  175 -
 .../framework/config/ScopedConfigStorage.java   |   30 +
 .../framework/config/ScopedConfigValue.java     |   43 -
 .../framework/config/dao/ConfigurationDao.java  |    2 +-
 .../config/dao/ConfigurationDaoImpl.java        |  111 +-
 .../framework/config/impl/ConfigDepotImpl.java  |  149 +
 .../framework/config/impl/ConfigurationVO.java  |  176 +
 .../framework/config/ConfigDepotAdminTest.java  |  131 -
 .../config/impl/ConfigDepotAdminTest.java       |  102 +
 .../src/com/cloud/utils/db/GenericDaoBase.java  |    1 +
 .../db/src/com/cloud/utils/db/Transaction.java  |    8 +-
 .../jobs/impl/AsyncJobManagerImpl.java          |  668 +-
 packaging/debian/init/cloud-agent               |    2 +-
 .../debian/config/etc/init.d/cloud-early-config |   12 +-
 .../redundant_router/check_heartbeat.sh.templ   |    2 +-
 .../affinity/ExplicitDedicationProcessor.java   |  318 +-
 .../api/commands/ListDedicatedClustersCmd.java  |    9 +
 .../api/commands/ListDedicatedHostsCmd.java     |    9 +
 .../api/commands/ListDedicatedPodsCmd.java      |    9 +
 .../api/commands/ListDedicatedZonesCmd.java     |    9 +
 .../api/response/DedicateClusterResponse.java   |   14 +
 .../api/response/DedicateHostResponse.java      |   12 +
 .../api/response/DedicatePodResponse.java       |   12 +
 .../api/response/DedicateZoneResponse.java      |   11 +
 .../dedicated/DedicatedResourceManagerImpl.java |  142 +-
 .../dedicated/manager/DedicatedApiUnitTest.java |   22 +-
 .../networkservice/BaremetaNetworkGuru.java     |    4 +-
 .../kvm/resource/LibvirtComputingResource.java  |   25 +-
 .../com/cloud/hypervisor/guru/VMwareGuru.java   |   11 +-
 .../hypervisor/vmware/VmwareDatacenterVO.java   |    8 +-
 .../vmware/manager/VmwareManagerImpl.java       |   10 +
 .../manager/VmwareStorageManagerImpl.java       |  113 +-
 .../vmware/resource/VmwareContextFactory.java   |   25 +-
 .../vmware/resource/VmwareResource.java         | 1460 ++--
 .../VmwareSecondaryStorageContextFactory.java   |   58 +-
 .../VmwareSecondaryStorageResourceHandler.java  |  110 +-
 .../resource/VmwareStorageLayoutHelper.java     |  299 +
 .../resource/VmwareStorageLayoutType.java       |   22 +
 .../resource/VmwareStorageProcessor.java        |  461 +-
 .../VmwareStorageSubsystemCommandHandler.java   |   10 +-
 .../xen/resource/CitrixResourceBase.java        |  117 +-
 .../xen/resource/XenServer56Resource.java       |   44 -
 .../xen/resource/XenServer610Resource.java      |   30 +-
 .../guru/BigSwitchVnsGuestNetworkGuru.java      |   31 +-
 .../cloud/network/element/CiscoVnmcElement.java |    4 +-
 .../network/element/CiscoVnmcElementTest.java   |    5 +-
 .../lb/ElasticLoadBalancerManagerImpl.java      |   12 +-
 .../lb/InternalLoadBalancerVMManager.java       |    9 +-
 .../lb/InternalLoadBalancerVMManagerImpl.java   |   27 +-
 .../ElementChildTestConfiguration.java          |    6 +-
 .../InternalLBVMServiceTest.java                |    1 -
 .../LbChildTestConfiguration.java               |    6 +-
 .../network/resource/JuniperSrxResource.java    |   40 +-
 plugins/network-elements/midonet/pom.xml        |    4 +-
 .../cloud/network/element/MidoNetElement.java   |  154 +-
 .../network/element/SimpleFirewallRule.java     |   20 +-
 .../network/guru/MidoNetGuestNetworkGuru.java   |   16 +-
 .../network/guru/MidoNetPublicNetworkGuru.java  |    2 +-
 .../network/resource/MidoNetVifDriver.java      |   18 +-
 .../network/element/MidoNetElementTest.java     |    4 +-
 .../cloud/network/element/NiciraNvpElement.java |    4 +-
 .../network/guru/NiciraNvpGuestNetworkGuru.java |    5 +-
 .../network/element/NiciraNvpElementTest.java   |    5 +-
 .../guru/NiciraNvpGuestNetworkGuruTest.java     |    6 +-
 .../cloud/network/guru/OvsGuestNetworkGuru.java |   14 +-
 .../cloudstack/network/element/SspElement.java  |    4 +-
 .../network/element/SspElementTest.java         |    4 +-
 .../CloudStackImageStoreLifeCycleImpl.java      |   43 +-
 ...CloudStackPrimaryDataStoreLifeCycleImpl.java |   20 +-
 .../cloudstack/ldap/LdapAuthenticator.java      |   10 +
 pom.xml                                         |    4 +-
 scripts/vm/hypervisor/xenserver/vmops           |   12 +-
 scripts/vm/network/security_group.py            |    4 +-
 server/pom.xml                                  |   12 +
 .../cloud/acl/AffinityGroupAccessChecker.java   |   82 +
 server/src/com/cloud/acl/DomainChecker.java     |   19 +
 server/src/com/cloud/agent/AgentManager.java    |  148 -
 .../com/cloud/agent/manager/AgentAttache.java   |  519 --
 .../cloud/agent/manager/AgentManagerImpl.java   | 1590 ----
 .../agent/manager/AgentMonitorService.java      |   26 -
 .../agent/manager/ClusteredAgentAttache.java    |  260 -
 .../manager/ClusteredAgentManagerImpl.java      | 1421 ----
 .../manager/ClusteredDirectAgentAttache.java    |   69 -
 .../agent/manager/ConnectedAgentAttache.java    |   95 -
 .../cloud/agent/manager/DirectAgentAttache.java |  215 -
 .../com/cloud/agent/manager/DummyAttache.java   |   48 -
 .../src/com/cloud/agent/manager/Routable.java   |   29 -
 .../agent/manager/SynchronousListener.java      |  135 -
 server/src/com/cloud/alert/AlertManager.java    |   58 -
 .../src/com/cloud/alert/AlertManagerImpl.java   |  141 +-
 server/src/com/cloud/api/ApiDBUtils.java        |    9 +-
 server/src/com/cloud/api/ApiResponseHelper.java |    1 -
 server/src/com/cloud/api/ApiServer.java         |    2 +-
 .../src/com/cloud/api/doc/ApiXmlDocWriter.java  |   44 +-
 .../com/cloud/api/query/QueryManagerImpl.java   |  159 +-
 .../cloud/api/query/dao/UserVmJoinDaoImpl.java  |   25 +-
 .../cloud/api/query/vo/AffinityGroupJoinVO.java |   16 +
 .../cloud/api/query/vo/DataCenterJoinVO.java    |   20 +
 .../src/com/cloud/capacity/CapacityManager.java |   59 -
 .../com/cloud/capacity/CapacityManagerImpl.java |   34 +-
 .../cluster/ClusteredAgentRebalanceService.java |   30 -
 .../agentlb/AgentLoadBalancerPlanner.java       |   29 -
 .../ClusterBasedAgentLoadBalancerPlanner.java   |  150 -
 server/src/com/cloud/configuration/Config.java  |  104 +-
 .../configuration/ConfigurationManager.java     |  242 -
 .../configuration/ConfigurationManagerImpl.java |  144 +-
 .../consoleproxy/ConsoleProxyManagerImpl.java   |   13 +-
 .../src/com/cloud/dc/DedicatedResourceVO.java   |   21 +-
 .../com/cloud/dc/dao/DedicatedResourceDao.java  |   11 +-
 .../cloud/dc/dao/DedicatedResourceDaoImpl.java  |   42 +-
 .../cloud/deploy/DeploymentPlanningManager.java |   50 -
 .../deploy/DeploymentPlanningManagerImpl.java   |   50 +-
 .../src/com/cloud/event/ActionEventUtils.java   |   19 +-
 server/src/com/cloud/event/AlertGenerator.java  |    8 +
 server/src/com/cloud/event/UsageEventUtils.java |  159 -
 .../com/cloud/ha/HighAvailabilityManager.java   |  114 -
 .../cloud/ha/HighAvailabilityManagerImpl.java   |   10 +-
 .../cloud/hypervisor/HypervisorGuruBase.java    |    4 +-
 .../cloud/hypervisor/HypervisorGuruManager.java |   27 -
 .../ExternalFirewallDeviceManagerImpl.java      |    3 +-
 .../ExternalLoadBalancerDeviceManagerImpl.java  |    3 +-
 .../src/com/cloud/network/IpAddressManager.java |  181 -
 .../com/cloud/network/IpAddressManagerImpl.java |   26 +-
 .../com/cloud/network/NetworkManagerImpl.java   | 3167 --------
 .../src/com/cloud/network/NetworkModelImpl.java |   12 -
 .../com/cloud/network/NetworkRuleApplier.java   |   28 -
 .../com/cloud/network/NetworkServiceImpl.java   |   10 +-
 .../com/cloud/network/NetworkStateListener.java |   99 -
 server/src/com/cloud/network/addr/PublicIp.java |  235 -
 .../element/VpcVirtualRouterElement.java        |   51 +-
 .../network/firewall/FirewallManagerImpl.java   |    4 +-
 .../cloud/network/guru/ControlNetworkGuru.java  |    2 +-
 .../cloud/network/guru/DirectNetworkGuru.java   |    7 +-
 .../network/guru/DirectPodBasedNetworkGuru.java |    5 +-
 .../network/guru/ExternalGuestNetworkGuru.java  |   10 +-
 .../cloud/network/guru/GuestNetworkGuru.java    |   32 +-
 .../cloud/network/guru/PodBasedNetworkGuru.java |    2 +-
 .../cloud/network/guru/PrivateNetworkGuru.java  |    2 +-
 .../cloud/network/guru/PublicNetworkGuru.java   |    7 +-
 .../cloud/network/guru/StorageNetworkGuru.java  |    2 +-
 .../network/lb/LoadBalancingRulesManager.java   |   62 -
 .../lb/LoadBalancingRulesManagerImpl.java       |    6 +-
 .../router/VirtualNetworkApplianceManager.java  |   50 +-
 .../VirtualNetworkApplianceManagerImpl.java     |   45 +-
 .../VpcVirtualNetworkApplianceManagerImpl.java  |    9 +-
 .../cloud/network/rules/FirewallManager.java    |   89 -
 .../com/cloud/network/rules/RulesManager.java   |   66 -
 .../cloud/network/rules/RulesManagerImpl.java   |   25 +-
 .../cloud/network/rules/StaticNatRuleImpl.java  |  147 -
 .../security/SecurityGroupManagerImpl.java      |    4 +-
 .../cloud/network/vpc/NetworkACLItemDao.java    |   37 -
 .../com/cloud/network/vpc/NetworkACLItemVO.java |  237 -
 .../cloud/network/vpc/NetworkACLManager.java    |  155 -
 .../network/vpc/NetworkACLManagerImpl.java      |    6 +-
 .../network/vpc/NetworkACLServiceImpl.java      |   53 +-
 .../src/com/cloud/network/vpc/NetworkACLVO.java |   79 -
 .../src/com/cloud/network/vpc/VpcManager.java   |  170 -
 .../com/cloud/network/vpc/VpcManagerImpl.java   |   37 +-
 .../cloud/network/vpc/dao/NetworkACLDao.java    |   23 -
 .../network/vpc/dao/NetworkACLDaoImpl.java      |   35 -
 .../network/vpc/dao/NetworkACLItemDaoImpl.java  |  113 -
 .../network/vpn/RemoteAccessVpnManagerImpl.java |   67 +-
 server/src/com/cloud/resource/Discoverer.java   |   51 -
 .../src/com/cloud/resource/ResourceManager.java |  156 -
 .../com/cloud/resource/ResourceManagerImpl.java |  328 +-
 .../cloud/resource/ResourceStateAdapter.java    |   63 -
 .../com/cloud/server/ConfigurationServer.java   |    3 +-
 .../cloud/server/ConfigurationServerImpl.java   |   89 +-
 .../com/cloud/server/ManagementServerImpl.java  |   19 +-
 .../com/cloud/servlet/CloudStartupServlet.java  |    9 +-
 .../com/cloud/storage/StorageManagerImpl.java   |   66 +-
 .../com/cloud/storage/VolumeApiServiceImpl.java |   58 +-
 .../cloud/storage/dao/GuestOSHypervisorDao.java |   27 -
 .../storage/dao/GuestOSHypervisorDaoImpl.java   |   49 -
 .../com/cloud/storage/dao/VolumeDetailsDao.java |   36 -
 .../cloud/storage/dao/VolumeDetailsDaoImpl.java |  114 -
 .../storage/download/DownloadListener.java      |    2 +
 .../storage/listener/SnapshotStateListener.java |    6 +
 .../storage/listener/VolumeStateListener.java   |    6 +
 .../secondary/SecondaryStorageManagerImpl.java  |   13 +-
 .../com/cloud/template/TemplateAdapterBase.java |   16 +-
 .../src/com/cloud/template/TemplateManager.java |  117 -
 .../com/cloud/template/TemplateManagerImpl.java |   23 +-
 server/src/com/cloud/test/DatabaseConfig.java   |    2 +-
 .../src/com/cloud/user/AccountManagerImpl.java  |    9 +-
 .../src/com/cloud/user/DomainManagerImpl.java   |    4 +-
 server/src/com/cloud/vm/NicDetailVO.java        |   85 -
 .../com/cloud/vm/ReservationContextImpl.java    |   96 -
 server/src/com/cloud/vm/UserVmManager.java      |    6 +
 server/src/com/cloud/vm/UserVmManagerImpl.java  |  203 +-
 .../src/com/cloud/vm/UserVmStateListener.java   |    6 +
 .../com/cloud/vm/VirtualMachineProfileImpl.java |  258 -
 server/src/com/cloud/vm/dao/NicDetailDao.java   |   35 -
 .../src/com/cloud/vm/dao/NicDetailDaoImpl.java  |  110 -
 server/src/com/cloud/vm/dao/NicIpAliasDao.java  |   60 -
 .../src/com/cloud/vm/dao/NicIpAliasDaoImpl.java |  177 -
 server/src/com/cloud/vm/dao/NicIpAliasVO.java   |  226 -
 .../cloud/vm/snapshot/VMSnapshotManager.java    |   47 -
 .../affinity/AffinityGroupServiceImpl.java      |  188 +-
 .../lb/ApplicationLoadBalancerManagerImpl.java  |    9 +-
 .../apache/cloudstack/region/PortableIpDao.java |   39 -
 .../cloudstack/region/PortableIpDaoImpl.java    |  131 -
 .../cloudstack/region/PortableIpRangeDao.java   |   30 -
 .../region/PortableIpRangeDaoImpl.java          |   65 -
 .../cloudstack/region/PortableIpRangeVO.java    |  119 -
 .../apache/cloudstack/region/PortableIpVO.java  |  222 -
 .../com/cloud/alert/AlertControlsUnitTest.java  |    2 +
 .../configuration/ConfigurationManagerTest.java |    4 +-
 .../cloud/network/CreatePrivateNetworkTest.java |    3 +-
 .../com/cloud/network/MockNetworkModelImpl.java |   18 +-
 .../com/cloud/network/MockRulesManagerImpl.java |  258 -
 .../com/cloud/network/NetworkManagerTest.java   |   67 -
 .../network/firewall/FirewallManagerTest.java   |    5 +-
 .../SecurityGroupManagerTestConfiguration.java  |    6 +-
 .../cloud/resource/MockResourceManagerImpl.java |   25 -
 .../vm/DeploymentPlanningManagerImplTest.java   |    6 +
 .../com/cloud/vpc/MockNetworkManagerImpl.java   |   19 +-
 .../com/cloud/vpc/MockNetworkModelImpl.java     |   19 +-
 .../test/com/cloud/vpc/MockVpcManagerImpl.java  |  386 -
 .../com/cloud/vpc/NetworkACLManagerTest.java    |    6 +-
 .../com/cloud/vpc/NetworkACLServiceTest.java    |   21 +-
 server/test/com/cloud/vpc/VpcApiUnitTest.java   |   20 +-
 server/test/com/cloud/vpc/VpcTest.java          |  286 -
 .../cloud/vpc/dao/MockConfigurationDaoImpl.java |    2 +-
 .../affinity/AffinityApiUnitTest.java           |   27 +-
 .../lb/ApplicationLoadBalancerTest.java         |  277 +-
 .../cloudstack/lb/ChildTestConfiguration.java   |  111 -
 .../networkoffering/ChildTestConfiguration.java |   25 +-
 .../CreateNetworkOfferingTest.java              |    2 +-
 .../privategw/AclOnPrivateGwTest.java           |    6 +-
 services/console-proxy/server/js/ajaxviewer.js  |    8 +-
 .../secondary-storage/conf/agent.properties     |    2 +
 services/secondary-storage/conf/log4j.xml       |  102 +
 services/secondary-storage/pom.xml              |   10 +-
 .../LocalNfsSecondaryStorageResource.java       |   87 +-
 .../resource/NfsSecondaryStorageResource.java   |  340 +-
 .../resource/SecondaryStorageDiscoverer.java    |    9 +-
 .../storage/template/DownloadManagerImpl.java   |    2 +-
 .../LocalNfsSecondaryStorageResourceTest.java   |   75 +-
 .../NfsSecondaryStorageResourceTest.java        |  120 +
 setup/db/db/schema-410to420.sql                 |   62 +-
 setup/db/db/schema-420to430.sql                 |    4 +
 .../component/cpu_limits/test_cpu_limits.py     |   36 +-
 .../component/cpu_limits/test_domain_limits.py  |   68 +-
 .../component/cpu_limits/test_maximum_limits.py |   56 +-
 .../component/cpu_limits/test_project_limits.py |   28 +-
 .../memory_limits/test_domain_limits.py         |  761 ++
 .../memory_limits/test_maximum_limits.py        |  352 +
 .../memory_limits/test_memory_limits.py         |  764 ++
 .../memory_limits/test_project_limits.py        |  350 +
 .../component/test_multiple_ip_ranges.py        |   75 +-
 test/integration/component/test_portable_ip.py  | 1309 +++
 .../component/test_shared_networks.py           |    3 +-
 test/integration/component/test_stopped_vm.py   |  148 +
 tools/apidoc/gen_toc.py                         |    2 +-
 tools/devcloud-kvm/devcloud-kvm-advanced.cfg    |    4 +
 tools/marvin/marvin/integration/lib/base.py     |   13 +-
 tools/marvin/marvin/integration/lib/common.py   |   52 +-
 tools/marvin/marvin/integration/lib/utils.py    |   17 +-
 ui/css/cloudstack3.css                          |    9 +-
 ui/index.jsp                                    |   61 +-
 ui/scripts/network.js                           |   14 +-
 ui/scripts/sharedFunctions.js                   |  687 +-
 ui/scripts/system.js                            |  145 +-
 ui/scripts/ui-custom/zoneWizard.js              |  131 +-
 ui/scripts/ui/widgets/listView.js               |    2 +-
 ui/scripts/zoneWizard.js                        |  235 +-
 utils/src/com/cloud/utils/ReflectUtil.java      |   18 +-
 utils/src/com/cloud/utils/UriUtils.java         |   46 +-
 .../com/cloud/utils/component/AdapterBase.java  |   15 +-
 .../cloud/utils/component/ComponentContext.java |  184 +-
 .../utils/component/ComponentLifecycleBase.java |   92 +-
 .../com/cloud/utils/component/ManagerBase.java  |    9 +-
 .../cloud/hypervisor/vmware/mo/ClusterMO.java   |   35 +-
 .../vmware/mo/CustomFieldConstants.java         |    1 +
 .../cloud/hypervisor/vmware/mo/DatastoreMO.java |   49 +-
 .../com/cloud/hypervisor/vmware/mo/HostMO.java  |  136 +-
 .../vmware/mo/HypervisorHostHelper.java         |   97 +-
 .../vmware/mo/VirtualMachineDiskInfo.java       |   42 +
 .../mo/VirtualMachineDiskInfoBuilder.java       |   97 +
 .../hypervisor/vmware/mo/VirtualMachineMO.java  |  131 +-
 .../vmware/mo/VmwareHypervisorHost.java         |    2 +-
 .../hypervisor/vmware/util/VmwareClient.java    |   46 +-
 .../hypervisor/vmware/util/VmwareContext.java   |   92 +-
 .../vmware/util/VmwareContextPool.java          |  202 +
 .../hypervisor/vmware/util/VmwareHelper.java    |   69 +-
 .../vmware/mo/TestVmwareContextFactory.java     |   68 +
 .../hypervisor/vmware/mo/VmwareMOTest.java      |   45 +
 453 files changed, 28780 insertions(+), 25621 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c3569db0/api/src/com/cloud/agent/api/to/VolumeTO.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c3569db0/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c3569db0/setup/db/db/schema-420to430.sql
----------------------------------------------------------------------


Mime
View raw message