This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch healthcheck-4.20
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
omit f2343b62ff7 dummy commit , please don't merge
add a4224e58ccf Improve logging to include more identifiable information
(#9873)
add 48d4b7d1eb9 dummy commit , please don't merge
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (f2343b62ff7)
\
N -- N -- N refs/heads/healthcheck-4.20 (48d4b7d1eb9)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
agent/src/main/java/com/cloud/agent/Agent.java | 44 +-
.../com/cloud/agent/api/to/LoadBalancerTO.java | 24 +-
.../main/java/com/cloud/agent/api/to/NfsTO.java | 8 +
api/src/main/java/com/cloud/agent/api/to/S3TO.java | 8 +
.../com/cloud/agent/api/to/StorageFilerTO.java | 3 +-
.../main/java/com/cloud/agent/api/to/SwiftTO.java | 8 +
.../main/java/com/cloud/network/Ipv6Service.java | 2 +-
.../java/com/cloud/network/NetworkProfile.java | 8 +
.../com/cloud/network/lb/LoadBalancingRule.java | 4 +
.../cloud/network/vpn/RemoteAccessVpnService.java | 2 +-
.../region/ha/GlobalLoadBalancingRulesService.java | 3 +-
api/src/main/java/com/cloud/vm/NicProfile.java | 5 +-
.../api/command/admin/host/UpdateHostCmd.java | 5 +-
.../snapshot/CreateSnapshotFromVMSnapshotCmd.java | 15 +-
.../api/command/user/vpn/RemoveVpnUserCmd.java | 2 +-
.../cloudstack/cluster/ClusterDrsAlgorithm.java | 7 +-
.../apache/cloudstack/vm/UnmanagedInstanceTO.java | 26 +-
.../com/cloud/agent/api/to/LoadBalancerTOTest.java | 20 +-
.../java/com/cloud/agent/api/ReadyCommand.java | 20 +-
.../java/com/cloud/agent/api/StartupAnswer.java | 14 +-
.../apache/cloudstack/storage/to/ImageStoreTO.java | 13 +-
.../cloudstack/storage/to/PrimaryDataStoreTO.java | 13 +-
.../cloudstack/storage/to/TemplateObjectTO.java | 5 +-
.../cloudstack/storage/to/VolumeObjectTO.java | 5 +-
.../engine/subsystem/api/storage/EndPoint.java | 2 +
.../api/storage/HypervisorHostListener.java | 10 +
.../engine/subsystem/api/storage/TemplateInfo.java | 2 +
.../subsystem/api/storage/TemplateService.java | 3 +-
.../src/main/java/com/cloud/agent/Listener.java | 8 +
.../java/com/cloud/capacity/CapacityManager.java | 2 +-
.../cloud/configuration/ConfigurationManager.java | 4 +-
.../java/com/cloud/network/IpAddressManager.java | 5 +-
.../network/lb/LoadBalancingRulesManager.java | 4 +-
.../com/cloud/network/rules/FirewallManager.java | 6 +-
.../java/com/cloud/network/rules/RulesManager.java | 5 +-
.../network/security/SecurityGroupManager.java | 5 +-
.../java/com/cloud/network/vpc/VpcManager.java | 3 +
.../java/com/cloud/resource/ResourceManager.java | 2 +-
.../java/com/cloud/storage/StorageManager.java | 4 +-
.../java/com/cloud/template/TemplateManager.java | 4 +-
.../java/com/cloud/vm/VmWorkJobHandlerProxy.java | 8 +-
.../java/com/cloud/agent/manager/AgentAttache.java | 20 +-
.../com/cloud/agent/manager/AgentManagerImpl.java | 187 ++++----
.../cloud/agent/manager/ClusteredAgentAttache.java | 8 +-
.../agent/manager/ClusteredAgentManagerImpl.java | 122 +++---
.../agent/manager/ClusteredDirectAgentAttache.java | 8 +-
.../cloud/agent/manager/ConnectedAgentAttache.java | 4 +-
.../cloud/agent/manager/DirectAgentAttache.java | 27 +-
.../java/com/cloud/agent/manager/DummyAttache.java | 4 +-
.../cluster/agentlb/AgentLoadBalancerPlanner.java | 3 +-
.../ClusterBasedAgentLoadBalancerPlanner.java | 21 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 111 ++---
.../com/cloud/vm/VirtualMachinePowerStateSync.java | 5 +-
.../cloud/vm/VirtualMachinePowerStateSyncImpl.java | 80 ++--
.../com/cloud/vm/VmWorkJobWakeupDispatcher.java | 11 +-
.../entity/api/DataCenterResourceManagerImpl.java | 2 +-
.../datacenter/entity/api/db/EngineClusterVO.java | 8 +
.../entity/api/db/EngineDataCenterVO.java | 8 +
.../datacenter/entity/api/db/EngineHostPodVO.java | 8 +
.../datacenter/entity/api/db/EngineHostVO.java | 5 +-
.../entity/api/db/dao/EngineClusterDaoImpl.java | 2 +-
.../entity/api/db/dao/EngineDataCenterDaoImpl.java | 2 +-
.../entity/api/db/dao/EngineHostDaoImpl.java | 2 +-
.../entity/api/db/dao/EngineHostPodDaoImpl.java | 2 +-
.../engine/orchestration/NetworkOrchestrator.java | 263 +++++------
.../engine/orchestration/StorageOrchestrator.java | 11 +-
.../engine/orchestration/VolumeOrchestrator.java | 4 +-
.../cloud/agent/manager/AgentManagerImplTest.java | 2 +-
.../agent/manager/ConnectedAgentAttacheTest.java | 16 +-
.../agent/manager/DirectAgentAttacheTest.java | 6 +-
.../src/main/java/com/cloud/dc/HostPodVO.java | 8 +
.../schema/src/main/java/com/cloud/dc/VlanVO.java | 24 +-
.../main/java/com/cloud/dc/VmwareDatacenterVO.java | 5 +-
.../src/main/java/com/cloud/domain/DomainVO.java | 5 +-
.../src/main/java/com/cloud/host/HostVO.java | 2 +-
.../com/cloud/network/LBHealthCheckPolicyVO.java | 8 +
.../com/cloud/network/as/AutoScalePolicyVO.java | 5 +-
.../com/cloud/network/as/AutoScaleVmGroupVO.java | 9 +-
.../com/cloud/network/as/AutoScaleVmProfileVO.java | 5 +-
.../java/com/cloud/network/as/ConditionVO.java | 5 +-
.../main/java/com/cloud/network/as/CounterVO.java | 5 +-
.../network/dao/ExternalLoadBalancerDeviceVO.java | 8 +
.../java/com/cloud/network/dao/IPAddressVO.java | 5 +-
.../cloud/network/dao/LBStickinessPolicyVO.java | 8 +
.../java/com/cloud/network/dao/LoadBalancerVO.java | 8 +
.../dao/PhysicalNetworkServiceProviderVO.java | 8 +
.../com/cloud/network/dao/PhysicalNetworkVO.java | 8 +
.../com/cloud/network/dao/RemoteAccessVpnVO.java | 6 +
.../network/dao/Site2SiteCustomerGatewayVO.java | 8 +
.../network/dao/Site2SiteVpnConnectionVO.java | 8 +
.../cloud/network/dao/Site2SiteVpnGatewayVO.java | 8 +
.../com/cloud/network/rules/FirewallRuleVO.java | 5 +-
.../network/security/SecurityGroupRuleVO.java | 9 +
.../cloud/network/security/SecurityGroupVO.java | 9 +
.../com/cloud/network/vpc/NetworkACLItemVO.java | 5 +-
.../java/com/cloud/network/vpc/NetworkACLVO.java | 2 +-
.../java/com/cloud/network/vpc/VpcGatewayVO.java | 7 +-
.../java/com/cloud/network/vpc/VpcOfferingVO.java | 6 +-
.../src/main/java/com/cloud/network/vpc/VpcVO.java | 6 +-
.../com/cloud/offerings/NetworkOfferingVO.java | 5 +-
.../com/cloud/projects/ProjectInvitationVO.java | 7 +-
.../main/java/com/cloud/projects/ProjectVO.java | 4 +-
.../src/main/java/com/cloud/storage/BucketVO.java | 8 +-
.../java/com/cloud/storage/DiskOfferingVO.java | 8 +
.../java/com/cloud/storage/SnapshotPolicyVO.java | 8 +
.../java/com/cloud/storage/SnapshotScheduleVO.java | 17 +-
.../main/java/com/cloud/storage/SnapshotVO.java | 8 +-
.../main/java/com/cloud/storage/VMTemplateVO.java | 4 +-
.../src/main/java/com/cloud/storage/VolumeVO.java | 4 +-
.../main/java/com/cloud/user/UserAccountVO.java | 7 +
.../src/main/java/com/cloud/user/UserVO.java | 2 +-
.../java/com/cloud/user/dao/AccountDaoImpl.java | 2 +-
.../main/java/com/cloud/vm/InstanceGroupVO.java | 7 +
.../schema/src/main/java/com/cloud/vm/NicVO.java | 5 +-
.../java/com/cloud/vm/dao/NicSecondaryIpVO.java | 9 +
.../java/com/cloud/vm/dao/VMInstanceDaoImpl.java | 18 +-
.../java/com/cloud/vm/snapshot/VMSnapshotVO.java | 8 +
.../cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java | 2 +-
.../java/org/apache/cloudstack/acl/RoleVO.java | 3 +-
.../cloudstack/affinity/AffinityGroupVO.java | 6 +-
.../apache/cloudstack/backup/BackupScheduleVO.java | 7 +
.../org/apache/cloudstack/backup/BackupVO.java | 7 +
.../cluster/ClusterDrsPlanMigrationVO.java | 8 +
.../cloudstack/cluster/ClusterDrsPlanVO.java | 8 +
.../download/DirectDownloadCertificateVO.java | 8 +
.../engine/cloud/entity/api/db/VMEntityVO.java | 3 +-
.../lb/ApplicationLoadBalancerRuleVO.java | 8 +
.../org/apache/cloudstack/network/BgpPeerVO.java | 5 +-
.../region/gslb/GlobalLoadBalancerRuleVO.java | 10 +
.../apache/cloudstack/secstorage/HeuristicVO.java | 4 +-
.../storage/datastore/db/ImageStoreVO.java | 8 +
.../storage/datastore/db/ObjectStoreVO.java | 8 +
.../storage/datastore/db/StoragePoolVO.java | 3 +-
.../cloudstack/storage/sharedfs/SharedFSVO.java | 8 +
.../cloudstack/vm/schedule/VMScheduleVO.java | 6 +
.../cloudstack/vm/schedule/VMScheduledJobVO.java | 10 +
.../com/cloud/vm/dao/VMInstanceDaoImplTest.java | 20 +-
.../KvmNonManagedStorageDataMotionStrategy.java | 12 +-
.../KvmNonManagedStorageSystemDataMotionTest.java | 1 -
.../storage/image/TemplateDataFactoryImpl.java | 10 +-
.../storage/image/TemplateServiceImpl.java | 82 ++--
.../storage/image/store/ImageStoreImpl.java | 5 +
.../storage/image/store/TemplateObject.java | 9 +
.../storage/object/store/ObjectStoreImpl.java | 8 +
.../storage/snapshot/DefaultSnapshotStrategy.java | 14 +-
.../storage/snapshot/SnapshotDataFactoryImpl.java | 2 +-
.../storage/snapshot/SnapshotObject.java | 16 +-
.../storage/snapshot/SnapshotServiceImpl.java | 58 ++-
.../vmsnapshot/ScaleIOVMSnapshotStrategy.java | 23 +-
.../cloudstack/storage/LocalHostEndpoint.java | 5 +
.../cloudstack/storage/RemoteHostEndPoint.java | 7 +
.../storage/endpoint/DefaultEndPointSelector.java | 2 +-
.../storage/helper/VMSnapshotHelperImpl.java | 15 +-
.../storage/image/BaseImageStoreDriverImpl.java | 23 +-
.../storage/vmsnapshot/VMSnapshotHelper.java | 4 +-
.../volume/datastore/PrimaryDataStoreHelper.java | 9 +-
.../storage/datastore/PrimaryDataStoreImpl.java | 3 +-
.../BasePrimaryDataStoreLifeCycleImpl.java | 5 +-
.../datastore/provider/DefaultHostListener.java | 40 +-
.../cloudstack/storage/volume/VolumeObject.java | 9 +-
.../storage/volume/VolumeServiceImpl.java | 183 ++++----
.../BasePrimaryDataStoreLifeCycleImplTest.java | 2 +-
.../storage/volume/VolumeServiceTest.java | 6 +
.../java/com/cloud/cluster/ClusterManagerImpl.java | 49 ++-
.../com/cloud/cluster/ManagementServerHostVO.java | 5 +-
.../java/com/cloud/utils/db/GenericDaoBase.java | 4 +
.../apache/cloudstack/framework/events/Event.java | 8 +
.../cloudstack/framework/jobs/impl/AsyncJobVO.java | 27 +-
.../affinity/ExplicitDedicationProcessor.java | 6 +-
.../cloudstack/affinity/HostAffinityProcessor.java | 2 +-
.../affinity/HostAntiAffinityProcessor.java | 10 +-
.../affinity/NonStrictHostAffinityProcessor.java | 10 +-
.../apache/cloudstack/sioc/SiocManagerImpl.java | 11 +-
.../cloudstack/backup/DummyBackupProvider.java | 10 +-
.../cloudstack/backup/NASBackupProvider.java | 11 +-
.../cloudstack/backup/NetworkerBackupProvider.java | 35 +-
.../backup/networker/NetworkerClient.java | 6 +-
.../cloudstack/backup/VeeamBackupProvider.java | 21 +-
.../cloudstack/backup/VeeamBackupProviderTest.java | 2 +-
.../dedicated/DedicatedResourceManagerImpl.java | 50 +--
.../cloud/deploy/ImplicitDedicationPlanner.java | 13 +-
.../org/apache/cloudstack/cluster/Balanced.java | 22 +-
.../apache/cloudstack/cluster/BalancedTest.java | 18 +-
.../org/apache/cloudstack/cluster/Condensed.java | 22 +-
.../apache/cloudstack/cluster/CondensedTest.java | 19 +-
.../cloudstack/mom/webhook/WebhookServiceImpl.java | 5 +-
.../mom/webhook/vo/WebhookDeliveryJoinVO.java | 4 +-
.../mom/webhook/vo/WebhookDeliveryVO.java | 2 +-
.../cloudstack/mom/webhook/vo/WebhookJoinVO.java | 2 +-
.../cloudstack/mom/webhook/vo/WebhookVO.java | 2 +-
.../manager/allocator/impl/RandomAllocator.java | 8 +-
.../baremetal/manager/BareMetalDiscoverer.java | 2 +-
.../cloud/baremetal/manager/BareMetalPlanner.java | 28 +-
.../baremetal/manager/BaremetalManagerImpl.java | 10 +-
.../main/java/com/cloud/ha/HypervInvestigator.java | 2 +-
.../hyperv/discoverer/HypervServerDiscoverer.java | 12 +-
.../cloud/hypervisor/hyperv/guru/HypervGuru.java | 2 +-
.../main/java/com/cloud/ha/KVMInvestigator.java | 15 +-
.../kvm/storage/KVMStorageProcessor.java | 68 +--
.../hypervisor/kvm/storage/LibvirtStoragePool.java | 5 +-
.../kvm/storage/MultipathSCSIAdapterBase.java | 5 +-
.../apache/cloudstack/kvm/ha/KVMHAProvider.java | 12 +-
.../cloudstack/kvm/ha/KVMHostActivityChecker.java | 23 +-
.../java/com/cloud/ha/SimulatorInvestigator.java | 2 +-
.../cloud/hypervisor/guru/VmwareVmImplementer.java | 2 +-
.../hypervisor/vmware/VmwareServerDiscoverer.java | 2 +-
.../storage/resource/VmwareStorageProcessor.java | 12 +-
.../motion/XenServerStorageMotionStrategy.java | 22 +-
.../cloudstack/cloudian/CloudianConnectorImpl.java | 6 +-
.../cluster/KubernetesClusterManagerImpl.java | 84 ++--
.../kubernetes/cluster/KubernetesClusterVO.java | 8 +
.../cluster/KubernetesServiceHelperImpl.java | 2 +-
.../KubernetesClusterActionWorker.java | 8 +-
.../KubernetesClusterDestroyWorker.java | 34 +-
...ernetesClusterResourceModifierActionWorker.java | 35 +-
.../KubernetesClusterScaleWorker.java | 35 +-
.../KubernetesClusterStartWorker.java | 24 +-
.../actionworkers/KubernetesClusterStopWorker.java | 5 +-
.../KubernetesClusterUpgradeWorker.java | 12 +-
.../cluster/utils/KubernetesClusterUtil.java | 50 +--
.../version/KubernetesSupportedVersionVO.java | 8 +
.../version/KubernetesVersionManagerImpl.java | 6 +-
.../cluster/DeleteKubernetesClusterCmd.java | 3 +-
.../cluster/ScaleKubernetesClusterCmd.java | 3 +-
.../cluster/StopKubernetesClusterCmd.java | 3 +-
.../cluster/UpgradeKubernetesClusterCmd.java | 3 +-
.../cloudstack/metrics/MetricsServiceImpl.java | 2 +-
.../com/cloud/network/BigSwitchBcfDeviceVO.java | 8 +
.../cloud/network/element/BigSwitchBcfElement.java | 18 +-
.../network/guru/BigSwitchBcfGuestNetworkGuru.java | 10 +-
.../cloud/network/element/BrocadeVcsElement.java | 14 +-
.../network/guru/BrocadeVcsGuestNetworkGuru.java | 10 +-
.../cloud/network/cisco/CiscoVnmcControllerVO.java | 9 +
.../cloud/network/element/CiscoVnmcElement.java | 84 ++--
.../element/ElasticLoadBalancerElement.java | 2 +-
.../network/lb/ElasticLoadBalancerManagerImpl.java | 6 +-
.../cloud/network/lb/LoadBalanceRuleHandler.java | 12 +-
.../element/InternalLoadBalancerElement.java | 3 +-
.../lb/InternalLoadBalancerVMManagerImpl.java | 14 +-
.../contrail/management/ContrailElementImpl.java | 18 +-
.../network/contrail/management/ContrailGuru.java | 18 +-
.../contrail/management/ManagementNetworkGuru.java | 2 +-
.../contrail/model/VirtualMachineModel.java | 4 +-
.../contrail/model/VirtualNetworkModel.java | 5 +-
.../cloud/network/element/NetscalerElement.java | 6 +-
.../cloud/network/vm/NetScalerVMManagerImpl.java | 4 +-
.../cloud/network/element/NiciraNvpElement.java | 32 +-
.../network/guru/NiciraNvpGuestNetworkGuru.java | 8 +-
.../org/apache/cloudstack/service/NsxElement.java | 17 +-
.../cloudstack/service/NsxGuestNetworkGuru.java | 12 +-
.../cloudstack/service/NsxPublicNetworkGuru.java | 6 +-
.../apache/cloudstack/service/NsxServiceImpl.java | 6 +-
.../opendaylight/OpendaylightGuestNetworkGuru.java | 8 +-
.../OpenDaylightControllerResourceManagerImpl.java | 8 +-
.../java/com/cloud/network/element/OvsElement.java | 58 +--
.../cloud/network/guru/OvsGuestNetworkGuru.java | 5 +-
.../cloud/network/ovs/OvsTunnelManagerImpl.java | 63 +--
.../command/ConfigTungstenFabricServiceCmd.java | 2 +-
.../network/tungsten/service/TungstenElement.java | 11 +-
.../tungsten/service/TungstenGuestNetworkGuru.java | 4 +-
.../cloud/network/guru/VxlanGuestNetworkGuru.java | 2 +-
.../driver/CephObjectStoreDriverImpl.java | 2 +-
.../driver/AdaptiveDataStoreDriverImpl.java | 47 +-
.../lifecycle/AdaptiveDataStoreLifeCycleImpl.java | 37 +-
.../provider/AdaptivePrimaryHostListener.java | 41 +-
.../driver/ElastistorPrimaryDataStoreDriver.java | 2 +-
.../ElastistorPrimaryDataStoreLifeCycle.java | 18 +-
.../datastore/provider/ElastistorHostListener.java | 10 +-
.../driver/DateraPrimaryDataStoreDriver.java | 31 +-
.../lifecycle/DateraPrimaryDataStoreLifeCycle.java | 4 +-
.../datastore/provider/DateraHostListener.java | 18 +-
.../CloudStackPrimaryDataStoreDriverImpl.java | 12 +-
.../CloudStackPrimaryDataStoreLifeCycleImpl.java | 46 +-
...loudStackPrimaryDataStoreLifeCycleImplTest.java | 4 +-
.../driver/LinstorPrimaryDataStoreDriverImpl.java | 4 +-
.../LinstorPrimaryDataStoreLifeCycleImpl.java | 16 +-
.../datastore/provider/LinstorHostListener.java | 4 +-
.../snapshot/LinstorVMSnapshotStrategy.java | 18 +-
.../NexentaPrimaryDataStoreLifeCycle.java | 2 +-
.../client/ScaleIOGatewayClientConnectionPool.java | 34 +-
.../driver/ScaleIOPrimaryDataStoreDriver.java | 144 +++---
.../ScaleIOPrimaryDataStoreLifeCycle.java | 20 +-
.../datastore/manager/ScaleIOSDCManagerImpl.java | 67 +--
.../datastore/provider/ScaleIOHostListener.java | 32 +-
.../driver/ScaleIOPrimaryDataStoreDriverTest.java | 17 +-
.../ScaleIOPrimaryDataStoreLifeCycleTest.java | 5 +-
.../driver/SolidFirePrimaryDataStoreDriver.java | 18 +-
.../SolidFirePrimaryDataStoreLifeCycle.java | 4 +-
.../SolidFireSharedPrimaryDataStoreLifeCycle.java | 30 +-
.../datastore/provider/SolidFireHostListener.java | 38 +-
.../provider/SolidFireSharedHostListener.java | 22 +-
.../storage/datastore/util/SolidFireUtil.java | 4 +-
.../StorPoolBackupSnapshotCommandWrapper.java | 3 +-
.../StorPoolPrimaryDataStoreLifeCycle.java | 2 +-
.../datastore/provider/StorPoolHostListener.java | 20 +-
.../storage/motion/StorPoolDataMotionStrategy.java | 18 +-
.../storage/snapshot/StorPoolSnapshotStrategy.java | 12 +-
.../snapshot/StorPoolVMSnapshotStrategy.java | 15 +-
.../cloudstack/api/command/LdapImportUsersCmd.java | 2 +-
.../api/command/LinkAccountToLdapCmd.java | 6 +-
.../api/command/LinkDomainToLdapCmd.java | 6 +-
.../api/command/LinkAccountToLdapCmdTest.java | 4 +
.../api/command/LinkDomainToLdapCmdTest.java | 4 +
.../com/cloud/acl/AffinityGroupAccessChecker.java | 4 +-
.../src/main/java/com/cloud/acl/DomainChecker.java | 24 +-
.../manager/allocator/impl/FirstFitAllocator.java | 15 +-
.../allocator/impl/RecreateHostAllocator.java | 2 +-
.../allocator/impl/UserConcentratedAllocator.java | 25 +-
.../java/com/cloud/alert/AlertManagerImpl.java | 21 +-
.../java/com/cloud/alert/ClusterAlertAdapter.java | 10 +-
server/src/main/java/com/cloud/api/ApiServer.java | 10 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 8 +-
.../cloud/api/query/dao/SnapshotJoinDaoImpl.java | 2 +-
.../cloud/api/query/vo/NetworkOfferingJoinVO.java | 7 +
.../main/java/com/cloud/bgp/BGPServiceImpl.java | 36 +-
.../com/cloud/capacity/CapacityManagerImpl.java | 184 ++++----
.../configuration/ConfigurationManagerImpl.java | 227 +++++-----
.../AgentBasedConsoleProxyManager.java | 16 +-
.../AgentBasedStandaloneConsoleProxyManager.java | 22 +-
.../consoleproxy/ConsoleProxyManagerImpl.java | 77 ++--
.../cloud/consoleproxy/ConsoleProxyService.java | 3 +-
.../consoleproxy/StaticConsoleProxyManager.java | 2 +-
.../java/com/cloud/dc/DedicatedResourceVO.java | 8 +
.../deploy/DeploymentPlanningManagerImpl.java | 233 +++++-----
.../java/com/cloud/deploy/FirstFitPlanner.java | 8 +-
.../com/cloud/ha/AbstractInvestigatorImpl.java | 17 +-
.../com/cloud/ha/HighAvailabilityManagerImpl.java | 62 ++-
.../cloud/ha/ManagementIPSystemVMInvestigator.java | 8 +-
.../java/com/cloud/ha/UserVmDomRInvestigator.java | 27 +-
.../hypervisor/CloudZonesStartupProcessor.java | 4 +-
.../com/cloud/hypervisor/HypervisorGuruBase.java | 2 +-
.../main/java/com/cloud/hypervisor/KVMGuru.java | 15 +-
.../cloud/hypervisor/kvm/dpdk/DpdkHelperImpl.java | 7 +-
.../network/ExternalDeviceUsageManagerImpl.java | 10 +-
.../network/ExternalFirewallDeviceManagerImpl.java | 25 +-
.../ExternalLoadBalancerDeviceManagerImpl.java | 52 +--
.../com/cloud/network/IpAddressManagerImpl.java | 110 ++---
.../com/cloud/network/Ipv6AddressManagerImpl.java | 15 +-
.../java/com/cloud/network/Ipv6ServiceImpl.java | 38 +-
.../cloud/network/NetworkMigrationManagerImpl.java | 16 +-
.../java/com/cloud/network/NetworkModelImpl.java | 62 +--
.../java/com/cloud/network/NetworkServiceImpl.java | 129 +++---
.../com/cloud/network/NetworkUsageManagerImpl.java | 36 +-
.../com/cloud/network/SshKeysDistriMonitor.java | 11 +-
.../com/cloud/network/as/AutoScaleManager.java | 5 +-
.../com/cloud/network/as/AutoScaleManagerImpl.java | 220 +++++-----
.../network/element/ConfigDriveNetworkElement.java | 31 +-
.../network/element/VirtualRouterElement.java | 25 +-
.../network/element/VpcVirtualRouterElement.java | 39 +-
.../network/firewall/FirewallManagerImpl.java | 48 +-
.../com/cloud/network/guru/DirectNetworkGuru.java | 6 +-
.../network/guru/DirectPodBasedNetworkGuru.java | 6 +-
.../com/cloud/network/guru/GuestNetworkGuru.java | 13 +-
.../network/lb/LoadBalancingRulesManagerImpl.java | 179 ++++----
.../cloud/network/router/CommandSetupHelper.java | 2 +-
.../cloud/network/router/NetworkHelperImpl.java | 49 +--
.../router/VirtualNetworkApplianceManagerImpl.java | 114 ++---
.../VpcVirtualNetworkApplianceManagerImpl.java | 18 +-
.../com/cloud/network/rules/DhcpSubNetRules.java | 2 +-
.../cloud/network/rules/PrivateGatewayRules.java | 2 +-
.../com/cloud/network/rules/RulesManagerImpl.java | 101 +++--
.../cloud/network/rules/VpcIpAssociationRules.java | 4 +-
.../network/security/SecurityGroupListener.java | 15 +-
.../network/security/SecurityGroupManagerImpl.java | 80 ++--
.../security/SecurityGroupManagerImpl2.java | 11 +-
.../cloud/network/vpc/NetworkACLManagerImpl.java | 24 +-
.../cloud/network/vpc/NetworkACLServiceImpl.java | 18 +-
.../java/com/cloud/network/vpc/VpcManagerImpl.java | 100 +++--
.../vpc/VpcPrivateGatewayTransactionCallable.java | 5 +-
.../network/vpn/RemoteAccessVpnManagerImpl.java | 21 +-
.../cloud/network/vpn/Site2SiteVpnManagerImpl.java | 26 +-
.../java/com/cloud/projects/ProjectManager.java | 2 +-
.../com/cloud/projects/ProjectManagerImpl.java | 73 ++-
.../com/cloud/resource/ResourceManagerImpl.java | 148 +++----
.../resource/RollingMaintenanceManagerImpl.java | 2 +-
.../resourceicon/ResourceIconManagerImpl.java | 4 +-
.../resourcelimit/ResourceLimitManagerImpl.java | 7 +-
.../com/cloud/server/ConfigurationServerImpl.java | 4 +-
.../com/cloud/server/ManagementServerImpl.java | 30 +-
.../main/java/com/cloud/server/StatsCollector.java | 29 +-
.../com/cloud/servlet/ConsoleProxyServlet.java | 26 +-
.../com/cloud/storage/ImageStoreServiceImpl.java | 6 +-
.../cloud/storage/ImageStoreUploadMonitorImpl.java | 36 +-
.../java/com/cloud/storage/OCFS2ManagerImpl.java | 20 +-
.../java/com/cloud/storage/StorageManagerImpl.java | 228 +++++-----
.../cloud/storage/StoragePoolAutomationImpl.java | 7 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 138 +++---
.../cloud/storage/download/DownloadListener.java | 6 +-
.../storage/download/DownloadMonitorImpl.java | 6 +-
.../cloud/storage/listener/StoragePoolMonitor.java | 21 +-
.../cloud/storage/snapshot/SnapshotManager.java | 3 +-
.../storage/snapshot/SnapshotManagerImpl.java | 114 +++--
.../storage/snapshot/SnapshotSchedulerImpl.java | 42 +-
.../com/cloud/storage/upload/UploadListener.java | 4 +-
.../cloud/storage/upload/UploadMonitorImpl.java | 10 +-
.../com/cloud/tags/TaggedResourceManagerImpl.java | 15 +-
.../cloud/template/HypervisorTemplateAdapter.java | 38 +-
.../com/cloud/template/TemplateAdapterBase.java | 2 +-
.../com/cloud/template/TemplateManagerImpl.java | 93 ++--
.../java/com/cloud/usage/UsageServiceImpl.java | 2 +-
.../java/com/cloud/user/AccountManagerImpl.java | 229 +++++-----
.../java/com/cloud/user/DomainManagerImpl.java | 47 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 487 +++++++++++----------
.../cloud/vm/snapshot/VMSnapshotManagerImpl.java | 46 +-
.../cloudstack/acl/ProjectRoleManagerImpl.java | 2 +-
.../org/apache/cloudstack/acl/RoleManagerImpl.java | 4 +-
.../affinity/AffinityGroupServiceImpl.java | 8 +-
.../agent/lb/IndirectAgentLBServiceImpl.java | 6 +-
.../cloudstack/backup/BackupManagerImpl.java | 40 +-
.../org/apache/cloudstack/ca/CAManagerImpl.java | 8 +-
.../cloudstack/cluster/ClusterDrsServiceImpl.java | 32 +-
.../consoleproxy/ConsoleAccessManagerImpl.java | 29 +-
.../diagnostics/DiagnosticsServiceImpl.java | 18 +-
.../diagnostics/to/DiagnosticsDataObject.java | 8 +
.../direct/download/DirectDownloadManagerImpl.java | 91 ++--
.../org/apache/cloudstack/ha/HAManagerImpl.java | 17 +-
.../ha/provider/host/HAAbstractHostProvider.java | 10 +-
.../org/apache/cloudstack/ha/task/BaseHATask.java | 2 +-
.../cloudstack/network/RoutedIpv4ManagerImpl.java | 4 +-
.../lb/ApplicationLoadBalancerManagerImpl.java | 5 +-
.../deployment/RouterDeploymentDefinition.java | 12 +-
.../deployment/VpcRouterDeploymentDefinition.java | 8 +-
.../network/topology/AdvancedNetworkTopology.java | 10 +-
.../network/topology/BasicNetworkTopology.java | 22 +-
.../OutOfBandManagementServiceImpl.java | 14 +-
.../outofbandmanagement/PowerOperationTask.java | 5 +-
.../gslb/GlobalLoadBalancingRulesServiceImpl.java | 19 +-
.../apache/cloudstack/snapshot/SnapshotHelper.java | 25 +-
.../storage/heuristics/HeuristicRuleHelper.java | 8 +-
.../GenericHeuristicPresetVariable.java | 4 +-
.../storage/object/BucketApiServiceImpl.java | 2 +-
.../storage/sharedfs/SharedFSServiceImpl.java | 6 +-
.../storage/template/VnfTemplateManagerImpl.java | 16 +-
.../volume/VolumeImportUnmanageManagerImpl.java | 34 +-
.../user/UserPasswordResetManagerImpl.java | 35 +-
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 111 +++--
.../vm/schedule/VMScheduleManagerImpl.java | 6 +-
.../cloudstack/vm/schedule/VMSchedulerImpl.java | 30 +-
.../java/com/cloud/alert/AlertManagerImplTest.java | 25 ++
.../com/cloud/capacity/CapacityManagerTest.java | 4 +-
.../configuration/ConfigurationManagerTest.java | 2 +-
.../deploy/DeploymentPlanningManagerImplTest.java | 4 +-
.../cloud/ha/HighAvailabilityManagerImplTest.java | 2 -
.../com/cloud/network/Ipv6ServiceImplTest.java | 37 +-
.../com/cloud/network/MockFirewallManagerImpl.java | 4 +-
.../com/cloud/network/NetworkServiceImplTest.java | 4 +-
.../cloud/network/as/AutoScaleManagerImplTest.java | 52 ++-
.../element/VpcVirtualRouterElementTest.java | 6 +-
.../com/cloud/projects/MockProjectManagerImpl.java | 2 +-
.../cloud/resource/MockResourceManagerImpl.java | 2 +-
.../cloud/storage/VolumeApiServiceImplTest.java | 3 -
.../storage/listener/StoragePoolMonitorTest.java | 6 +-
.../template/HypervisorTemplateAdapterTest.java | 13 +-
.../com/cloud/user/AccountManagerImplTest.java | 7 +-
.../java/com/cloud/user/DomainManagerImplTest.java | 6 +-
.../java/com/cloud/vm/UserVmManagerImplTest.java | 3 +-
.../test/java/com/cloud/vm/UserVmManagerTest.java | 3 +-
.../cloud/vm/snapshot/VMSnapshotManagerTest.java | 8 +-
.../cloud/vpc/MockConfigurationManagerImpl.java | 4 +-
.../cluster/ClusterDrsServiceImplTest.java | 8 +-
.../deployment/RouterDeploymentDefinitionTest.java | 6 +
.../heuristics/HeuristicRuleHelperTest.java | 3 -
.../VolumeImportUnmanageManagerImplTest.java | 18 +-
.../cloudstack/vm/UnmanagedVMsManagerImplTest.java | 1 -
.../vm/schedule/VMSchedulerImplTest.java | 2 +-
.../com/cloud/usage/parser/BucketUsageParser.java | 2 +-
.../cloud/usage/parser/NetworksUsageParser.java | 4 +-
.../com/cloud/usage/parser/VpcUsageParser.java | 6 +-
468 files changed, 5469 insertions(+), 4703 deletions(-)
