Merge pull request #714 from rafaelweingartner/master-lrg-cs-hackday-003 Changed variable s_logger to non-static and fixed its name in com.cloud.utils.component.ComponentLifecycleBase and its subclassesHi guys, We have noticed that every single class that is a subclass of ComponentLifecycleBase instantiate their on logger manually and uses a nonstandard name. We fixed that by changing the variable in ComponentLifecycleBase to protected and non-static and instantiated it using the method getClass from Object class. Therefore, we can reduce the code in a few hundred lines and use a more intuitive name for the logger variable.
During that process we found a static method that used the s_logger variable in classes: com.cloud.network.element.VirtualRouterElement org.apache.cloudstack.network.element.InternalLoadBalancerElement To fix that we had to create a new class com.cloud.network.element.HAProxyLBRule, instantiate it with @Componente and inject into the aforementioned classes. The class that we create is com.cloud.network.element.HAProxyLBRule and has the following methods: com.cloud.network.element.HAProxyLBRule.containsOnlyNumbers(String, String) com.cloud.network.element.HAProxyLBRule.validateHAProxyLBRule(LoadBalancingRule) Sadly we could not write test cases to it; hence we did not fully understand those methods. However, if anyone out there understands it, we would appreciate some code to be added to it. As minor this change may seem; we believe that it enhances a little bit the ACS code by using standard name to logger variable. * pr/714: Solved jira ticket: CLOUDSTACK-8750 Signed-off-by: Daan Hoogland <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cd7218e2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cd7218e2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cd7218e2 Branch: refs/heads/master Commit: cd7218e241a8ac93df7a73f938320487aa526de6 Parents: f5a7395 3818257 Author: Daan Hoogland <[email protected]> Authored: Sat Aug 29 22:04:03 2015 +0200 Committer: Daan Hoogland <[email protected]> Committed: Sat Aug 29 22:04:04 2015 +0200 ---------------------------------------------------------------------- .../cloud/storage/template/IsoProcessor.java | 6 +- .../cloud/storage/template/OVAProcessor.java | 24 +- .../cloud/storage/template/QCOW2Processor.java | 8 +- .../storage/template/RawImageProcessor.java | 8 +- .../cloud/storage/template/TARProcessor.java | 6 +- .../cloud/storage/template/VhdProcessor.java | 8 +- .../cloud/storage/template/VmdkProcessor.java | 20 +- .../cloud/agent/manager/AgentManagerImpl.java | 245 ++++---- .../manager/ClusteredAgentManagerImpl.java | 331 ++++++----- .../ClusterBasedAgentLoadBalancerPlanner.java | 16 +- .../com/cloud/vm/VirtualMachineManagerImpl.java | 576 +++++++++---------- .../src/com/cloud/vm/VmWorkJobDispatcher.java | 22 +- .../com/cloud/vm/VmWorkJobWakeupDispatcher.java | 14 +- .../entity/api/db/dao/EngineClusterDaoImpl.java | 6 +- .../orchestration/NetworkOrchestrator.java | 352 ++++++------ .../orchestration/VolumeOrchestrator.java | 154 +++-- .../com/cloud/capacity/dao/CapacityDaoImpl.java | 8 +- .../certificate/dao/CertificateDaoImpl.java | 4 +- .../agentlb/dao/HostTransferMapDaoImpl.java | 2 - .../src/com/cloud/dc/dao/DataCenterDaoImpl.java | 4 +- .../dc/dao/DataCenterIpAddressDaoImpl.java | 14 +- .../DataCenterLinkLocalIpAddressDaoImpl.java | 6 +- .../src/com/cloud/dc/dao/HostPodDaoImpl.java | 4 +- .../src/com/cloud/domain/dao/DomainDaoImpl.java | 20 +- .../src/com/cloud/event/dao/EventDaoImpl.java | 2 - .../com/cloud/event/dao/UsageEventDaoImpl.java | 20 +- .../event/dao/UsageEventDetailsDaoImpl.java | 2 - .../com/cloud/gpu/dao/HostGpuGroupsDaoImpl.java | 2 - .../src/com/cloud/gpu/dao/VGPUTypesDaoImpl.java | 2 - .../src/com/cloud/host/dao/HostDaoImpl.java | 64 +-- .../dao/HypervisorCapabilitiesDaoImpl.java | 2 - .../network/dao/FirewallRulesCidrsDaoImpl.java | 2 - .../com/cloud/network/dao/IPAddressDaoImpl.java | 4 +- .../cloud/network/dao/PortProfileDaoImpl.java | 2 - .../network/dao/RemoteAccessVpnDaoImpl.java | 2 - .../dao/Site2SiteVpnConnectionDaoImpl.java | 2 - .../network/dao/Site2SiteVpnGatewayDaoImpl.java | 2 - .../network/dao/UserIpv6AddressDaoImpl.java | 2 - .../security/dao/VmRulesetLogDaoImpl.java | 26 +- .../vpc/dao/NetworkACLItemCidrsDaoImpl.java | 2 - .../network/vpc/dao/NetworkACLItemDaoImpl.java | 2 - .../cloud/network/vpc/dao/PrivateIpDaoImpl.java | 6 +- .../projects/dao/ProjectAccountDaoImpl.java | 4 +- .../com/cloud/projects/dao/ProjectDaoImpl.java | 4 +- .../projects/dao/ProjectInvitationDaoImpl.java | 8 +- .../storage/dao/LaunchPermissionDaoImpl.java | 6 +- .../com/cloud/storage/dao/SnapshotDaoImpl.java | 10 +- .../storage/dao/StoragePoolHostDaoImpl.java | 8 +- .../com/cloud/storage/dao/UploadDaoImpl.java | 2 - .../cloud/storage/dao/VMTemplateDaoImpl.java | 24 +- .../storage/dao/VMTemplateHostDaoImpl.java | 14 +- .../storage/dao/VMTemplatePoolDaoImpl.java | 16 +- .../storage/dao/VMTemplateZoneDaoImpl.java | 2 - .../com/cloud/storage/dao/VolumeDaoImpl.java | 10 +- .../cloud/storage/dao/VolumeHostDaoImpl.java | 6 +- .../cloud/upgrade/DatabaseIntegrityChecker.java | 42 +- .../com/cloud/upgrade/dao/VersionDaoImpl.java | 14 +- .../src/com/cloud/usage/dao/UsageDaoImpl.java | 28 +- .../cloud/usage/dao/UsageIPAddressDaoImpl.java | 6 +- .../com/cloud/usage/dao/UsageJobDaoImpl.java | 6 +- .../dao/UsageLoadBalancerPolicyDaoImpl.java | 8 +- .../cloud/usage/dao/UsageNetworkDaoImpl.java | 8 +- .../usage/dao/UsageNetworkOfferingDaoImpl.java | 6 +- .../dao/UsagePortForwardingRuleDaoImpl.java | 8 +- .../usage/dao/UsageSecurityGroupDaoImpl.java | 6 +- .../cloud/usage/dao/UsageStorageDaoImpl.java | 8 +- .../cloud/usage/dao/UsageVMInstanceDaoImpl.java | 8 +- .../cloud/usage/dao/UsageVMSnapshotDaoImpl.java | 8 +- .../cloud/usage/dao/UsageVPNUserDaoImpl.java | 6 +- .../com/cloud/usage/dao/UsageVmDiskDaoImpl.java | 8 +- .../com/cloud/usage/dao/UsageVolumeDaoImpl.java | 8 +- .../src/com/cloud/user/dao/AccountDaoImpl.java | 8 +- .../cloud/user/dao/UserStatisticsDaoImpl.java | 6 +- .../cloud/user/dao/VmDiskStatisticsDaoImpl.java | 6 +- .../com/cloud/vm/dao/ConsoleProxyDaoImpl.java | 14 +- .../cloud/vm/dao/UserVmCloneSettingDaoImpl.java | 2 - .../src/com/cloud/vm/dao/UserVmDaoImpl.java | 22 +- .../src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 14 +- .../vm/snapshot/dao/VMSnapshotDaoImpl.java | 6 +- .../entity/api/db/dao/VMEntityDaoImpl.java | 2 - .../cloudstack/region/dao/RegionDaoImpl.java | 2 - .../test/DirectAgentManagerSimpleImpl.java | 2 - .../vmsnapshot/DefaultVMSnapshotStrategy.java | 26 +- .../allocator/AbstractStoragePoolAllocator.java | 30 +- .../GarbageCollectingStoragePoolAllocator.java | 6 +- .../allocator/LocalStoragePoolAllocator.java | 14 +- .../allocator/ZoneWideStoragePoolAllocator.java | 12 +- .../provider/DataStoreProviderManagerImpl.java | 10 +- .../storage/db/ObjectInDataStoreDaoImpl.java | 6 +- .../image/db/SnapshotDataStoreDaoImpl.java | 20 +- .../image/db/TemplateDataStoreDaoImpl.java | 18 +- .../image/db/VolumeDataStoreDaoImpl.java | 14 +- .../db/TemplatePrimaryDataStoreDaoImpl.java | 6 +- .../cloud/cluster/ClusterFenceManagerImpl.java | 4 +- .../com/cloud/cluster/ClusterManagerImpl.java | 196 ++++--- .../cluster/ClusterServiceServletAdapter.java | 10 +- .../dao/ManagementServerHostDaoImpl.java | 14 +- .../dao/ManagementServerHostPeerDaoImpl.java | 4 +- .../config/dao/ConfigurationDaoImpl.java | 8 +- .../src/com/cloud/utils/db/GenericDaoBase.java | 38 +- .../framework/jobs/dao/AsyncJobDaoImpl.java | 8 +- .../jobs/dao/AsyncJobJoinMapDaoImpl.java | 4 +- .../framework/jobs/dao/SyncQueueDaoImpl.java | 6 +- .../jobs/dao/SyncQueueItemDaoImpl.java | 6 +- .../framework/jobs/dao/VmWorkJobDaoImpl.java | 14 +- .../jobs/impl/AsyncJobManagerImpl.java | 146 +++-- .../framework/jobs/impl/AsyncJobMonitor.java | 10 +- .../jobs/impl/SyncQueueManagerImpl.java | 32 +- .../framework/jobs/AsyncJobTestDispatcher.java | 7 +- .../security/keystore/KeystoreManagerImpl.java | 18 +- .../spring/lifecycle/registry/DumpRegistry.java | 9 +- .../acl/StaticRoleBasedAPIAccessChecker.java | 4 +- .../affinity/ExplicitDedicationProcessor.java | 22 +- .../affinity/HostAntiAffinityProcessor.java | 18 +- .../discovery/ApiDiscoveryServiceImpl.java | 12 +- .../ratelimit/ApiRateLimitServiceImpl.java | 8 +- .../cloud/deploy/ImplicitDedicationPlanner.java | 12 +- .../deploy/UserConcentratedPodPlanner.java | 22 +- .../com/cloud/deploy/UserDispersingPlanner.java | 38 +- .../mom/inmemory/InMemoryEventBus.java | 2 - .../cloudstack/mom/kafka/KafkaEventBus.java | 2 - .../mom/rabbitmq/RabbitMQEventBus.java | 24 +- .../src/com/cloud/netapp/NetappManagerImpl.java | 112 ++-- .../src/com/cloud/netapp/dao/LunDaoImpl.java | 2 - .../src/com/cloud/netapp/dao/PoolDaoImpl.java | 2 - .../src/com/cloud/netapp/dao/VolumeDaoImpl.java | 2 - .../com/cloud/deploy/SkipHeuresticsPlanner.java | 6 +- .../manager/allocator/impl/RandomAllocator.java | 30 +- .../baremetal/manager/BareMetalDiscoverer.java | 20 +- .../cloud/baremetal/manager/BareMetalGuru.java | 2 - .../baremetal/manager/BareMetalPlanner.java | 12 +- .../manager/BareMetalTemplateAdapter.java | 12 +- .../baremetal/manager/BaremetalManagerImpl.java | 10 +- .../BareMetalPingServiceImpl.java | 14 +- .../networkservice/BareMetalResourceBase.java | 52 +- .../networkservice/BaremetaNetworkGuru.java | 6 +- .../networkservice/BaremetalDhcpElement.java | 4 +- .../BaremetalDhcpManagerImpl.java | 12 +- .../BaremetalDhcpResourceBase.java | 4 +- .../networkservice/BaremetalDhcpdResource.java | 8 +- .../BaremetalDnsmasqResource.java | 8 +- .../BaremetalKickStartPxeResource.java | 16 +- .../BaremetalKickStartServiceImpl.java | 16 +- .../BaremetalPingPxeResource.java | 22 +- .../networkservice/BaremetalPxeElement.java | 4 +- .../networkservice/BaremetalPxeManagerImpl.java | 6 +- .../BaremetalPxeResourceBase.java | 4 +- .../src/com/cloud/ha/HypervInvestigator.java | 4 +- .../discoverer/HypervServerDiscoverer.java | 46 +- .../kvm/src/com/cloud/ha/KVMInvestigator.java | 10 +- .../com/cloud/ovm/hypervisor/OvmDiscoverer.java | 22 +- .../src/com/cloud/ovm/hypervisor/OvmFencer.java | 16 +- .../java/com/cloud/ha/Ovm3Investigator.java | 8 +- .../ovm3/resources/Ovm3Discoverer.java | 54 +- .../ovm3/resources/Ovm3FenceBuilder.java | 14 +- .../ovm3/resources/Ovm3HypervisorGuru.java | 6 +- .../agent/manager/MockAgentManagerImpl.java | 24 +- .../agent/manager/MockNetworkManagerImpl.java | 12 +- .../agent/manager/MockStorageManagerImpl.java | 4 +- .../cloud/agent/manager/MockVmManagerImpl.java | 28 +- .../agent/manager/SimulatorManagerImpl.java | 12 +- .../src/com/cloud/ha/SimulatorFencer.java | 16 +- .../src/com/cloud/ha/SimulatorInvestigator.java | 12 +- .../com/cloud/resource/SimulatorDiscoverer.java | 28 +- .../resource/SimulatorSecondaryDiscoverer.java | 4 +- .../simulator/dao/MockConfigurationDaoImpl.java | 4 +- .../com/cloud/hypervisor/guru/VMwareGuru.java | 12 +- .../vmware/VmwareServerDiscoverer.java | 72 ++- .../vmware/dao/LegacyZoneDaoImpl.java | 2 - .../vmware/dao/VmwareDatacenterDaoImpl.java | 2 - .../vmware/manager/VmwareManagerImpl.java | 144 +++-- .../network/CiscoNexusVSMDeviceManagerImpl.java | 8 +- .../network/dao/CiscoNexusVSMDeviceDaoImpl.java | 2 - .../network/element/CiscoNexusVSMElement.java | 10 +- .../src/com/cloud/ha/XenServerFencer.java | 18 +- .../discoverer/XcpServerDiscoverer.java | 60 +- .../network/element/BigSwitchBcfElement.java | 16 +- .../guru/BigSwitchBcfGuestNetworkGuru.java | 20 +- .../network/resource/BigSwitchBcfResource.java | 18 +- .../network/element/BrocadeVcsElement.java | 12 +- .../guru/BrocadeVcsGuestNetworkGuru.java | 32 +- .../cloud/network/element/CiscoVnmcElement.java | 64 +-- .../element/ElasticLoadBalancerElement.java | 6 +- .../lb/ElasticLoadBalancerManagerImpl.java | 50 +- .../element/F5ExternalLoadBalancerElement.java | 10 +- .../cloudstack/element/GloboDnsElement.java | 6 +- .../cloudstack/resource/GloboDnsResource.java | 32 +- .../element/InternalLoadBalancerElement.java | 62 +- .../lb/InternalLoadBalancerVMManagerImpl.java | 80 ++- .../test/resources/lb_element.xml | 2 +- .../management/ContrailElementImpl.java | 46 +- .../contrail/management/ContrailGuru.java | 52 +- .../management/ContrailManagerImpl.java | 50 +- .../management/ContrailVpcElementImpl.java | 25 +- .../management/ManagementNetworkGuru.java | 10 +- .../contrail/management/MockAccountManager.java | 4 +- .../JuniperSRXExternalFirewallElement.java | 16 +- .../cloud/network/element/MidoNetElement.java | 36 +- .../network/guru/MidoNetGuestNetworkGuru.java | 22 +- .../network/guru/MidoNetPublicNetworkGuru.java | 28 +- .../cloud/network/element/NetscalerElement.java | 50 +- .../cloud/network/element/NiciraNvpElement.java | 62 +- .../network/guru/NiciraNvpGuestNetworkGuru.java | 26 +- .../cloud/network/element/NuageVspElement.java | 36 +- .../network/guru/NuageVspGuestNetworkGuru.java | 54 +- .../network/manager/NuageVspManagerImpl.java | 6 +- .../network/resource/NuageVspResource.java | 12 +- .../opendaylight/OpendaylightElement.java | 2 - .../OpendaylightGuestNetworkGuru.java | 34 +- .../com/cloud/network/element/OvsElement.java | 22 +- .../cloud/network/guru/OvsGuestNetworkGuru.java | 13 +- .../cloud/network/ovs/OvsTunnelManagerImpl.java | 104 ++-- .../dao/VpcDistributedRouterSeqNoDaoImpl.java | 2 - .../PaloAltoExternalFirewallElement.java | 16 +- .../cloudstack/network/dao/SspUuidDaoImpl.java | 2 - .../cloudstack/network/element/SspElement.java | 72 ++- .../network/guru/SspGuestNetworkGuru.java | 22 +- .../network/guru/VxlanGuestNetworkGuru.java | 6 +- .../allocator/RandomStoragePoolAllocator.java | 16 +- .../util/ElastistorVolumeApiServiceImpl.java | 10 +- .../cloudstack/ldap/LdapAuthenticator.java | 6 +- .../cloud/server/auth/MD5UserAuthenticator.java | 12 +- .../server/auth/PBKDF2UserAuthenticator.java | 14 +- .../server/auth/PlainTextUserAuthenticator.java | 12 +- .../cloudstack/saml/SAML2AuthManagerImpl.java | 46 +- .../cloudstack/saml/SAML2UserAuthenticator.java | 10 +- .../auth/SHA256SaltedUserAuthenticator.java | 12 +- .../allocator/impl/FirstFitAllocator.java | 88 ++- .../allocator/impl/RecreateHostAllocator.java | 22 +- .../impl/UserConcentratedAllocator.java | 40 +- .../authn/impl/BasicAgentAuthManager.java | 4 +- .../src/com/cloud/alert/AlertManagerImpl.java | 69 ++- .../com/cloud/alert/ClusterAlertAdapter.java | 32 +- .../cloud/alert/ConsoleProxyAlertAdapter.java | 42 +- .../alert/SecondaryStorageVmAlertAdapter.java | 42 +- .../com/cloud/api/ApiAsyncJobDispatcher.java | 4 +- server/src/com/cloud/api/ApiServer.java | 286 +++++---- .../api/auth/APIAuthenticationManagerImpl.java | 8 +- .../com/cloud/api/query/QueryManagerImpl.java | 20 +- .../cloud/api/query/dao/AccountJoinDaoImpl.java | 2 - .../api/query/dao/AffinityGroupJoinDaoImpl.java | 2 - .../api/query/dao/DataCenterJoinDaoImpl.java | 2 - .../api/query/dao/DiskOfferingJoinDaoImpl.java | 2 - .../cloud/api/query/dao/DomainJoinDaoImpl.java | 2 - .../api/query/dao/DomainRouterJoinDaoImpl.java | 2 - .../cloud/api/query/dao/HostJoinDaoImpl.java | 4 +- .../com/cloud/api/query/dao/HostTagDaoImpl.java | 2 - .../api/query/dao/ImageStoreJoinDaoImpl.java | 2 - .../api/query/dao/InstanceGroupJoinDaoImpl.java | 2 - .../query/dao/ProjectAccountJoinDaoImpl.java | 2 - .../query/dao/ProjectInvitationJoinDaoImpl.java | 2 - .../cloud/api/query/dao/ProjectJoinDaoImpl.java | 2 - .../api/query/dao/StoragePoolJoinDaoImpl.java | 2 - .../cloud/api/query/dao/StorageTagDaoImpl.java | 2 - .../api/query/dao/TemplateJoinDaoImpl.java | 2 - .../api/query/dao/UserAccountJoinDaoImpl.java | 2 - .../cloud/api/query/dao/UserVmJoinDaoImpl.java | 2 - .../cloud/api/query/dao/VolumeJoinDaoImpl.java | 2 - .../com/cloud/capacity/CapacityManagerImpl.java | 150 +++-- .../configuration/ConfigurationManagerImpl.java | 94 ++- .../AgentBasedConsoleProxyManager.java | 22 +- ...AgentBasedStandaloneConsoleProxyManager.java | 18 +- .../consoleproxy/ConsoleProxyManagerImpl.java | 268 +++++---- .../deploy/DeploymentPlanningManagerImpl.java | 166 +++--- .../src/com/cloud/deploy/FirstFitPlanner.java | 92 ++- .../com/cloud/event/dao/EventJoinDaoImpl.java | 2 - .../com/cloud/ha/AbstractInvestigatorImpl.java | 22 +- .../com/cloud/ha/CheckOnAgentInvestigator.java | 10 +- .../ha/HighAvailabilityManagerExtImpl.java | 10 +- .../cloud/ha/HighAvailabilityManagerImpl.java | 172 +++--- server/src/com/cloud/ha/KVMFencer.java | 10 +- .../ha/ManagementIPSystemVMInvestigator.java | 28 +- server/src/com/cloud/ha/RecreatableFencer.java | 14 +- .../com/cloud/ha/UserVmDomRInvestigator.java | 50 +- .../src/com/cloud/ha/XenServerInvestigator.java | 4 +- .../cloud/ha/dao/HighAvailabilityDaoImpl.java | 2 - .../hypervisor/CloudZonesStartupProcessor.java | 66 ++- .../cloud/hypervisor/HypervisorGuruBase.java | 4 +- .../hypervisor/HypervisorGuruManagerImpl.java | 2 - .../kvm/discoverer/KvmServerDiscoverer.java | 2 - .../kvm/discoverer/LibvirtServerDiscoverer.java | 28 +- .../kvm/discoverer/LxcServerDiscoverer.java | 2 - .../metadata/ResourceMetaDataManagerImpl.java | 2 - .../network/ExternalDeviceUsageManagerImpl.java | 76 ++- .../ExternalFirewallDeviceManagerImpl.java | 38 +- .../network/ExternalIpAddressAllocator.java | 10 +- .../ExternalLoadBalancerDeviceManagerImpl.java | 84 ++- .../ExternalNetworkDeviceManagerImpl.java | 4 +- .../com/cloud/network/IpAddressManagerImpl.java | 142 +++-- .../cloud/network/Ipv6AddressManagerImpl.java | 4 +- .../src/com/cloud/network/NetworkModelImpl.java | 68 ++- .../com/cloud/network/NetworkServiceImpl.java | 148 +++-- .../cloud/network/NetworkUsageManagerImpl.java | 36 +- .../network/StorageNetworkManagerImpl.java | 8 +- .../cloud/network/as/AutoScaleManagerImpl.java | 96 ++-- .../element/CloudZonesNetworkElement.java | 8 +- .../cloud/network/element/HAProxyLBRule.java | 134 +++++ .../network/element/VirtualRouterElement.java | 162 +----- .../element/VpcVirtualRouterElement.java | 86 ++- .../network/firewall/FirewallManagerImpl.java | 58 +- .../cloud/network/guru/ControlNetworkGuru.java | 18 +- .../cloud/network/guru/DirectNetworkGuru.java | 20 +- .../network/guru/DirectPodBasedNetworkGuru.java | 8 +- .../network/guru/ExternalGuestNetworkGuru.java | 4 +- .../cloud/network/guru/GuestNetworkGuru.java | 10 +- .../cloud/network/guru/PodBasedNetworkGuru.java | 8 +- .../cloud/network/guru/PrivateNetworkGuru.java | 8 +- .../cloud/network/guru/PublicNetworkGuru.java | 10 +- .../cloud/network/guru/StorageNetworkGuru.java | 8 +- .../network/lb/LBHealthCheckManagerImpl.java | 16 +- .../lb/LoadBalancingRulesManagerImpl.java | 172 +++--- .../VirtualNetworkApplianceManagerImpl.java | 244 ++++---- .../VpcVirtualNetworkApplianceManagerImpl.java | 86 ++- .../cloud/network/rules/RulesManagerImpl.java | 118 ++-- .../security/SecurityGroupManagerImpl2.java | 54 +- .../network/vpc/NetworkACLManagerImpl.java | 40 +- .../network/vpc/NetworkACLServiceImpl.java | 8 +- .../com/cloud/network/vpc/VpcManagerImpl.java | 184 +++--- .../network/vpn/RemoteAccessVpnManagerImpl.java | 26 +- .../network/vpn/Site2SiteVpnManagerImpl.java | 4 +- .../com/cloud/projects/ProjectManagerImpl.java | 68 ++- .../src/com/cloud/resource/DiscovererBase.java | 20 +- .../com/cloud/resource/DummyHostDiscoverer.java | 4 +- .../com/cloud/resource/ResourceManagerImpl.java | 162 +++--- .../resourcelimit/ResourceLimitManagerImpl.java | 20 +- .../cloud/server/ConfigurationServerImpl.java | 152 +++-- .../com/cloud/server/ManagementServerImpl.java | 116 ++-- server/src/com/cloud/server/StatsCollector.java | 86 ++- .../storage/ImageStoreUploadMonitorImpl.java | 66 ++- .../src/com/cloud/storage/OCFS2ManagerImpl.java | 12 +- .../com/cloud/storage/StorageManagerImpl.java | 172 +++--- .../com/cloud/storage/VolumeApiServiceImpl.java | 60 +- .../storage/download/DownloadMonitorImpl.java | 18 +- .../storage/snapshot/SnapshotManagerImpl.java | 50 +- .../storage/snapshot/SnapshotSchedulerImpl.java | 24 +- .../cloud/storage/upload/UploadMonitorImpl.java | 34 +- .../cloud/tags/TaggedResourceManagerImpl.java | 4 +- .../template/HypervisorTemplateAdapter.java | 32 +- .../com/cloud/template/TemplateAdapterBase.java | 4 +- .../com/cloud/template/TemplateManagerImpl.java | 88 ++- .../src/com/cloud/usage/UsageServiceImpl.java | 10 +- .../src/com/cloud/user/AccountManagerImpl.java | 228 ++++---- .../src/com/cloud/user/DomainManagerImpl.java | 38 +- server/src/com/cloud/vm/UserVmManagerImpl.java | 342 ++++++----- .../vm/snapshot/VMSnapshotManagerImpl.java | 20 +- .../affinity/AffinityGroupServiceImpl.java | 16 +- .../lb/ApplicationLoadBalancerManagerImpl.java | 10 +- .../cloudstack/region/RegionManagerImpl.java | 2 - .../cloudstack/region/RegionServiceImpl.java | 2 - .../consoleproxy/ConsoleProxyManagerTest.java | 1 + .../com/cloud/vpc/MockNetworkManagerImpl.java | 4 +- .../vpc/dao/MockNetworkOfferingDaoImpl.java | 6 +- .../test/com/cloud/vpc/dao/MockVpcDaoImpl.java | 6 +- .../SecondaryStorageManagerImpl.java | 206 ++++--- .../resource/SecondaryStorageDiscoverer.java | 32 +- .../storage/template/DownloadManagerImpl.java | 84 ++- .../storage/template/UploadManagerImpl.java | 76 ++- .../com/cloud/usage/UsageAlertManagerImpl.java | 19 +- usage/src/com/cloud/usage/UsageManagerImpl.java | 306 +++++----- .../utils/component/ComponentLifecycleBase.java | 2 +- .../utils/identity/ManagementServerNode.java | 4 +- 361 files changed, 5859 insertions(+), 6550 deletions(-) ----------------------------------------------------------------------
