You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2012/07/04 02:35:29 UTC
[1/50] [abbrv] git commit: Merge branch 'master' into vpc
Updated Branches:
refs/heads/vpc f2078afbd -> 31f9d718f
Merge branch 'master' into vpc
Conflicts:
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/31f9d718
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/31f9d718
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/31f9d718
Branch: refs/heads/vpc
Commit: 31f9d718fbaa50fb5572c6bbfd73ac0e8e83257e
Parents: f2078af 57927c9
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Tue Jul 3 17:32:50 2012 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Tue Jul 3 17:32:50 2012 -0700
----------------------------------------------------------------------
build/build-cloud-plugins.xml | 25 +-
client/tomcatconf/components.xml.in | 6 +
cloud.spec | 13 +
core/src/com/cloud/agent/IAgentControl.java | 28 +-
.../src/com/cloud/agent/IAgentControlListener.java | 28 +-
core/src/com/cloud/agent/Listener.java | 28 +-
core/src/com/cloud/agent/RecoveryHandler.java | 28 +-
.../com/cloud/agent/StartupCommandProcessor.java | 28 +-
.../cloud/agent/api/DirectNetworkUsageAnswer.java | 28 +-
.../cloud/agent/api/DirectNetworkUsageCommand.java | 28 +-
.../api/ExternalNetworkResourceUsageAnswer.java | 28 +-
.../api/ExternalNetworkResourceUsageCommand.java | 28 +-
.../agent/api/NetworkRulesSystemVmCommand.java | 28 +-
.../agent/api/RecurringNetworkUsageAnswer.java | 28 +-
.../agent/api/RecurringNetworkUsageCommand.java | 28 +-
.../cloud/agent/api/StartupVMMAgentCommand.java | 28 +-
.../virtualnetwork/VirtualRoutingResource.java | 26 +-
.../cloud/agent/transport/ArrayTypeAdaptor.java | 28 +-
.../agent/transport/LoggingExclusionStrategy.java | 28 +-
core/src/com/cloud/agent/transport/Request.java | 28 +-
core/src/com/cloud/agent/transport/Response.java | 28 +-
core/src/com/cloud/alert/AlertAdapter.java | 28 +-
core/src/com/cloud/alert/AlertManager.java | 28 +-
core/src/com/cloud/alert/AlertVO.java | 28 +-
core/src/com/cloud/async/AsyncJobVO.java | 28 +-
core/src/com/cloud/async/SyncQueueItemVO.java | 28 +-
core/src/com/cloud/async/SyncQueueVO.java | 28 +-
core/src/com/cloud/capacity/CapacityVO.java | 28 +-
core/src/com/cloud/certificate/CertificateVO.java | 28 +-
.../com/cloud/configuration/ConfigurationVO.java | 28 +-
.../com/cloud/configuration/ResourceCountVO.java | 28 +-
.../com/cloud/configuration/ResourceLimitVO.java | 28 +-
.../cloud/consoleproxy/ConsoleProxyAllocator.java | 28 +-
core/src/com/cloud/event/EventVO.java | 28 +-
core/src/com/cloud/event/UsageEvent.java | 28 +-
core/src/com/cloud/event/UsageEventVO.java | 28 +-
core/src/com/cloud/event/dao/EventDao.java | 28 +-
core/src/com/cloud/event/dao/EventDaoImpl.java | 28 +-
core/src/com/cloud/event/dao/UsageEventDao.java | 28 +-
.../src/com/cloud/event/dao/UsageEventDaoImpl.java | 28 +-
.../exception/AgentControlChannelException.java | 28 +-
.../exception/OperationTimedoutException.java | 28 +-
.../exception/UnsupportedVersionException.java | 28 +-
.../com/cloud/exception/UsageServerException.java | 28 +-
core/src/com/cloud/host/DetailVO.java | 28 +-
core/src/com/cloud/host/HostInfo.java | 28 +-
core/src/com/cloud/host/HostTagVO.java | 28 +-
core/src/com/cloud/host/HostVO.java | 28 +-
.../cloud/hypervisor/HypervisorCapabilitiesVO.java | 28 +-
.../hyperv/resource/HypervDummyResourceBase.java | 28 +-
.../hypervisor/hyperv/resource/HypervResource.java | 28 +-
.../kvm/resource/KvmDummyResourceBase.java | 28 +-
.../com/cloud/info/ConsoleProxyConnectionInfo.java | 28 +-
core/src/com/cloud/info/ConsoleProxyInfo.java | 28 +-
core/src/com/cloud/info/ConsoleProxyLoadInfo.java | 28 +-
core/src/com/cloud/info/ConsoleProxyStatus.java | 28 +-
core/src/com/cloud/info/RunningHostCountInfo.java | 28 +-
.../com/cloud/info/RunningHostInfoAgregator.java | 28 +-
core/src/com/cloud/info/SecStorageVmLoadInfo.java | 28 +-
.../src/com/cloud/network/HAProxyConfigurator.java | 28 +-
.../cloud/network/LoadBalancerConfigurator.java | 28 +-
.../com/cloud/network/LoadBalancerValidator.java | 28 +-
core/src/com/cloud/network/VpnUserVO.java | 28 +-
.../CreateLoadBalancerApplianceAnswer.java | 28 +-
.../DestroyLoadBalancerApplianceAnswer.java | 28 +-
.../network/resource/TrafficSentinelResource.java | 28 +-
.../com/cloud/network/resource/XTrustProvider.java | 16 +
.../network/security/SecurityGroupRuleVO.java | 28 +-
.../network/security/SecurityGroupRulesVO.java | 28 +-
.../network/security/SecurityGroupVMMapVO.java | 28 +-
.../cloud/network/security/SecurityGroupVO.java | 28 +-
.../cloud/network/security/SecurityGroupWork.java | 28 +-
.../network/security/SecurityGroupWorkVO.java | 28 +-
.../com/cloud/network/security/VmRulesetLogVO.java | 28 +-
core/src/com/cloud/resource/DiskPreparer.java | 28 +-
core/src/com/cloud/resource/NetworkPreparer.java | 28 +-
core/src/com/cloud/resource/ResourceListener.java | 28 +-
core/src/com/cloud/resource/ServerResource.java | 28 +-
.../src/com/cloud/resource/ServerResourceBase.java | 28 +-
.../cloud/resource/UnableDeleteHostException.java | 28 +-
.../resource/hypervisor/HypervisorResource.java | 28 +-
.../storage/PrimaryStorageHeadResource.java | 28 +-
core/src/com/cloud/serializer/GsonHelper.java | 28 +-
.../src/com/cloud/serializer/SerializerHelper.java | 28 +-
core/src/com/cloud/storage/DiskOfferingVO.java | 28 +-
core/src/com/cloud/storage/GuestOSCategoryVO.java | 28 +-
core/src/com/cloud/storage/GuestOSVO.java | 28 +-
core/src/com/cloud/storage/JavaStorageLayer.java | 28 +-
core/src/com/cloud/storage/LaunchPermissionVO.java | 28 +-
core/src/com/cloud/storage/SecondaryStorage.java | 28 +-
.../com/cloud/storage/SecondaryStorageLayer.java | 28 +-
core/src/com/cloud/storage/SnapshotPolicyVO.java | 28 +-
core/src/com/cloud/storage/SnapshotScheduleVO.java | 28 +-
core/src/com/cloud/storage/SnapshotVO.java | 28 +-
core/src/com/cloud/storage/StorageLayer.java | 28 +-
.../src/com/cloud/storage/StoragePoolDetailVO.java | 28 +-
.../com/cloud/storage/StoragePoolDiscoverer.java | 28 +-
.../com/cloud/storage/StoragePoolHostAssoc.java | 28 +-
core/src/com/cloud/storage/StoragePoolHostVO.java | 28 +-
core/src/com/cloud/storage/StoragePoolVO.java | 28 +-
core/src/com/cloud/storage/StoragePoolWorkVO.java | 28 +-
core/src/com/cloud/storage/SwiftVO.java | 28 +-
core/src/com/cloud/storage/UploadVO.java | 28 +-
core/src/com/cloud/storage/VMTemplateDetailVO.java | 28 +-
core/src/com/cloud/storage/VMTemplateHostVO.java | 28 +-
.../com/cloud/storage/VMTemplateStoragePoolVO.java | 28 +-
core/src/com/cloud/storage/VMTemplateSwiftVO.java | 28 +-
core/src/com/cloud/storage/VMTemplateVO.java | 28 +-
core/src/com/cloud/storage/VMTemplateZoneVO.java | 28 +-
core/src/com/cloud/storage/VolumeHostVO.java | 16 +
core/src/com/cloud/storage/VolumeVO.java | 28 +-
.../resource/CifsSecondaryStorageResource.java | 28 +-
.../resource/LocalSecondaryStorageResource.java | 28 +-
.../resource/NfsSecondaryStorageResource.java | 28 +-
.../storage/resource/SecondaryStorageResource.java | 28 +-
.../resource/SecondaryStorageResourceHandler.java | 28 +-
.../storage/resource/StoragePoolResource.java | 28 +-
.../cloud/storage/snapshot/SnapshotSchedule.java | 28 +-
.../cloud/storage/template/DownloadManager.java | 28 +-
.../storage/template/DownloadManagerImpl.java | 28 +-
.../storage/template/FtpTemplateUploader.java | 28 +-
.../storage/template/HttpTemplateDownloader.java | 28 +-
.../com/cloud/storage/template/IsoProcessor.java | 28 +-
.../storage/template/LocalTemplateDownloader.java | 28 +-
core/src/com/cloud/storage/template/Processor.java | 28 +-
.../com/cloud/storage/template/QCOW2Processor.java | 28 +-
.../cloud/storage/template/RawImageProcessor.java | 28 +-
.../storage/template/ScpTemplateDownloader.java | 28 +-
.../cloud/storage/template/TemplateConstants.java | 28 +-
.../cloud/storage/template/TemplateDownloader.java | 28 +-
.../storage/template/TemplateDownloaderBase.java | 28 +-
.../cloud/storage/template/TemplateLocation.java | 28 +-
.../cloud/storage/template/TemplateUploader.java | 28 +-
.../com/cloud/storage/template/UploadManager.java | 28 +-
.../cloud/storage/template/UploadManagerImpl.java | 28 +-
.../com/cloud/storage/template/VhdProcessor.java | 28 +-
.../com/cloud/storage/template/VmdkProcessor.java | 28 +-
core/src/com/cloud/user/AccountVO.java | 28 +-
core/src/com/cloud/user/SSHKeyPairVO.java | 28 +-
core/src/com/cloud/user/UserAccountVO.java | 28 +-
core/src/com/cloud/user/UserStatisticsVO.java | 28 +-
core/src/com/cloud/user/UserStatsLogVO.java | 28 +-
core/src/com/cloud/user/UserVO.java | 28 +-
core/src/com/cloud/vm/ConsoleProxy.java | 28 +-
core/src/com/cloud/vm/ConsoleProxyVO.java | 28 +-
core/src/com/cloud/vm/DomainRouterVO.java | 26 +-
core/src/com/cloud/vm/InstanceGroupVMMapVO.java | 28 +-
core/src/com/cloud/vm/InstanceGroupVO.java | 28 +-
core/src/com/cloud/vm/SecondaryStorageVm.java | 28 +-
core/src/com/cloud/vm/SecondaryStorageVmVO.java | 28 +-
core/src/com/cloud/vm/SystemVm.java | 28 +-
core/src/com/cloud/vm/UserVmDetailVO.java | 28 +-
core/src/com/cloud/vm/UserVmVO.java | 28 +-
core/src/com/cloud/vm/VMInstanceVO.java | 26 +-
core/src/com/cloud/vm/VirtualDisk.java | 28 +-
core/src/com/cloud/vm/VirtualEnvironment.java | 28 +-
core/src/com/cloud/vm/VirtualMachineName.java | 28 +-
core/src/com/cloud/vm/VirtualNetwork.java | 28 +-
core/src/com/cloud/vm/VmDetailConstants.java | 28 +-
.../com/cloud/agent/transport/RequestTest.java | 28 +-
.../vmware/mo/TestVmwareContextFactory.java | 28 +-
.../cloud/hypervisor/vmware/mo/TestVmwareMO.java | 28 +-
.../hypervisor/vmware/util/TestVmwareUtil.java | 28 +-
core/test/com/cloud/vmware/TestVMWare.java | 28 +-
docs/2.0/CloudStack2.0AdapterFrameworkGuide.docx | Bin 34851 -> 0 bytes
docs/2.0/downloads.html | 856 ----------
.../2.1/CloudStack 2.1 Adapter Framework Guide.pdf | Bin 399851 -> 0 bytes
...oudStack 2.1.3 User Interface Customization.pdf | Bin 566459 -> 0 bytes
docs/2.1/CloudStack2.1.1ReleaseNotes.docx | Bin 62587 -> 0 bytes
docs/2.1/CloudStack2.1.2ReleaseNotes.docx | Bin 68281 -> 0 bytes
docs/2.1/CloudStack2.1.3FOSSReleaseNotes.docx | Bin 62241 -> 0 bytes
docs/2.1/CloudStack2.1.3ReleaseNotes.docx | Bin 69397 -> 0 bytes
docs/2.1/CloudStack2.1AdminGuide.docx | Bin 524916 -> 0 bytes
docs/2.1/CloudStack2.1FOSSInstallationGuide.docx | Bin 143470 -> 0 bytes
docs/2.1/CloudStack2.1InstallGuide.docx | Bin 288162 -> 0 bytes
docs/2.1/CloudStack2.1ReleaseNotes.docx | Bin 59857 -> 0 bytes
.../CloudStack2.1UserInterfaceCustomization.docx | Bin 359013 -> 0 bytes
docs/2.2/CloudBridgeGuide.docx | Bin 123960 -> 0 bytes
docs/2.2/CloudStack2.2.11AdminGuide.docx | Bin 681440 -> 0 bytes
docs/2.2/CloudStack2.2.11AdminGuide.pdf | Bin 1225090 -> 0 bytes
docs/2.2/CloudStack2.2.11InstallGuide.docx | Bin 1115663 -> 0 bytes
docs/2.2/CloudStack2.2.11InstallGuide.pdf | Bin 1619630 -> 0 bytes
docs/2.2/CloudStack2.2.11ReleaseNotes.docx | Bin 96186 -> 0 bytes
docs/2.2/CloudStack2.2.11ReleaseNotes.pdf | Bin 470007 -> 0 bytes
docs/2.2/CloudStack2.2.12AdminGuide.docx | Bin 767339 -> 0 bytes
docs/2.2/CloudStack2.2.12AdminGuide.pdf | Bin 1236017 -> 0 bytes
docs/2.2/CloudStack2.2.12InstallGuide.docx | Bin 1118075 -> 0 bytes
docs/2.2/CloudStack2.2.12InstallGuide.pdf | Bin 1633038 -> 0 bytes
docs/2.2/CloudStack2.2.12ReleaseNotes.docx | Bin 98534 -> 0 bytes
docs/2.2/CloudStack2.2.12ReleaseNotes.pdf | Bin 483310 -> 0 bytes
docs/2.2/CloudStack2.2.13AdminGuide.docx | Bin 834604 -> 0 bytes
docs/2.2/CloudStack2.2.13InstallGuide.docx | Bin 1840874 -> 0 bytes
docs/2.2/CloudStack2.2.13ReleaseNotes.docx | Bin 74835 -> 0 bytes
docs/2.2/CloudStack2.2.14InstallGuide.docx | Bin 1842608 -> 0 bytes
docs/2.2/CloudStack2.2.14ReleaseNotes.docx | Bin 88565 -> 0 bytes
docs/2.2/CloudStack2.2.1ReleaseNotes.docx | Bin 60050 -> 0 bytes
docs/2.2/CloudStack2.2.2ReleaseNotes.docx | Bin 63189 -> 0 bytes
docs/2.2/CloudStack2.2.3ReleaseNotes.docx | Bin 67169 -> 0 bytes
docs/2.2/CloudStack2.2.4AdminGuide.docx | Bin 604397 -> 0 bytes
docs/2.2/CloudStack2.2.4AdminGuide.pdf | Bin 1120090 -> 0 bytes
docs/2.2/CloudStack2.2.4InstallGuide.docx | Bin 999654 -> 0 bytes
docs/2.2/CloudStack2.2.4InstallGuide.pdf | Bin 1433849 -> 0 bytes
docs/2.2/CloudStack2.2.4ReleaseNotes.docx | Bin 75756 -> 0 bytes
docs/2.2/CloudStack2.2.5ReleaseNotes.docx | Bin 78216 -> 0 bytes
docs/2.2/CloudStack2.2.8AdminGuide.docx | Bin 661207 -> 0 bytes
docs/2.2/CloudStack2.2.8AdminGuide.pdf | Bin 2097152 -> 0 bytes
docs/2.2/CloudStack2.2.8InstallGuide.docx | Bin 1113785 -> 0 bytes
docs/2.2/CloudStack2.2.8InstallGuide.pdf | Bin 2097152 -> 0 bytes
docs/2.2/CloudStack2.2.9AdminGuide.pdf | Bin 1209165 -> 0 bytes
docs/2.2/CloudStack2.2.9InstallGuide.pdf | Bin 1621703 -> 0 bytes
docs/2.2/CloudStack2.2.9ReleaseNotes.docx | Bin 93019 -> 0 bytes
docs/2.2/CloudStack2.2.9ReleaseNotes.pdf | Bin 421316 -> 0 bytes
docs/2.2/CloudStack2.2AdminGuide.docx | Bin 631360 -> 0 bytes
docs/2.2/CloudStack2.2AdminGuide.pdf | Bin 1106127 -> 0 bytes
.../CloudStack2.2AllocatorImplementationGuide.docx | Bin 30122 -> 0 bytes
docs/2.2/CloudStack2.2DeveloperGuide.docx | Bin 75226 -> 0 bytes
docs/2.2/CloudStack2.2InstallGuide.docx | Bin 1023751 -> 0 bytes
docs/2.2/CloudStack2.2InstallGuide.pdf | Bin 1472659 -> 0 bytes
docs/2.2/CloudStack2.2ReleaseNotes.docx | Bin 57934 -> 0 bytes
.../CloudStack2.2UserInterfaceCustomization.docx | Bin 445284 -> 0 bytes
.../CloudStack2.2UserInterfaceCustomization.pdf | Bin 495979 -> 0 bytes
docs/2.2/downloads-supp3.html | 89 -
docs/2.2/downloads.html | 1305 ---------------
docs/3.0/CloudPortal1.3FeaturesList.docx | Bin 304840 -> 0 bytes
docs/3.0/CloudStack2.2_3.0DeveloperGuide.docx | Bin 125605 -> 0 bytes
docs/3.0/CloudStack3.0.0ReleaseNotes.docx | Bin 86354 -> 0 bytes
docs/3.0/CloudStack3.0.1ReleaseNotes.docx | Bin 93943 -> 0 bytes
docs/3.0/CloudStack3.0.2ReleaseNotes.docx | Bin 138119 -> 0 bytes
docs/3.0/CloudStack3.0AdminGuide.docx | Bin 1148712 -> 0 bytes
docs/3.0/CloudStack3.0AdminGuide.pdf | Bin 2013127 -> 0 bytes
docs/3.0/CloudStack3.0AdminGuide_BareMetal.docx | Bin 1128407 -> 0 bytes
docs/3.0/CloudStack3.0FeaturesList.docx | Bin 304364 -> 0 bytes
docs/3.0/CloudStack3.0InstallGuide.docx | Bin 1636469 -> 0 bytes
docs/3.0/CloudStack3.0InstallGuide_BareMetal.docx | Bin 1584627 -> 0 bytes
docs/3.0/CloudStack3.0NewFeatures.docx | Bin 98103 -> 0 bytes
docs/3.0/CloudStack3.0Overview.docx | Bin 305066 -> 0 bytes
docs/3.0/CloudStack3.0QuickInstallGuide.docx | Bin 554347 -> 0 bytes
.../CloudStack3.0UserInterfaceCustomization.docx | Bin 474232 -> 0 bytes
docs/3.0/CloudStackAndCloudPortalFeaturesList.docx | Bin 402844 -> 0 bytes
docs/CloudStack2.0AdapterFrameworkGuide.docx | Bin 34851 -> 0 bytes
docs/CloudStack2.1.1ReleaseNotes.docx | Bin 62587 -> 0 bytes
docs/CloudStack2.1.2ReleaseNotes.docx | Bin 68281 -> 0 bytes
docs/CloudStack2.1.3FOSSReleaseNotes.docx | Bin 62241 -> 0 bytes
docs/CloudStack2.1.3ReleaseNotes.docx | Bin 69397 -> 0 bytes
docs/CloudStack2.1AdminGuide.docx | Bin 524916 -> 0 bytes
docs/CloudStack2.1FOSSInstallationGuide.docx | Bin 143470 -> 0 bytes
docs/CloudStack2.1InstallGuide.docx | Bin 288162 -> 0 bytes
docs/CloudStack2.1ReleaseNotes.docx | Bin 59857 -> 0 bytes
docs/CloudStack2.1UserInterfaceCustomization.docx | Bin 359013 -> 0 bytes
docs/runbook/README | 19 +
docs/runbook/en-US/Author_Group.xml | 20 +
docs/runbook/en-US/Book_Info.xml | 20 +
docs/runbook/en-US/Chapter.xml | 20 +
docs/runbook/en-US/Environment.xml | 20 +
docs/runbook/en-US/Management.xml | 20 +
docs/runbook/en-US/Overview.xml | 24 +-
docs/runbook/en-US/Preface.xml | 20 +
docs/runbook/en-US/Revision_History.xml | 20 +
docs/runbook/en-US/Runbook.xml | 20 +
docs/runbook/en-US/config.xml | 20 +
docs/runbook/en-US/kvm.xml | 20 +
plugins/file-systems/netapp/.classpath | 11 +
plugins/file-systems/netapp/.project | 17 +
plugins/file-systems/netapp/build.xml | 129 ++
.../cloud/api/commands/netapp/AssociateLunCmd.java | 100 ++
.../cloud/api/commands/netapp/CreateLunCmd.java | 98 ++
.../commands/netapp/CreateVolumeOnFilerCmd.java | 146 ++
.../api/commands/netapp/CreateVolumePoolCmd.java | 84 +
.../api/commands/netapp/DeleteVolumePoolCmd.java | 76 +
.../cloud/api/commands/netapp/DestroyLunCmd.java | 78 +
.../commands/netapp/DestroyVolumeOnFilerCmd.java | 87 +
.../api/commands/netapp/DissociateLunCmd.java | 79 +
.../com/cloud/api/commands/netapp/ListLunsCmd.java | 88 +
.../api/commands/netapp/ListVolumePoolsCmd.java | 84 +
.../api/commands/netapp/ListVolumesOnFilerCmd.java | 94 +
.../api/commands/netapp/ModifyVolumePoolCmd.java | 73 +
.../netapp/src/com/cloud/netapp/LunVO.java | 121 ++
.../src/com/cloud/netapp/NetappAllocator.java | 25 +
.../cloud/netapp/NetappDefaultAllocatorImpl.java | 142 ++
.../netapp/src/com/cloud/netapp/NetappManager.java | 66 +
.../src/com/cloud/netapp/NetappManagerImpl.java | 1040 ++++++++++++
.../src/com/cloud/netapp/NetappVolumeVO.java | 183 ++
.../netapp/src/com/cloud/netapp/PoolVO.java | 74 +
.../netapp/src/com/cloud/netapp/dao/LunDao.java | 31 +
.../src/com/cloud/netapp/dao/LunDaoImpl.java | 70 +
.../netapp/src/com/cloud/netapp/dao/PoolDao.java | 28 +
.../src/com/cloud/netapp/dao/PoolDaoImpl.java | 67 +
.../netapp/src/com/cloud/netapp/dao/VolumeDao.java | 30 +
.../src/com/cloud/netapp/dao/VolumeDaoImpl.java | 99 ++
.../ovm/scripts/vm/hypervisor/ovm/ConfigFileOps.py | 26 +-
.../scripts/vm/hypervisor/ovm/OvmCommonModule.py | 26 +-
.../ovm/scripts/vm/hypervisor/ovm/OvmDiskModule.py | 26 +-
.../ovm/scripts/vm/hypervisor/ovm/OvmDispatcher.py | 26 +-
.../scripts/vm/hypervisor/ovm/OvmFaultConstants.py | 26 +-
.../vm/hypervisor/ovm/OvmHaHeartBeatModule.py | 26 +-
.../ovm/scripts/vm/hypervisor/ovm/OvmHostModule.py | 27 +-
.../scripts/vm/hypervisor/ovm/OvmLoggerModule.py | 26 +-
.../scripts/vm/hypervisor/ovm/OvmNetworkModule.py | 26 +-
.../scripts/vm/hypervisor/ovm/OvmOCFS2Module.py | 26 +-
.../scripts/vm/hypervisor/ovm/OvmObjectModule.py | 26 +-
.../vm/hypervisor/ovm/OvmSecurityGroupModule.py | 26 +-
.../vm/hypervisor/ovm/OvmStoragePoolModule.py | 26 +-
.../ovm/scripts/vm/hypervisor/ovm/OvmVifModule.py | 26 +-
.../ovm/scripts/vm/hypervisor/ovm/OvmVmModule.py | 26 +-
.../scripts/vm/hypervisor/ovm/OvmVolumeModule.py | 26 +-
.../ovm/scripts/vm/hypervisor/ovm/configureOvm.sh | 26 +-
.../com/cloud/ovm/hypervisor/OvmDiscoverer.java | 28 +-
.../src/com/cloud/ovm/hypervisor/OvmFencer.java | 28 +-
.../ovm/src/com/cloud/ovm/hypervisor/OvmGuru.java | 28 +-
.../src/com/cloud/ovm/hypervisor/OvmHelper.java | 28 +-
.../com/cloud/ovm/hypervisor/OvmResourceBase.java | 28 +-
.../ovm/src/com/cloud/ovm/object/Coder.java | 28 +-
.../ovm/src/com/cloud/ovm/object/Connection.java | 28 +-
.../ovm/src/com/cloud/ovm/object/OvmBridge.java | 28 +-
.../ovm/src/com/cloud/ovm/object/OvmDisk.java | 28 +-
.../ovm/src/com/cloud/ovm/object/OvmHost.java | 28 +-
.../ovm/src/com/cloud/ovm/object/OvmObject.java | 28 +-
.../src/com/cloud/ovm/object/OvmSecurityGroup.java | 28 +-
.../src/com/cloud/ovm/object/OvmStoragePool.java | 28 +-
.../ovm/src/com/cloud/ovm/object/OvmVif.java | 28 +-
.../ovm/src/com/cloud/ovm/object/OvmVlan.java | 28 +-
.../ovm/src/com/cloud/ovm/object/OvmVm.java | 28 +-
.../ovm/src/com/cloud/ovm/object/OvmVolume.java | 28 +-
.../ovm/src/com/cloud/ovm/object/Test.java | 28 +-
.../elastic-loadbalancer/.classpath | 11 +
.../network-elements/elastic-loadbalancer/.project | 17 +
.../elastic-loadbalancer/build.xml | 129 ++
.../src/com/cloud/network/ElasticLbVmMapVO.java | 101 ++
.../element/ElasticLoadBalancerElement.java | 199 +++
.../network/lb/ElasticLoadBalancerManager.java | 41 +
.../network/lb/ElasticLoadBalancerManagerImpl.java | 1027 ++++++++++++
.../cloud/network/lb/dao/ElasticLbVmMapDao.java | 37 +
.../network/lb/dao/ElasticLbVmMapDaoImpl.java | 134 ++
server/src/com/cloud/account/SecurityManager.java | 28 +-
server/src/com/cloud/acl/DomainChecker.java | 28 +-
server/src/com/cloud/agent/AgentManager.java | 28 +-
server/src/com/cloud/agent/VmmAgentShell.java | 28 +-
.../src/com/cloud/agent/manager/AgentAttache.java | 28 +-
.../com/cloud/agent/manager/AgentManagerImpl.java | 28 +-
.../src/com/cloud/agent/manager/AgentMonitor.java | 28 +-
.../cloud/agent/manager/ClusteredAgentAttache.java | 28 +-
.../agent/manager/ClusteredAgentManagerImpl.java | 28 +-
.../agent/manager/ClusteredDirectAgentAttache.java | 28 +-
server/src/com/cloud/agent/manager/Commands.java | 28 +-
.../cloud/agent/manager/ConnectedAgentAttache.java | 28 +-
.../cloud/agent/manager/DirectAgentAttache.java | 28 +-
.../src/com/cloud/agent/manager/DummyAttache.java | 28 +-
server/src/com/cloud/agent/manager/Routable.java | 28 +-
.../cloud/agent/manager/SynchronousListener.java | 28 +-
.../agent/manager/allocator/HostAllocator.java | 28 +-
.../agent/manager/allocator/PodAllocator.java | 28 +-
.../manager/allocator/impl/FirstFitAllocator.java | 28 +-
.../allocator/impl/FirstFitRoutingAllocator.java | 28 +-
.../allocator/impl/RecreateHostAllocator.java | 28 +-
.../manager/allocator/impl/TestingAllocator.java | 28 +-
.../allocator/impl/UserConcentratedAllocator.java | 28 +-
.../agent/manager/authn/AgentAuthnException.java | 28 +-
.../cloud/agent/manager/authn/AgentAuthorizer.java | 28 +-
.../manager/authn/impl/BasicAgentAuthManager.java | 28 +-
server/src/com/cloud/alert/AlertManagerImpl.java | 28 +-
.../src/com/cloud/alert/ClusterAlertAdapter.java | 28 +-
.../com/cloud/alert/ConsoleProxyAlertAdapter.java | 28 +-
.../alert/SecondaryStorageVmAlertAdapter.java | 28 +-
server/src/com/cloud/alert/dao/AlertDao.java | 28 +-
server/src/com/cloud/alert/dao/AlertDaoImpl.java | 28 +-
server/src/com/cloud/api/ApiDBUtils.java | 26 +-
server/src/com/cloud/api/ApiDispatcher.java | 28 +-
server/src/com/cloud/api/ApiGsonHelper.java | 28 +-
.../src/com/cloud/api/ApiResponseGsonHelper.java | 28 +-
server/src/com/cloud/api/ApiResponseHelper.java | 26 +-
server/src/com/cloud/api/ApiSerializerHelper.java | 28 +-
server/src/com/cloud/api/ApiServer.java | 26 +-
server/src/com/cloud/api/ApiServlet.java | 28 +-
.../com/cloud/api/EncodedStringTypeAdapter.java | 28 +-
server/src/com/cloud/api/IdentityTypeAdapter.java | 28 +-
.../com/cloud/api/ResponseObjectTypeAdapter.java | 28 +-
server/src/com/cloud/api/SerializationContext.java | 28 +-
server/src/com/cloud/api/StringMapTypeAdapter.java | 28 +-
.../cloud/api/commands/AddNetworkDeviceCmd.java | 28 +-
.../cloud/api/commands/AddTrafficMonitorCmd.java | 28 +-
.../cloud/api/commands/DeleteNetworkDeviceCmd.java | 28 +-
.../api/commands/DeleteTrafficMonitorCmd.java | 28 +-
.../api/commands/GenerateUsageRecordsCmd.java | 28 +-
.../com/cloud/api/commands/GetUsageRecordsCmd.java | 28 +-
.../cloud/api/commands/ListNetworkDeviceCmd.java | 28 +-
.../cloud/api/commands/ListTrafficMonitorsCmd.java | 28 +-
.../com/cloud/api/commands/ListUsageTypesCmd.java | 28 +-
.../cloud/api/commands/netapp/AssociateLunCmd.java | 96 --
.../cloud/api/commands/netapp/CreateLunCmd.java | 94 -
.../commands/netapp/CreateVolumeOnFilerCmd.java | 142 --
.../api/commands/netapp/CreateVolumePoolCmd.java | 80 -
.../api/commands/netapp/DeleteVolumePoolCmd.java | 72 -
.../cloud/api/commands/netapp/DestroyLunCmd.java | 74 -
.../commands/netapp/DestroyVolumeOnFilerCmd.java | 83 -
.../api/commands/netapp/DissociateLunCmd.java | 75 -
.../com/cloud/api/commands/netapp/ListLunsCmd.java | 84 -
.../api/commands/netapp/ListVolumePoolsCmd.java | 80 -
.../api/commands/netapp/ListVolumesOnFilerCmd.java | 90 -
.../api/commands/netapp/ModifyVolumePoolCmd.java | 69 -
server/src/com/cloud/api/doc/Alert.java | 28 +-
server/src/com/cloud/api/doc/ApiXmlDocReader.java | 28 +-
server/src/com/cloud/api/doc/ApiXmlDocWriter.java | 28 +-
server/src/com/cloud/api/doc/Argument.java | 28 +-
server/src/com/cloud/api/doc/Command.java | 28 +-
.../cloud/api/response/ApiResponseSerializer.java | 28 +-
.../api/response/SecurityGroupResultObject.java | 28 +-
.../response/SecurityGroupRuleResultObject.java | 28 +-
server/src/com/cloud/async/AsyncCommandQueued.java | 28 +-
server/src/com/cloud/async/AsyncJobExecutor.java | 28 +-
.../com/cloud/async/AsyncJobExecutorContext.java | 28 +-
.../cloud/async/AsyncJobExecutorContextImpl.java | 28 +-
server/src/com/cloud/async/AsyncJobMBean.java | 28 +-
server/src/com/cloud/async/AsyncJobMBeanImpl.java | 28 +-
server/src/com/cloud/async/AsyncJobManager.java | 28 +-
.../src/com/cloud/async/AsyncJobManagerImpl.java | 16 +
server/src/com/cloud/async/AsyncJobResult.java | 28 +-
.../src/com/cloud/async/BaseAsyncJobExecutor.java | 28 +-
server/src/com/cloud/async/SyncQueueManager.java | 28 +-
.../src/com/cloud/async/SyncQueueManagerImpl.java | 28 +-
server/src/com/cloud/async/dao/AsyncJobDao.java | 28 +-
.../src/com/cloud/async/dao/AsyncJobDaoImpl.java | 28 +-
server/src/com/cloud/async/dao/SyncQueueDao.java | 28 +-
.../src/com/cloud/async/dao/SyncQueueDaoImpl.java | 28 +-
.../src/com/cloud/async/dao/SyncQueueItemDao.java | 28 +-
.../com/cloud/async/dao/SyncQueueItemDaoImpl.java | 28 +-
.../async/executor/ExtractJobResultObject.java | 28 +-
.../com/cloud/baremetal/BareMetalDiscoverer.java | 28 +-
server/src/com/cloud/baremetal/BareMetalGuru.java | 28 +-
.../cloud/baremetal/BareMetalPingServiceImpl.java | 28 +-
.../cloud/baremetal/BareMetalPxeServiceBase.java | 28 +-
.../com/cloud/baremetal/BareMetalResourceBase.java | 28 +-
.../cloud/baremetal/BareMetalTemplateAdapter.java | 28 +-
.../com/cloud/baremetal/BareMetalVmManager.java | 28 +-
.../cloud/baremetal/BareMetalVmManagerImpl.java | 28 +-
.../com/cloud/baremetal/DhcpServerResponse.java | 28 +-
server/src/com/cloud/baremetal/DhcpdResource.java | 28 +-
.../src/com/cloud/baremetal/DnsmasqResource.java | 28 +-
.../cloud/baremetal/ExternalDhcpEntryListener.java | 28 +-
.../com/cloud/baremetal/ExternalDhcpManager.java | 28 +-
.../cloud/baremetal/ExternalDhcpManagerImpl.java | 28 +-
.../cloud/baremetal/ExternalDhcpResourceBase.java | 28 +-
.../src/com/cloud/baremetal/HttpCallException.java | 28 +-
.../com/cloud/baremetal/PingPxeServerResource.java | 28 +-
.../src/com/cloud/baremetal/PxeServerManager.java | 28 +-
.../com/cloud/baremetal/PxeServerManagerImpl.java | 28 +-
.../src/com/cloud/baremetal/PxeServerProfile.java | 28 +-
.../com/cloud/baremetal/PxeServerResourceBase.java | 28 +-
.../src/com/cloud/baremetal/PxeServerResponse.java | 28 +-
.../src/com/cloud/baremetal/PxeServerService.java | 28 +-
server/src/com/cloud/capacity/CapacityManager.java | 28 +-
.../com/cloud/capacity/CapacityManagerImpl.java | 28 +-
.../cloud/capacity/ComputeCapacityListener.java | 28 +-
.../cloud/capacity/StorageCapacityListener.java | 28 +-
server/src/com/cloud/capacity/dao/CapacityDao.java | 28 +-
.../com/cloud/capacity/dao/CapacityDaoImpl.java | 28 +-
.../com/cloud/certificate/dao/CertificateDao.java | 28 +-
.../cloud/certificate/dao/CertificateDaoImpl.java | 28 +-
.../com/cloud/cluster/ActiveFencingException.java | 28 +-
.../src/com/cloud/cluster/CheckPointManager.java | 28 +-
.../com/cloud/cluster/CheckPointManagerImpl.java | 28 +-
server/src/com/cloud/cluster/CheckPointVO.java | 28 +-
server/src/com/cloud/cluster/CleanupMaid.java | 28 +-
.../src/com/cloud/cluster/ClusterFenceManager.java | 28 +-
.../com/cloud/cluster/ClusterFenceManagerImpl.java | 28 +-
.../cluster/ClusterInvalidSessionException.java | 28 +-
server/src/com/cloud/cluster/ClusterManager.java | 28 +-
.../src/com/cloud/cluster/ClusterManagerImpl.java | 28 +-
.../com/cloud/cluster/ClusterManagerListener.java | 28 +-
.../src/com/cloud/cluster/ClusterManagerMBean.java | 28 +-
.../com/cloud/cluster/ClusterManagerMBeanImpl.java | 28 +-
.../com/cloud/cluster/ClusterManagerMessage.java | 28 +-
.../cloud/cluster/ClusterNodeJoinEventArgs.java | 28 +-
.../cloud/cluster/ClusterNodeLeftEventArgs.java | 28 +-
server/src/com/cloud/cluster/ClusterService.java | 28 +-
.../com/cloud/cluster/ClusterServiceAdapter.java | 28 +-
.../src/com/cloud/cluster/ClusterServicePdu.java | 28 +-
.../cloud/cluster/ClusterServiceRequestPdu.java | 28 +-
.../cluster/ClusterServiceServletAdapter.java | 28 +-
.../cluster/ClusterServiceServletContainer.java | 28 +-
.../cluster/ClusterServiceServletHttpHandler.java | 28 +-
.../cloud/cluster/ClusterServiceServletImpl.java | 28 +-
.../cluster/ClusteredAgentRebalanceService.java | 28 +-
.../com/cloud/cluster/DummyClusterManagerImpl.java | 28 +-
.../src/com/cloud/cluster/LockMasterListener.java | 28 +-
.../cloud/cluster/ManagementServerHostPeerVO.java | 28 +-
.../com/cloud/cluster/ManagementServerHostVO.java | 28 +-
.../com/cloud/cluster/ManagementServerNode.java | 28 +-
.../com/cloud/cluster/RemoteMethodConstants.java | 28 +-
server/src/com/cloud/cluster/StackMaid.java | 28 +-
.../cluster/agentlb/AgentLoadBalancerPlanner.java | 28 +-
.../ClusterBasedAgentLoadBalancerPlanner.java | 28 +-
.../cloud/cluster/agentlb/HostTransferMapVO.java | 28 +-
.../cluster/agentlb/dao/HostTransferMapDao.java | 28 +-
.../agentlb/dao/HostTransferMapDaoImpl.java | 28 +-
.../cloud/cluster/dao/ManagementServerHostDao.java | 28 +-
.../cluster/dao/ManagementServerHostDaoImpl.java | 28 +-
.../cluster/dao/ManagementServerHostPeerDao.java | 28 +-
.../dao/ManagementServerHostPeerDaoImpl.java | 28 +-
server/src/com/cloud/cluster/dao/StackMaidDao.java | 28 +-
.../com/cloud/cluster/dao/StackMaidDaoImpl.java | 28 +-
.../configuration/CloudZonesComponentLibrary.java | 28 +-
server/src/com/cloud/configuration/Config.java | 26 +-
.../cloud/configuration/ConfigurationManager.java | 26 +-
.../configuration/ConfigurationManagerImpl.java | 27 +-
.../configuration/DefaultComponentLibrary.java | 30 +-
.../configuration/DefaultInterceptorLibrary.java | 28 +-
.../configuration/PremiumComponentLibrary.java | 36 +-
server/src/com/cloud/configuration/ZoneConfig.java | 28 +-
.../cloud/configuration/dao/ConfigurationDao.java | 28 +-
.../configuration/dao/ConfigurationDaoImpl.java | 28 +-
.../cloud/configuration/dao/ResourceCountDao.java | 28 +-
.../configuration/dao/ResourceCountDaoImpl.java | 28 +-
.../cloud/configuration/dao/ResourceLimitDao.java | 28 +-
.../configuration/dao/ResourceLimitDaoImpl.java | 28 +-
.../AgentBasedConsoleProxyManager.java | 26 +-
.../AgentBasedStandaloneConsoleProxyManager.java | 28 +-
server/src/com/cloud/consoleproxy/AgentHook.java | 28 +-
.../consoleproxy/ConsoleProxyAlertEventArgs.java | 28 +-
.../consoleproxy/ConsoleProxyBalanceAllocator.java | 28 +-
.../cloud/consoleproxy/ConsoleProxyListener.java | 28 +-
.../consoleproxy/ConsoleProxyManagementState.java | 28 +-
.../cloud/consoleproxy/ConsoleProxyManager.java | 28 +-
.../consoleproxy/ConsoleProxyManagerImpl.java | 26 +-
.../consoleproxy/StaticConsoleProxyManager.java | 28 +-
server/src/com/cloud/dao/EntityManagerImpl.java | 28 +-
server/src/com/cloud/dc/AccountVlanMapVO.java | 28 +-
server/src/com/cloud/dc/ClusterDetailsDao.java | 28 +-
server/src/com/cloud/dc/ClusterDetailsDaoImpl.java | 28 +-
server/src/com/cloud/dc/ClusterDetailsVO.java | 28 +-
server/src/com/cloud/dc/ClusterVO.java | 28 +-
server/src/com/cloud/dc/ClusterVSMMapVO.java | 28 +-
server/src/com/cloud/dc/DataCenterIpAddressVO.java | 28 +-
.../cloud/dc/DataCenterLinkLocalIpAddressVO.java | 28 +-
server/src/com/cloud/dc/DataCenterVO.java | 26 +-
server/src/com/cloud/dc/DataCenterVnetVO.java | 28 +-
server/src/com/cloud/dc/DcDetailVO.java | 28 +-
server/src/com/cloud/dc/HostPodVO.java | 28 +-
server/src/com/cloud/dc/PodCluster.java | 28 +-
server/src/com/cloud/dc/PodVlanMapVO.java | 28 +-
server/src/com/cloud/dc/PodVlanVO.java | 28 +-
.../com/cloud/dc/StorageNetworkIpAddressVO.java | 28 +-
.../src/com/cloud/dc/StorageNetworkIpRangeVO.java | 28 +-
server/src/com/cloud/dc/VlanVO.java | 28 +-
server/src/com/cloud/dc/dao/AccountVlanMapDao.java | 28 +-
.../com/cloud/dc/dao/AccountVlanMapDaoImpl.java | 28 +-
server/src/com/cloud/dc/dao/ClusterDao.java | 28 +-
server/src/com/cloud/dc/dao/ClusterDaoImpl.java | 28 +-
server/src/com/cloud/dc/dao/ClusterVSMMapDao.java | 28 +-
.../src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java | 28 +-
server/src/com/cloud/dc/dao/DataCenterDao.java | 28 +-
server/src/com/cloud/dc/dao/DataCenterDaoImpl.java | 28 +-
.../com/cloud/dc/dao/DataCenterIpAddressDao.java | 28 +-
.../cloud/dc/dao/DataCenterIpAddressDaoImpl.java | 28 +-
.../dao/DataCenterLinkLocalIpAddressDaoImpl.java | 28 +-
.../com/cloud/dc/dao/DataCenterVnetDaoImpl.java | 28 +-
server/src/com/cloud/dc/dao/DcDetailsDao.java | 28 +-
server/src/com/cloud/dc/dao/DcDetailsDaoImpl.java | 28 +-
server/src/com/cloud/dc/dao/HostPodDao.java | 28 +-
server/src/com/cloud/dc/dao/HostPodDaoImpl.java | 28 +-
server/src/com/cloud/dc/dao/PodVlanDaoImpl.java | 28 +-
server/src/com/cloud/dc/dao/PodVlanMapDao.java | 28 +-
server/src/com/cloud/dc/dao/PodVlanMapDaoImpl.java | 28 +-
.../cloud/dc/dao/StorageNetworkIpAddressDao.java | 28 +-
.../dc/dao/StorageNetworkIpAddressDaoImpl.java | 28 +-
.../com/cloud/dc/dao/StorageNetworkIpRangeDao.java | 28 +-
.../cloud/dc/dao/StorageNetworkIpRangeDaoImpl.java | 28 +-
server/src/com/cloud/dc/dao/VlanDao.java | 28 +-
server/src/com/cloud/dc/dao/VlanDaoImpl.java | 28 +-
server/src/com/cloud/deploy/BareMetalPlanner.java | 28 +-
server/src/com/cloud/deploy/FirstFitPlanner.java | 28 +-
server/src/com/cloud/deploy/PlannerBase.java | 28 +-
server/src/com/cloud/domain/DomainVO.java | 28 +-
server/src/com/cloud/domain/dao/DomainDao.java | 28 +-
server/src/com/cloud/domain/dao/DomainDaoImpl.java | 28 +-
.../src/com/cloud/event/ActionEventCallback.java | 28 +-
server/src/com/cloud/event/EventUtils.java | 28 +-
.../src/com/cloud/ha/AbstractInvestigatorImpl.java | 28 +-
.../src/com/cloud/ha/CheckOnAgentInvestigator.java | 28 +-
server/src/com/cloud/ha/FenceBuilder.java | 28 +-
server/src/com/cloud/ha/HaWorkVO.java | 28 +-
.../src/com/cloud/ha/HighAvailabilityManager.java | 28 +-
.../cloud/ha/HighAvailabilityManagerExtImpl.java | 28 +-
.../com/cloud/ha/HighAvailabilityManagerImpl.java | 28 +-
server/src/com/cloud/ha/Investigator.java | 28 +-
server/src/com/cloud/ha/KVMFencer.java | 28 +-
.../cloud/ha/ManagementIPSystemVMInvestigator.java | 28 +-
server/src/com/cloud/ha/RecreatableFencer.java | 28 +-
.../src/com/cloud/ha/UserVmDomRInvestigator.java | 28 +-
server/src/com/cloud/ha/XenServerInvestigator.java | 28 +-
.../src/com/cloud/ha/dao/HighAvailabilityDao.java | 28 +-
.../com/cloud/ha/dao/HighAvailabilityDaoImpl.java | 28 +-
server/src/com/cloud/host/dao/HostDao.java | 28 +-
server/src/com/cloud/host/dao/HostDaoImpl.java | 28 +-
server/src/com/cloud/host/dao/HostDetailsDao.java | 28 +-
.../src/com/cloud/host/dao/HostDetailsDaoImpl.java | 28 +-
server/src/com/cloud/host/dao/HostTagsDao.java | 28 +-
server/src/com/cloud/host/dao/HostTagsDaoImpl.java | 28 +-
.../hypervisor/CloudZonesStartupProcessor.java | 28 +-
.../com/cloud/hypervisor/HypervisorGuruBase.java | 26 +-
.../cloud/hypervisor/HypervisorGuruManager.java | 28 +-
.../hypervisor/HypervisorGuruManagerImpl.java | 28 +-
server/src/com/cloud/hypervisor/KVMGuru.java | 28 +-
.../hypervisor/dao/HypervisorCapabilitiesDao.java | 28 +-
.../dao/HypervisorCapabilitiesDaoImpl.java | 28 +-
.../src/com/cloud/hypervisor/guru/HypervGuru.java | 28 +-
.../hypervisor/hyperv/HypervServerDiscoverer.java | 28 +-
.../kvm/discoverer/KvmServerDiscoverer.java | 28 +-
server/src/com/cloud/keystore/KeystoreDao.java | 28 +-
server/src/com/cloud/keystore/KeystoreDaoImpl.java | 28 +-
server/src/com/cloud/keystore/KeystoreManager.java | 28 +-
.../com/cloud/keystore/KeystoreManagerImpl.java | 28 +-
server/src/com/cloud/keystore/KeystoreVO.java | 28 +-
server/src/com/cloud/maint/AgentUpgradeVO.java | 28 +-
server/src/com/cloud/maint/UpgradeManager.java | 28 +-
server/src/com/cloud/maint/UpgradeManagerImpl.java | 28 +-
.../src/com/cloud/maint/UpgradeManagerMBean.java | 28 +-
server/src/com/cloud/maint/UpgradeMonitor.java | 28 +-
server/src/com/cloud/maint/Version.java | 28 +-
.../src/com/cloud/maint/dao/AgentUpgradeDao.java | 28 +-
.../com/cloud/maint/dao/AgentUpgradeDaoImpl.java | 28 +-
.../com/cloud/migration/Db21to22MigrationUtil.java | 28 +-
.../migration/Db22beta4to22GAMigrationUtil.java | 28 +-
.../src/com/cloud/migration/DiskOffering20Dao.java | 28 +-
.../com/cloud/migration/DiskOffering20DaoImpl.java | 28 +-
.../src/com/cloud/migration/DiskOffering20VO.java | 28 +-
.../src/com/cloud/migration/DiskOffering21Dao.java | 28 +-
.../com/cloud/migration/DiskOffering21DaoImpl.java | 28 +-
.../src/com/cloud/migration/DiskOffering21VO.java | 28 +-
.../com/cloud/migration/ServiceOffering20Dao.java | 28 +-
.../cloud/migration/ServiceOffering20DaoImpl.java | 28 +-
.../com/cloud/migration/ServiceOffering20VO.java | 28 +-
.../com/cloud/migration/ServiceOffering21Dao.java | 28 +-
.../cloud/migration/ServiceOffering21DaoImpl.java | 28 +-
.../com/cloud/migration/ServiceOffering21VO.java | 28 +-
server/src/com/cloud/netapp/LunVO.java | 117 --
server/src/com/cloud/netapp/NetappAllocator.java | 21 -
.../cloud/netapp/NetappDefaultAllocatorImpl.java | 138 --
server/src/com/cloud/netapp/NetappManager.java | 62 -
server/src/com/cloud/netapp/NetappManagerImpl.java | 1036 ------------
server/src/com/cloud/netapp/NetappVolumeVO.java | 179 --
server/src/com/cloud/netapp/PoolVO.java | 70 -
server/src/com/cloud/netapp/dao/LunDao.java | 27 -
server/src/com/cloud/netapp/dao/LunDaoImpl.java | 66 -
server/src/com/cloud/netapp/dao/PoolDao.java | 24 -
server/src/com/cloud/netapp/dao/PoolDaoImpl.java | 63 -
server/src/com/cloud/netapp/dao/VolumeDao.java | 26 -
server/src/com/cloud/netapp/dao/VolumeDaoImpl.java | 95 --
server/src/com/cloud/network/ElasticLbVmMapVO.java | 97 --
.../cloud/network/ExteralIpAddressAllocator.java | 28 +-
.../network/ExternalFirewallDeviceManager.java | 28 +-
.../network/ExternalFirewallDeviceManagerImpl.java | 26 +-
.../cloud/network/ExternalFirewallDeviceVO.java | 28 +-
.../network/ExternalLoadBalancerDeviceManager.java | 28 +-
.../ExternalLoadBalancerDeviceManagerImpl.java | 26 +-
.../network/ExternalLoadBalancerDeviceVO.java | 28 +-
.../network/ExternalLoadBalancerUsageManager.java | 28 +-
.../ExternalLoadBalancerUsageManagerImpl.java | 28 +-
.../network/ExternalNetworkDeviceManager.java | 28 +-
.../network/ExternalNetworkDeviceManagerImpl.java | 28 +-
.../com/cloud/network/FirewallRulesCidrsVO.java | 28 +-
server/src/com/cloud/network/IPAddressVO.java | 26 +-
.../cloud/network/InlineLoadBalancerNicMapVO.java | 28 +-
server/src/com/cloud/network/IpAddrAllocator.java | 28 +-
.../com/cloud/network/LBStickinessPolicyVO.java | 28 +-
.../src/com/cloud/network/LoadBalancerVMMapVO.java | 28 +-
server/src/com/cloud/network/LoadBalancerVO.java | 28 +-
.../com/cloud/network/NetworkAccountDaoImpl.java | 28 +-
server/src/com/cloud/network/NetworkAccountVO.java | 28 +-
server/src/com/cloud/network/NetworkDomainVO.java | 28 +-
.../cloud/network/NetworkExternalFirewallVO.java | 28 +-
.../network/NetworkExternalLoadBalancerVO.java | 28 +-
server/src/com/cloud/network/NetworkManager.java | 26 +-
.../src/com/cloud/network/NetworkManagerImpl.java | 26 +-
.../src/com/cloud/network/NetworkRuleConfigVO.java | 28 +-
.../src/com/cloud/network/NetworkServiceMapVO.java | 28 +-
.../src/com/cloud/network/NetworkUsageManager.java | 28 +-
.../com/cloud/network/NetworkUsageManagerImpl.java | 28 +-
server/src/com/cloud/network/NetworkVO.java | 26 +-
.../src/com/cloud/network/PhysicalNetworkVO.java | 28 +-
.../com/cloud/network/PortProfileManagerImpl.java | 28 +-
server/src/com/cloud/network/PortProfileVO.java | 16 +
.../src/com/cloud/network/RemoteAccessVpnVO.java | 28 +-
.../com/cloud/network/SshKeysDistriMonitor.java | 28 +-
.../com/cloud/network/StorageNetworkManager.java | 28 +-
.../cloud/network/StorageNetworkManagerImpl.java | 28 +-
server/src/com/cloud/network/addr/PublicIp.java | 26 +-
.../network/dao/ExternalFirewallDeviceDao.java | 28 +-
.../network/dao/ExternalFirewallDeviceDaoImpl.java | 28 +-
.../network/dao/ExternalLoadBalancerDeviceDao.java | 28 +-
.../dao/ExternalLoadBalancerDeviceDaoImpl.java | 28 +-
.../cloud/network/dao/FirewallRulesCidrsDao.java | 28 +-
.../network/dao/FirewallRulesCidrsDaoImpl.java | 28 +-
.../com/cloud/network/dao/FirewallRulesDao.java | 26 +-
.../cloud/network/dao/FirewallRulesDaoImpl.java | 26 +-
server/src/com/cloud/network/dao/IPAddressDao.java | 26 +-
.../com/cloud/network/dao/IPAddressDaoImpl.java | 26 +-
.../network/dao/InlineLoadBalancerNicMapDao.java | 28 +-
.../dao/InlineLoadBalancerNicMapDaoImpl.java | 28 +-
.../cloud/network/dao/LBStickinessPolicyDao.java | 28 +-
.../network/dao/LBStickinessPolicyDaoImpl.java | 28 +-
.../src/com/cloud/network/dao/LoadBalancerDao.java | 28 +-
.../com/cloud/network/dao/LoadBalancerDaoImpl.java | 28 +-
.../cloud/network/dao/LoadBalancerVMMapDao.java | 28 +-
.../network/dao/LoadBalancerVMMapDaoImpl.java | 28 +-
server/src/com/cloud/network/dao/NetworkDao.java | 26 +-
.../src/com/cloud/network/dao/NetworkDaoImpl.java | 26 +-
.../com/cloud/network/dao/NetworkDomainDao.java | 28 +-
.../cloud/network/dao/NetworkDomainDaoImpl.java | 28 +-
.../network/dao/NetworkExternalFirewallDao.java | 28 +-
.../dao/NetworkExternalFirewallDaoImpl.java | 28 +-
.../dao/NetworkExternalLoadBalancerDao.java | 28 +-
.../dao/NetworkExternalLoadBalancerDaoImpl.java | 28 +-
.../com/cloud/network/dao/NetworkOpDaoImpl.java | 28 +-
server/src/com/cloud/network/dao/NetworkOpVO.java | 28 +-
.../cloud/network/dao/NetworkRuleConfigDao.java | 28 +-
.../network/dao/NetworkRuleConfigDaoImpl.java | 28 +-
.../cloud/network/dao/NetworkServiceMapDao.java | 28 +-
.../network/dao/NetworkServiceMapDaoImpl.java | 28 +-
.../com/cloud/network/dao/PhysicalNetworkDao.java | 28 +-
.../cloud/network/dao/PhysicalNetworkDaoImpl.java | 28 +-
.../dao/PhysicalNetworkIsolationMethodDaoImpl.java | 28 +-
.../dao/PhysicalNetworkIsolationMethodVO.java | 28 +-
.../dao/PhysicalNetworkServiceProviderDao.java | 28 +-
.../dao/PhysicalNetworkServiceProviderDaoImpl.java | 28 +-
.../dao/PhysicalNetworkServiceProviderVO.java | 28 +-
.../network/dao/PhysicalNetworkTagDaoImpl.java | 28 +-
.../cloud/network/dao/PhysicalNetworkTagVO.java | 28 +-
.../network/dao/PhysicalNetworkTrafficTypeDao.java | 28 +-
.../dao/PhysicalNetworkTrafficTypeDaoImpl.java | 28 +-
.../network/dao/PhysicalNetworkTrafficTypeVO.java | 28 +-
.../src/com/cloud/network/dao/PortProfileDao.java | 28 +-
.../com/cloud/network/dao/PortProfileDaoImpl.java | 28 +-
.../com/cloud/network/dao/RemoteAccessVpnDao.java | 28 +-
.../cloud/network/dao/RemoteAccessVpnDaoImpl.java | 28 +-
.../network/dao/VirtualRouterProviderDao.java | 28 +-
.../network/dao/VirtualRouterProviderDaoImpl.java | 28 +-
server/src/com/cloud/network/dao/VpnUserDao.java | 28 +-
.../src/com/cloud/network/dao/VpnUserDaoImpl.java | 28 +-
.../cloud/network/element/BareMetalElement.java | 28 +-
.../network/element/CloudZonesNetworkElement.java | 28 +-
.../element/ElasticLoadBalancerElement.java | 195 ---
.../cloud/network/element/ExternalDhcpElement.java | 28 +-
.../network/element/SecurityGroupElement.java | 28 +-
.../network/element/VirtualRouterElement.java | 26 +-
.../network/element/VirtualRouterProviderVO.java | 28 +-
.../network/firewall/FirewallManagerImpl.java | 26 +-
.../com/cloud/network/guru/ControlNetworkGuru.java | 26 +-
.../com/cloud/network/guru/DirectNetworkGuru.java | 28 +-
.../network/guru/DirectPodBasedNetworkGuru.java | 28 +-
.../network/guru/ExternalGuestNetworkGuru.java | 28 +-
.../com/cloud/network/guru/GuestNetworkGuru.java | 26 +-
server/src/com/cloud/network/guru/GuruUtils.java | 28 +-
.../cloud/network/guru/PodBasedNetworkGuru.java | 28 +-
.../com/cloud/network/guru/PublicNetworkGuru.java | 26 +-
.../com/cloud/network/guru/StorageNetworkGuru.java | 28 +-
.../network/lb/ElasticLoadBalancerManager.java | 37 -
.../network/lb/ElasticLoadBalancerManagerImpl.java | 1023 -----------
.../network/lb/LoadBalancingRulesManager.java | 28 +-
.../network/lb/LoadBalancingRulesManagerImpl.java | 44 +-
.../cloud/network/lb/dao/ElasticLbVmMapDao.java | 33 -
.../network/lb/dao/ElasticLbVmMapDaoImpl.java | 130 --
.../router/VirtualNetworkApplianceManager.java | 26 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 26 +-
.../com/cloud/network/rules/FirewallManager.java | 26 +-
.../com/cloud/network/rules/FirewallRuleVO.java | 26 +-
.../cloud/network/rules/PortForwardingRuleVO.java | 26 +-
.../src/com/cloud/network/rules/RulesManager.java | 28 +-
.../com/cloud/network/rules/RulesManagerImpl.java | 26 +-
.../src/com/cloud/network/rules/StaticNatImpl.java | 28 +-
.../com/cloud/network/rules/StaticNatRuleImpl.java | 26 +-
.../network/rules/dao/PortForwardingRulesDao.java | 28 +-
.../rules/dao/PortForwardingRulesDaoImpl.java | 26 +-
.../security/LocalSecurityGroupWorkQueue.java | 28 +-
.../com/cloud/network/security/RuleUpdateLog.java | 28 +-
.../network/security/SecurityGroupListener.java | 28 +-
.../network/security/SecurityGroupManager.java | 28 +-
.../network/security/SecurityGroupManagerImpl.java | 28 +-
.../security/SecurityGroupManagerImpl2.java | 28 +-
.../security/SecurityGroupManagerMBean.java | 28 +-
.../network/security/SecurityGroupWorkQueue.java | 28 +-
.../network/security/SecurityGroupWorkTracker.java | 28 +-
.../network/security/SecurityManagerMBeanImpl.java | 28 +-
.../network/security/dao/SecurityGroupDao.java | 28 +-
.../network/security/dao/SecurityGroupDaoImpl.java | 28 +-
.../network/security/dao/SecurityGroupRuleDao.java | 28 +-
.../security/dao/SecurityGroupRuleDaoImpl.java | 28 +-
.../security/dao/SecurityGroupRulesDao.java | 28 +-
.../security/dao/SecurityGroupRulesDaoImpl.java | 28 +-
.../security/dao/SecurityGroupVMMapDao.java | 28 +-
.../security/dao/SecurityGroupVMMapDaoImpl.java | 28 +-
.../network/security/dao/SecurityGroupWorkDao.java | 28 +-
.../security/dao/SecurityGroupWorkDaoImpl.java | 28 +-
.../network/security/dao/VmRulesetLogDao.java | 28 +-
.../network/security/dao/VmRulesetLogDaoImpl.java | 28 +-
.../network/vpn/RemoteAccessVpnManagerImpl.java | 26 +-
.../offerings/NetworkOfferingServiceMapVO.java | 28 +-
.../src/com/cloud/offerings/NetworkOfferingVO.java | 26 +-
.../cloud/offerings/dao/NetworkOfferingDao.java | 28 +-
.../offerings/dao/NetworkOfferingDaoImpl.java | 28 +-
.../dao/NetworkOfferingServiceMapDao.java | 26 +-
.../dao/NetworkOfferingServiceMapDaoImpl.java | 26 +-
.../src/com/cloud/projects/ProjectAccountVO.java | 28 +-
.../com/cloud/projects/ProjectInvitationVO.java | 28 +-
server/src/com/cloud/projects/ProjectManager.java | 28 +-
.../src/com/cloud/projects/ProjectManagerImpl.java | 26 +-
server/src/com/cloud/projects/ProjectVO.java | 26 +-
.../com/cloud/projects/dao/ProjectAccountDao.java | 28 +-
.../cloud/projects/dao/ProjectAccountDaoImpl.java | 28 +-
server/src/com/cloud/projects/dao/ProjectDao.java | 28 +-
.../src/com/cloud/projects/dao/ProjectDaoImpl.java | 28 +-
.../cloud/projects/dao/ProjectInvitationDao.java | 28 +-
.../projects/dao/ProjectInvitationDaoImpl.java | 28 +-
server/src/com/cloud/resource/Discoverer.java | 28 +-
server/src/com/cloud/resource/DiscovererBase.java | 28 +-
.../com/cloud/resource/DummyHostDiscoverer.java | 28 +-
.../cloud/resource/DummyHostServerResource.java | 28 +-
server/src/com/cloud/resource/ResourceManager.java | 28 +-
.../com/cloud/resource/ResourceManagerImpl.java | 28 +-
.../com/cloud/resource/ResourceStateAdapter.java | 28 +-
.../resourcelimit/ResourceLimitManagerImpl.java | 55 +-
.../com/cloud/secstorage/CommandExecLogDao.java | 28 +-
.../cloud/secstorage/CommandExecLogDaoImpl.java | 28 +-
.../src/com/cloud/secstorage/CommandExecLogVO.java | 28 +-
.../PremiumSecondaryStorageManagerImpl.java | 28 +-
.../src/com/cloud/server/ConfigurationServer.java | 28 +-
.../com/cloud/server/ConfigurationServerImpl.java | 26 +-
server/src/com/cloud/server/Criteria.java | 28 +-
server/src/com/cloud/server/ManagementServer.java | 28 +-
.../src/com/cloud/server/ManagementServerExt.java | 28 +-
.../com/cloud/server/ManagementServerExtImpl.java | 28 +-
.../src/com/cloud/server/ManagementServerImpl.java | 26 +-
server/src/com/cloud/server/StatsCollector.java | 28 +-
.../api/response/BaremetalTemplateResponse.java | 28 +-
.../api/response/ExternalFirewallResponse.java | 28 +-
.../api/response/ExternalLoadBalancerResponse.java | 28 +-
.../server/api/response/NetworkDeviceResponse.java | 28 +-
.../server/api/response/NwDeviceDhcpResponse.java | 28 +-
.../api/response/NwDevicePxeServerResponse.java | 28 +-
.../cloud/server/api/response/PxePingResponse.java | 28 +-
.../api/response/TrafficMonitorResponse.java | 28 +-
.../server/api/response/UsageRecordResponse.java | 28 +-
.../server/api/response/UsageTypeResponse.java | 28 +-
.../response/netapp/AssociateLunCmdResponse.java | 28 +-
.../api/response/netapp/CreateLunCmdResponse.java | 28 +-
.../netapp/CreateVolumeOnFilerCmdResponse.java | 28 +-
.../netapp/CreateVolumePoolCmdResponse.java | 28 +-
.../api/response/netapp/DeleteLUNCmdResponse.java | 28 +-
.../netapp/DeleteVolumeOnFilerCmdResponse.java | 28 +-
.../netapp/DeleteVolumePoolCmdResponse.java | 28 +-
.../response/netapp/DissociateLunCmdResponse.java | 28 +-
.../api/response/netapp/ListLunsCmdResponse.java | 28 +-
.../netapp/ListVolumePoolsCmdResponse.java | 28 +-
.../netapp/ListVolumesOnFilerCmdResponse.java | 28 +-
.../netapp/ModifyVolumePoolCmdResponse.java | 28 +-
.../server/auth/DefaultUserAuthenticator.java | 28 +-
.../com/cloud/server/auth/UserAuthenticator.java | 28 +-
.../src/com/cloud/service/ServiceOfferingVO.java | 28 +-
.../com/cloud/service/dao/ServiceOfferingDao.java | 28 +-
.../cloud/service/dao/ServiceOfferingDaoImpl.java | 28 +-
.../src/com/cloud/servlet/CloudStartupServlet.java | 28 +-
.../com/cloud/servlet/ConsoleProxyClientParam.java | 208 ++--
.../ConsoleProxyPasswordBasedEncryptor.java | 258 ++--
.../src/com/cloud/servlet/ConsoleProxyServlet.java | 286 ++--
.../com/cloud/servlet/RegisterCompleteServlet.java | 28 +-
.../cloud/storage/LocalStoragePoolListener.java | 28 +-
server/src/com/cloud/storage/OCFS2Manager.java | 28 +-
server/src/com/cloud/storage/OCFS2ManagerImpl.java | 28 +-
server/src/com/cloud/storage/StorageManager.java | 28 +-
.../src/com/cloud/storage/StorageManagerImpl.java | 28 +-
.../cloud/storage/StorageMigrationCleanupMaid.java | 28 +-
.../allocator/AbstractStoragePoolAllocator.java | 28 +-
.../allocator/FirstFitStoragePoolAllocator.java | 28 +-
.../GarbageCollectingStoragePoolAllocator.java | 28 +-
.../allocator/LocalStoragePoolAllocator.java | 28 +-
.../storage/allocator/StoragePoolAllocator.java | 28 +-
.../allocator/UseLocalForRootAllocator.java | 28 +-
.../src/com/cloud/storage/dao/DiskOfferingDao.java | 28 +-
.../com/cloud/storage/dao/DiskOfferingDaoImpl.java | 28 +-
.../com/cloud/storage/dao/GuestOSCategoryDao.java | 28 +-
.../cloud/storage/dao/GuestOSCategoryDaoImpl.java | 28 +-
server/src/com/cloud/storage/dao/GuestOSDao.java | 28 +-
.../src/com/cloud/storage/dao/GuestOSDaoImpl.java | 28 +-
.../com/cloud/storage/dao/LaunchPermissionDao.java | 28 +-
.../cloud/storage/dao/LaunchPermissionDaoImpl.java | 28 +-
server/src/com/cloud/storage/dao/SnapshotDao.java | 28 +-
.../src/com/cloud/storage/dao/SnapshotDaoImpl.java | 28 +-
.../com/cloud/storage/dao/SnapshotPolicyDao.java | 28 +-
.../cloud/storage/dao/SnapshotPolicyDaoImpl.java | 28 +-
.../com/cloud/storage/dao/SnapshotScheduleDao.java | 28 +-
.../cloud/storage/dao/SnapshotScheduleDaoImpl.java | 28 +-
.../src/com/cloud/storage/dao/StoragePoolDao.java | 28 +-
.../com/cloud/storage/dao/StoragePoolDaoImpl.java | 28 +-
.../cloud/storage/dao/StoragePoolDetailsDao.java | 28 +-
.../storage/dao/StoragePoolDetailsDaoImpl.java | 28 +-
.../com/cloud/storage/dao/StoragePoolHostDao.java | 28 +-
.../cloud/storage/dao/StoragePoolHostDaoImpl.java | 28 +-
.../com/cloud/storage/dao/StoragePoolWorkDao.java | 28 +-
.../cloud/storage/dao/StoragePoolWorkDaoImpl.java | 28 +-
server/src/com/cloud/storage/dao/SwiftDao.java | 28 +-
server/src/com/cloud/storage/dao/SwiftDaoImpl.java | 28 +-
server/src/com/cloud/storage/dao/UploadDao.java | 28 +-
.../src/com/cloud/storage/dao/UploadDaoImpl.java | 28 +-
.../src/com/cloud/storage/dao/VMTemplateDao.java | 28 +-
.../com/cloud/storage/dao/VMTemplateDaoImpl.java | 28 +-
.../cloud/storage/dao/VMTemplateDetailsDao.java | 28 +-
.../storage/dao/VMTemplateDetailsDaoImpl.java | 28 +-
.../com/cloud/storage/dao/VMTemplateHostDao.java | 28 +-
.../cloud/storage/dao/VMTemplateHostDaoImpl.java | 28 +-
.../com/cloud/storage/dao/VMTemplatePoolDao.java | 28 +-
.../cloud/storage/dao/VMTemplatePoolDaoImpl.java | 28 +-
.../com/cloud/storage/dao/VMTemplateSwiftDao.java | 28 +-
.../cloud/storage/dao/VMTemplateSwiftDaoImpl.java | 28 +-
.../com/cloud/storage/dao/VMTemplateZoneDao.java | 28 +-
.../cloud/storage/dao/VMTemplateZoneDaoImpl.java | 28 +-
server/src/com/cloud/storage/dao/VolumeDao.java | 28 +-
.../src/com/cloud/storage/dao/VolumeDaoImpl.java | 28 +-
.../src/com/cloud/storage/dao/VolumeHostDao.java | 58 +-
.../com/cloud/storage/dao/VolumeHostDaoImpl.java | 212 ++--
.../storage/download/DownloadAbandonedState.java | 28 +-
.../storage/download/DownloadActiveState.java | 28 +-
.../storage/download/DownloadCompleteState.java | 28 +-
.../cloud/storage/download/DownloadErrorState.java | 28 +-
.../storage/download/DownloadInProgressState.java | 28 +-
.../storage/download/DownloadInactiveState.java | 28 +-
.../cloud/storage/download/DownloadListener.java | 28 +-
.../cloud/storage/download/DownloadMonitor.java | 28 +-
.../storage/download/DownloadMonitorImpl.java | 28 +-
.../com/cloud/storage/download/DownloadState.java | 28 +-
.../cloud/storage/download/NotDownloadedState.java | 28 +-
.../cloud/storage/listener/StoragePoolMonitor.java | 28 +-
.../storage/listener/StorageSyncListener.java | 28 +-
.../cloud/storage/monitor/StorageHostMonitor.java | 28 +-
.../resource/DummySecondaryStorageResource.java | 28 +-
.../secondary/SecStorageVmAlertEventArgs.java | 28 +-
.../secondary/SecondaryStorageDiscoverer.java | 28 +-
.../secondary/SecondaryStorageListener.java | 28 +-
.../secondary/SecondaryStorageManagerImpl.java | 26 +-
.../secondary/SecondaryStorageVmAllocator.java | 28 +-
.../SecondaryStorageVmDefaultAllocator.java | 28 +-
.../secondary/SecondaryStorageVmManager.java | 28 +-
.../cloud/storage/snapshot/SnapshotManager.java | 28 +-
.../storage/snapshot/SnapshotManagerImpl.java | 28 +-
.../cloud/storage/snapshot/SnapshotScheduler.java | 28 +-
.../storage/snapshot/SnapshotSchedulerImpl.java | 28 +-
.../src/com/cloud/storage/swift/SwiftManager.java | 28 +-
.../com/cloud/storage/swift/SwiftManagerImpl.java | 28 +-
.../com/cloud/storage/upload/NotUploadedState.java | 28 +-
.../cloud/storage/upload/UploadAbandonedState.java | 28 +-
.../cloud/storage/upload/UploadActiveState.java | 28 +-
.../cloud/storage/upload/UploadCompleteState.java | 28 +-
.../com/cloud/storage/upload/UploadErrorState.java | 28 +-
.../storage/upload/UploadInProgressState.java | 28 +-
.../cloud/storage/upload/UploadInactiveState.java | 28 +-
.../com/cloud/storage/upload/UploadListener.java | 28 +-
.../com/cloud/storage/upload/UploadMonitor.java | 28 +-
.../cloud/storage/upload/UploadMonitorImpl.java | 28 +-
.../src/com/cloud/storage/upload/UploadState.java | 28 +-
server/src/com/cloud/tags/ResourceTagVO.java | 28 +-
.../com/cloud/tags/TaggedResourceManagerImpl.java | 28 +-
server/src/com/cloud/tags/dao/ResourceTagDao.java | 28 +-
.../com/cloud/tags/dao/ResourceTagsDaoImpl.java | 28 +-
.../cloud/template/HyervisorTemplateAdapter.java | 28 +-
server/src/com/cloud/template/TemplateAdapter.java | 28 +-
.../com/cloud/template/TemplateAdapterBase.java | 28 +-
server/src/com/cloud/template/TemplateManager.java | 28 +-
.../com/cloud/template/TemplateManagerImpl.java | 28 +-
server/src/com/cloud/template/TemplateProfile.java | 28 +-
server/src/com/cloud/test/DatabaseConfig.java | 28 +-
server/src/com/cloud/test/IPRangeConfig.java | 28 +-
server/src/com/cloud/test/PodZoneConfig.java | 26 +-
.../cloud/upgrade/DatabaseIntegrityChecker.java | 28 +-
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 28 +-
.../upgrade/PremiumDatabaseUpgradeChecker.java | 28 +-
server/src/com/cloud/upgrade/dao/DbUpgrade.java | 28 +-
.../src/com/cloud/upgrade/dao/DbUpgradeUtils.java | 28 +-
.../src/com/cloud/upgrade/dao/Upgrade217to218.java | 28 +-
.../src/com/cloud/upgrade/dao/Upgrade218to22.java | 28 +-
.../upgrade/dao/Upgrade218to224DomainVlans.java | 28 +-
.../cloud/upgrade/dao/Upgrade218to22Premium.java | 28 +-
.../com/cloud/upgrade/dao/Upgrade2210to2211.java | 28 +-
.../com/cloud/upgrade/dao/Upgrade2211to2212.java | 28 +-
.../upgrade/dao/Upgrade2211to2212Premium.java | 28 +-
.../com/cloud/upgrade/dao/Upgrade2212to2213.java | 28 +-
.../com/cloud/upgrade/dao/Upgrade2213to2214.java | 28 +-
.../src/com/cloud/upgrade/dao/Upgrade2214to30.java | 28 +-
.../src/com/cloud/upgrade/dao/Upgrade221to222.java | 28 +-
.../cloud/upgrade/dao/Upgrade221to222Premium.java | 28 +-
.../src/com/cloud/upgrade/dao/Upgrade222to224.java | 28 +-
.../cloud/upgrade/dao/Upgrade222to224Premium.java | 28 +-
.../src/com/cloud/upgrade/dao/Upgrade224to225.java | 28 +-
.../src/com/cloud/upgrade/dao/Upgrade225to226.java | 28 +-
.../src/com/cloud/upgrade/dao/Upgrade227to228.java | 28 +-
.../cloud/upgrade/dao/Upgrade227to228Premium.java | 28 +-
.../src/com/cloud/upgrade/dao/Upgrade228to229.java | 28 +-
.../com/cloud/upgrade/dao/Upgrade229to2210.java | 28 +-
.../src/com/cloud/upgrade/dao/Upgrade301to302.java | 25 +-
.../src/com/cloud/upgrade/dao/Upgrade302to303.java | 16 +
.../src/com/cloud/upgrade/dao/Upgrade30to301.java | 28 +-
.../cloud/upgrade/dao/UpgradeSnapshot217to224.java | 28 +-
.../cloud/upgrade/dao/UpgradeSnapshot223to224.java | 28 +-
server/src/com/cloud/upgrade/dao/VersionDao.java | 28 +-
.../src/com/cloud/upgrade/dao/VersionDaoImpl.java | 28 +-
server/src/com/cloud/upgrade/dao/VersionVO.java | 28 +-
.../cloud/usage/ExternalPublicIpStatisticsVO.java | 28 +-
server/src/com/cloud/usage/StorageTypes.java | 28 +-
server/src/com/cloud/usage/UsageIPAddressVO.java | 28 +-
server/src/com/cloud/usage/UsageJobVO.java | 28 +-
.../com/cloud/usage/UsageLoadBalancerPolicyVO.java | 28 +-
.../com/cloud/usage/UsageNetworkOfferingVO.java | 28 +-
server/src/com/cloud/usage/UsageNetworkVO.java | 28 +-
.../com/cloud/usage/UsagePortForwardingRuleVO.java | 28 +-
.../src/com/cloud/usage/UsageSecurityGroupVO.java | 28 +-
server/src/com/cloud/usage/UsageStorageVO.java | 28 +-
server/src/com/cloud/usage/UsageTypes.java | 28 +-
server/src/com/cloud/usage/UsageVMInstanceVO.java | 28 +-
server/src/com/cloud/usage/UsageVO.java | 28 +-
server/src/com/cloud/usage/UsageVPNUserVO.java | 28 +-
server/src/com/cloud/usage/UsageVolumeVO.java | 28 +-
.../usage/dao/ExternalPublicIpStatisticsDao.java | 28 +-
.../dao/ExternalPublicIpStatisticsDaoImpl.java | 28 +-
server/src/com/cloud/usage/dao/UsageDao.java | 28 +-
server/src/com/cloud/usage/dao/UsageDaoImpl.java | 28 +-
.../src/com/cloud/usage/dao/UsageIPAddressDao.java | 28 +-
.../com/cloud/usage/dao/UsageIPAddressDaoImpl.java | 28 +-
server/src/com/cloud/usage/dao/UsageJobDao.java | 28 +-
.../src/com/cloud/usage/dao/UsageJobDaoImpl.java | 28 +-
.../usage/dao/UsageLoadBalancerPolicyDao.java | 28 +-
.../usage/dao/UsageLoadBalancerPolicyDaoImpl.java | 28 +-
.../src/com/cloud/usage/dao/UsageNetworkDao.java | 28 +-
.../com/cloud/usage/dao/UsageNetworkDaoImpl.java | 28 +-
.../cloud/usage/dao/UsageNetworkOfferingDao.java | 28 +-
.../usage/dao/UsageNetworkOfferingDaoImpl.java | 28 +-
.../usage/dao/UsagePortForwardingRuleDao.java | 28 +-
.../usage/dao/UsagePortForwardingRuleDaoImpl.java | 28 +-
.../com/cloud/usage/dao/UsageSecurityGroupDao.java | 28 +-
.../cloud/usage/dao/UsageSecurityGroupDaoImpl.java | 28 +-
.../src/com/cloud/usage/dao/UsageStorageDao.java | 28 +-
.../com/cloud/usage/dao/UsageStorageDaoImpl.java | 28 +-
.../com/cloud/usage/dao/UsageVMInstanceDao.java | 28 +-
.../cloud/usage/dao/UsageVMInstanceDaoImpl.java | 28 +-
.../src/com/cloud/usage/dao/UsageVPNUserDao.java | 28 +-
.../com/cloud/usage/dao/UsageVPNUserDaoImpl.java | 28 +-
server/src/com/cloud/usage/dao/UsageVolumeDao.java | 28 +-
.../com/cloud/usage/dao/UsageVolumeDaoImpl.java | 28 +-
server/src/com/cloud/user/AccountDetailVO.java | 28 +-
server/src/com/cloud/user/AccountDetailsDao.java | 28 +-
.../src/com/cloud/user/AccountDetailsDaoImpl.java | 28 +-
server/src/com/cloud/user/AccountManager.java | 28 +-
server/src/com/cloud/user/AccountManagerImpl.java | 26 +-
server/src/com/cloud/user/DomainManager.java | 28 +-
server/src/com/cloud/user/DomainManagerImpl.java | 28 +-
server/src/com/cloud/user/dao/AccountDao.java | 28 +-
server/src/com/cloud/user/dao/AccountDaoImpl.java | 28 +-
server/src/com/cloud/user/dao/SSHKeyPairDao.java | 28 +-
.../src/com/cloud/user/dao/SSHKeyPairDaoImpl.java | 28 +-
server/src/com/cloud/user/dao/UserAccountDao.java | 28 +-
.../src/com/cloud/user/dao/UserAccountDaoImpl.java | 28 +-
server/src/com/cloud/user/dao/UserDao.java | 28 +-
server/src/com/cloud/user/dao/UserDaoImpl.java | 28 +-
.../src/com/cloud/user/dao/UserStatisticsDao.java | 28 +-
.../com/cloud/user/dao/UserStatisticsDaoImpl.java | 28 +-
server/src/com/cloud/user/dao/UserStatsLogDao.java | 28 +-
.../com/cloud/user/dao/UserStatsLogDaoImpl.java | 28 +-
.../cloud/uuididentity/IdentityServiceImpl.java | 28 +-
.../com/cloud/uuididentity/dao/IdentityDao.java | 50 +-
.../cloud/uuididentity/dao/IdentityDaoImpl.java | 356 ++--
.../src/com/cloud/uuididentity/dao/IdentityVO.java | 28 +-
.../vm/ClusteredVirtualMachineManagerImpl.java | 28 +-
server/src/com/cloud/vm/ItWorkDao.java | 28 +-
server/src/com/cloud/vm/ItWorkDaoImpl.java | 28 +-
server/src/com/cloud/vm/ItWorkVO.java | 28 +-
server/src/com/cloud/vm/NicVO.java | 28 +-
.../src/com/cloud/vm/ReservationContextImpl.java | 28 +-
.../src/com/cloud/vm/SystemVmLoadScanHandler.java | 28 +-
server/src/com/cloud/vm/SystemVmLoadScanner.java | 28 +-
server/src/com/cloud/vm/UserVmManager.java | 28 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 28 +-
server/src/com/cloud/vm/UserVmStateListener.java | 28 +-
server/src/com/cloud/vm/VirtualMachineGuru.java | 26 +-
server/src/com/cloud/vm/VirtualMachineManager.java | 26 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 26 +-
.../com/cloud/vm/VirtualMachineProfileImpl.java | 28 +-
server/src/com/cloud/vm/dao/ConsoleProxyDao.java | 28 +-
.../src/com/cloud/vm/dao/ConsoleProxyDaoImpl.java | 28 +-
server/src/com/cloud/vm/dao/DomainRouterDao.java | 26 +-
.../src/com/cloud/vm/dao/DomainRouterDaoImpl.java | 26 +-
server/src/com/cloud/vm/dao/InstanceGroupDao.java | 28 +-
.../src/com/cloud/vm/dao/InstanceGroupDaoImpl.java | 28 +-
.../com/cloud/vm/dao/InstanceGroupVMMapDao.java | 28 +-
.../cloud/vm/dao/InstanceGroupVMMapDaoImpl.java | 28 +-
server/src/com/cloud/vm/dao/NicDao.java | 26 +-
server/src/com/cloud/vm/dao/NicDaoImpl.java | 26 +-
.../dao/RandomlyIncreasingVMInstanceDaoImpl.java | 28 +-
.../com/cloud/vm/dao/SecondaryStorageVmDao.java | 28 +-
.../cloud/vm/dao/SecondaryStorageVmDaoImpl.java | 28 +-
server/src/com/cloud/vm/dao/UserVmDao.java | 28 +-
server/src/com/cloud/vm/dao/UserVmDaoImpl.java | 28 +-
server/src/com/cloud/vm/dao/UserVmData.java | 28 +-
server/src/com/cloud/vm/dao/UserVmDetailsDao.java | 28 +-
.../src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java | 28 +-
server/src/com/cloud/vm/dao/VMInstanceDao.java | 28 +-
server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 26 +-
.../test/com/cloud/agent/MockAgentManagerImpl.java | 28 +-
.../cloud/agent/manager/ResourceManagerTest.java | 28 +-
.../cloud/agent/manager/SearchCriteria2Test.java | 28 +-
server/test/com/cloud/async/CleanupDelegate.java | 28 +-
server/test/com/cloud/async/TestAsync.java | 28 +-
.../test/com/cloud/async/TestAsyncJobManager.java | 28 +-
.../test/com/cloud/async/TestSyncQueueManager.java | 28 +-
.../com/cloud/cluster/CheckPointManagerTest.java | 28 +-
server/test/com/cloud/keystore/KeystoreTest.java | 28 +-
.../com/cloud/network/MockNetworkManagerImpl.java | 26 +-
.../com/cloud/network/dao/ElbVmMapDaoTest.java | 28 +-
.../test/com/cloud/network/dao/NetworkDaoTest.java | 28 +-
.../security/SecurityGroupManagerImpl2Test.java | 28 +-
.../network/security/SecurityGroupQueueTest.java | 28 +-
.../test/com/cloud/snapshot/SnapshotDaoTest.java | 28 +-
.../com/cloud/storage/dao/StoragePoolDaoTest.java | 28 +-
.../upgrade/AdvanceZone217To224UpgradeTest.java | 28 +-
.../upgrade/AdvanceZone223To224UpgradeTest.java | 28 +-
.../upgrade/BasicZone218To224UpgradeTest.java | 28 +-
server/test/com/cloud/upgrade/DbUpgrade22Test.java | 28 +-
.../com/cloud/upgrade/HostCapacity218to22Test.java | 28 +-
.../upgrade/InstanceGroup218To224UpgradeTest.java | 28 +-
.../upgrade/PortForwarding218To224UpgradeTest.java | 28 +-
.../cloud/upgrade/Sanity220To224UpgradeTest.java | 28 +-
.../cloud/upgrade/Sanity222To224UpgradeTest.java | 28 +-
.../cloud/upgrade/Sanity223To225UpgradeTest.java | 28 +-
.../cloud/upgrade/Sanity224To225UpgradeTest.java | 28 +-
.../cloud/upgrade/Template2214To30UpgradeTest.java | 28 +-
.../com/cloud/upgrade/Test2214To30DBUpgrade.java | 28 +-
.../cloud/upgrade/Usage217To224UpgradeTest.java | 28 +-
.../upgrade/UsageEvents218To224UpgradeTest.java | 28 +-
.../com/cloud/user/MockAccountManagerImpl.java | 28 +-
server/test/com/cloud/utils/db/GlobalLockTest.java | 28 +-
.../test/com/cloud/vm/MockUserVmManagerImpl.java | 28 +-
.../cloud/vm/MockVirtualMachineManagerImpl.java | 26 +-
.../test/com/cloud/vm/dao/UserVmDaoImplTest.java | 28 +-
setup/db/deploy-db-simulator.sh | 46 +-
tools/marvin/marvin/configGenerator.py | 1 +
tools/marvin/marvin/deployDataCenter.py | 33 +-
.../marvin/marvin/sandbox/advanced/advanced_env.py | 41 +-
.../marvin/sandbox/advanced/setup.properties | 22 +-
tools/marvin/marvin/sandbox/basic/basic_env.py | 134 ++
tools/marvin/setup.py | 2 +-
ui/scripts/accounts.js | 9 +-
ui/scripts/storage.js | 2 +-
wscript_build | 1 +
wscript_configure | 4 +-
1149 files changed, 21542 insertions(+), 18914 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/31f9d718/client/tomcatconf/components.xml.in
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/31f9d718/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
----------------------------------------------------------------------
diff --cc core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
index 656ca37,33e2971..fd7e0c0
--- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@@ -1,15 -1,19 +1,19 @@@
- // Copyright 2012 Citrix Systems, Inc. Licensed under the
- // Apache License, Version 2.0 (the "License"); you may not use this
- // file except in compliance with the License. Citrix Systems, Inc.
- // reserves all rights not expressly granted by the License.
- // You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- // Unless required by applicable law or agreed to in writing, software
- // distributed under the License is distributed on an "AS IS" BASIS,
- // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- // See the License for the specific language governing permissions and
- // limitations under the License.
+ // 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
+ // regarding copyright ownership. The ASF licenses this file
+ // to you under the Apache License, Version 2.0 (the
+ // "License"); you may not use this file except in compliance
+ // with the License. You may obtain a copy of the License at
-//
+//
- // Automatically generated by addcopyright.py at 04/03/2012
+ // http://www.apache.org/licenses/LICENSE-2.0
+ //
+ // Unless required by applicable law or agreed to in writing,
+ // software distributed under the License is distributed on an
+ // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ // KIND, either express or implied. See the License for the
+ // specific language governing permissions and limitations
+ // under the License.
package com.cloud.agent.resource.virtualnetwork;
import java.io.BufferedReader;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/31f9d718/core/src/com/cloud/vm/DomainRouterVO.java
----------------------------------------------------------------------
diff --cc core/src/com/cloud/vm/DomainRouterVO.java
index 463d68e,39336f9..052d205
--- a/core/src/com/cloud/vm/DomainRouterVO.java
+++ b/core/src/com/cloud/vm/DomainRouterVO.java
@@@ -1,15 -1,19 +1,19 @@@
- // Copyright 2012 Citrix Systems, Inc. Licensed under the
- // Apache License, Version 2.0 (the "License"); you may not use this
- // file except in compliance with the License. Citrix Systems, Inc.
- // reserves all rights not expressly granted by the License.
- // You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- // Unless required by applicable law or agreed to in writing, software
- // distributed under the License is distributed on an "AS IS" BASIS,
- // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- // See the License for the specific language governing permissions and
- // limitations under the License.
+ // 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
+ // regarding copyright ownership. The ASF licenses this file
+ // to you under the Apache License, Version 2.0 (the
+ // "License"); you may not use this file except in compliance
+ // with the License. You may obtain a copy of the License at
-//
+//
- // Automatically generated by addcopyright.py at 04/03/2012
+ // http://www.apache.org/licenses/LICENSE-2.0
+ //
+ // Unless required by applicable law or agreed to in writing,
+ // software distributed under the License is distributed on an
+ // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ // KIND, either express or implied. See the License for the
+ // specific language governing permissions and limitations
+ // under the License.
package com.cloud.vm;
import javax.persistence.Column;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/31f9d718/core/src/com/cloud/vm/VMInstanceVO.java
----------------------------------------------------------------------
diff --cc core/src/com/cloud/vm/VMInstanceVO.java
index dd1a495,07acae1..22c29a7
--- a/core/src/com/cloud/vm/VMInstanceVO.java
+++ b/core/src/com/cloud/vm/VMInstanceVO.java
@@@ -1,15 -1,19 +1,19 @@@
- // Copyright 2012 Citrix Systems, Inc. Licensed under the
- // Apache License, Version 2.0 (the "License"); you may not use this
- // file except in compliance with the License. Citrix Systems, Inc.
- // reserves all rights not expressly granted by the License.
- // You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- // Unless required by applicable law or agreed to in writing, software
- // distributed under the License is distributed on an "AS IS" BASIS,
- // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- // See the License for the specific language governing permissions and
- // limitations under the License.
+ // 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
+ // regarding copyright ownership. The ASF licenses this file
+ // to you under the Apache License, Version 2.0 (the
+ // "License"); you may not use this file except in compliance
+ // with the License. You may obtain a copy of the License at
-//
+//
- // Automatically generated by addcopyright.py at 04/03/2012
+ // http://www.apache.org/licenses/LICENSE-2.0
+ //
+ // Unless required by applicable law or agreed to in writing,
+ // software distributed under the License is distributed on an
+ // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ // KIND, either express or implied. See the License for the
+ // specific language governing permissions and limitations
+ // under the License.
package com.cloud.vm;
import java.util.Date;