You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2013/12/12 22:01:46 UTC
[46/48] git commit: updated refs/heads/master to cf0a11e
All Checkstyle problems corrected
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/be5e5cc6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/be5e5cc6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/be5e5cc6
Branch: refs/heads/master
Commit: be5e5cc6415239b5261f6bc05671f5f4454c94ca
Parents: f33b247
Author: Alex Huang <al...@citrix.com>
Authored: Thu Dec 12 10:30:09 2013 -0800
Committer: Alex Huang <al...@citrix.com>
Committed: Thu Dec 12 12:26:07 2013 -0800
----------------------------------------------------------------------
agent/src/com/cloud/agent/AgentShell.java | 2 +-
.../com/cloud/agent/resource/DummyResource.java | 4 +-
api/src/com/cloud/agent/api/to/NfsTO.java | 8 +-
api/src/com/cloud/agent/api/to/VolumeTO.java | 6 +-
api/src/com/cloud/alert/Alert.java | 1 +
api/src/com/cloud/deploy/DeploymentPlanner.java | 22 +-
api/src/com/cloud/event/EventTypes.java | 1 -
api/src/com/cloud/network/Networks.java | 2 +-
api/src/com/cloud/network/OvsProvider.java | 4 +-
.../network/VirtualNetworkApplianceService.java | 2 +-
.../com/cloud/network/as/AutoScalePolicy.java | 4 +-
.../com/cloud/network/as/AutoScaleVmGroup.java | 2 +-
api/src/com/cloud/network/as/Counter.java | 2 +-
.../cloud/network/element/NetworkElement.java | 2 -
.../element/UserDataServiceProvider.java | 2 +-
.../element/VirtualRouterElementService.java | 5 +-
.../cloud/network/firewall/FirewallService.java | 2 +-
.../network/lb/LoadBalancingRulesService.java | 4 +-
.../cloud/network/vpc/NetworkACLService.java | 2 +-
api/src/com/cloud/offering/DiskOffering.java | 2 +-
.../cloud/region/ha/GlobalLoadBalancerRule.java | 4 +-
api/src/com/cloud/storage/VolumeApiService.java | 8 -
.../storage/snapshot/SnapshotApiService.java | 2 -
.../com/cloud/user/ResourceLimitService.java | 2 -
api/src/com/cloud/vm/DiskProfile.java | 16 +-
api/src/com/cloud/vm/UserVmService.java | 25 +-
api/src/com/cloud/vm/VirtualMachine.java | 18 +-
.../apache/cloudstack/alert/AlertService.java | 18 +-
.../org/apache/cloudstack/api/ApiConstants.java | 10 +-
.../api/BaseAsyncCreateCustomIdCmd.java | 7 +-
.../cloudstack/api/BaseAsyncCustomIdCmd.java | 5 +-
api/src/org/apache/cloudstack/api/BaseCmd.java | 13 +-
.../apache/cloudstack/api/BaseCustomIdCmd.java | 4 +-
.../org/apache/cloudstack/api/BaseListCmd.java | 22 +-
.../BaseListTemplateOrIsoPermissionsCmd.java | 14 +-
.../BaseUpdateTemplateOrIsoPermissionsCmd.java | 24 +-
.../cloudstack/api/ResponseGenerator.java | 4 +-
.../command/admin/alert/GenerateAlertCmd.java | 21 +-
.../api/command/admin/config/ListCfgsByCmd.java | 20 +-
.../api/command/admin/config/UpdateCfgCmd.java | 16 +-
.../ListInternalLoadBalancerElementsCmd.java | 4 +-
.../admin/network/CreateNetworkOfferingCmd.java | 8 +-
.../network/ListNetworkServiceProvidersCmd.java | 4 +-
.../network/ListStorageNetworkIpRangeCmd.java | 4 +-
.../ListSupportedNetworkServicesCmd.java | 4 +-
.../admin/network/UpdateNetworkOfferingCmd.java | 4 +-
.../offering/CreateServiceOfferingCmd.java | 4 +-
.../command/admin/resource/ListAlertsCmd.java | 6 +-
.../admin/router/ConfigureOvsElementCmd.java | 176 +-
.../admin/router/ListOvsElementsCmd.java | 106 +-
.../router/ListVirtualRouterElementsCmd.java | 4 +-
.../api/command/admin/storage/AddS3Cmd.java | 62 +-
.../admin/systemvm/ScaleSystemVMCmd.java | 10 +-
.../admin/systemvm/UpgradeSystemVMCmd.java | 12 +-
.../usage/ListTrafficTypeImplementorsCmd.java | 4 +-
.../admin/usage/ListTrafficTypesCmd.java | 4 +-
.../command/admin/vpc/CreateVPCOfferingCmd.java | 4 +-
.../command/admin/vpc/UpdateVPCOfferingCmd.java | 4 +-
.../user/network/ListNetworkACLListsCmd.java | 9 +-
.../user/network/ListNetworkACLsCmd.java | 7 +-
.../user/network/ListNetworkOfferingsCmd.java | 4 +-
.../command/user/network/ListNetworksCmd.java | 4 +-
.../api/command/user/vm/DeployVMCmd.java | 14 +-
.../api/command/user/vm/ScaleVMCmd.java | 13 +-
.../api/command/user/vm/UpdateVMCmd.java | 5 +-
.../api/command/user/vm/UpgradeVMCmd.java | 12 +-
.../command/user/volume/CreateVolumeCmd.java | 5 +-
.../command/user/volume/UpdateVolumeCmd.java | 5 +-
.../api/command/user/vpc/CreateVPCCmd.java | 22 +-
.../command/user/vpc/ListVPCOfferingsCmd.java | 4 +-
.../api/command/user/vpc/RestartVPCCmd.java | 4 +-
.../api/command/user/vpc/UpdateVPCCmd.java | 4 +-
.../cloudstack/api/response/AlertResponse.java | 7 +-
.../api/response/CapabilitiesResponse.java | 6 +-
.../api/response/DiskOfferingResponse.java | 3 +-
.../api/response/OvsProviderResponse.java | 108 +-
.../api/response/ServiceOfferingResponse.java | 6 +-
.../apache/cloudstack/context/CallContext.java | 27 +-
.../api/command/test/AddIpToVmNicTest.java | 6 +-
.../ec2/AmazonEC2MessageReceiverInOut.java | 288 +-
awsapi/src/com/amazon/ec2/UserDataType.java | 4 +-
.../com/amazon/ec2/client/AmazonEC2Stub.java | 1444 ++++----
.../amazon/s3/AmazonS3MessageReceiverInOut.java | 32 +-
awsapi/src/com/amazon/s3/MetadataDirective.java | 2 +-
awsapi/src/com/amazon/s3/MfaDeleteStatus.java | 2 +-
awsapi/src/com/amazon/s3/Payer.java | 2 +-
awsapi/src/com/amazon/s3/Permission.java | 2 +-
awsapi/src/com/amazon/s3/StorageClass.java | 2 +-
awsapi/src/com/amazon/s3/VersioningStatus.java | 2 +-
.../src/com/amazon/s3/client/AmazonS3Stub.java | 166 +-
.../cloud/bridge/service/EC2RestServlet.java | 36 +-
.../service/controller/s3/ServiceProvider.java | 2 +-
.../bridge/service/core/ec2/EC2Engine.java | 54 +-
.../src/main/resources/tooling/checkstyle.xml | 89 +-
.../cloud/agent/api/AttachVolumeCommand.java | 2 +-
.../cloud/agent/api/ComputeChecksumCommand.java | 4 +-
.../CreatePrivateTemplateFromVolumeCommand.java | 4 +-
.../cloud/agent/api/ManageSnapshotCommand.java | 4 +-
.../agent/api/PerformanceMonitorAnswer.java | 12 +-
.../agent/api/PerformanceMonitorCommand.java | 34 +-
core/src/com/cloud/agent/api/StartAnswer.java | 8 +-
core/src/com/cloud/agent/api/StopAnswer.java | 4 +-
.../agent/api/UpdateHostPasswordCommand.java | 14 +-
.../baremetal/PrepareCreateTemplateCommand.java | 66 +
.../baremetal/prepareCreateTemplateCommand.java | 66 -
.../com/cloud/agent/api/routing/IpAliasTO.java | 8 +-
.../api/routing/LoadBalancerConfigCommand.java | 8 +-
.../api/storage/AbstractDownloadCommand.java | 2 +-
.../storage/CreatePrivateTemplateAnswer.java | 4 +-
.../com/cloud/agent/api/storage/SsCommand.java | 48 +
.../com/cloud/agent/api/storage/ssCommand.java | 48 -
.../cloud/info/RunningHostInfoAgregator.java | 8 +-
.../cloud/network/LoadBalancerValidator.java | 2 -
.../resource/TrafficSentinelResource.java | 8 +-
.../template/HttpTemplateDownloader.java | 14 +-
.../template/TemplateDownloaderBase.java | 6 +-
.../cloud/storage/template/VhdProcessor.java | 22 +-
.../storage/command/DownloadCommand.java | 4 +-
.../src/com/xensource/xenapi/APIVersion.java | 44 +-
.../src/com/xensource/xenapi/Auth.java | 26 +-
.../src/com/xensource/xenapi/Blob.java | 139 +-
.../src/com/xensource/xenapi/Bond.java | 181 +-
.../src/com/xensource/xenapi/Connection.java | 66 +-
.../src/com/xensource/xenapi/Console.java | 127 +-
.../src/com/xensource/xenapi/Crashdump.java | 105 +-
.../src/com/xensource/xenapi/DRTask.java | 85 +-
.../src/com/xensource/xenapi/DataSource.java | 11 +-
.../src/com/xensource/xenapi/Event.java | 75 +-
.../src/com/xensource/xenapi/GPUGroup.java | 137 +-
.../src/com/xensource/xenapi/Host.java | 1083 +++---
.../src/com/xensource/xenapi/HostCpu.java | 174 +-
.../src/com/xensource/xenapi/HostCrashdump.java | 125 +-
.../src/com/xensource/xenapi/HostMetrics.java | 112 +-
.../src/com/xensource/xenapi/HostPatch.java | 187 +-
.../src/com/xensource/xenapi/Marshalling.java | 18 +-
.../src/com/xensource/xenapi/Message.java | 84 +-
.../src/com/xensource/xenapi/Network.java | 267 +-
.../src/com/xensource/xenapi/PBD.java | 175 +-
.../src/com/xensource/xenapi/PCI.java | 125 +-
.../src/com/xensource/xenapi/PGPU.java | 101 +-
.../src/com/xensource/xenapi/PIF.java | 509 +--
.../src/com/xensource/xenapi/PIFMetrics.java | 165 +-
.../src/com/xensource/xenapi/Pool.java | 854 ++---
.../src/com/xensource/xenapi/PoolPatch.java | 229 +-
.../src/com/xensource/xenapi/Role.java | 115 +-
.../src/com/xensource/xenapi/SM.java | 165 +-
.../src/com/xensource/xenapi/SR.java | 739 ++--
.../src/com/xensource/xenapi/Secret.java | 117 +-
.../src/com/xensource/xenapi/Session.java | 219 +-
.../src/com/xensource/xenapi/Subject.java | 121 +-
.../src/com/xensource/xenapi/Task.java | 227 +-
.../src/com/xensource/xenapi/Tunnel.java | 157 +-
.../src/com/xensource/xenapi/Types.java | 3163 +++++++++--------
.../src/com/xensource/xenapi/User.java | 127 +-
.../src/com/xensource/xenapi/VBD.java | 413 ++-
.../src/com/xensource/xenapi/VBDMetrics.java | 101 +-
.../src/com/xensource/xenapi/VDI.java | 801 ++---
.../src/com/xensource/xenapi/VGPU.java | 141 +-
.../src/com/xensource/xenapi/VIF.java | 399 ++-
.../src/com/xensource/xenapi/VIFMetrics.java | 101 +-
.../src/com/xensource/xenapi/VLAN.java | 127 +-
.../src/com/xensource/xenapi/VM.java | 2103 +++++------
.../src/com/xensource/xenapi/VMAppliance.java | 233 +-
.../com/xensource/xenapi/VMGuestMetrics.java | 149 +-
.../src/com/xensource/xenapi/VMMetrics.java | 157 +-
.../src/com/xensource/xenapi/VMPP.java | 399 ++-
.../src/com/xensource/xenapi/VTPM.java | 77 +-
.../src/com/cloud/vm/VirtualMachineManager.java | 48 +-
.../src/com/cloud/alert/AlertManager.java | 8 +-
.../src/com/cloud/event/UsageEventUtils.java | 40 +-
.../com/cloud/network/NetworkStateListener.java | 6 +-
.../src/com/cloud/network/vpc/VpcManager.java | 2 +-
.../src/com/cloud/template/TemplateManager.java | 2 -
.../components-api/src/com/cloud/vm/VmWork.java | 28 +-
.../cloud/agent/manager/AgentManagerImpl.java | 3 +-
.../manager/ClusteredAgentManagerImpl.java | 78 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 964 +++---
.../cloud/vm/VirtualMachinePowerStateSync.java | 16 +-
.../src/com/cloud/vm/VmWorkAddVmToNetwork.java | 38 +-
.../src/com/cloud/vm/VmWorkJobDispatcher.java | 145 +-
.../src/com/cloud/vm/VmWorkMigrate.java | 6 +-
.../src/com/cloud/vm/VmWorkMigrateForScale.java | 38 +-
.../com/cloud/vm/VmWorkMigrateWithStorage.java | 40 +-
.../src/com/cloud/vm/VmWorkReboot.java | 76 +-
.../src/com/cloud/vm/VmWorkReconfigure.java | 32 +-
.../src/com/cloud/vm/VmWorkRemoveNicFromVm.java | 18 +-
.../com/cloud/vm/VmWorkRemoveVmFromNetwork.java | 38 +-
.../src/com/cloud/vm/VmWorkSerializer.java | 27 +-
.../src/com/cloud/vm/VmWorkStart.java | 174 +-
.../src/com/cloud/vm/VmWorkStop.java | 18 +-
.../com/cloud/vm/VmWorkStorageMigration.java | 16 +-
.../entity/api/db/dao/EngineHostDaoImpl.java | 4 +-
.../orchestration/NetworkOrchestrator.java | 87 +-
.../orchestration/VolumeOrchestrator.java | 31 +-
.../cloud/vm/VirtualMachineManagerImplTest.java | 1 -
engine/schema/src/com/cloud/alert/AlertVO.java | 5 +-
.../src/com/cloud/alert/dao/AlertDao.java | 4 +-
.../src/com/cloud/alert/dao/AlertDaoImpl.java | 8 +-
.../src/com/cloud/capacity/dao/CapacityDao.java | 11 +-
.../com/cloud/capacity/dao/CapacityDaoImpl.java | 59 +-
.../src/com/cloud/dc/dao/DataCenterDaoImpl.java | 12 +-
.../event/dao/UsageEventDetailsDaoImpl.java | 2 +-
.../com/cloud/network/as/AutoScalePolicyVO.java | 26 +-
.../cloud/network/as/AutoScaleVmGroupVO.java | 28 +-
.../network/as/AutoScaleVmGroupVmMapVO.java | 46 +-
.../as/dao/AutoScalePolicyConditionMapDao.java | 4 +-
.../dao/AutoScalePolicyConditionMapDaoImpl.java | 16 +-
.../as/dao/AutoScaleVmGroupVmMapDao.java | 6 +-
.../as/dao/AutoScaleVmGroupVmMapDaoImpl.java | 46 +-
.../network/dao/ExternalFirewallDeviceDao.java | 12 +-
.../network/dao/ExternalFirewallDeviceVO.java | 6 +-
.../dao/ExternalLoadBalancerDeviceDao.java | 16 +-
.../dao/ExternalLoadBalancerDeviceDaoImpl.java | 8 +-
.../dao/ExternalLoadBalancerDeviceVO.java | 12 +-
.../network/dao/LoadBalancerCertMapDaoImpl.java | 4 +-
.../com/cloud/network/dao/OvsProviderDao.java | 6 +-
.../cloud/network/dao/OvsProviderDaoImpl.java | 68 +-
.../com/cloud/network/dao/SslCertDaoImpl.java | 2 +-
.../cloud/network/element/OvsProviderVO.java | 128 +-
.../security/dao/VmRulesetLogDaoImpl.java | 4 +-
.../com/cloud/offerings/NetworkOfferingVO.java | 4 +-
.../com/cloud/service/ServiceOfferingVO.java | 39 +-
.../cloud/service/dao/ServiceOfferingDao.java | 2 +-
.../service/dao/ServiceOfferingDaoImpl.java | 8 +-
.../src/com/cloud/storage/DiskOfferingVO.java | 2 +-
.../storage/dao/VMTemplateHostDaoImpl.java | 28 +-
.../cloud/upgrade/DatabaseIntegrityChecker.java | 2 +-
.../cloud/upgrade/DatabaseUpgradeChecker.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade218to22.java | 20 +-
.../cloud/upgrade/dao/Upgrade2213to2214.java | 4 +-
.../com/cloud/upgrade/dao/Upgrade410to420.java | 16 +-
.../com/cloud/upgrade/dao/Upgrade420to421.java | 16 +-
.../com/cloud/upgrade/dao/Upgrade430to440.java | 4 +-
.../src/com/cloud/usage/UsageVMInstanceVO.java | 12 +-
.../com/cloud/usage/dao/UsageStorageDao.java | 2 +-
.../cloud/usage/dao/UsageStorageDaoImpl.java | 4 +-
.../src/com/cloud/user/dao/AccountDaoImpl.java | 2 +-
.../src/com/cloud/vm/dao/NicIpAliasDao.java | 2 +-
.../src/com/cloud/vm/dao/UserVmDaoImpl.java | 4 +-
.../src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 2 +-
.../cloud/vm/snapshot/dao/VMSnapshotDao.java | 2 +-
.../vm/snapshot/dao/VMSnapshotDaoImpl.java | 4 +-
.../resourcedetail/NetworkACLItemDetailVO.java | 1 -
.../resourcedetail/NetworkACLListDetailVO.java | 1 -
.../dao/NetworkACLItemDetailsDaoImpl.java | 7 +-
.../dao/NetworkACLListDetailsDaoImpl.java | 9 +-
.../resourcedetail/dao/VpcDetailsDaoImpl.java | 7 +-
.../dao/VpcGatewayDetailsDao.java | 1 -
.../dao/VpcGatewayDetailsDaoImpl.java | 7 +-
.../cloudstack/storage/test/AllTests.java | 2 +-
.../storage/test/ChildTestConfiguration.java | 16 +-
.../storage/test/CloudStackTestNGBase.java | 12 +-
.../storage/test/EndpointSelectorTest.java | 1 -
.../storage/test/SnapshotTestWithFakeData.java | 9 +-
.../storage/test/VolumeServiceTest.java | 470 +++
.../storage/test/volumeServiceTest.java | 470 ---
.../resources/StorageAllocatorTestContext.xml | 30 +-
.../vmsnapshot/DefaultVMSnapshotStrategy.java | 8 +-
.../storage/volume/VolumeServiceImpl.java | 3 +-
.../com/cloud/cluster/ClusterManagerImpl.java | 32 +-
.../dao/ManagementServerHostDaoImpl.java | 204 +-
.../config/impl/ConfigDepotAdminTest.java | 4 +-
.../db/src/com/cloud/utils/db/GenericDao.java | 6 +-
.../src/com/cloud/utils/db/GenericDaoBase.java | 24 +-
.../db/src/com/cloud/utils/db/Merovingian2.java | 4 +-
.../db/src/com/cloud/utils/db/SqlGenerator.java | 4 +-
.../com/cloud/utils/db/TransactionLegacy.java | 2 +-
.../test/com/cloud/utils/db/GlobalLockTest.java | 6 +-
.../jobs/AsyncJobExecutionContext.java | 154 +-
.../managed/threadlocal/ManagedThreadLocal.java | 6 +-
.../acl/StaticRoleBasedAPIAccessChecker.java | 4 +-
.../discovery/ApiDiscoveryServiceImpl.java | 8 +-
.../cloudstack/discovery/ApiDiscoveryTest.java | 26 +-
.../cloudstack/ratelimit/ApiRateLimitTest.java | 74 +-
.../implicitplanner/ImplicitPlannerTest.java | 1 -
.../mom/rabbitmq/RabbitMQEventBus.java | 64 +-
.../netapp/NetappDefaultAllocatorImpl.java | 15 +-
.../src/com/cloud/netapp/NetappManagerImpl.java | 5 -
.../BareMetalPingServiceImpl.java | 4 +-
.../BaremetalKickStartPxeResource.java | 2 +-
.../BaremetalPingPxeResource.java | 10 +-
.../BaremetalUserdataElement.java | 2 +-
.../discoverer/HypervServerDiscoverer.java | 15 -
.../hyperv/manager/HypervManagerImpl.java | 45 +-
.../resource/HypervDirectConnectResource.java | 43 +-
.../kvm/resource/BridgeVifDriver.java | 2 +-
.../hypervisor/kvm/resource/KVMHABase.java | 2 +-
.../hypervisor/kvm/resource/KVMHAChecker.java | 2 +-
.../hypervisor/kvm/resource/KVMHAMonitor.java | 6 +-
.../kvm/resource/LibvirtCapXMLParser.java | 8 +-
.../kvm/resource/LibvirtComputingResource.java | 456 ++-
.../kvm/resource/LibvirtConnection.java | 16 +-
.../kvm/resource/LibvirtNetworkDef.java | 10 +-
.../hypervisor/kvm/resource/LibvirtVMDef.java | 14 +-
.../kvm/storage/IscsiAdmStorageAdaptor.java | 367 ++
.../kvm/storage/IscsiAdmStoragePool.java | 167 +
.../kvm/storage/KVMStoragePoolManager.java | 2 +-
.../kvm/storage/KVMStorageProcessor.java | 26 +-
.../kvm/storage/iScsiAdmStorageAdaptor.java | 367 --
.../kvm/storage/iScsiAdmStoragePool.java | 167 -
.../resource/LibvirtComputingResourceTest.java | 16 +-
.../kvm/resource/LibvirtVifDriverTest.java | 26 +-
.../src/com/cloud/ovm/hypervisor/OvmHelper.java | 66 +-
.../cloud/ovm/hypervisor/OvmResourceBase.java | 46 +-
.../ovm/src/com/cloud/ovm/object/Coder.java | 18 +-
.../ovm/src/com/cloud/ovm/object/OvmBridge.java | 2 +-
.../ovm/src/com/cloud/ovm/object/OvmHost.java | 4 +-
.../com/cloud/resource/AgentResourceBase.java | 4 +-
.../com/cloud/hypervisor/guru/VMwareGuru.java | 13 +-
.../vmware/manager/VmwareManagerImpl.java | 2 +-
.../vmware/resource/VmwareResource.java | 155 +-
.../resource/VmwareStorageProcessor.java | 6 +-
.../xen/discoverer/XcpServerDiscoverer.java | 4 +-
.../hypervisor/xen/resource/CitrixHelper.java | 3270 +++++++++---------
.../xen/resource/CitrixResourceBase.java | 275 +-
.../xen/resource/XenServer56SP2Resource.java | 4 +-
.../xen/resource/XenServerConnectionPool.java | 22 +-
.../xen/resource/XenServerPoolVms.java | 16 +-
.../network/bigswitch/BigSwitchVnsApi.java | 22 +-
.../cloud/network/bigswitch/NetworkData.java | 22 +-
.../com/cloud/network/bigswitch/PortData.java | 10 +-
.../network/resource/BigSwitchVnsResource.java | 6 +-
.../api/ConfigureNexusVsmForAsaCommand.java | 24 +-
.../api/CreateLogicalEdgeFirewallCommand.java | 8 +-
.../network/cisco/CiscoVnmcConnectionImpl.java | 19 +-
.../element/CiscoVnmcElementService.java | 2 +-
.../network/resource/CiscoVnmcResource.java | 4 +-
.../lb/ElasticLoadBalancerManagerImpl.java | 8 +-
.../element/F5ExternalLoadBalancerElement.java | 4 +-
.../lb/InternalLoadBalancerVMManagerImpl.java | 4 +-
.../management/ContrailElementImpl.java | 2 +-
.../contrail/management/ContrailGuru.java | 6 +-
.../contrail/management/ContrailManager.java | 6 +-
.../management/ContrailManagerImpl.java | 16 +-
.../network/contrail/management/EventUtils.java | 7 +-
.../management/ManagementNetworkGuru.java | 26 +-
.../contrail/management/ServerDBSyncImpl.java | 18 +-
.../contrail/management/ServiceManagerImpl.java | 8 +-
.../contrail/model/ServiceInstanceModel.java | 12 +-
.../contrail/model/VirtualMachineModel.java | 52 +-
.../IntegrationTestConfiguration.java | 2 -
.../management/ManagementServerMock.java | 14 +-
.../management/NetworkProviderTest.java | 28 +-
.../contrail/management/PublicNetworkTest.java | 28 +-
.../test/resources/commonContext.xml | 146 +-
.../JuniperSRXExternalFirewallElement.java | 5 +-
.../network/resource/JuniperSrxResource.java | 10 +-
.../commands/AddNetscalerLoadBalancerCmd.java | 6 +-
.../cloud/network/element/NetscalerElement.java | 2 +-
.../network/resource/NetscalerResource.java | 114 +-
.../agent/api/OvsCreateGreTunnelAnswer.java | 98 +-
.../agent/api/OvsCreateGreTunnelCommand.java | 67 +-
.../cloud/agent/api/OvsCreateTunnelAnswer.java | 104 +-
.../cloud/agent/api/OvsCreateTunnelCommand.java | 77 +-
.../cloud/agent/api/OvsDeleteFlowCommand.java | 23 +-
.../agent/api/OvsDestroyBridgeCommand.java | 33 +-
.../agent/api/OvsDestroyTunnelCommand.java | 55 +-
.../agent/api/OvsFetchInterfaceAnswer.java | 70 +-
.../agent/api/OvsFetchInterfaceCommand.java | 23 +-
.../cloud/agent/api/OvsSetTagAndFlowAnswer.java | 30 +-
.../agent/api/OvsSetTagAndFlowCommand.java | 79 +-
.../cloud/agent/api/OvsSetupBridgeCommand.java | 53 +-
.../com/cloud/agent/api/StartupOvsCommand.java | 7 +-
.../com/cloud/network/element/OvsElement.java | 1014 +++---
.../cloud/network/guru/OvsGuestNetworkGuru.java | 334 +-
.../cloud/network/ovs/OvsTunnelManagerImpl.java | 479 ++-
.../PaloAltoExternalFirewallElement.java | 3 -
.../element/PaloAltoFirewallElementService.java | 3 -
.../network/resource/PaloAltoResource.java | 70 +-
.../resource/MockablePaloAltoResource.java | 31 +-
.../network/resource/PaloAltoResourceTest.java | 96 +-
.../cloudstack/network/element/SspElement.java | 4 +-
.../driver/CloudStackImageStoreDriverImpl.java | 2 +-
.../CloudStackImageStoreLifeCycleImpl.java | 4 +-
.../lifecycle/S3ImageStoreLifeCycleImpl.java | 4 +-
.../cloudstack/api/command/LDAPConfigCmd.java | 48 +-
.../api/command/LdapImportUsersCmd.java | 26 +-
.../apache/cloudstack/ldap/LdapManagerImpl.java | 15 +-
pom.xml | 2 +-
.../allocator/impl/FirstFitAllocator.java | 4 +-
.../src/com/cloud/alert/AlertManagerImpl.java | 55 +-
.../com/cloud/alert/ClusterAlertAdapter.java | 3 +-
.../cloud/alert/ConsoleProxyAlertAdapter.java | 14 +-
.../alert/SecondaryStorageVmAlertAdapter.java | 14 +-
server/src/com/cloud/api/ApiDBUtils.java | 857 +++--
server/src/com/cloud/api/ApiDispatcher.java | 2 +-
server/src/com/cloud/api/ApiResponseHelper.java | 36 +-
server/src/com/cloud/api/ApiServer.java | 30 +-
.../src/com/cloud/api/doc/ApiXmlDocWriter.java | 90 +-
.../api/query/dao/DiskOfferingJoinDaoImpl.java | 2 +-
.../api/query/dao/DomainRouterJoinDaoImpl.java | 2 +-
.../api/query/vo/ServiceOfferingJoinVO.java | 8 +-
.../com/cloud/api/query/vo/UserVmJoinVO.java | 10 +-
.../com/cloud/capacity/CapacityManagerImpl.java | 48 +-
.../cloud/capacity/ComputeCapacityListener.java | 6 +-
server/src/com/cloud/configuration/Config.java | 64 +-
.../configuration/ConfigurationManagerImpl.java | 20 +-
.../src/com/cloud/configuration/ZoneConfig.java | 6 +-
.../consoleproxy/ConsoleProxyManagerImpl.java | 24 +-
.../deploy/DeploymentPlanningManagerImpl.java | 30 +-
.../src/com/cloud/deploy/FirstFitPlanner.java | 5 +-
.../src/com/cloud/event/ActionEventUtils.java | 32 +-
server/src/com/cloud/event/AlertGenerator.java | 19 +-
.../cloud/ha/HighAvailabilityManagerImpl.java | 27 +-
.../metadata/ResourceMetaDataManagerImpl.java | 51 +-
.../src/com/cloud/network/IpAddrAllocator.java | 4 +-
.../com/cloud/network/IpAddressManagerImpl.java | 2 +-
.../src/com/cloud/network/NetworkModelImpl.java | 28 +-
.../com/cloud/network/NetworkServiceImpl.java | 78 +-
.../cloud/network/NetworkUsageManagerImpl.java | 3 +-
.../com/cloud/network/as/AutoScaleManager.java | 4 +-
.../cloud/network/as/AutoScaleManagerImpl.java | 400 +--
.../element/CloudZonesNetworkElement.java | 2 +-
.../network/element/VirtualRouterElement.java | 101 +-
.../cloud/network/guru/ControlNetworkGuru.java | 6 +-
.../cloud/network/guru/DirectNetworkGuru.java | 6 +-
.../network/guru/ExternalGuestNetworkGuru.java | 1 -
.../cloud/network/guru/GuestNetworkGuru.java | 6 +-
.../cloud/network/guru/PodBasedNetworkGuru.java | 6 +-
.../cloud/network/guru/PrivateNetworkGuru.java | 6 +-
.../cloud/network/guru/PublicNetworkGuru.java | 6 +-
.../cloud/network/guru/StorageNetworkGuru.java | 6 +-
.../lb/LoadBalancingRulesManagerImpl.java | 4 +-
.../router/VirtualNetworkApplianceManager.java | 2 +-
.../VirtualNetworkApplianceManagerImpl.java | 40 +-
.../network/vpc/NetworkACLServiceImpl.java | 23 +-
.../com/cloud/resource/ResourceManagerImpl.java | 9 +-
.../resourcelimit/ResourceLimitManagerImpl.java | 19 +-
.../cloud/server/ConfigurationServerImpl.java | 124 +-
.../com/cloud/server/ManagementServerImpl.java | 34 +-
server/src/com/cloud/server/StatsCollector.java | 739 ++--
.../com/cloud/storage/StorageManagerImpl.java | 4 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 22 +-
.../storage/download/DownloadListener.java | 16 +-
.../storage/download/DownloadMonitorImpl.java | 1 -
.../storage/listener/SnapshotStateListener.java | 7 +-
.../storage/listener/VolumeStateListener.java | 7 +-
.../resource/DummySecondaryStorageResource.java | 4 +-
.../secondary/SecondaryStorageManagerImpl.java | 9 +-
.../storage/snapshot/SnapshotManagerImpl.java | 5 +-
.../storage/snapshot/SnapshotSchedulerImpl.java | 8 +-
.../cloud/storage/upload/UploadListener.java | 12 +-
.../cloud/tags/TaggedResourceManagerImpl.java | 62 +-
.../template/HypervisorTemplateAdapter.java | 5 +-
.../com/cloud/template/TemplateManagerImpl.java | 18 +-
.../src/com/cloud/user/AccountManagerImpl.java | 109 +-
.../src/com/cloud/uuididentity/UUIDManager.java | 1 -
.../com/cloud/uuididentity/UUIDManagerImpl.java | 46 +-
.../cloud/uuididentity/dao/IdentityDaoImpl.java | 10 +-
.../src/com/cloud/vm/SystemVmLoadScanner.java | 18 +-
server/src/com/cloud/vm/UserVmManager.java | 5 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 145 +-
.../src/com/cloud/vm/UserVmStateListener.java | 13 +-
.../vm/snapshot/VMSnapshotManagerImpl.java | 4 +-
.../cloudstack/network/lb/CertServiceImpl.java | 24 +-
server/test/async-job-component.xml | 371 +-
.../com/cloud/capacity/CapacityManagerTest.java | 28 +-
.../network/DedicateGuestVlanRangesTest.java | 16 +-
.../cloud/network/MockFirewallManagerImpl.java | 2 +-
.../network/UpdatePhysicalNetworkTest.java | 6 +-
.../SecurityGroupManagerTestConfiguration.java | 12 +-
.../snapshot/SnapshotDaoTestConfiguration.java | 2 +-
.../vm/snapshot/VMSnapshotManagerTest.java | 2 +-
.../cloud/vpc/MockResourceLimitManagerImpl.java | 1 -
.../MockVpcVirtualNetworkApplianceManager.java | 2 +-
.../com/cloud/vpc/NetworkACLManagerTest.java | 9 +-
.../com/cloud/vpc/NetworkACLServiceTest.java | 18 +-
.../com/cloud/vpc/VpcTestConfiguration.java | 28 +-
.../networkoffering/ChildTestConfiguration.java | 18 +-
.../main/java/rdpclient/AwtRdpMouseAdapter.java | 19 +-
...lJoinRequestServerMCSChannelConfirmPDUs.java | 222 ++
...JoinRequest_ServerMCSChannelConfirmPDUs.java | 222 --
.../java/rdpclient/ClientPacketSniffer.java | 2 +-
.../ClientX224ConnectionRequestPDU.java | 4 +-
.../src/main/java/rdpclient/RdpClient.java | 70 +-
.../java/rdpclient/ServerPacketSniffer.java | 2 +-
.../ServerX224ConnectionConfirmPDU.java | 2 +-
.../src/main/java/streamer/SocketWrapper.java | 2 +-
.../vncclient/AwtMouseEventToVncAdapter.java | 1 -
.../java/vncclient/Vnc33Authentication.java | 292 ++
.../src/main/java/vncclient/Vnc33Hello.java | 116 +
.../src/main/java/vncclient/VncClient.java | 10 +-
.../src/main/java/vncclient/VncInitializer.java | 2 +-
.../main/java/vncclient/VncMessageHandler.java | 50 +-
.../java/vncclient/Vnc_3_3_Authentication.java | 292 --
.../src/main/java/vncclient/Vnc_3_3_Hello.java | 116 -
.../com/cloud/consoleproxy/ConsoleProxy.java | 17 +-
.../consoleproxy/vnc/VncScreenDescription.java | 6 +-
.../resource/NfsSecondaryStorageResource.java | 4 +-
.../cloud/test/longrun/BuildGuestNetwork.java | 10 +-
.../com/cloud/test/longrun/GuestNetwork.java | 107 +
.../cloud/test/longrun/PerformanceWithAPI.java | 36 +-
.../com/cloud/test/longrun/guestNetwork.java | 107 -
.../com/cloud/test/regression/ApiCommand.java | 4 +-
.../cloud/test/regression/TestCaseEngine.java | 110 +-
.../test/stress/StressTestDirectAttach.java | 156 +-
.../cloud/test/stress/TestClientWithAPI.java | 362 +-
test/src/com/cloud/test/stress/WgetTest.java | 2 +-
test/src/com/cloud/test/utils/ConsoleProxy.java | 4 +-
.../com/cloud/usage/UsageAlertManagerImpl.java | 6 +-
usage/src/com/cloud/usage/UsageManagerImpl.java | 444 +--
.../usage/parser/IPAddressUsageParser.java | 34 +-
.../usage/parser/LoadBalancerUsageParser.java | 12 +-
.../parser/NetworkOfferingUsageParser.java | 20 +-
.../cloud/usage/parser/NetworkUsageParser.java | 14 +-
.../usage/parser/PortForwardingUsageParser.java | 12 +-
.../usage/parser/SecurityGroupUsageParser.java | 12 +-
.../cloud/usage/parser/StorageUsageParser.java | 12 +-
.../usage/parser/VMInstanceUsageParser.java | 12 +-
.../usage/parser/VMSnapshotUsageParser.java | 18 +-
.../cloud/usage/parser/VPNUserUsageParser.java | 12 +-
.../cloud/usage/parser/VmDiskUsageParser.java | 14 +-
.../cloud/usage/parser/VolumeUsageParser.java | 12 +-
.../usage/UsageManagerTestConfiguration.java | 12 +-
utils/src/com/cloud/utils/DateUtil.java | 6 +-
utils/src/com/cloud/utils/StringUtils.java | 16 +-
utils/src/com/cloud/utils/SwiftUtil.java | 2 +-
utils/src/com/cloud/utils/events/EventArgs.java | 2 +-
utils/src/com/cloud/utils/net/NetUtils.java | 10 +-
utils/src/com/cloud/utils/nio/Link.java | 4 +-
.../cloud/utils/security/CertificateHelper.java | 4 +-
utils/src/com/cloud/utils/ssh/SSHCmdHelper.java | 14 +-
utils/src/com/cloud/utils/ssh/SshException.java | 27 +
utils/src/com/cloud/utils/ssh/SshHelper.java | 4 +-
utils/src/com/cloud/utils/ssh/sshException.java | 27 -
.../utils/identity/ManagementServerNode.java | 2 +-
.../hypervisor/vmware/mo/VirtualMachineMO.java | 6 +-
.../hypervisor/vmware/util/VmwareClient.java | 38 +-
.../hypervisor/vmware/util/VmwareContext.java | 18 +-
529 files changed, 20223 insertions(+), 19831 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/agent/src/com/cloud/agent/AgentShell.java
----------------------------------------------------------------------
diff --git a/agent/src/com/cloud/agent/AgentShell.java b/agent/src/com/cloud/agent/AgentShell.java
index 87004f9..210a860 100644
--- a/agent/src/com/cloud/agent/AgentShell.java
+++ b/agent/src/com/cloud/agent/AgentShell.java
@@ -304,7 +304,7 @@ public class AgentShell implements IAgentShell, Daemon {
// For KVM agent, do it specially here
File file = new File("/etc/cloudstack/agent/log4j-cloud.xml");
- if(!file.exists()) {
+ if (!file.exists()) {
file = PropertiesUtil.findConfigFile("log4j-cloud.xml");
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/agent/src/com/cloud/agent/resource/DummyResource.java
----------------------------------------------------------------------
diff --git a/agent/src/com/cloud/agent/resource/DummyResource.java b/agent/src/com/cloud/agent/resource/DummyResource.java
index 816f6ed..73f8ef1 100755
--- a/agent/src/com/cloud/agent/resource/DummyResource.java
+++ b/agent/src/com/cloud/agent/resource/DummyResource.java
@@ -180,8 +180,8 @@ public class DummyResource implements ServerResource {
return true;
}
- public void setParams(Map<String, Object> _params) {
- this._params = _params;
+ public void setParams(Map<String, Object> params) {
+ this._params = params;
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/com/cloud/agent/api/to/NfsTO.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/to/NfsTO.java b/api/src/com/cloud/agent/api/to/NfsTO.java
index ee6c3e3..1c9ee38 100644
--- a/api/src/com/cloud/agent/api/to/NfsTO.java
+++ b/api/src/com/cloud/agent/api/to/NfsTO.java
@@ -44,8 +44,8 @@ public class NfsTO implements DataStoreTO {
return _url;
}
- public void setUrl(String _url) {
- this._url = _url;
+ public void setUrl(String url) {
+ this._url = url;
}
@Override
@@ -53,8 +53,8 @@ public class NfsTO implements DataStoreTO {
return _role;
}
- public void setRole(DataStoreRole _role) {
- this._role = _role;
+ public void setRole(DataStoreRole role) {
+ this._role = role;
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/com/cloud/agent/api/to/VolumeTO.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/to/VolumeTO.java b/api/src/com/cloud/agent/api/to/VolumeTO.java
index eb1d918..2ad5e0b 100644
--- a/api/src/com/cloud/agent/api/to/VolumeTO.java
+++ b/api/src/com/cloud/agent/api/to/VolumeTO.java
@@ -129,15 +129,15 @@ public class VolumeTO implements InternalIdentity {
public String getChainInfo() {
return chainInfo;
}
-
+
public void setChainInfo(String chainInfo) {
- this.chainInfo = chainInfo;
+ this.chainInfo = chainInfo;
}
public String getOsType() {
return guestOsType;
}
-
+
public void setPath(String path) {
this.path = path;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/com/cloud/alert/Alert.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/alert/Alert.java b/api/src/com/cloud/alert/Alert.java
index 6555b6f..f774420 100644
--- a/api/src/com/cloud/alert/Alert.java
+++ b/api/src/com/cloud/alert/Alert.java
@@ -39,5 +39,6 @@ public interface Alert extends Identity, InternalIdentity {
Date getResolved();
boolean getArchived();
+
String getName();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/com/cloud/deploy/DeploymentPlanner.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/deploy/DeploymentPlanner.java b/api/src/com/cloud/deploy/DeploymentPlanner.java
index 6916a5b..35f406d 100644
--- a/api/src/com/cloud/deploy/DeploymentPlanner.java
+++ b/api/src/com/cloud/deploy/DeploymentPlanner.java
@@ -99,22 +99,22 @@ public interface DeploymentPlanner extends Adapter {
public ExcludeList() {
}
- public ExcludeList(Set<Long> _dcIds, Set<Long> _podIds, Set<Long> _clusterIds, Set<Long> _hostIds, Set<Long> _poolIds) {
- if (_dcIds != null) {
- this._dcIds = new HashSet<Long>(_dcIds);
+ public ExcludeList(Set<Long> dcIds, Set<Long> podIds, Set<Long> clusterIds, Set<Long> hostIds, Set<Long> poolIds) {
+ if (dcIds != null) {
+ this._dcIds = new HashSet<Long>(dcIds);
}
- if (_podIds != null) {
- this._podIds = new HashSet<Long>(_podIds);
+ if (podIds != null) {
+ this._podIds = new HashSet<Long>(podIds);
}
- if (_clusterIds != null) {
- this._clusterIds = new HashSet<Long>(_clusterIds);
+ if (clusterIds != null) {
+ this._clusterIds = new HashSet<Long>(clusterIds);
}
- if (_hostIds != null) {
- this._hostIds = new HashSet<Long>(_hostIds);
+ if (hostIds != null) {
+ this._hostIds = new HashSet<Long>(hostIds);
}
- if (_poolIds != null) {
- this._poolIds = new HashSet<Long>(_poolIds);
+ if (poolIds != null) {
+ this._poolIds = new HashSet<Long>(poolIds);
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/com/cloud/event/EventTypes.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/event/EventTypes.java b/api/src/com/cloud/event/EventTypes.java
index d3c29e9..5a342cd 100755
--- a/api/src/com/cloud/event/EventTypes.java
+++ b/api/src/com/cloud/event/EventTypes.java
@@ -455,7 +455,6 @@ public class EventTypes {
//Alert generation
public static final String ALERT_GENERATE = "ALERT.GENERATE";
-
static {
// TODO: need a way to force author adding event types to declare the entity details as well, with out braking
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/com/cloud/network/Networks.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/Networks.java b/api/src/com/cloud/network/Networks.java
index e15ed46..e4034a5 100755
--- a/api/src/com/cloud/network/Networks.java
+++ b/api/src/com/cloud/network/Networks.java
@@ -31,7 +31,7 @@ public class Networks {
None, DcGlobal, // global to data center
HostLocal;
- public static String DummyPrivateIp = "169.254.1.1";
+ public static final String DummyPrivateIp = "169.254.1.1";
}
/**
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/com/cloud/network/OvsProvider.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/OvsProvider.java b/api/src/com/cloud/network/OvsProvider.java
index e20491a..dfa4091 100644
--- a/api/src/com/cloud/network/OvsProvider.java
+++ b/api/src/com/cloud/network/OvsProvider.java
@@ -20,7 +20,7 @@ import org.apache.cloudstack.api.Identity;
import org.apache.cloudstack.api.InternalIdentity;
public interface OvsProvider extends InternalIdentity, Identity {
- public boolean isEnabled();
+ public boolean isEnabled();
- public long getNspId();
+ public long getNspId();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/com/cloud/network/VirtualNetworkApplianceService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/VirtualNetworkApplianceService.java b/api/src/com/cloud/network/VirtualNetworkApplianceService.java
index 96162f3..fa3ef6d 100644
--- a/api/src/com/cloud/network/VirtualNetworkApplianceService.java
+++ b/api/src/com/cloud/network/VirtualNetworkApplianceService.java
@@ -69,5 +69,5 @@ public interface VirtualNetworkApplianceService {
List<Long> upgradeRouterTemplate(UpgradeRouterTemplateCmd cmd);
- public static final String _minVRVersion = "4.2.0";
+ public static final String MinVRVersion = "4.2.0";
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/com/cloud/network/as/AutoScalePolicy.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/as/AutoScalePolicy.java b/api/src/com/cloud/network/as/AutoScalePolicy.java
index 8452ba1..56ea3f5 100644
--- a/api/src/com/cloud/network/as/AutoScalePolicy.java
+++ b/api/src/com/cloud/network/as/AutoScalePolicy.java
@@ -32,8 +32,8 @@ public interface AutoScalePolicy extends ControlledEntity, InternalIdentity {
public int getDuration();
public int getQuietTime();
-
- public Date getLastQuiteTime();
+
+ public Date getLastQuiteTime();
public String getAction();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/com/cloud/network/as/AutoScaleVmGroup.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/as/AutoScaleVmGroup.java b/api/src/com/cloud/network/as/AutoScaleVmGroup.java
index 15f7bea..e8b328f 100644
--- a/api/src/com/cloud/network/as/AutoScaleVmGroup.java
+++ b/api/src/com/cloud/network/as/AutoScaleVmGroup.java
@@ -47,7 +47,7 @@ public interface AutoScaleVmGroup extends ControlledEntity, InternalIdentity {
int getInterval();
- Date getLastInterval();
+ Date getLastInterval();
String getState();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/com/cloud/network/as/Counter.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/as/Counter.java b/api/src/com/cloud/network/as/Counter.java
index 99b3364..286bf51 100644
--- a/api/src/com/cloud/network/as/Counter.java
+++ b/api/src/com/cloud/network/as/Counter.java
@@ -34,5 +34,5 @@ public interface Counter extends InternalIdentity, Identity {
String getValue();
Source getSource();
-
+
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/com/cloud/network/element/NetworkElement.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/element/NetworkElement.java b/api/src/com/cloud/network/element/NetworkElement.java
index e7988bf..951732f 100644
--- a/api/src/com/cloud/network/element/NetworkElement.java
+++ b/api/src/com/cloud/network/element/NetworkElement.java
@@ -22,7 +22,6 @@ import java.util.Set;
import com.cloud.deploy.DeployDestination;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
-import com.cloud.exception.InsufficientNetworkCapacityException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.Network;
import com.cloud.network.Network.Capability;
@@ -67,7 +66,6 @@ public interface NetworkElement extends Adapter {
* @return
* @throws ConcurrentOperationException
* @throws ResourceUnavailableException
- * @throws InsufficientNetworkCapacityException
*/
boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException,
ResourceUnavailableException, InsufficientCapacityException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/com/cloud/network/element/UserDataServiceProvider.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/element/UserDataServiceProvider.java b/api/src/com/cloud/network/element/UserDataServiceProvider.java
index ad485a5..45ab0d8 100644
--- a/api/src/com/cloud/network/element/UserDataServiceProvider.java
+++ b/api/src/com/cloud/network/element/UserDataServiceProvider.java
@@ -33,5 +33,5 @@ public interface UserDataServiceProvider extends NetworkElement {
boolean saveUserData(Network network, NicProfile nic, VirtualMachineProfile vm) throws ResourceUnavailableException;
- boolean saveSSHKey(Network network, NicProfile nic, VirtualMachineProfile vm, String SSHPublicKey) throws ResourceUnavailableException;
+ boolean saveSSHKey(Network network, NicProfile nic, VirtualMachineProfile vm, String sshPublicKey) throws ResourceUnavailableException;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/com/cloud/network/element/VirtualRouterElementService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/element/VirtualRouterElementService.java b/api/src/com/cloud/network/element/VirtualRouterElementService.java
index c8d45ca..f8e0150 100644
--- a/api/src/com/cloud/network/element/VirtualRouterElementService.java
+++ b/api/src/com/cloud/network/element/VirtualRouterElementService.java
@@ -31,12 +31,13 @@ import com.cloud.utils.component.PluggableService;
public interface VirtualRouterElementService extends PluggableService {
VirtualRouterProvider configure(ConfigureVirtualRouterElementCmd cmd);
- OvsProvider configure(ConfigureOvsElementCmd cmd);
+ OvsProvider configure(ConfigureOvsElementCmd cmd);
+
VirtualRouterProvider addElement(Long nspId, Type providerType);
VirtualRouterProvider getCreatedElement(long id);
List<? extends VirtualRouterProvider> searchForVirtualRouterElement(ListVirtualRouterElementsCmd cmd);
- List<? extends OvsProvider> searchForOvsElement(ListOvsElementsCmd cmd);
+ List<? extends OvsProvider> searchForOvsElement(ListOvsElementsCmd cmd);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/com/cloud/network/firewall/FirewallService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/firewall/FirewallService.java b/api/src/com/cloud/network/firewall/FirewallService.java
index 3413c4d..917bda3 100644
--- a/api/src/com/cloud/network/firewall/FirewallService.java
+++ b/api/src/com/cloud/network/firewall/FirewallService.java
@@ -44,7 +44,7 @@ public interface FirewallService {
boolean applyEgressFirewallRules(FirewallRule rule, Account caller) throws ResourceUnavailableException;
- boolean applyIngressFirewallRules(long Ipid, Account caller) throws ResourceUnavailableException;
+ boolean applyIngressFirewallRules(long ipId, Account caller) throws ResourceUnavailableException;
FirewallRule getFirewallRule(long ruleId);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/com/cloud/network/lb/LoadBalancingRulesService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/lb/LoadBalancingRulesService.java b/api/src/com/cloud/network/lb/LoadBalancingRulesService.java
index e62b45c..cd0a276 100644
--- a/api/src/com/cloud/network/lb/LoadBalancingRulesService.java
+++ b/api/src/com/cloud/network/lb/LoadBalancingRulesService.java
@@ -101,7 +101,7 @@ public interface LoadBalancingRulesService {
boolean applyLoadBalancerConfig(long lbRuleId) throws ResourceUnavailableException;
- boolean assignCertToLoadBalancer(long lbRuleId, Long CertId);
+ boolean assignCertToLoadBalancer(long lbRuleId, Long certId);
boolean removeCertFromLoadBalancer(long lbRuleId);
@@ -145,7 +145,7 @@ public interface LoadBalancingRulesService {
List<? extends HealthCheckPolicy> searchForLBHealthCheckPolicies(ListLBHealthCheckPoliciesCmd cmd);
- LoadBalancer findById(long LoadBalancer);
+ LoadBalancer findById(long loadBalancer);
public void updateLBHealthChecks(Scheme scheme) throws ResourceUnavailableException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/com/cloud/network/vpc/NetworkACLService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpc/NetworkACLService.java b/api/src/com/cloud/network/vpc/NetworkACLService.java
index db37833..4d11880 100644
--- a/api/src/com/cloud/network/vpc/NetworkACLService.java
+++ b/api/src/com/cloud/network/vpc/NetworkACLService.java
@@ -47,7 +47,7 @@ public interface NetworkACLService {
* @param cmd
* @return
*/
- Pair<List<? extends NetworkACL>,Integer> listNetworkACLs(ListNetworkACLListsCmd cmd);
+ Pair<List<? extends NetworkACL>, Integer> listNetworkACLs(ListNetworkACLListsCmd cmd);
/**
* Delete specified network ACL. Deletion fails if the list is not empty
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/com/cloud/offering/DiskOffering.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/offering/DiskOffering.java b/api/src/com/cloud/offering/DiskOffering.java
index 2227fd7..4641b9a 100644
--- a/api/src/com/cloud/offering/DiskOffering.java
+++ b/api/src/com/cloud/offering/DiskOffering.java
@@ -36,7 +36,7 @@ public interface DiskOffering extends InfrastructureEntity, Identity, InternalId
public enum DiskCacheMode {
NONE("none"), WRITEBACK("writeback"), WRITETHROUGH("writethrough");
-
+
private final String _diskCacheMode;
DiskCacheMode(String cacheMode) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/com/cloud/region/ha/GlobalLoadBalancerRule.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/region/ha/GlobalLoadBalancerRule.java b/api/src/com/cloud/region/ha/GlobalLoadBalancerRule.java
index c5fd9ae..bb311f3 100644
--- a/api/src/com/cloud/region/ha/GlobalLoadBalancerRule.java
+++ b/api/src/com/cloud/region/ha/GlobalLoadBalancerRule.java
@@ -53,8 +53,8 @@ public interface GlobalLoadBalancerRule extends Identity, InternalIdentity, Cont
tcp, udp, http;
public static boolean isValidServiceType(String serviceType) {
if (tcp.name().equalsIgnoreCase(serviceType) ||
- udp.name().equalsIgnoreCase(serviceType) ||
- http.name().equalsIgnoreCase(serviceType)) {
+ udp.name().equalsIgnoreCase(serviceType) ||
+ http.name().equalsIgnoreCase(serviceType)) {
return true;
}
return false;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/com/cloud/storage/VolumeApiService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/storage/VolumeApiService.java b/api/src/com/cloud/storage/VolumeApiService.java
index db23c1b..09ac3ee 100644
--- a/api/src/com/cloud/storage/VolumeApiService.java
+++ b/api/src/com/cloud/storage/VolumeApiService.java
@@ -18,8 +18,6 @@
*/
package com.cloud.storage;
-import java.net.URISyntaxException;
-
import org.apache.cloudstack.api.command.user.volume.AttachVolumeCmd;
import org.apache.cloudstack.api.command.user.volume.CreateVolumeCmd;
import org.apache.cloudstack.api.command.user.volume.DetachVolumeCmd;
@@ -29,8 +27,6 @@ import org.apache.cloudstack.api.command.user.volume.ResizeVolumeCmd;
import org.apache.cloudstack.api.command.user.volume.UploadVolumeCmd;
import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.InternalErrorException;
-import com.cloud.exception.PermissionDeniedException;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.user.Account;
@@ -42,7 +38,6 @@ public interface VolumeApiService {
* the API command wrapping the criteria (account/domainId [admin only], zone, diskOffering, snapshot,
* name)
* @return the volume object
- * @throws PermissionDeniedException
*/
Volume allocVolume(CreateVolumeCmd cmd) throws ResourceAllocationException;
@@ -96,9 +91,6 @@ public interface VolumeApiService {
* the command specifying url (where the volume needs to be extracted to), zoneId (zone where the volume
* exists),
* id (the id of the volume)
- * @throws URISyntaxException
- * @throws InternalErrorException
- * @throws PermissionDeniedException
*
*/
String extractVolume(ExtractVolumeCmd cmd);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/com/cloud/storage/snapshot/SnapshotApiService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/storage/snapshot/SnapshotApiService.java b/api/src/com/cloud/storage/snapshot/SnapshotApiService.java
index 4f13510..91c0830 100644
--- a/api/src/com/cloud/storage/snapshot/SnapshotApiService.java
+++ b/api/src/com/cloud/storage/snapshot/SnapshotApiService.java
@@ -24,7 +24,6 @@ import org.apache.cloudstack.api.command.user.snapshot.ListSnapshotPoliciesCmd;
import org.apache.cloudstack.api.command.user.snapshot.ListSnapshotsCmd;
import com.cloud.api.commands.ListRecurringSnapshotScheduleCmd;
-import com.cloud.exception.PermissionDeniedException;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.storage.Snapshot;
import com.cloud.storage.Volume;
@@ -39,7 +38,6 @@ public interface SnapshotApiService {
* @param cmd
* the command containing the search criteria (order by, limit, etc.)
* @return list of snapshots
- * @throws PermissionDeniedException
*/
Pair<List<? extends Snapshot>, Integer> listSnapshots(ListSnapshotsCmd cmd);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/com/cloud/user/ResourceLimitService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/user/ResourceLimitService.java b/api/src/com/cloud/user/ResourceLimitService.java
index f8923b7..e878edd 100644
--- a/api/src/com/cloud/user/ResourceLimitService.java
+++ b/api/src/com/cloud/user/ResourceLimitService.java
@@ -139,7 +139,6 @@ public interface ResourceLimitService {
*/
public long getResourceCount(Account account, ResourceType type);
-
/**
* Checks if a limit has been exceeded for an account depending on the displayResource flag
*
@@ -153,7 +152,6 @@ public interface ResourceLimitService {
*/
void checkResourceLimit(Account account, ResourceType type, Boolean displayResource, long... count) throws ResourceAllocationException;
-
/**
* Increments the resource count depending on the displayResource flag
*
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/com/cloud/vm/DiskProfile.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/vm/DiskProfile.java b/api/src/com/cloud/vm/DiskProfile.java
index d08b710..5fdacf2 100644
--- a/api/src/com/cloud/vm/DiskProfile.java
+++ b/api/src/com/cloud/vm/DiskProfile.java
@@ -71,9 +71,9 @@ public class DiskProfile {
null);
this.hyperType = hyperType;
}
-
+
public DiskProfile(DiskProfile dp) {
-
+
}
/**
@@ -156,17 +156,17 @@ public class DiskProfile {
public HypervisorType getHypervisorType() {
return this.hyperType;
}
-
+
public void setPath(String path) {
- this.path = path;
+ this.path = path;
}
-
+
public String getPath() {
- return this.path;
+ return this.path;
}
-
+
public void setSize(long size) {
- this.size = size;
+ this.size = size;
}
public void setBytesReadRate(Long bytesReadRate) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/com/cloud/vm/UserVmService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/vm/UserVmService.java b/api/src/com/cloud/vm/UserVmService.java
index 5306bf9..e02573d 100755
--- a/api/src/com/cloud/vm/UserVmService.java
+++ b/api/src/com/cloud/vm/UserVmService.java
@@ -19,8 +19,6 @@ package com.cloud.vm;
import java.util.List;
import java.util.Map;
-import javax.naming.InsufficientResourcesException;
-
import org.apache.cloudstack.api.BaseCmd.HTTPMethod;
import org.apache.cloudstack.api.command.admin.vm.AssignVMCmd;
import org.apache.cloudstack.api.command.admin.vm.ExpungeVMCmd;
@@ -197,12 +195,11 @@ public interface UserVmService {
* @throws ResourceUnavailableException
* if the resources required to deploy the VM is not currently
* available.
- * @throws InsufficientResourcesException
*/
UserVm createBasicSecurityGroupVirtualMachine(DataCenter zone, ServiceOffering serviceOffering, VirtualMachineTemplate template, List<Long> securityGroupIdList,
- Account owner, String hostName, String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, HTTPMethod httpmethod,
- String userData, String sshKeyPair, Map<Long, IpAddresses> requestedIps, IpAddresses defaultIp, Boolean displayVm, String keyboard,
- List<Long> affinityGroupIdList, Map<String, String> customParameter, String customId) throws InsufficientCapacityException,
+ Account owner, String hostName, String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, HTTPMethod httpmethod,
+ String userData, String sshKeyPair, Map<Long, IpAddresses> requestedIps, IpAddresses defaultIp, Boolean displayVm, String keyboard,
+ List<Long> affinityGroupIdList, Map<String, String> customParameter, String customId) throws InsufficientCapacityException,
ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException;
/**
@@ -271,12 +268,11 @@ public interface UserVmService {
* @throws ResourceUnavailableException
* if the resources required to deploy the VM is not currently
* available.
- * @throws InsufficientResourcesException
*/
UserVm createAdvancedSecurityGroupVirtualMachine(DataCenter zone, ServiceOffering serviceOffering, VirtualMachineTemplate template, List<Long> networkIdList,
- List<Long> securityGroupIdList, Account owner, String hostName, String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor,
- HTTPMethod httpmethod, String userData, String sshKeyPair, Map<Long, IpAddresses> requestedIps, IpAddresses defaultIps, Boolean displayVm, String keyboard,
- List<Long> affinityGroupIdList, Map<String, String> customParameters, String customId) throws InsufficientCapacityException,
+ List<Long> securityGroupIdList, Account owner, String hostName, String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor,
+ HTTPMethod httpmethod, String userData, String sshKeyPair, Map<Long, IpAddresses> requestedIps, IpAddresses defaultIps, Boolean displayVm, String keyboard,
+ List<Long> affinityGroupIdList, Map<String, String> customParameters, String customId) throws InsufficientCapacityException,
ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException;
/**
@@ -343,14 +339,13 @@ public interface UserVmService {
* @throws ResourceUnavailableException
* if the resources required to deploy the VM is not currently
* available.
- * @throws InsufficientResourcesException
*/
UserVm createAdvancedVirtualMachine(DataCenter zone, ServiceOffering serviceOffering, VirtualMachineTemplate template, List<Long> networkIdList, Account owner,
- String hostName, String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, HTTPMethod httpmethod, String userData,
- String sshKeyPair, Map<Long, IpAddresses> requestedIps, IpAddresses defaultIps, Boolean displayVm, String keyboard, List<Long> affinityGroupIdList,
- Map<String, String> customParameters, String customId)
+ String hostName, String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, HTTPMethod httpmethod, String userData,
+ String sshKeyPair, Map<Long, IpAddresses> requestedIps, IpAddresses defaultIps, Boolean displayVm, String keyboard, List<Long> affinityGroupIdList,
+ Map<String, String> customParameters, String customId)
- throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException;
+ throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException;
/**
* Starts the virtual machine created from createVirtualMachine.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/com/cloud/vm/VirtualMachine.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/vm/VirtualMachine.java b/api/src/com/cloud/vm/VirtualMachine.java
index 331b8a3..52b947f 100755
--- a/api/src/com/cloud/vm/VirtualMachine.java
+++ b/api/src/com/cloud/vm/VirtualMachine.java
@@ -29,11 +29,11 @@ import com.cloud.utils.fsm.StateObject;
/**
* VirtualMachine describes the properties held by a virtual machine
- *
+ *
*/
public interface VirtualMachine extends RunningOn, ControlledEntity, Identity, InternalIdentity, StateObject<VirtualMachine.State> {
- public enum PowerState {
+ public enum PowerState {
PowerUnknown, PowerOn, PowerOff,
}
@@ -115,7 +115,7 @@ public interface VirtualMachine extends RunningOn, ControlledEntity, Identity, I
s_fsm.addTransition(State.Expunging, VirtualMachine.Event.ExpungeOperation, State.Expunging);
s_fsm.addTransition(State.Error, VirtualMachine.Event.DestroyRequested, State.Expunging);
s_fsm.addTransition(State.Error, VirtualMachine.Event.ExpungeOperation, State.Expunging);
-
+
s_fsm.addTransition(State.Stopping, VirtualMachine.Event.FollowAgentPowerOnReport, State.Running);
s_fsm.addTransition(State.Stopped, VirtualMachine.Event.FollowAgentPowerOnReport, State.Running);
s_fsm.addTransition(State.Running, VirtualMachine.Event.FollowAgentPowerOnReport, State.Running);
@@ -125,7 +125,7 @@ public interface VirtualMachine extends RunningOn, ControlledEntity, Identity, I
s_fsm.addTransition(State.Running, VirtualMachine.Event.FollowAgentPowerOffReport, State.Stopped);
s_fsm.addTransition(State.Migrating, VirtualMachine.Event.FollowAgentPowerOffReport, State.Stopped);
}
-
+
public static boolean isVmStarted(State oldState, Event e, State newState) {
if (oldState == State.Starting && newState == State.Running) {
return true;
@@ -192,10 +192,10 @@ public interface VirtualMachine extends RunningOn, ControlledEntity, Identity, I
AgentReportMigrated,
RevertRequested,
SnapshotRequested,
-
+
// added for new VMSync logic
FollowAgentPowerOnReport,
- FollowAgentPowerOffReport,
+ FollowAgentPowerOffReport,
};
public enum Type {
@@ -206,7 +206,7 @@ public interface VirtualMachine extends RunningOn, ControlledEntity, Identity, I
* VM with this type. UserBareMetal should treat exactly as User.
*/
UserBareMetal(false),
-
+
/*
* General VM type for queuing VM orchestration work
*/
@@ -264,7 +264,7 @@ public interface VirtualMachine extends RunningOn, ControlledEntity, Identity, I
/**
* returns the guest OS ID
- *
+ *
* @return guestOSId
*/
long getGuestOSId();
@@ -303,7 +303,7 @@ public interface VirtualMachine extends RunningOn, ControlledEntity, Identity, I
Date getCreated();
long getServiceOfferingId();
-
+
Long getDiskOfferingId();
Type getType();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/alert/AlertService.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/alert/AlertService.java b/api/src/org/apache/cloudstack/alert/AlertService.java
index 2143fe8..2e98aea 100644
--- a/api/src/org/apache/cloudstack/alert/AlertService.java
+++ b/api/src/org/apache/cloudstack/alert/AlertService.java
@@ -1,4 +1,3 @@
-
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
@@ -28,7 +27,7 @@ public interface AlertService {
private static Set<AlertType> defaultAlertTypes = new HashSet<AlertType>();
private final String name;
private final short type;
-
+
private AlertType(short type, String name, boolean isDefault) {
this.name = name;
this.type = type;
@@ -36,12 +35,13 @@ public interface AlertService {
defaultAlertTypes.add(this);
}
}
-
+
public static final AlertType ALERT_TYPE_MEMORY = new AlertType(Capacity.CAPACITY_TYPE_MEMORY, "ALERT.MEMORY", true);
public static final AlertType ALERT_TYPE_CPU = new AlertType(Capacity.CAPACITY_TYPE_CPU, "ALERT.CPU", true);
public static final AlertType ALERT_TYPE_STORAGE = new AlertType(Capacity.CAPACITY_TYPE_STORAGE, "ALERT.STORAGE", true);
public static final AlertType ALERT_TYPE_STORAGE_ALLOCATED = new AlertType(Capacity.CAPACITY_TYPE_STORAGE_ALLOCATED, "ALERT.STORAGE.ALLOCATED", true);
- public static final AlertType ALERT_TYPE_VIRTUAL_NETWORK_PUBLIC_IP = new AlertType(Capacity.CAPACITY_TYPE_VIRTUAL_NETWORK_PUBLIC_IP, "ALERT.NETWORK.PUBLICIP", true);
+ public static final AlertType ALERT_TYPE_VIRTUAL_NETWORK_PUBLIC_IP = new AlertType(Capacity.CAPACITY_TYPE_VIRTUAL_NETWORK_PUBLIC_IP, "ALERT.NETWORK.PUBLICIP",
+ true);
public static final AlertType ALERT_TYPE_PRIVATE_IP = new AlertType(Capacity.CAPACITY_TYPE_PRIVATE_IP, "ALERT.NETWORK.PRIVATEIP", true);
public static final AlertType ALERT_TYPE_SECONDARY_STORAGE = new AlertType(Capacity.CAPACITY_TYPE_SECONDARY_STORAGE, "ALERT.STORAGE.SECONDARY", true);
public static final AlertType ALERT_TYPE_HOST = new AlertType((short)7, "ALERT.COMPUTE.HOST", true);
@@ -51,10 +51,10 @@ public interface AlertService {
public static final AlertType ALERT_TYPE_ROUTING = new AlertType((short)11, "ALERT.NETWORK.ROUTING", true);
public static final AlertType ALERT_TYPE_STORAGE_MISC = new AlertType((short)12, "ALERT.STORAGE.MISC", true);
public static final AlertType ALERT_TYPE_USAGE_SERVER = new AlertType((short)13, "ALERT.USAGE", true);
- public static final AlertType ALERT_TYPE_MANAGMENT_NODE = new AlertType((short)14, "ALERT.MANAGEMENT", true);
+ public static final AlertType ALERT_TYPE_MANAGMENT_NODE = new AlertType((short)14, "ALERT.MANAGEMENT", true);
public static final AlertType ALERT_TYPE_DOMAIN_ROUTER_MIGRATE = new AlertType((short)15, "ALERT.NETWORK.DOMAINROUTERMIGRATE", true);
public static final AlertType ALERT_TYPE_CONSOLE_PROXY_MIGRATE = new AlertType((short)16, "ALERT.SERVICE.CONSOLEPROXYMIGRATE", true);
- public static final AlertType ALERT_TYPE_USERVM_MIGRATE = new AlertType((short)17, "ALERT.USERVM.MIGRATE", true);
+ public static final AlertType ALERT_TYPE_USERVM_MIGRATE = new AlertType((short)17, "ALERT.USERVM.MIGRATE", true);
public static final AlertType ALERT_TYPE_VLAN = new AlertType((short)18, "ALERT.NETWORK.VLAN", true);
public static final AlertType ALERT_TYPE_SSVM = new AlertType((short)19, "ALERT.SERVICE.SSVM", true);
public static final AlertType ALERT_TYPE_USAGE_SERVER_RESULT = new AlertType((short)20, "ALERT.USAGE.RESULT", true);
@@ -69,7 +69,7 @@ public interface AlertService {
public short getType() {
return type;
}
-
+
public String getName() {
return name;
}
@@ -82,7 +82,7 @@ public interface AlertService {
}
return null;
}
-
+
@Override
public String toString() {
return String.valueOf(this.getType());
@@ -97,7 +97,7 @@ public interface AlertService {
}
}
}
-
+
boolean generateAlert(AlertType alertType, long dataCenterId, Long podId, String msg);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/ApiConstants.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/ApiConstants.java b/api/src/org/apache/cloudstack/api/ApiConstants.java
index a132e54..8f596b7 100755
--- a/api/src/org/apache/cloudstack/api/ApiConstants.java
+++ b/api/src/org/apache/cloudstack/api/ApiConstants.java
@@ -412,11 +412,11 @@ public class ApiConstants {
// Ovs controller
public static final String OVS_DEVICE_ID = "ovsdeviceid";
public static final String OVS_DEVICE_NAME = "ovsdevicename";
- // OpenDaylight controller
- public static final String ODL_DEVICE_ID = "odldeviceid";
- public static final String ODL_DEVICE_NAME = "odldevicename";
- public static final String ODL_TRANSPORT_ZONE_UUID = "transportzoneuuid";
- public static final String ODL_GATEWAYSERVICE_UUID = "l3gatewayserviceuuid";
+ // OpenDaylight controller
+ public static final String ODL_DEVICE_ID = "odldeviceid";
+ public static final String ODL_DEVICE_NAME = "odldevicename";
+ public static final String ODL_TRANSPORT_ZONE_UUID = "transportzoneuuid";
+ public static final String ODL_GATEWAYSERVICE_UUID = "l3gatewayserviceuuid";
public static final String EXTERNAL_SWITCH_MGMT_DEVICE_ID = "vsmdeviceid";
public static final String EXTERNAL_SWITCH_MGMT_DEVICE_NAME = "vsmdevicename";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/BaseAsyncCreateCustomIdCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/BaseAsyncCreateCustomIdCmd.java b/api/src/org/apache/cloudstack/api/BaseAsyncCreateCustomIdCmd.java
index 0f75653..8680d7f 100644
--- a/api/src/org/apache/cloudstack/api/BaseAsyncCreateCustomIdCmd.java
+++ b/api/src/org/apache/cloudstack/api/BaseAsyncCreateCustomIdCmd.java
@@ -16,9 +16,10 @@
// under the License.
package org.apache.cloudstack.api;
-
-public abstract class BaseAsyncCreateCustomIdCmd extends BaseAsyncCreateCmd{
- @Parameter(name=ApiConstants.CUSTOM_ID, type=CommandType.STRING, description="an optional field, in case you want to set a custom id to the resource. Allowed to Root Admins only")
+public abstract class BaseAsyncCreateCustomIdCmd extends BaseAsyncCreateCmd {
+ @Parameter(name = ApiConstants.CUSTOM_ID,
+ type = CommandType.STRING,
+ description = "an optional field, in case you want to set a custom id to the resource. Allowed to Root Admins only")
private String customId;
public String getCustomId() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/BaseAsyncCustomIdCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/BaseAsyncCustomIdCmd.java b/api/src/org/apache/cloudstack/api/BaseAsyncCustomIdCmd.java
index 95be24f..18264da 100644
--- a/api/src/org/apache/cloudstack/api/BaseAsyncCustomIdCmd.java
+++ b/api/src/org/apache/cloudstack/api/BaseAsyncCustomIdCmd.java
@@ -16,9 +16,10 @@
// under the License.
package org.apache.cloudstack.api;
-
public abstract class BaseAsyncCustomIdCmd extends BaseAsyncCmd {
- @Parameter(name=ApiConstants.CUSTOM_ID, type=CommandType.STRING, description="an optional field, in case you want to set a custom id to the resource. Allowed to Root Admins only")
+ @Parameter(name = ApiConstants.CUSTOM_ID,
+ type = CommandType.STRING,
+ description = "an optional field, in case you want to set a custom id to the resource. Allowed to Root Admins only")
private String customId;
public String getCustomId() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/BaseCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/BaseCmd.java b/api/src/org/apache/cloudstack/api/BaseCmd.java
index 86a7c72..0cfb950 100644
--- a/api/src/org/apache/cloudstack/api/BaseCmd.java
+++ b/api/src/org/apache/cloudstack/api/BaseCmd.java
@@ -94,7 +94,7 @@ public abstract class BaseCmd {
public static final DateFormat INPUT_FORMAT = new SimpleDateFormat("yyyy-MM-dd");
public static final DateFormat NEW_INPUT_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
public static Pattern newInputDateFormat = Pattern.compile("[\\d]+-[\\d]+-[\\d]+ [\\d]+:[\\d]+:[\\d]+");
- private static final DateFormat _outputFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ");
+ private static final DateFormat s_outputFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ");
private Object _responseObject = null;
private Map<String, String> fullUrlParams;
@@ -191,12 +191,11 @@ public abstract class BaseCmd {
public InternalLoadBalancerVMService _internalLbSvc;
@Inject
public NetworkModel _ntwkModel;
- @Inject
+ @Inject
public AlertService _alertSvc;
-
- public abstract void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
- ResourceAllocationException, NetworkRuleConflictException;
+ public abstract void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
+ ResourceAllocationException, NetworkRuleConflictException;
public void configure() {
}
@@ -258,8 +257,8 @@ public abstract class BaseCmd {
return "";
}
String formattedString = null;
- synchronized (_outputFormat) {
- formattedString = _outputFormat.format(date);
+ synchronized (s_outputFormat) {
+ formattedString = s_outputFormat.format(date);
}
return formattedString;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/BaseCustomIdCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/BaseCustomIdCmd.java b/api/src/org/apache/cloudstack/api/BaseCustomIdCmd.java
index df59b44..8ae746f 100644
--- a/api/src/org/apache/cloudstack/api/BaseCustomIdCmd.java
+++ b/api/src/org/apache/cloudstack/api/BaseCustomIdCmd.java
@@ -18,7 +18,9 @@ package org.apache.cloudstack.api;
public abstract class BaseCustomIdCmd extends BaseCmd {
- @Parameter(name=ApiConstants.CUSTOM_ID, type=CommandType.STRING, description="an optional field, in case you want to set a custom id to the resource. Allowed to Root Admins only")
+ @Parameter(name = ApiConstants.CUSTOM_ID,
+ type = CommandType.STRING,
+ description = "an optional field, in case you want to set a custom id to the resource. Allowed to Root Admins only")
private String customId;
public String getCustomId() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/BaseListCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/BaseListCmd.java b/api/src/org/apache/cloudstack/api/BaseListCmd.java
index dfb3f3b..c1a4b4c 100644
--- a/api/src/org/apache/cloudstack/api/BaseListCmd.java
+++ b/api/src/org/apache/cloudstack/api/BaseListCmd.java
@@ -20,8 +20,8 @@ import com.cloud.exception.InvalidParameterValueException;
public abstract class BaseListCmd extends BaseCmd {
- private static Long MAX_PAGESIZE = null;
- public static Long PAGESIZE_UNLIMITED = -1L;
+ private static Long s_maxPageSize = null;
+ public static Long s_pageSizeUnlimited = -1L;
// ///////////////////////////////////////////////////
// ///////// BaseList API parameters /////////////////
@@ -53,11 +53,11 @@ public abstract class BaseListCmd extends BaseCmd {
}
public Integer getPageSize() {
- if (pageSize != null && MAX_PAGESIZE.longValue() != PAGESIZE_UNLIMITED && pageSize.longValue() > MAX_PAGESIZE.longValue()) {
- throw new InvalidParameterValueException("Page size can't exceed max allowed page size value: " + MAX_PAGESIZE.longValue());
+ if (pageSize != null && s_maxPageSize.longValue() != s_pageSizeUnlimited && pageSize.longValue() > s_maxPageSize.longValue()) {
+ throw new InvalidParameterValueException("Page size can't exceed max allowed page size value: " + s_maxPageSize.longValue());
}
- if (pageSize != null && pageSize.longValue() == PAGESIZE_UNLIMITED && page != null) {
+ if (pageSize != null && pageSize.longValue() == s_pageSizeUnlimited && page != null) {
throw new InvalidParameterValueException("Can't specify page parameter when pagesize is -1 (Unlimited)");
}
@@ -66,11 +66,11 @@ public abstract class BaseListCmd extends BaseCmd {
@Override
public void configure() {
- if (MAX_PAGESIZE == null) {
- if (_configService.getDefaultPageSize().longValue() != PAGESIZE_UNLIMITED) {
- MAX_PAGESIZE = _configService.getDefaultPageSize();
+ if (s_maxPageSize == null) {
+ if (_configService.getDefaultPageSize().longValue() != s_pageSizeUnlimited) {
+ s_maxPageSize = _configService.getDefaultPageSize();
} else {
- MAX_PAGESIZE = PAGESIZE_UNLIMITED;
+ s_maxPageSize = s_pageSizeUnlimited;
}
}
}
@@ -82,12 +82,12 @@ public abstract class BaseListCmd extends BaseCmd {
}
public Long getPageSizeVal() {
- Long defaultPageSize = MAX_PAGESIZE;
+ Long defaultPageSize = s_maxPageSize;
Integer pageSizeInt = getPageSize();
if (pageSizeInt != null) {
defaultPageSize = pageSizeInt.longValue();
}
- if (defaultPageSize.longValue() == PAGESIZE_UNLIMITED) {
+ if (defaultPageSize.longValue() == s_pageSizeUnlimited) {
defaultPageSize = null;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/BaseListTemplateOrIsoPermissionsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/BaseListTemplateOrIsoPermissionsCmd.java b/api/src/org/apache/cloudstack/api/BaseListTemplateOrIsoPermissionsCmd.java
index c9725a5..48c1e02 100644
--- a/api/src/org/apache/cloudstack/api/BaseListTemplateOrIsoPermissionsCmd.java
+++ b/api/src/org/apache/cloudstack/api/BaseListTemplateOrIsoPermissionsCmd.java
@@ -27,8 +27,8 @@ import com.cloud.template.VirtualMachineTemplate;
import com.cloud.user.Account;
public class BaseListTemplateOrIsoPermissionsCmd extends BaseCmd {
- public Logger s_logger = getLogger();
- protected String s_name = "listtemplatepermissionsresponse";
+ public Logger logger = getLogger();
+ protected static final String s_name = "listtemplatepermissionsresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@@ -58,6 +58,10 @@ public class BaseListTemplateOrIsoPermissionsCmd extends BaseCmd {
return Account.ACCOUNT_ID_SYSTEM; // no account info given, parent this command to SYSTEM so ERROR events are tracked
}
+ protected Logger getLogger() {
+ return Logger.getLogger(BaseUpdateTemplateOrIsoPermissionsCmd.class);
+ }
+
@Override
public String getCommandName() {
return s_name;
@@ -71,10 +75,6 @@ public class BaseListTemplateOrIsoPermissionsCmd extends BaseCmd {
return "templateOrIso";
}
- protected Logger getLogger() {
- return Logger.getLogger(BaseUpdateTemplateOrIsoPermissionsCmd.class.getName());
- }
-
@Override
public void execute() {
List<String> accountNames = _templateService.listTemplatePermissions(this);
@@ -84,6 +84,6 @@ public class BaseListTemplateOrIsoPermissionsCmd extends BaseCmd {
TemplatePermissionsResponse response = _responseGenerator.createTemplatePermissionsResponse(accountNames, id, isAdmin);
response.setResponseName(getCommandName());
- this.setResponseObject(response);
+ setResponseObject(response);
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoPermissionsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoPermissionsCmd.java b/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoPermissionsCmd.java
index 5d05439..77e5a15 100644
--- a/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoPermissionsCmd.java
+++ b/api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoPermissionsCmd.java
@@ -27,13 +27,21 @@ import org.apache.cloudstack.api.response.TemplateResponse;
import com.cloud.exception.InvalidParameterValueException;
public abstract class BaseUpdateTemplateOrIsoPermissionsCmd extends BaseCmd {
- public Logger s_logger = getLogger();
- protected String s_name = getResponseName();
+ public Logger _logger = getLogger();
+ protected String _name = getResponseName();
// ///////////////////////////////////////////////////
// ////////////// API parameters /////////////////////
// ///////////////////////////////////////////////////
+ protected Logger getLogger() {
+ return Logger.getLogger(BaseUpdateTemplateOrIsoPermissionsCmd.class);
+ }
+
+ protected String getResponseName() {
+ return "updatetemplateorisopermissionsresponse";
+ }
+
@Parameter(name = ApiConstants.ACCOUNTS,
type = CommandType.LIST,
collectionType = CommandType.STRING,
@@ -109,15 +117,7 @@ public abstract class BaseUpdateTemplateOrIsoPermissionsCmd extends BaseCmd {
@Override
public String getCommandName() {
- return s_name;
- }
-
- protected String getResponseName() {
- return "updatetemplateorisopermissionsresponse";
- }
-
- protected Logger getLogger() {
- return Logger.getLogger(BaseUpdateTemplateOrIsoPermissionsCmd.class.getName());
+ return _name;
}
@Override
@@ -125,7 +125,7 @@ public abstract class BaseUpdateTemplateOrIsoPermissionsCmd extends BaseCmd {
boolean result = _templateService.updateTemplateOrIsoPermissions(this);
if (result) {
SuccessResponse response = new SuccessResponse(getCommandName());
- this.setResponseObject(response);
+ setResponseObject(response);
} else {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update template/iso permissions");
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/ResponseGenerator.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/ResponseGenerator.java b/api/src/org/apache/cloudstack/api/ResponseGenerator.java
index e7a1b35..1cb5388 100644
--- a/api/src/org/apache/cloudstack/api/ResponseGenerator.java
+++ b/api/src/org/apache/cloudstack/api/ResponseGenerator.java
@@ -290,7 +290,7 @@ public interface ResponseGenerator {
//ListResponse<SecurityGroupResponse> createSecurityGroupResponses(List<? extends SecurityGroupRules> networkGroups);
- SecurityGroupResponse createSecurityGroupResponseFromSecurityGroupRule(List<? extends SecurityRule> SecurityRules);
+ SecurityGroupResponse createSecurityGroupResponseFromSecurityGroupRule(List<? extends SecurityRule> securityRules);
SecurityGroupResponse createSecurityGroupResponse(SecurityGroup group);
@@ -355,7 +355,7 @@ public interface ResponseGenerator {
VirtualRouterProviderResponse createVirtualRouterProviderResponse(VirtualRouterProvider result);
- OvsProviderResponse createOvsProviderResponse(OvsProvider result);
+ OvsProviderResponse createOvsProviderResponse(OvsProvider result);
StorageNetworkIpRangeResponse createStorageNetworkIpRangeResponse(StorageNetworkIpRange result);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be5e5cc6/api/src/org/apache/cloudstack/api/command/admin/alert/GenerateAlertCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/alert/GenerateAlertCmd.java b/api/src/org/apache/cloudstack/api/command/admin/alert/GenerateAlertCmd.java
index b23a3be..620c5ed 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/alert/GenerateAlertCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/alert/GenerateAlertCmd.java
@@ -31,7 +31,7 @@ import org.apache.log4j.Logger;
import com.cloud.event.EventTypes;
-@APICommand(name = "generateAlert", description = "Generates an alert", responseObject = SuccessResponse.class, since="4.3")
+@APICommand(name = "generateAlert", description = "Generates an alert", responseObject = SuccessResponse.class, since = "4.3")
public class GenerateAlertCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(GenerateAlertCmd.class.getName());
@@ -42,19 +42,19 @@ public class GenerateAlertCmd extends BaseAsyncCmd {
// ////////////// API parameters /////////////////////
// ///////////////////////////////////////////////////
- @Parameter(name = ApiConstants.TYPE, type = CommandType.SHORT, description = "Type of the alert", required=true)
+ @Parameter(name = ApiConstants.TYPE, type = CommandType.SHORT, description = "Type of the alert", required = true)
private Short type;
- @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "Name of the alert", required=true)
+ @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "Name of the alert", required = true)
private String name;
-
- @Parameter(name = ApiConstants.DESCRIPTION, type = CommandType.STRING, description = "Alert description", required=true)
+
+ @Parameter(name = ApiConstants.DESCRIPTION, type = CommandType.STRING, description = "Alert description", required = true)
private String description;
-
- @Parameter(name=ApiConstants.ZONE_ID, type=CommandType.UUID, entityType=ZoneResponse.class, description="Zone id for which alert is generated")
+
+ @Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class, description = "Zone id for which alert is generated")
private Long zoneId;
-
- @Parameter(name=ApiConstants.POD_ID, type=CommandType.UUID, entityType=PodResponse.class, description="Pod id for which alert is generated")
+
+ @Parameter(name = ApiConstants.POD_ID, type = CommandType.UUID, entityType = PodResponse.class, description = "Pod id for which alert is generated")
private Long podId;
// ///////////////////////////////////////////////////
@@ -87,14 +87,11 @@ public class GenerateAlertCmd extends BaseAsyncCmd {
public Long getPodId() {
return podId;
}
-
// ///////////////////////////////////////////////////
// ///////////// API Implementation///////////////////
// ///////////////////////////////////////////////////
-
-
@Override
public void execute() {
AlertType alertType = AlertService.AlertType.generateAlert(getType(), getName());