Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 95B1D11AF9 for ; Sun, 12 May 2013 04:06:31 +0000 (UTC) Received: (qmail 57836 invoked by uid 500); 12 May 2013 04:06:31 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 57292 invoked by uid 500); 12 May 2013 04:06:30 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 56799 invoked by uid 99); 12 May 2013 04:06:26 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 12 May 2013 04:06:26 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7545588C6DE; Sun, 12 May 2013 04:06:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mchen@apache.org To: commits@cloudstack.apache.org Date: Sun, 12 May 2013 04:06:30 -0000 Message-Id: In-Reply-To: <4c224b7f05bd4697b9747b502a15a190@git.apache.org> References: <4c224b7f05bd4697b9747b502a15a190@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/6] git commit: updated refs/heads/object_store to 1bd216f Merge with latest code rebased from master Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1bd216fc Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1bd216fc Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1bd216fc Branch: refs/heads/object_store Commit: 1bd216fc488521834c12e366ddf4b7f48287ea42 Parents: f8e51f7 9931876 Author: Min Chen Authored: Sat May 11 21:04:31 2013 -0700 Committer: Min Chen Committed: Sat May 11 21:05:54 2013 -0700 ---------------------------------------------------------------------- .gitignore | 6 +- CHANGES | 385 ++- DISCLAIMER | 7 - README.md | 6 +- agent/conf/agent.properties | 2 +- agent/src/com/cloud/agent/AgentShell.java | 3 +- .../consoleproxy/ConsoleProxyResource.java | 4 +- api/src/com/cloud/agent/Listener.java | 119 - .../com/cloud/agent/api/AgentControlAnswer.java | 30 - .../com/cloud/agent/api/AgentControlCommand.java | 27 - api/src/com/cloud/agent/api/AttachIsoCommand.java | 59 - .../com/cloud/agent/api/AttachVolumeAnswer.java | 58 - .../com/cloud/agent/api/AttachVolumeCommand.java | 99 - .../com/cloud/agent/api/BackupSnapshotAnswer.java | 44 - .../com/cloud/agent/api/BackupSnapshotCommand.java | 121 - .../com/cloud/agent/api/BumpUpPriorityCommand.java | 30 - api/src/com/cloud/agent/api/CancelCommand.java | 45 - api/src/com/cloud/agent/api/ChangeAgentAnswer.java | 26 - .../com/cloud/agent/api/ChangeAgentCommand.java | 46 - api/src/com/cloud/agent/api/CheckHealthAnswer.java | 26 - .../com/cloud/agent/api/CheckHealthCommand.java | 30 - .../com/cloud/agent/api/CheckNetworkAnswer.java | 38 - .../com/cloud/agent/api/CheckNetworkCommand.java | 42 - api/src/com/cloud/agent/api/CheckOnHostAnswer.java | 48 - .../com/cloud/agent/api/CheckOnHostCommand.java | 42 - api/src/com/cloud/agent/api/CheckRouterAnswer.java | 81 - .../com/cloud/agent/api/CheckRouterCommand.java | 30 - .../agent/api/CheckS2SVpnConnectionsAnswer.java | 71 - .../agent/api/CheckS2SVpnConnectionsCommand.java | 39 - api/src/com/cloud/agent/api/CheckStateAnswer.java | 45 - api/src/com/cloud/agent/api/CheckStateCommand.java | 40 - .../cloud/agent/api/CheckVirtualMachineAnswer.java | 52 - .../agent/api/CheckVirtualMachineCommand.java | 41 - .../cloud/agent/api/CleanupNetworkRulesCmd.java | 47 - .../agent/api/CleanupSnapshotBackupCommand.java | 75 - api/src/com/cloud/agent/api/ClusterSyncAnswer.java | 55 - .../com/cloud/agent/api/ClusterSyncCommand.java | 47 - .../cloud/agent/api/ComputeChecksumCommand.java | 40 - .../api/ConsoleAccessAuthenticationAnswer.java | 88 - .../api/ConsoleAccessAuthenticationCommand.java | 68 - .../agent/api/ConsoleProxyLoadReportCommand.java | 39 - .../CreatePrivateTemplateFromSnapshotCommand.java | 82 - .../CreatePrivateTemplateFromVolumeCommand.java | 93 - .../cloud/agent/api/CreateStoragePoolCommand.java | 30 - .../cloud/agent/api/CreateVMSnapshotAnswer.java | 62 - .../cloud/agent/api/CreateVMSnapshotCommand.java | 42 - .../agent/api/CreateVolumeFromSnapshotAnswer.java | 38 - .../agent/api/CreateVolumeFromSnapshotCommand.java | 58 - .../api/CreateVolumeFromVMSnapshotAnswer.java | 54 - .../api/CreateVolumeFromVMSnapshotCommand.java | 88 - api/src/com/cloud/agent/api/CronCommand.java | 24 - .../agent/api/DeleteSnapshotBackupAnswer.java | 32 - .../agent/api/DeleteSnapshotBackupCommand.java | 84 - .../cloud/agent/api/DeleteSnapshotsDirCommand.java | 63 - .../cloud/agent/api/DeleteStoragePoolCommand.java | 61 - .../cloud/agent/api/DeleteVMSnapshotAnswer.java | 49 - .../cloud/agent/api/DeleteVMSnapshotCommand.java | 28 - .../agent/api/DownloadSnapshotFromS3Command.java | 61 - ...oadTemplateFromS3ToSecondaryStorageCommand.java | 66 - api/src/com/cloud/agent/api/FenceAnswer.java | 36 - api/src/com/cloud/agent/api/FenceCommand.java | 61 - .../com/cloud/agent/api/GetDomRVersionAnswer.java | 45 - api/src/com/cloud/agent/api/GetDomRVersionCmd.java | 30 - .../com/cloud/agent/api/GetFileStatsAnswer.java | 37 - .../com/cloud/agent/api/GetFileStatsCommand.java | 41 - .../com/cloud/agent/api/GetHostStatsAnswer.java | 88 - .../com/cloud/agent/api/GetHostStatsCommand.java | 53 - .../com/cloud/agent/api/GetStorageStatsAnswer.java | 51 - .../cloud/agent/api/GetStorageStatsCommand.java | 76 - api/src/com/cloud/agent/api/GetVmStatsAnswer.java | 40 - api/src/com/cloud/agent/api/GetVmStatsCommand.java | 54 - api/src/com/cloud/agent/api/GetVncPortAnswer.java | 48 - api/src/com/cloud/agent/api/GetVncPortCommand.java | 43 - api/src/com/cloud/agent/api/HostStatsEntry.java | 113 - api/src/com/cloud/agent/api/MaintainAnswer.java | 46 - api/src/com/cloud/agent/api/MaintainCommand.java | 28 - .../com/cloud/agent/api/ManageSnapshotAnswer.java | 40 - .../com/cloud/agent/api/ManageSnapshotCommand.java | 92 - api/src/com/cloud/agent/api/MigrateAnswer.java | 33 - api/src/com/cloud/agent/api/MigrateCommand.java | 59 - .../com/cloud/agent/api/ModifySshKeysCommand.java | 44 - .../cloud/agent/api/ModifyStoragePoolAnswer.java | 57 - .../cloud/agent/api/ModifyStoragePoolCommand.java | 75 - .../com/cloud/agent/api/NetworkUsageAnswer.java | 61 - .../com/cloud/agent/api/NetworkUsageCommand.java | 98 - api/src/com/cloud/agent/api/PingAnswer.java | 33 - api/src/com/cloud/agent/api/PingCommand.java | 45 - .../com/cloud/agent/api/PingRoutingCommand.java | 54 - .../agent/api/PingRoutingWithNwGroupsCommand.java | 46 - .../cloud/agent/api/PingRoutingWithOvsCommand.java | 42 - .../com/cloud/agent/api/PingStorageCommand.java | 37 - api/src/com/cloud/agent/api/PingTestCommand.java | 54 - api/src/com/cloud/agent/api/PlugNicAnswer.java | 25 - api/src/com/cloud/agent/api/PlugNicCommand.java | 46 - api/src/com/cloud/agent/api/PoolEjectCommand.java | 42 - .../cloud/agent/api/PrepareForMigrationAnswer.java | 34 - .../agent/api/PrepareForMigrationCommand.java | 39 - .../cloud/agent/api/PrepareOCFS2NodesCommand.java | 44 - .../agent/api/PropagateResourceEventCommand.java | 48 - api/src/com/cloud/agent/api/ReadyAnswer.java | 31 - api/src/com/cloud/agent/api/ReadyCommand.java | 58 - api/src/com/cloud/agent/api/RebootAnswer.java | 42 - api/src/com/cloud/agent/api/RebootCommand.java | 45 - .../com/cloud/agent/api/RebootRouterCommand.java | 38 - .../cloud/agent/api/RevertToVMSnapshotAnswer.java | 63 - .../cloud/agent/api/RevertToVMSnapshotCommand.java | 29 - api/src/com/cloud/agent/api/ScaleVmAnswer.java | 28 - api/src/com/cloud/agent/api/ScaleVmCommand.java | 113 - .../agent/api/ScheduleHostScanTaskCommand.java | 32 - .../agent/api/SecStorageFirewallCfgCommand.java | 82 - .../com/cloud/agent/api/SecStorageSetupAnswer.java | 33 - .../cloud/agent/api/SecStorageSetupCommand.java | 96 - .../cloud/agent/api/SecStorageVMSetupCommand.java | 57 - .../cloud/agent/api/SecurityGroupRuleAnswer.java | 70 - .../com/cloud/agent/api/SecurityGroupRulesCmd.java | 304 - api/src/com/cloud/agent/api/SetupAnswer.java | 37 - api/src/com/cloud/agent/api/SetupCommand.java | 60 - .../cloud/agent/api/SetupGuestNetworkAnswer.java | 25 - .../cloud/agent/api/SetupGuestNetworkCommand.java | 72 - api/src/com/cloud/agent/api/ShutdownCommand.java | 56 - api/src/com/cloud/agent/api/SnapshotCommand.java | 126 - api/src/com/cloud/agent/api/StartAnswer.java | 57 - api/src/com/cloud/agent/api/StartCommand.java | 52 - api/src/com/cloud/agent/api/StartupAnswer.java | 44 - api/src/com/cloud/agent/api/StartupCommand.java | 286 - .../agent/api/StartupExternalDhcpCommand.java | 25 - .../agent/api/StartupExternalFirewallCommand.java | 26 - .../api/StartupExternalLoadBalancerCommand.java | 26 - .../com/cloud/agent/api/StartupProxyCommand.java | 49 - .../cloud/agent/api/StartupPxeServerCommand.java | 25 - .../com/cloud/agent/api/StartupRoutingCommand.java | 224 - .../agent/api/StartupSecondaryStorageCommand.java | 32 - .../com/cloud/agent/api/StartupStorageCommand.java | 110 - .../agent/api/StartupTrafficMonitorCommand.java | 26 - api/src/com/cloud/agent/api/StopAnswer.java | 45 - api/src/com/cloud/agent/api/StopCommand.java | 71 - .../com/cloud/agent/api/TransferAgentCommand.java | 57 - api/src/com/cloud/agent/api/UnPlugNicAnswer.java | 25 - api/src/com/cloud/agent/api/UnPlugNicCommand.java | 45 - .../cloud/agent/api/UpdateHostPasswordCommand.java | 48 - api/src/com/cloud/agent/api/UpgradeAnswer.java | 26 - api/src/com/cloud/agent/api/UpgradeCommand.java | 42 - .../cloud/agent/api/UpgradeSnapshotCommand.java | 64 - ...oadTemplateToS3FromSecondaryStorageCommand.java | 121 - .../com/cloud/agent/api/VMSnapshotBaseCommand.java | 74 - api/src/com/cloud/agent/api/VMSnapshotTO.java | 90 - .../cloud/agent/api/ValidateSnapshotAnswer.java | 53 - .../cloud/agent/api/ValidateSnapshotCommand.java | 84 - api/src/com/cloud/agent/api/VmStatsEntry.java | 82 - .../agent/api/baremetal/IpmISetBootDevCommand.java | 43 - .../api/baremetal/IpmiBootorResetCommand.java | 28 - .../api/baremetal/PreparePxeServerAnswer.java | 29 - .../api/baremetal/PreparePxeServerCommand.java | 80 - .../baremetal/prepareCreateTemplateCommand.java | 66 - .../com/cloud/agent/api/check/CheckSshAnswer.java | 37 - .../com/cloud/agent/api/check/CheckSshCommand.java | 65 - .../api/downloadSnapshotFromSwiftCommand.java | 60 - ...TemplateFromSwiftToSecondaryStorageCommand.java | 90 - .../api/proxy/CheckConsoleProxyLoadCommand.java | 60 - .../agent/api/proxy/ConsoleProxyLoadAnswer.java | 44 - .../com/cloud/agent/api/proxy/ProxyCommand.java | 25 - .../StartConsoleProxyAgentHttpHandlerCommand.java | 68 - .../api/proxy/WatchConsoleProxyLoadCommand.java | 65 - .../CreateLoadBalancerApplianceCommand.java | 48 - .../DestroyLoadBalancerApplianceCommand.java | 32 - .../cloud/agent/api/routing/DhcpEntryCommand.java | 142 - .../routing/GlobalLoadBalancerConfigAnswer.java | 27 - .../routing/GlobalLoadBalancerConfigCommand.java | 100 - .../api/routing/HealthCheckLBConfigAnswer.java | 42 - .../api/routing/HealthCheckLBConfigCommand.java | 39 - .../com/cloud/agent/api/routing/IpAssocAnswer.java | 48 - .../cloud/agent/api/routing/IpAssocCommand.java | 42 - .../cloud/agent/api/routing/IpAssocVpcCommand.java | 29 - .../api/routing/LoadBalancerConfigCommand.java | 66 - .../agent/api/routing/NetworkElementCommand.java | 53 - .../api/routing/RemoteAccessVpnCfgCommand.java | 78 - .../agent/api/routing/SavePasswordCommand.java | 54 - .../agent/api/routing/SetFirewallRulesAnswer.java | 36 - .../agent/api/routing/SetFirewallRulesCommand.java | 98 - .../agent/api/routing/SetNetworkACLAnswer.java | 36 - .../agent/api/routing/SetNetworkACLCommand.java | 97 - .../api/routing/SetPortForwardingRulesAnswer.java | 37 - .../api/routing/SetPortForwardingRulesCommand.java | 40 - .../routing/SetPortForwardingRulesVpcCommand.java | 30 - .../agent/api/routing/SetSourceNatAnswer.java | 27 - .../agent/api/routing/SetSourceNatCommand.java | 42 - .../agent/api/routing/SetStaticNatRulesAnswer.java | 37 - .../api/routing/SetStaticNatRulesCommand.java | 47 - .../agent/api/routing/SetStaticRouteAnswer.java | 36 - .../agent/api/routing/SetStaticRouteCommand.java | 62 - .../agent/api/routing/Site2SiteVpnCfgCommand.java | 154 - .../agent/api/routing/SiteLoadBalancerConfig.java | 121 - .../cloud/agent/api/routing/UserDataCommand.java | 63 - .../com/cloud/agent/api/routing/VmDataCommand.java | 67 - .../agent/api/routing/VpnUsersCfgCommand.java | 94 - .../agent/api/storage/AbstractDownloadCommand.java | 78 - .../agent/api/storage/AbstractUploadCommand.java | 68 - .../cloud/agent/api/storage/CopyVolumeAnswer.java | 42 - .../cloud/agent/api/storage/CopyVolumeCommand.java | 72 - .../com/cloud/agent/api/storage/CreateAnswer.java | 53 - .../com/cloud/agent/api/storage/CreateCommand.java | 96 - .../api/storage/CreateEntityDownloadURLAnswer.java | 37 - .../storage/CreateEntityDownloadURLCommand.java | 72 - .../api/storage/CreatePrivateTemplateAnswer.java | 77 - .../api/storage/CreatePrivateTemplateCommand.java | 90 - .../agent/api/storage/CreateVolumeOVAAnswer.java | 26 + .../agent/api/storage/CreateVolumeOVACommand.java | 60 + .../api/storage/DeleteEntityDownloadURLAnswer.java | 37 - .../storage/DeleteEntityDownloadURLCommand.java | 72 - .../agent/api/storage/DeleteTemplateCommand.java | 62 - .../agent/api/storage/DeleteVolumeCommand.java | 54 - .../com/cloud/agent/api/storage/DestroyAnswer.java | 31 - .../cloud/agent/api/storage/DestroyCommand.java | 55 - .../cloud/agent/api/storage/DownloadAnswer.java | 141 - .../agent/api/storage/ListTemplateAnswer.java | 53 - .../agent/api/storage/ListTemplateCommand.java | 47 - .../cloud/agent/api/storage/ListVolumeAnswer.java | 53 - .../cloud/agent/api/storage/ListVolumeCommand.java | 47 - .../storage/ManageVolumeAvailabilityAnswer.java | 31 - .../storage/ManageVolumeAvailabilityCommand.java | 54 - .../agent/api/storage/PrepareOVAPackingAnswer.java | 26 + .../api/storage/PrepareOVAPackingCommand.java | 48 + .../api/storage/PrimaryStorageDownloadAnswer.java | 54 - .../api/storage/PrimaryStorageDownloadCommand.java | 96 - .../agent/api/storage/ResizeVolumeAnswer.java | 40 - .../agent/api/storage/ResizeVolumeCommand.java | 85 - .../cloud/agent/api/storage/StorageCommand.java | 26 - .../cloud/agent/api/storage/UpgradeDiskAnswer.java | 29 - .../agent/api/storage/UpgradeDiskCommand.java | 50 - .../com/cloud/agent/api/storage/UploadAnswer.java | 123 - .../com/cloud/agent/api/storage/UploadCommand.java | 144 - .../agent/api/storage/UploadProgressCommand.java | 48 - api/src/com/cloud/agent/api/storage/ssCommand.java | 48 - api/src/com/cloud/agent/api/to/DataObjectType.java | 25 + api/src/com/cloud/agent/api/to/DataTO.java | 28 + api/src/com/cloud/agent/api/to/DiskTO.java | 60 + api/src/com/cloud/agent/api/to/FirewallRuleTO.java | 6 + .../com/cloud/agent/api/to/VirtualMachineTO.java | 6 +- ...TemplateToSwiftFromSecondaryStorageCommand.java | 80 - api/src/com/cloud/alert/AlertAdapter.java | 22 + .../api/commands/CreatePrivateNetworkCmd.java | 197 - .../cloud/api/commands/DestroyConsoleProxyCmd.java | 93 - api/src/com/cloud/async/AsyncJob.java | 4 +- .../cloud/configuration/ConfigurationService.java | 21 +- .../cloud/consoleproxy/ConsoleProxyService.java | 23 - api/src/com/cloud/event/EventTypes.java | 22 +- api/src/com/cloud/event/UsageEvent.java | 33 + .../cloud/exception/AffinityConflictException.java | 34 + .../exception/AgentControlChannelException.java | 27 + .../cloud/hypervisor/HypervisorCapabilities.java | 2 + api/src/com/cloud/hypervisor/HypervisorGuru.java | 9 + api/src/com/cloud/info/ConsoleProxyLoadInfo.java | 48 + api/src/com/cloud/info/RunningHostCountInfo.java | 48 + api/src/com/cloud/network/GuestVlan.java | 31 + api/src/com/cloud/network/IpAddress.java | 9 - api/src/com/cloud/network/Network.java | 15 +- api/src/com/cloud/network/NetworkModel.java | 4 +- api/src/com/cloud/network/NetworkService.java | 19 +- api/src/com/cloud/network/PhysicalNetwork.java | 5 +- api/src/com/cloud/network/PublicIpAddress.java | 3 - api/src/com/cloud/network/UserIpv6Address.java | 52 + api/src/com/cloud/network/element/IpDeployer.java | 6 +- api/src/com/cloud/network/rules/RulesService.java | 2 +- .../cloud/network/security/SecurityGroupRules.java | 2 + api/src/com/cloud/network/vpc/PrivateIp.java | 1 + api/src/com/cloud/network/vpc/VpcGateway.java | 4 + api/src/com/cloud/network/vpc/VpcService.java | 4 +- api/src/com/cloud/offering/NetworkOffering.java | 3 + .../region/ha/GlobalLoadBalancingRulesService.java | 3 + .../cloud/resource/UnableDeleteHostException.java | 28 + api/src/com/cloud/server/ManagementService.java | 19 +- .../com/cloud/storage/StoragePoolDiscoverer.java | 33 + .../cloud/storage/snapshot/SnapshotSchedule.java | 11 +- api/src/com/cloud/user/Account.java | 4 + api/src/com/cloud/user/User.java | 2 + api/src/com/cloud/vm/ConsoleProxy.java | 27 + api/src/com/cloud/vm/DiskProfile.java | 2 +- api/src/com/cloud/vm/SecondaryStorageVm.java | 26 + api/src/com/cloud/vm/SystemVm.java | 26 + api/src/com/cloud/vm/UserVmService.java | 231 +- api/src/com/cloud/vm/VirtualMachineName.java | 190 + api/src/com/cloud/vm/VirtualMachineProfile.java | 8 +- api/src/com/cloud/vm/VmDetailConstants.java | 24 + .../apache/cloudstack/affinity/AffinityGroup.java | 31 + .../affinity/AffinityGroupProcessor.java | 49 + .../cloudstack/affinity/AffinityGroupResponse.java | 158 + .../cloudstack/affinity/AffinityGroupService.java | 79 + .../affinity/AffinityGroupTypeResponse.java | 48 + .../cloudstack/affinity/AffinityProcessorBase.java | 44 + .../org/apache/cloudstack/api/ApiConstants.java | 13 +- api/src/org/apache/cloudstack/api/BaseCmd.java | 36 +- .../apache/cloudstack/api/ResponseGenerator.java | 32 +- .../command/admin/account/CreateAccountCmd.java | 14 +- .../api/command/admin/cluster/ListClustersCmd.java | 8 +- .../command/admin/cluster/UpdateClusterCmd.java | 15 +- .../api/command/admin/config/ListCfgsByCmd.java | 44 +- .../api/command/admin/config/UpdateCfgCmd.java | 43 +- .../admin/host/FindHostsForMigrationCmd.java | 107 + .../api/command/admin/host/ListHostsCmd.java | 14 +- .../admin/network/DedicateGuestVlanRangeCmd.java | 118 + .../network/ListDedicatedGuestVlanRangesCmd.java | 129 + .../network/ListNetworkIsolationMethodsCmd.java | 58 + .../network/ReleaseDedicatedGuestVlanRangeCmd.java | 94 + .../admin/network/UpdatePhysicalNetworkCmd.java | 8 +- .../admin/offering/CreateServiceOfferingCmd.java | 1 + .../api/command/admin/pod/ListPodsByCmd.java | 7 + .../api/command/admin/router/ListRoutersCmd.java | 7 + .../storage/FindStoragePoolsForMigrationCmd.java | 98 + .../command/admin/storage/ListStoragePoolsCmd.java | 7 + .../command/admin/systemvm/ListSystemVMsCmd.java | 7 + .../admin/vlan/DedicatePublicIpRangeCmd.java | 108 + .../admin/vlan/ReleasePublicIpRangeCmd.java | 77 + .../api/command/admin/vm/MigrateVMCmd.java | 2 +- .../vm/MigrateVirtualMachineWithVolumeCmd.java | 160 + .../command/admin/vpc/CreatePrivateGatewayCmd.java | 14 +- .../command/user/address/AssociateIPAddrCmd.java | 31 +- .../user/affinitygroup/CreateAffinityGroupCmd.java | 167 + .../user/affinitygroup/DeleteAffinityGroupCmd.java | 154 + .../affinitygroup/ListAffinityGroupTypesCmd.java | 67 + .../user/affinitygroup/ListAffinityGroupsCmd.java | 90 + .../affinitygroup/UpdateVMAffinityGroupCmd.java | 164 + .../api/command/user/iso/ListIsosCmd.java | 7 + .../api/command/user/nat/EnableStaticNatCmd.java | 2 +- .../api/command/user/network/ListNetworksCmd.java | 7 + .../ha/gslb/CreateGlobalLoadBalancerRuleCmd.java | 3 + .../ha/gslb/ListGlobalLoadBalancerRuleCmd.java | 2 +- .../command/user/snapshot/CreateSnapshotCmd.java | 2 +- .../command/user/snapshot/ListSnapshotsCmd.java | 7 + .../api/command/user/tag/CreateTagsCmd.java | 2 +- .../api/command/user/tag/DeleteTagsCmd.java | 2 +- .../api/command/user/tag/ListTagsCmd.java | 2 +- .../command/user/template/ListTemplatesCmd.java | 8 + .../api/command/user/vm/AddIpToVmNicCmd.java | 9 +- .../api/command/user/vm/DeployVMCmd.java | 48 +- .../cloudstack/api/command/user/vm/ListVMsCmd.java | 21 +- .../cloudstack/api/command/user/vm/ScaleVMCmd.java | 10 +- .../api/command/user/vm/UpdateVMCmd.java | 2 +- .../user/vmsnapshot/CreateVMSnapshotCmd.java | 2 +- .../user/vmsnapshot/DeleteVMSnapshotCmd.java | 2 +- .../command/user/vmsnapshot/ListVMSnapshotCmd.java | 2 +- .../user/vmsnapshot/RevertToSnapshotCmd.java | 92 - .../user/vmsnapshot/RevertToVMSnapshotCmd.java | 92 + .../api/command/user/volume/ListVolumesCmd.java | 7 + .../api/command/user/volume/MigrateVolumeCmd.java | 8 + .../api/command/user/zone/ListZonesByCmd.java | 8 + .../cloudstack/api/response/AccountResponse.java | 7 + .../cloudstack/api/response/ClusterResponse.java | 9 +- .../api/response/ConfigurationResponse.java | 15 + .../api/response/DeploymentPlannersResponse.java | 37 + .../api/response/DomainRouterResponse.java | 11 + .../api/response/FirewallRuleResponse.java | 12 + .../api/response/GlobalLoadBalancerResponse.java | 18 + .../api/response/GuestVlanRangeResponse.java | 94 + .../api/response/HostForMigrationResponse.java | 365 + .../cloudstack/api/response/HostResponse.java | 10 +- .../api/response/IsolationMethodResponse.java | 33 + .../cloudstack/api/response/NetworkResponse.java | 7 + .../cloudstack/api/response/PodResponse.java | 9 +- .../api/response/PrivateGatewayResponse.java | 10 + .../cloudstack/api/response/SnapshotResponse.java | 16 + .../response/StoragePoolForMigrationResponse.java | 248 + .../api/response/StoragePoolResponse.java | 18 +- .../cloudstack/api/response/SystemVmResponse.java | 11 + .../cloudstack/api/response/TemplateResponse.java | 7 + .../cloudstack/api/response/UserResponse.java | 8 + .../cloudstack/api/response/UserVmResponse.java | 21 + .../cloudstack/api/response/VolumeResponse.java | 8 + .../network/ExternalNetworkDeviceManager.java | 1 + .../org/apache/cloudstack/query/QueryService.java | 3 + .../api/agent/test/AgentControlAnswerTest.java | 35 - .../api/agent/test/AgentControlCommandTest.java | 33 - .../cloudstack/api/agent/test/AnswerTest.java | 73 - .../api/agent/test/AttachIsoCommandTest.java | 80 - .../api/agent/test/AttachVolumeAnswerTest.java | 65 - .../api/agent/test/AttachVolumeCommandTest.java | 120 - .../api/agent/test/BackupSnapshotAnswerTest.java | 75 - .../api/agent/test/BackupSnapshotCommandTest.java | 301 - .../api/agent/test/BumpUpPriorityCommandTest.java | 83 - .../api/agent/test/CancelCommandTest.java | 46 - .../api/agent/test/ChangeAgentAnswerTest.java | 44 - .../api/agent/test/ChangeAgentCommandTest.java | 50 - .../api/agent/test/CheckHealthAnswerTest.java | 49 - .../api/agent/test/CheckHealthCommandTest.java | 40 - .../api/agent/test/CheckNetworkAnswerTest.java | 62 - .../api/agent/test/CheckNetworkCommandTest.java | 53 - .../api/agent/test/CheckOnHostCommandTest.java | 483 -- .../api/agent/test/SnapshotCommandTest.java | 209 - .../api/command/test/AddIpToVmNicTest.java | 6 +- .../api/command/test/ListCfgCmdTest.java | 89 + .../api/command/test/ScaleVMCmdTest.java | 35 +- .../api/command/test/UpdateCfgCmdTest.java | 116 + .../agent/api/test/ResizeVolumeCommandTest.java | 229 - awsapi/pom.xml | 33 +- .../com/cloud/bridge/service/EC2RestServlet.java | 2 +- .../com/cloud/bridge/service/core/s3/S3Engine.java | 2 +- .../test/com/cloud/gate/model/ModelTestCase.java | 368 - .../com/cloud/gate/persist/PersitTestCase.java | 73 - build/replace.properties | 1 + .../WEB-INF/classes/resources/messages.properties | 1753 +++--- .../classes/resources/messages_ar.properties | 285 + .../classes/resources/messages_ca.properties | 307 + .../classes/resources/messages_de_DE.properties | 748 ++ .../classes/resources/messages_es.properties | 862 +++ .../classes/resources/messages_fr_FR.properties | 1880 +++--- .../classes/resources/messages_it_IT.properties | 618 ++ .../classes/resources/messages_ja.properties | 2904 ++++---- .../classes/resources/messages_ko_KR.properties | 2883 ++++---- .../classes/resources/messages_nb_NO.properties | 366 + .../classes/resources/messages_pt_BR.properties | 2092 +++--- .../classes/resources/messages_ru_RU.properties | 2890 ++++---- .../classes/resources/messages_zh_CN.properties | 2986 ++++---- client/pom.xml | 39 +- client/tomcatconf/applicationContext.xml.in | 36 +- client/tomcatconf/commands.properties.in | 30 +- client/tomcatconf/componentContext.xml.in | 20 +- client/tomcatconf/nonossComponentContext.xml.in | 37 +- client/tomcatconf/simulatorComponentContext.xml.in | 30 +- core/pom.xml | 7 +- core/src/com/cloud/agent/Listener.java | 119 + core/src/com/cloud/agent/RecoveryHandler.java | 31 - .../com/cloud/agent/api/AgentControlAnswer.java | 30 + .../com/cloud/agent/api/AgentControlCommand.java | 27 + core/src/com/cloud/agent/api/AttachIsoCommand.java | 59 + .../com/cloud/agent/api/AttachVolumeAnswer.java | 58 + .../com/cloud/agent/api/AttachVolumeCommand.java | 99 + .../com/cloud/agent/api/BackupSnapshotAnswer.java | 44 + .../com/cloud/agent/api/BackupSnapshotCommand.java | 121 + .../com/cloud/agent/api/BumpUpPriorityCommand.java | 30 + core/src/com/cloud/agent/api/CancelCommand.java | 45 + .../src/com/cloud/agent/api/ChangeAgentAnswer.java | 26 + .../com/cloud/agent/api/ChangeAgentCommand.java | 46 + .../src/com/cloud/agent/api/CheckHealthAnswer.java | 26 + .../com/cloud/agent/api/CheckHealthCommand.java | 30 + .../com/cloud/agent/api/CheckNetworkAnswer.java | 38 + .../com/cloud/agent/api/CheckNetworkCommand.java | 42 + .../src/com/cloud/agent/api/CheckOnHostAnswer.java | 48 + .../com/cloud/agent/api/CheckOnHostCommand.java | 42 + .../src/com/cloud/agent/api/CheckRouterAnswer.java | 81 + .../com/cloud/agent/api/CheckRouterCommand.java | 30 + .../agent/api/CheckS2SVpnConnectionsAnswer.java | 71 + .../agent/api/CheckS2SVpnConnectionsCommand.java | 39 + core/src/com/cloud/agent/api/CheckStateAnswer.java | 45 + .../src/com/cloud/agent/api/CheckStateCommand.java | 40 + .../cloud/agent/api/CheckVirtualMachineAnswer.java | 52 + .../agent/api/CheckVirtualMachineCommand.java | 41 + .../cloud/agent/api/CleanupNetworkRulesCmd.java | 47 + .../agent/api/CleanupSnapshotBackupCommand.java | 75 + .../src/com/cloud/agent/api/ClusterSyncAnswer.java | 55 + .../com/cloud/agent/api/ClusterSyncCommand.java | 47 + .../cloud/agent/api/ComputeChecksumCommand.java | 40 + .../api/ConsoleAccessAuthenticationAnswer.java | 88 + .../api/ConsoleAccessAuthenticationCommand.java | 68 + .../agent/api/ConsoleProxyLoadReportCommand.java | 39 + .../CreatePrivateTemplateFromSnapshotCommand.java | 82 + .../CreatePrivateTemplateFromVolumeCommand.java | 93 + .../cloud/agent/api/CreateStoragePoolCommand.java | 30 + .../cloud/agent/api/CreateVMSnapshotAnswer.java | 62 + .../cloud/agent/api/CreateVMSnapshotCommand.java | 42 + .../agent/api/CreateVolumeFromSnapshotAnswer.java | 38 + .../agent/api/CreateVolumeFromSnapshotCommand.java | 58 + .../api/CreateVolumeFromVMSnapshotAnswer.java | 54 + .../api/CreateVolumeFromVMSnapshotCommand.java | 88 + core/src/com/cloud/agent/api/CronCommand.java | 24 + .../agent/api/DeleteSnapshotBackupAnswer.java | 32 + .../agent/api/DeleteSnapshotBackupCommand.java | 85 + .../cloud/agent/api/DeleteSnapshotsDirCommand.java | 63 + .../cloud/agent/api/DeleteStoragePoolCommand.java | 61 + .../cloud/agent/api/DeleteVMSnapshotAnswer.java | 49 + .../cloud/agent/api/DeleteVMSnapshotCommand.java | 28 + .../agent/api/DownloadSnapshotFromS3Command.java | 61 + .../api/DownloadSnapshotFromSwiftCommand.java | 60 + ...oadTemplateFromS3ToSecondaryStorageCommand.java | 66 + ...TemplateFromSwiftToSecondaryStorageCommand.java | 90 + core/src/com/cloud/agent/api/FenceAnswer.java | 36 + core/src/com/cloud/agent/api/FenceCommand.java | 61 + .../com/cloud/agent/api/GetDomRVersionAnswer.java | 45 + .../src/com/cloud/agent/api/GetDomRVersionCmd.java | 30 + .../com/cloud/agent/api/GetFileStatsAnswer.java | 37 + .../com/cloud/agent/api/GetFileStatsCommand.java | 41 + .../com/cloud/agent/api/GetHostStatsAnswer.java | 88 + .../com/cloud/agent/api/GetHostStatsCommand.java | 53 + .../com/cloud/agent/api/GetStorageStatsAnswer.java | 51 + .../cloud/agent/api/GetStorageStatsCommand.java | 76 + core/src/com/cloud/agent/api/GetVmStatsAnswer.java | 40 + .../src/com/cloud/agent/api/GetVmStatsCommand.java | 54 + core/src/com/cloud/agent/api/GetVncPortAnswer.java | 48 + .../src/com/cloud/agent/api/GetVncPortCommand.java | 43 + core/src/com/cloud/agent/api/HostStatsEntry.java | 113 + core/src/com/cloud/agent/api/MaintainAnswer.java | 46 + core/src/com/cloud/agent/api/MaintainCommand.java | 28 + .../com/cloud/agent/api/ManageSnapshotAnswer.java | 40 + .../com/cloud/agent/api/ManageSnapshotCommand.java | 92 + core/src/com/cloud/agent/api/MigrateAnswer.java | 33 + core/src/com/cloud/agent/api/MigrateCommand.java | 59 + .../cloud/agent/api/MigrateWithStorageAnswer.java | 43 + .../cloud/agent/api/MigrateWithStorageCommand.java | 45 + .../api/MigrateWithStorageCompleteAnswer.java | 41 + .../api/MigrateWithStorageCompleteCommand.java | 36 + .../agent/api/MigrateWithStorageReceiveAnswer.java | 55 + .../api/MigrateWithStorageReceiveCommand.java | 45 + .../agent/api/MigrateWithStorageSendAnswer.java | 39 + .../agent/api/MigrateWithStorageSendCommand.java | 58 + .../com/cloud/agent/api/ModifySshKeysCommand.java | 44 + .../cloud/agent/api/ModifyStoragePoolAnswer.java | 57 + .../cloud/agent/api/ModifyStoragePoolCommand.java | 75 + .../com/cloud/agent/api/NetworkUsageAnswer.java | 61 + .../com/cloud/agent/api/NetworkUsageCommand.java | 98 + core/src/com/cloud/agent/api/PingAnswer.java | 33 + core/src/com/cloud/agent/api/PingCommand.java | 45 + .../com/cloud/agent/api/PingRoutingCommand.java | 54 + .../agent/api/PingRoutingWithNwGroupsCommand.java | 46 + .../cloud/agent/api/PingRoutingWithOvsCommand.java | 42 + .../com/cloud/agent/api/PingStorageCommand.java | 37 + core/src/com/cloud/agent/api/PingTestCommand.java | 54 + core/src/com/cloud/agent/api/PlugNicAnswer.java | 25 + core/src/com/cloud/agent/api/PlugNicCommand.java | 46 + core/src/com/cloud/agent/api/PoolEjectCommand.java | 42 + .../cloud/agent/api/PrepareForMigrationAnswer.java | 34 + .../agent/api/PrepareForMigrationCommand.java | 39 + .../cloud/agent/api/PrepareOCFS2NodesCommand.java | 44 + .../agent/api/PropagateResourceEventCommand.java | 48 + core/src/com/cloud/agent/api/ReadyAnswer.java | 31 + core/src/com/cloud/agent/api/ReadyCommand.java | 58 + core/src/com/cloud/agent/api/RebootAnswer.java | 42 + core/src/com/cloud/agent/api/RebootCommand.java | 45 + .../com/cloud/agent/api/RebootRouterCommand.java | 38 + .../cloud/agent/api/RevertToVMSnapshotAnswer.java | 63 + .../cloud/agent/api/RevertToVMSnapshotCommand.java | 29 + core/src/com/cloud/agent/api/ScaleVmAnswer.java | 28 + core/src/com/cloud/agent/api/ScaleVmCommand.java | 113 + .../agent/api/ScheduleHostScanTaskCommand.java | 32 + .../agent/api/SecStorageFirewallCfgCommand.java | 82 + .../com/cloud/agent/api/SecStorageSetupAnswer.java | 33 + .../cloud/agent/api/SecStorageSetupCommand.java | 96 + .../cloud/agent/api/SecStorageVMSetupCommand.java | 57 + .../cloud/agent/api/SecurityGroupRuleAnswer.java | 70 + .../com/cloud/agent/api/SecurityGroupRulesCmd.java | 304 + core/src/com/cloud/agent/api/SetupAnswer.java | 37 + core/src/com/cloud/agent/api/SetupCommand.java | 60 + .../cloud/agent/api/SetupGuestNetworkAnswer.java | 25 + .../cloud/agent/api/SetupGuestNetworkCommand.java | 72 + core/src/com/cloud/agent/api/ShutdownCommand.java | 56 + core/src/com/cloud/agent/api/SnapshotCommand.java | 126 + core/src/com/cloud/agent/api/StartAnswer.java | 57 + core/src/com/cloud/agent/api/StartCommand.java | 52 + core/src/com/cloud/agent/api/StartupAnswer.java | 44 + core/src/com/cloud/agent/api/StartupCommand.java | 286 + .../agent/api/StartupExternalDhcpCommand.java | 25 + .../agent/api/StartupExternalFirewallCommand.java | 26 + .../api/StartupExternalLoadBalancerCommand.java | 26 + .../com/cloud/agent/api/StartupProxyCommand.java | 49 + .../cloud/agent/api/StartupPxeServerCommand.java | 25 + .../com/cloud/agent/api/StartupRoutingCommand.java | 224 + .../agent/api/StartupSecondaryStorageCommand.java | 32 + .../com/cloud/agent/api/StartupStorageCommand.java | 110 + .../agent/api/StartupTrafficMonitorCommand.java | 26 + core/src/com/cloud/agent/api/StopAnswer.java | 45 + core/src/com/cloud/agent/api/StopCommand.java | 71 + .../com/cloud/agent/api/TransferAgentCommand.java | 57 + core/src/com/cloud/agent/api/UnPlugNicAnswer.java | 25 + core/src/com/cloud/agent/api/UnPlugNicCommand.java | 45 + .../com/cloud/agent/api/UnregisterVMCommand.java | 34 + .../cloud/agent/api/UpdateHostPasswordCommand.java | 48 + core/src/com/cloud/agent/api/UpgradeAnswer.java | 26 + core/src/com/cloud/agent/api/UpgradeCommand.java | 42 + .../cloud/agent/api/UpgradeSnapshotCommand.java | 64 + ...oadTemplateToS3FromSecondaryStorageCommand.java | 121 + ...TemplateToSwiftFromSecondaryStorageCommand.java | 80 + .../com/cloud/agent/api/VMSnapshotBaseCommand.java | 74 + core/src/com/cloud/agent/api/VMSnapshotTO.java | 90 + .../cloud/agent/api/ValidateSnapshotAnswer.java | 53 + .../cloud/agent/api/ValidateSnapshotCommand.java | 84 + core/src/com/cloud/agent/api/VmStatsEntry.java | 82 + .../agent/api/baremetal/IpmISetBootDevCommand.java | 43 + .../api/baremetal/IpmiBootorResetCommand.java | 28 + .../api/baremetal/PreparePxeServerAnswer.java | 29 + .../api/baremetal/PreparePxeServerCommand.java | 80 + .../baremetal/prepareCreateTemplateCommand.java | 66 + .../com/cloud/agent/api/check/CheckSshAnswer.java | 37 + .../com/cloud/agent/api/check/CheckSshCommand.java | 65 + .../api/proxy/CheckConsoleProxyLoadCommand.java | 60 + .../agent/api/proxy/ConsoleProxyLoadAnswer.java | 44 + .../com/cloud/agent/api/proxy/ProxyCommand.java | 25 + .../StartConsoleProxyAgentHttpHandlerCommand.java | 68 + .../api/proxy/WatchConsoleProxyLoadCommand.java | 65 + .../CreateLoadBalancerApplianceCommand.java | 48 + .../DestroyLoadBalancerApplianceCommand.java | 32 + .../cloud/agent/api/routing/DhcpEntryCommand.java | 142 + .../routing/GlobalLoadBalancerConfigAnswer.java | 27 + .../routing/GlobalLoadBalancerConfigCommand.java | 100 + .../api/routing/HealthCheckLBConfigAnswer.java | 42 + .../api/routing/HealthCheckLBConfigCommand.java | 39 + .../com/cloud/agent/api/routing/IpAssocAnswer.java | 48 + .../cloud/agent/api/routing/IpAssocCommand.java | 42 + .../cloud/agent/api/routing/IpAssocVpcCommand.java | 29 + .../api/routing/LoadBalancerConfigCommand.java | 66 + .../agent/api/routing/NetworkElementCommand.java | 53 + .../api/routing/RemoteAccessVpnCfgCommand.java | 78 + .../agent/api/routing/SavePasswordCommand.java | 54 + .../agent/api/routing/SetFirewallRulesAnswer.java | 36 + .../agent/api/routing/SetFirewallRulesCommand.java | 98 + .../agent/api/routing/SetNetworkACLAnswer.java | 36 + .../agent/api/routing/SetNetworkACLCommand.java | 97 + .../api/routing/SetPortForwardingRulesAnswer.java | 37 + .../api/routing/SetPortForwardingRulesCommand.java | 40 + .../routing/SetPortForwardingRulesVpcCommand.java | 30 + .../agent/api/routing/SetSourceNatAnswer.java | 27 + .../agent/api/routing/SetSourceNatCommand.java | 42 + .../agent/api/routing/SetStaticNatRulesAnswer.java | 37 + .../api/routing/SetStaticNatRulesCommand.java | 47 + .../agent/api/routing/SetStaticRouteAnswer.java | 36 + .../agent/api/routing/SetStaticRouteCommand.java | 62 + .../agent/api/routing/Site2SiteVpnCfgCommand.java | 154 + .../agent/api/routing/SiteLoadBalancerConfig.java | 121 + .../cloud/agent/api/routing/UserDataCommand.java | 63 + .../com/cloud/agent/api/routing/VmDataCommand.java | 67 + .../agent/api/routing/VpnUsersCfgCommand.java | 94 + .../agent/api/storage/AbstractDownloadCommand.java | 78 + .../agent/api/storage/AbstractUploadCommand.java | 68 + .../cloud/agent/api/storage/CopyVolumeAnswer.java | 42 + .../cloud/agent/api/storage/CopyVolumeCommand.java | 72 + .../com/cloud/agent/api/storage/CreateAnswer.java | 53 + .../com/cloud/agent/api/storage/CreateCommand.java | 96 + .../api/storage/CreateEntityDownloadURLAnswer.java | 37 + .../storage/CreateEntityDownloadURLCommand.java | 72 + .../api/storage/CreatePrivateTemplateAnswer.java | 77 + .../api/storage/CreatePrivateTemplateCommand.java | 90 + .../api/storage/DeleteEntityDownloadURLAnswer.java | 37 + .../storage/DeleteEntityDownloadURLCommand.java | 72 + .../agent/api/storage/DeleteTemplateCommand.java | 62 + .../agent/api/storage/DeleteVolumeCommand.java | 54 + .../com/cloud/agent/api/storage/DestroyAnswer.java | 31 + .../cloud/agent/api/storage/DestroyCommand.java | 55 + .../cloud/agent/api/storage/DownloadAnswer.java | 141 + .../agent/api/storage/ListTemplateAnswer.java | 53 + .../agent/api/storage/ListTemplateCommand.java | 47 + .../cloud/agent/api/storage/ListVolumeAnswer.java | 53 + .../cloud/agent/api/storage/ListVolumeCommand.java | 47 + .../storage/ManageVolumeAvailabilityAnswer.java | 31 + .../storage/ManageVolumeAvailabilityCommand.java | 54 + .../agent/api/storage/MigrateVolumeAnswer.java | 38 + .../agent/api/storage/MigrateVolumeCommand.java | 51 + .../api/storage/PrimaryStorageDownloadAnswer.java | 54 + .../api/storage/PrimaryStorageDownloadCommand.java | 96 + .../agent/api/storage/ResizeVolumeAnswer.java | 40 + .../agent/api/storage/ResizeVolumeCommand.java | 85 + .../cloud/agent/api/storage/StorageCommand.java | 26 + .../cloud/agent/api/storage/UpgradeDiskAnswer.java | 29 + .../agent/api/storage/UpgradeDiskCommand.java | 50 + .../com/cloud/agent/api/storage/UploadAnswer.java | 123 + .../com/cloud/agent/api/storage/UploadCommand.java | 144 + .../agent/api/storage/UploadProgressCommand.java | 48 + .../src/com/cloud/agent/api/storage/ssCommand.java | 48 + .../virtualnetwork/VirtualRoutingResource.java | 15 +- core/src/com/cloud/alert/AlertAdapter.java | 22 - core/src/com/cloud/alert/AlertManager.java | 58 - core/src/com/cloud/alert/AlertVO.java | 183 - core/src/com/cloud/async/AsyncJobVO.java | 400 -- core/src/com/cloud/async/SyncQueueItemVO.java | 141 - core/src/com/cloud/async/SyncQueueVO.java | 137 - core/src/com/cloud/capacity/CapacityVO.java | 204 - core/src/com/cloud/certificate/CertificateVO.java | 63 - .../com/cloud/configuration/ConfigurationVO.java | 107 - .../com/cloud/configuration/ResourceCountVO.java | 131 - .../com/cloud/configuration/ResourceLimitVO.java | 128 - core/src/com/cloud/event/EventVO.java | 194 - core/src/com/cloud/event/UsageEvent.java | 33 - core/src/com/cloud/event/UsageEventVO.java | 216 - core/src/com/cloud/event/dao/EventDao.java | 38 - core/src/com/cloud/event/dao/EventDaoImpl.java | 109 - core/src/com/cloud/event/dao/UsageEventDao.java | 36 - .../src/com/cloud/event/dao/UsageEventDaoImpl.java | 187 - .../exception/AgentControlChannelException.java | 27 - core/src/com/cloud/host/DetailVO.java | 73 - core/src/com/cloud/host/HostTagVO.java | 65 - core/src/com/cloud/host/HostVO.java | 732 -- .../cloud/hypervisor/HypervisorCapabilitiesVO.java | 181 - core/src/com/cloud/info/ConsoleProxyLoadInfo.java | 48 - core/src/com/cloud/info/RunningHostCountInfo.java | 48 - core/src/com/cloud/network/VpnUserVO.java | 131 - .../network/security/SecurityGroupRuleVO.java | 167 - .../network/security/SecurityGroupRulesVO.java | 156 - .../network/security/SecurityGroupVMMapVO.java | 89 - .../cloud/network/security/SecurityGroupVO.java | 99 - .../cloud/network/security/SecurityGroupWork.java | 40 - .../network/security/SecurityGroupWorkVO.java | 135 - .../com/cloud/network/security/VmRulesetLogVO.java | 81 - core/src/com/cloud/resource/ResourceListener.java | 40 +- .../src/com/cloud/resource/ServerResourceBase.java | 2 +- .../cloud/resource/UnableDeleteHostException.java | 28 - core/src/com/cloud/serializer/GsonHelper.java | 2 +- core/src/com/cloud/storage/DiskOfferingVO.java | 318 - core/src/com/cloud/storage/GuestOSCategoryVO.java | 68 - core/src/com/cloud/storage/GuestOSVO.java | 90 - core/src/com/cloud/storage/LaunchPermissionVO.java | 57 - core/src/com/cloud/storage/S3VO.java | 209 - core/src/com/cloud/storage/SecondaryStorage.java | 30 - .../com/cloud/storage/SecondaryStorageLayer.java | 39 - core/src/com/cloud/storage/SnapshotPolicyVO.java | 133 - core/src/com/cloud/storage/SnapshotScheduleVO.java | 125 - core/src/com/cloud/storage/SnapshotVO.java | 228 - .../com/cloud/storage/StoragePoolDiscoverer.java | 35 - .../com/cloud/storage/StoragePoolHostAssoc.java | 35 - core/src/com/cloud/storage/StoragePoolHostVO.java | 109 - core/src/com/cloud/storage/StoragePoolWorkVO.java | 118 - core/src/com/cloud/storage/SwiftVO.java | 108 - core/src/com/cloud/storage/UploadVO.java | 268 - core/src/com/cloud/storage/VMTemplateDetailVO.java | 84 - core/src/com/cloud/storage/VMTemplateHostVO.java | 339 - core/src/com/cloud/storage/VMTemplateS3VO.java | 204 - .../com/cloud/storage/VMTemplateStoragePoolVO.java | 290 - core/src/com/cloud/storage/VMTemplateSwiftVO.java | 107 - core/src/com/cloud/storage/VMTemplateVO.java | 529 -- core/src/com/cloud/storage/VMTemplateZoneVO.java | 116 - core/src/com/cloud/storage/VolumeHostVO.java | 364 - core/src/com/cloud/storage/VolumeVO.java | 454 -- .../resource/CifsSecondaryStorageResource.java | 755 -- .../resource/LocalNfsSecondaryStorageResource.java | 183 - .../resource/LocalSecondaryStorageResource.java | 247 - .../resource/NfsSecondaryStorageResource.java | 2110 ------ .../storage/resource/SecondaryStorageResource.java | 28 - .../resource/SecondaryStorageResourceHandler.java | 24 - .../storage/resource/StoragePoolResource.java | 4 + .../cloud/storage/resource/StorageProcessor.java | 45 + .../resource/StorageSubsystemCommandHandler.java | 27 + .../StorageSubsystemCommandHandlerBase.java | 135 + .../cloud/storage/snapshot/SnapshotSchedule.java | 46 - .../cloud/storage/template/DownloadManager.java | 106 - .../storage/template/DownloadManagerImpl.java | 1140 --- .../com/cloud/storage/template/UploadManager.java | 85 - .../cloud/storage/template/UploadManagerImpl.java | 645 -- core/src/com/cloud/user/AccountVO.java | 182 - core/src/com/cloud/user/SSHKeyPairVO.java | 119 - core/src/com/cloud/user/UserAccountVO.java | 284 - core/src/com/cloud/user/UserStatisticsVO.java | 165 - core/src/com/cloud/user/UserStatsLogVO.java | 132 - core/src/com/cloud/user/UserVO.java | 265 - core/src/com/cloud/vm/ConsoleProxy.java | 27 - core/src/com/cloud/vm/ConsoleProxyVO.java | 151 - core/src/com/cloud/vm/DomainRouterVO.java | 246 - core/src/com/cloud/vm/InstanceGroupVMMapVO.java | 71 - core/src/com/cloud/vm/InstanceGroupVO.java | 120 - core/src/com/cloud/vm/SecondaryStorageVm.java | 26 - core/src/com/cloud/vm/SecondaryStorageVmVO.java | 135 - core/src/com/cloud/vm/SystemVm.java | 26 - core/src/com/cloud/vm/UserVmCloneSettingVO.java | 50 - core/src/com/cloud/vm/UserVmDetailVO.java | 85 - core/src/com/cloud/vm/UserVmVO.java | 137 - core/src/com/cloud/vm/VMInstanceVO.java | 483 -- core/src/com/cloud/vm/VirtualDisk.java | 31 - core/src/com/cloud/vm/VirtualMachineName.java | 190 - core/src/com/cloud/vm/VmDetailConstants.java | 23 - core/src/com/cloud/vm/snapshot/VMSnapshotVO.java | 224 - .../storage/command/DownloadCommand.java | 184 + .../storage/command/DownloadProgressCommand.java | 49 + .../api/agent/test/AgentControlAnswerTest.java | 35 + .../api/agent/test/AgentControlCommandTest.java | 33 + .../cloudstack/api/agent/test/AnswerTest.java | 73 + .../api/agent/test/AttachIsoCommandTest.java | 80 + .../api/agent/test/AttachVolumeAnswerTest.java | 65 + .../api/agent/test/AttachVolumeCommandTest.java | 120 + .../api/agent/test/BackupSnapshotAnswerTest.java | 75 + .../api/agent/test/BackupSnapshotCommandTest.java | 301 + .../api/agent/test/BumpUpPriorityCommandTest.java | 83 + .../api/agent/test/CancelCommandTest.java | 46 + .../api/agent/test/ChangeAgentAnswerTest.java | 44 + .../api/agent/test/ChangeAgentCommandTest.java | 50 + .../api/agent/test/CheckHealthAnswerTest.java | 49 + .../api/agent/test/CheckHealthCommandTest.java | 40 + .../api/agent/test/CheckNetworkAnswerTest.java | 62 + .../api/agent/test/CheckNetworkCommandTest.java | 53 + .../api/agent/test/CheckOnHostCommandTest.java | 483 ++ .../api/agent/test/SnapshotCommandTest.java | 209 + .../agent/api/test/ResizeVolumeCommandTest.java | 229 + debian/cloudstack-agent.install | 6 +- debian/cloudstack-awsapi.install | 10 +- debian/cloudstack-common.install | 8 +- debian/cloudstack-management.install | 10 +- debian/rules | 39 +- deps/install-non-oss.sh | 13 - docs/en-US/Admin_Guide.xml | 2 +- docs/en-US/Book_Info.xml | 39 +- docs/en-US/CloudStack_Nicira_NVP_Guide.xml | 2 +- docs/en-US/Common_Content/feedback.xml | 24 + docs/en-US/Developers_Guide.xml | 2 +- docs/en-US/Installation_Guide.xml | 4 +- docs/en-US/MidoNet_Plugin_Guide.ent | 22 + docs/en-US/MidoNet_Plugin_Guide.xml | 52 + docs/en-US/Preface.xml | 2 +- docs/en-US/Release_Notes.xml | 5334 ++++++++++++++- docs/en-US/about-working-with-vms.xml | 85 +- docs/en-US/add-clusters-vsphere.xml | 11 +- docs/en-US/added-API-commands-4.2.xml | 110 + docs/en-US/added-API-commands.xml | 2 +- docs/en-US/advanced-zone-configuration.xml | 2 +- docs/en-US/advanced-zone-network-traffic-types.xml | 2 +- docs/en-US/append-displayname-vms.xml | 84 + docs/en-US/aws-ec2-introduction.xml | 2 +- docs/en-US/basic-zone-network-traffic-types.xml | 4 +- docs/en-US/build-nonoss.xml | 49 + docs/en-US/building-documentation.xml | 2 +- docs/en-US/building-marvin.xml | 2 +- docs/en-US/building-translation.xml | 2 +- ...change-console-proxy-ssl-certificate-domain.xml | 2 +- docs/en-US/changed-API-commands-4.2.xml | 134 + docs/en-US/citrix-xenserver-installation.xml | 2 +- docs/en-US/configure-package-repository.xml | 2 +- docs/en-US/configure-vpn.xml | 2 +- docs/en-US/console-proxy.xml | 2 +- docs/en-US/creating-network-offerings.xml | 45 + docs/en-US/delete-event-alerts.xml | 59 + docs/en-US/elastic-ip.xml | 103 + docs/en-US/events.xml | 5 +- docs/en-US/feedback.xml | 24 + docs/en-US/global-config.xml | 79 + docs/en-US/gslb.xml | 235 + docs/en-US/guest-ip-ranges.xml | 10 +- docs/en-US/hypervisor-host-install-firewall.xml | 4 +- docs/en-US/hypervisor-host-install-libvirt.xml | 2 +- ...hypervisor-host-install-network-openvswitch.xml | 2 +- docs/en-US/hypervisor-host-install-network.xml | 12 +- docs/en-US/hypervisor-installation.xml | 1 + docs/en-US/hypervisor-kvm-install-flow.xml | 1 + .../hypervisor-support-for-primarystorage.xml | 148 +- docs/en-US/images/VMSnapshotButton.png | Bin 0 -> 967 bytes docs/en-US/images/add-gslb.png | Bin 0 -> 17665 bytes docs/en-US/images/add-vlan-icon.png | Bin 0 -> 860 bytes docs/en-US/images/eip-ns-basiczone.png | Bin 0 -> 63227 bytes docs/en-US/images/gslb.png | Bin 0 -> 184080 bytes docs/en-US/images/revert-vm.png | Bin 0 -> 860 bytes docs/en-US/ipv6-support.xml | 4 +- docs/en-US/libcloud-examples.xml | 75 + docs/en-US/limit-accounts-domains.xml | 371 + docs/en-US/lxc-install.xml | 110 + docs/en-US/lxc-topology-req.xml | 24 + .../en-US/management-server-install-prepare-os.xml | 2 +- docs/en-US/management-server-install-systemvm.xml | 4 + docs/en-US/management-server-lb.xml | 2 +- docs/en-US/minimum-system-requirements.xml | 3 +- docs/en-US/multiple-ip-nic.xml | 91 + docs/en-US/network-offerings.xml | 83 +- docs/en-US/networks.xml | 2 + docs/en-US/non-contiguous-vlan.xml | 68 + docs/en-US/plugin-midonet-about.xml | 27 + docs/en-US/plugin-midonet-features.xml | 57 + docs/en-US/plugin-midonet-introduction.xml | 26 + docs/en-US/plugin-midonet-preparations.xml | 90 + docs/en-US/plugin-midonet-provider.xml | 39 + docs/en-US/plugin-midonet-revisions.xml | 45 + docs/en-US/plugin-midonet-ui.xml | 65 + docs/en-US/plugin-midonet-usage.xml | 29 + docs/en-US/prepare-system-vm-template.xml | 4 + docs/en-US/set-up-network-for-users.xml | 13 +- docs/en-US/signing-api-calls-python.xml | 101 + docs/en-US/signing-api-requests.xml | 3 + docs/en-US/source-build.xml | 4 +- docs/en-US/source.xml | 1 + docs/en-US/tools.xml | 1 + docs/en-US/topology-req.xml | 3 +- docs/en-US/translating-documentation.xml | 2 +- .../troubleshooting-working-with-server-logs.xml | 6 +- docs/en-US/using-netscaler-load-balancers.xml | 132 +- docs/en-US/using-sshkeys.xml | 2 +- docs/en-US/virtual-machines.xml | 2 + docs/en-US/vlan-provisioning.xml | 2 + docs/en-US/vm-snapshots.xml | 148 + docs/en-US/vmware-cluster-config-dvswitch.xml | 35 +- docs/en-US/vmware-install.xml | 4 +- docs/en-US/vmware-requirements.xml | 2 +- docs/en-US/whats-new.xml | 6 +- docs/en-US/work-with-usage.xml | 26 +- docs/en-US/writing-new-documentation.xml | 4 +- docs/publican-cloudstack/defaults.cfg | 4 +- docs/publican-plugin-midonet.cfg | 28 + engine/api/pom.xml | 10 +- .../subsystem/api/storage/DataMotionService.java | 10 + .../subsystem/api/storage/DataMotionStrategy.java | 13 + .../engine/subsystem/api/storage/DataObject.java | 2 + .../subsystem/api/storage/DataObjectType.java | 25 - .../subsystem/api/storage/DataStoreDriver.java | 1 + .../engine/subsystem/api/storage/DataTO.java | 30 - .../engine/subsystem/api/storage/EndPoint.java | 2 - .../api/storage/ObjectInDataStoreStateMachine.java | 4 +- .../subsystem/api/storage/SnapshotResult.java | 16 + .../subsystem/api/storage/SnapshotStrategy.java | 16 + .../subsystem/api/storage/VolumeService.java | 6 +- .../cloudstack/storage/command/AttachAnswer.java | 44 + .../cloudstack/storage/command/AttachCommand.java | 52 + .../cloudstack/storage/command/CommandResult.java | 2 +- .../cloudstack/storage/command/CopyCmdAnswer.java | 2 +- .../cloudstack/storage/command/CopyCommand.java | 2 +- .../storage/command/CreateObjectAnswer.java | 2 +- .../storage/command/CreateObjectCommand.java | 2 +- .../cloudstack/storage/command/DeleteCommand.java | 2 +- .../cloudstack/storage/command/DettachAnswer.java | 44 + .../cloudstack/storage/command/DettachCommand.java | 52 + .../storage/command/DownloadCommand.java | 184 - .../storage/command/DownloadProgressCommand.java | 49 - .../datastore/db/StoragePoolDetailsDao.java | 1 + .../cloudstack/storage/to/PrimaryDataStoreTO.java | 41 + .../cloudstack/storage/to/SnapshotObjectTO.java | 20 +- .../cloudstack/storage/to/TemplateObjectTO.java | 11 +- .../cloudstack/storage/to/VolumeObjectTO.java | 31 +- .../engine/cloud/entity/api/VMEntityManager.java | 2 +- .../cloud/entity/api/VMEntityManagerImpl.java | 117 +- .../cloud/entity/api/VirtualMachineEntityImpl.java | 2 +- .../platform/orchestration/CloudOrchestrator.java | 63 +- engine/pom.xml | 2 - engine/schema/src/com/cloud/alert/AlertVO.java | 183 + .../schema/src/com/cloud/alert/dao/AlertDao.java | 33 + .../src/com/cloud/alert/dao/AlertDaoImpl.java | 156 + .../schema/src/com/cloud/capacity/CapacityVO.java | 204 + .../src/com/cloud/capacity/dao/CapacityDao.java | 45 + .../com/cloud/capacity/dao/CapacityDaoImpl.java | 816 +++ .../src/com/cloud/certificate/CertificateVO.java | 63 + .../com/cloud/certificate/dao/CertificateDao.java | 24 + .../cloud/certificate/dao/CertificateDaoImpl.java | 63 + .../cluster/ClusterInvalidSessionException.java | 33 + .../cloud/cluster/ManagementServerHostPeerVO.java | 120 + .../com/cloud/cluster/ManagementServerHostVO.java | 182 + .../cloud/cluster/agentlb/HostTransferMapVO.java | 98 + .../cluster/agentlb/dao/HostTransferMapDao.java | 45 + .../agentlb/dao/HostTransferMapDaoImpl.java | 146 + .../cloud/cluster/dao/ManagementServerHostDao.java | 48 + .../cluster/dao/ManagementServerHostDaoImpl.java | 276 + .../cluster/dao/ManagementServerHostPeerDao.java | 27 + .../dao/ManagementServerHostPeerDaoImpl.java | 108 + .../com/cloud/configuration/ConfigurationVO.java | 107 + .../com/cloud/configuration/ResourceCountVO.java | 131 + .../com/cloud/configuration/ResourceLimitVO.java | 128 + .../cloud/configuration/dao/ConfigurationDao.java | 69 + .../configuration/dao/ConfigurationDaoImpl.java | 225 + .../cloud/configuration/dao/ResourceCountDao.java | 58 + .../configuration/dao/ResourceCountDaoImpl.java | 222 + .../cloud/configuration/dao/ResourceLimitDao.java | 35 + .../configuration/dao/ResourceLimitDaoImpl.java | 100 + .../schema/src/com/cloud/dc/AccountVlanMapVO.java | 65 + .../schema/src/com/cloud/dc/ClusterDetailsDao.java | 32 + .../src/com/cloud/dc/ClusterDetailsDaoImpl.java | 133 + .../schema/src/com/cloud/dc/ClusterDetailsVO.java | 74 + engine/schema/src/com/cloud/dc/ClusterVO.java | 189 + .../schema/src/com/cloud/dc/ClusterVSMMapVO.java | 62 + .../src/com/cloud/dc/DataCenterIpAddressVO.java | 115 + .../cloud/dc/DataCenterLinkLocalIpAddressVO.java | 108 + engine/schema/src/com/cloud/dc/DataCenterVO.java | 460 ++ .../schema/src/com/cloud/dc/DataCenterVnetVO.java | 120 + engine/schema/src/com/cloud/dc/DcDetailVO.java | 73 + engine/schema/src/com/cloud/dc/HostPodVO.java | 197 + engine/schema/src/com/cloud/dc/PodCluster.java | 67 + engine/schema/src/com/cloud/dc/PodVlanMapVO.java | 62 + engine/schema/src/com/cloud/dc/PodVlanVO.java | 98 + .../com/cloud/dc/StorageNetworkIpAddressVO.java | 120 + .../src/com/cloud/dc/StorageNetworkIpRangeVO.java | 184 + engine/schema/src/com/cloud/dc/VlanVO.java | 196 + .../src/com/cloud/dc/dao/AccountVlanMapDao.java | 30 + .../com/cloud/dc/dao/AccountVlanMapDaoImpl.java | 75 + engine/schema/src/com/cloud/dc/dao/ClusterDao.java | 37 + .../src/com/cloud/dc/dao/ClusterDaoImpl.java | 241 + .../src/com/cloud/dc/dao/ClusterVSMMapDao.java | 29 + .../src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java | 95 + .../schema/src/com/cloud/dc/dao/DataCenterDao.java | 82 + .../src/com/cloud/dc/dao/DataCenterDaoImpl.java | 425 ++ .../com/cloud/dc/dao/DataCenterIpAddressDao.java | 38 + .../cloud/dc/dao/DataCenterIpAddressDaoImpl.java | 225 + .../dc/dao/DataCenterLinkLocalIpAddressDao.java | 32 + .../dao/DataCenterLinkLocalIpAddressDaoImpl.java | 188 + .../src/com/cloud/dc/dao/DataCenterVnetDao.java | 49 + .../com/cloud/dc/dao/DataCenterVnetDaoImpl.java | 318 + .../schema/src/com/cloud/dc/dao/DcDetailsDao.java | 32 + .../src/com/cloud/dc/dao/DcDetailsDaoImpl.java | 97 + engine/schema/src/com/cloud/dc/dao/HostPodDao.java | 35 + .../src/com/cloud/dc/dao/HostPodDaoImpl.java | 134 + engine/schema/src/com/cloud/dc/dao/PodVlanDao.java | 30 + .../src/com/cloud/dc/dao/PodVlanDaoImpl.java | 139 + .../schema/src/com/cloud/dc/dao/PodVlanMapDao.java | 30 + .../src/com/cloud/dc/dao/PodVlanMapDaoImpl.java | 75 + .../cloud/dc/dao/StorageNetworkIpAddressDao.java | 32 + .../dc/dao/StorageNetworkIpAddressDaoImpl.java | 114 + .../com/cloud/dc/dao/StorageNetworkIpRangeDao.java | 32 + .../cloud/dc/dao/StorageNetworkIpRangeDaoImpl.java | 78 + engine/schema/src/com/cloud/dc/dao/VlanDao.java | 55 + .../schema/src/com/cloud/dc/dao/VlanDaoImpl.java | 334 + engine/schema/src/com/cloud/domain/DomainVO.java | 215 + .../schema/src/com/cloud/domain/dao/DomainDao.java | 34 + .../src/com/cloud/domain/dao/DomainDaoImpl.java | 278 + engine/schema/src/com/cloud/event/EventVO.java | 194 + .../schema/src/com/cloud/event/UsageEventVO.java | 216 + .../schema/src/com/cloud/event/dao/EventDao.java | 38 + .../src/com/cloud/event/dao/EventDaoImpl.java | 109 + .../src/com/cloud/event/dao/UsageEventDao.java | 35 + .../src/com/cloud/event/dao/UsageEventDaoImpl.java | 187 + engine/schema/src/com/cloud/host/DetailVO.java | 73 + engine/schema/src/com/cloud/host/HostTagVO.java | 65 + engine/schema/src/com/cloud/host/HostVO.java | 732 ++ engine/schema/src/com/cloud/host/dao/HostDao.java | 83 + .../schema/src/com/cloud/host/dao/HostDaoImpl.java | 920 +++ .../src/com/cloud/host/dao/HostDetailsDao.java | 32 + .../src/com/cloud/host/dao/HostDetailsDaoImpl.java | 110 + .../schema/src/com/cloud/host/dao/HostTagsDao.java | 30 + .../src/com/cloud/host/dao/HostTagsDaoImpl.java | 75 + .../cloud/hypervisor/HypervisorCapabilitiesVO.java | 212 + .../hypervisor/dao/HypervisorCapabilitiesDao.java | 38 + .../dao/HypervisorCapabilitiesDaoImpl.java | 105 + .../schema/src/com/cloud/keystore/KeystoreDao.java | 29 + .../src/com/cloud/keystore/KeystoreDaoImpl.java | 118 + .../schema/src/com/cloud/keystore/KeystoreVO.java | 101 + .../src/com/cloud/migration/DiskOffering20Dao.java | 22 + .../com/cloud/migration/DiskOffering20DaoImpl.java | 27 + .../src/com/cloud/migration/DiskOffering20VO.java | 113 + .../src/com/cloud/migration/DiskOffering21Dao.java | 23 + .../com/cloud/migration/DiskOffering21DaoImpl.java | 27 + .../src/com/cloud/migration/DiskOffering21VO.java | 257 + .../com/cloud/migration/ServiceOffering20Dao.java | 22 + .../cloud/migration/ServiceOffering20DaoImpl.java | 27 + .../com/cloud/migration/ServiceOffering20VO.java | 199 + .../com/cloud/migration/ServiceOffering21Dao.java | 22 + .../cloud/migration/ServiceOffering21DaoImpl.java | 27 + .../com/cloud/migration/ServiceOffering21VO.java | 178 + .../com/cloud/network/LBHealthCheckPolicyVO.java | 157 + .../src/com/cloud/network/UserIpv6AddressVO.java | 188 + engine/schema/src/com/cloud/network/VpnUserVO.java | 131 + .../network/as/AutoScalePolicyConditionMapVO.java | 61 + .../com/cloud/network/as/AutoScalePolicyVO.java | 134 + .../network/as/AutoScaleVmGroupPolicyMapVO.java | 64 + .../com/cloud/network/as/AutoScaleVmGroupVO.java | 191 + .../com/cloud/network/as/AutoScaleVmProfileVO.java | 218 + .../src/com/cloud/network/as/ConditionVO.java | 129 + .../schema/src/com/cloud/network/as/CounterVO.java | 111 + .../as/dao/AutoScalePolicyConditionMapDao.java | 28 + .../as/dao/AutoScalePolicyConditionMapDaoImpl.java | 61 + .../cloud/network/as/dao/AutoScalePolicyDao.java | 24 + .../network/as/dao/AutoScalePolicyDaoImpl.java | 38 + .../cloud/network/as/dao/AutoScaleVmGroupDao.java | 28 + .../network/as/dao/AutoScaleVmGroupDaoImpl.java | 65 + .../as/dao/AutoScaleVmGroupPolicyMapDao.java | 30 + .../as/dao/AutoScaleVmGroupPolicyMapDaoImpl.java | 77 + .../network/as/dao/AutoScaleVmProfileDao.java | 25 + .../network/as/dao/AutoScaleVmProfileDaoImpl.java | 38 + .../src/com/cloud/network/as/dao/ConditionDao.java | 28 + .../com/cloud/network/as/dao/ConditionDaoImpl.java | 56 + .../src/com/cloud/network/as/dao/CounterDao.java | 29 + .../com/cloud/network/as/dao/CounterDaoImpl.java | 70 + .../cloud/network/dao/AccountGuestVlanMapDao.java | 34 + .../network/dao/AccountGuestVlanMapDaoImpl.java | 83 + .../cloud/network/dao/AccountGuestVlanMapVO.java | 94 + .../network/dao/ExternalFirewallDeviceDao.java | 58 + .../network/dao/ExternalFirewallDeviceDaoImpl.java | 96 + .../network/dao/ExternalFirewallDeviceVO.java | 161 + .../network/dao/ExternalLoadBalancerDeviceDao.java | 74 + .../dao/ExternalLoadBalancerDeviceDaoImpl.java | 127 + .../network/dao/ExternalLoadBalancerDeviceVO.java | 227 + .../cloud/network/dao/FirewallRulesCidrsDao.java | 29 + .../network/dao/FirewallRulesCidrsDaoImpl.java | 70 + .../cloud/network/dao/FirewallRulesCidrsVO.java | 65 + .../com/cloud/network/dao/FirewallRulesDao.java | 65 + .../cloud/network/dao/FirewallRulesDaoImpl.java | 352 + .../src/com/cloud/network/dao/IPAddressDao.java | 71 + .../com/cloud/network/dao/IPAddressDaoImpl.java | 376 + .../src/com/cloud/network/dao/IPAddressVO.java | 307 + .../network/dao/InlineLoadBalancerNicMapDao.java | 24 + .../dao/InlineLoadBalancerNicMapDaoImpl.java | 46 + .../network/dao/InlineLoadBalancerNicMapVO.java | 60 + .../cloud/network/dao/LBHealthCheckPolicyDao.java | 35 + .../network/dao/LBHealthCheckPolicyDaoImpl.java | 71 + .../cloud/network/dao/LBStickinessPolicyDao.java | 34 + .../network/dao/LBStickinessPolicyDaoImpl.java | 69 + .../cloud/network/dao/LBStickinessPolicyVO.java | 145 + .../src/com/cloud/network/dao/LoadBalancerDao.java | 36 + .../com/cloud/network/dao/LoadBalancerDaoImpl.java | 137 + .../cloud/network/dao/LoadBalancerVMMapDao.java | 31 + .../network/dao/LoadBalancerVMMapDaoImpl.java | 97 + .../com/cloud/network/dao/LoadBalancerVMMapVO.java | 89 + .../src/com/cloud/network/dao/LoadBalancerVO.java | 98 + .../com/cloud/network/dao/NetworkAccountDao.java | 22 + .../cloud/network/dao/NetworkAccountDaoImpl.java | 29 + .../com/cloud/network/dao/NetworkAccountVO.java | 72 + .../src/com/cloud/network/dao/NetworkDao.java | 114 + .../src/com/cloud/network/dao/NetworkDaoImpl.java | 621 ++ .../com/cloud/network/dao/NetworkDomainDao.java | 27 + .../cloud/network/dao/NetworkDomainDaoImpl.java | 75 + .../src/com/cloud/network/dao/NetworkDomainVO.java | 72 + .../network/dao/NetworkExternalFirewallDao.java | 38 + .../dao/NetworkExternalFirewallDaoImpl.java | 61 + .../network/dao/NetworkExternalFirewallVO.java | 88 + .../dao/NetworkExternalLoadBalancerDao.java | 38 + .../dao/NetworkExternalLoadBalancerDaoImpl.java | 62 + .../network/dao/NetworkExternalLoadBalancerVO.java | 89 + .../src/com/cloud/network/dao/NetworkOpDao.java | 26 + .../com/cloud/network/dao/NetworkOpDaoImpl.java | 84 + .../src/com/cloud/network/dao/NetworkOpVO.java | 76 + .../cloud/network/dao/NetworkRuleConfigDao.java | 26 + .../network/dao/NetworkRuleConfigDaoImpl.java | 51 + .../com/cloud/network/dao/NetworkRuleConfigVO.java | 93 + .../cloud/network/dao/NetworkServiceMapDao.java | 38 + .../network/dao/NetworkServiceMapDaoImpl.java | 167 + .../com/cloud/network/dao/NetworkServiceMapVO.java | 92 + .../src/com/cloud/network/dao/NetworkVO.java | 543 ++ .../com/cloud/network/dao/PhysicalNetworkDao.java | 28 + .../cloud/network/dao/PhysicalNetworkDaoImpl.java | 79 + .../dao/PhysicalNetworkIsolationMethodDaoImpl.java | 70 + .../dao/PhysicalNetworkIsolationMethodVO.java | 68 + .../dao/PhysicalNetworkServiceProviderDao.java | 28 + .../dao/PhysicalNetworkServiceProviderDaoImpl.java | 131 + .../dao/PhysicalNetworkServiceProviderVO.java | 322 + .../network/dao/PhysicalNetworkTagDaoImpl.java | 63 + .../cloud/network/dao/PhysicalNetworkTagVO.java | 68 + .../network/dao/PhysicalNetworkTrafficTypeDao.java | 33 + .../dao/PhysicalNetworkTrafficTypeDaoImpl.java | 143 + .../network/dao/PhysicalNetworkTrafficTypeVO.java | 149 + .../com/cloud/network/dao/PhysicalNetworkVO.java | 246 + .../src/com/cloud/network/dao/PortProfileDao.java | 50 + .../com/cloud/network/dao/PortProfileDaoImpl.java | 89 + .../src/com/cloud/network/dao/PortProfileVO.java | 204 + .../com/cloud/network/dao/RemoteAccessVpnDao.java | 30 + .../cloud/network/dao/RemoteAccessVpnDaoImpl.java | 84 + .../com/cloud/network/dao/RemoteAccessVpnVO.java | 142 + .../com/cloud/network/dao/RouterNetworkDao.java | 26 + .../cloud/network/dao/RouterNetworkDaoImpl.java | 62 + .../src/com/cloud/network/dao/RouterNetworkVO.java | 75 + .../network/dao/Site2SiteCustomerGatewayDao.java | 27 + .../dao/Site2SiteCustomerGatewayDaoImpl.java | 66 + .../network/dao/Site2SiteCustomerGatewayVO.java | 206 + .../network/dao/Site2SiteVpnConnectionDao.java | 29 + .../network/dao/Site2SiteVpnConnectionDaoImpl.java | 97 + .../network/dao/Site2SiteVpnConnectionVO.java | 143 + .../cloud/network/dao/Site2SiteVpnGatewayDao.java | 23 + .../network/dao/Site2SiteVpnGatewayDaoImpl.java | 50 + .../cloud/network/dao/Site2SiteVpnGatewayVO.java | 114 + .../com/cloud/network/dao/UserIpv6AddressDao.java | 41 + .../cloud/network/dao/UserIpv6AddressDaoImpl.java | 122 + .../network/dao/VirtualRouterProviderDao.java | 31 + .../network/dao/VirtualRouterProviderDaoImpl.java | 79 + .../src/com/cloud/network/dao/VpnUserDao.java | 28 + .../src/com/cloud/network/dao/VpnUserDaoImpl.java | 87 + .../network/element/VirtualRouterProviderVO.java | 120 + .../com/cloud/network/rules/FirewallRuleVO.java | 270 + .../cloud/network/rules/PortForwardingRuleVO.java | 96 + .../network/rules/dao/PortForwardingRulesDao.java | 47 + .../rules/dao/PortForwardingRulesDaoImpl.java | 162 + .../network/security/SecurityGroupRuleVO.java | 167 + .../network/security/SecurityGroupRulesVO.java | 169 + .../network/security/SecurityGroupVMMapVO.java | 89 + .../cloud/network/security/SecurityGroupVO.java | 99 + .../cloud/network/security/SecurityGroupWork.java | 40 + .../network/security/SecurityGroupWorkVO.java | 135 + .../com/cloud/network/security/VmRulesetLogVO.java | 81 + .../network/security/dao/SecurityGroupDao.java | 30 + .../network/security/dao/SecurityGroupDaoImpl.java | 136 + .../network/security/dao/SecurityGroupRuleDao.java | 35 + .../security/dao/SecurityGroupRuleDaoImpl.java | 176 + .../security/dao/SecurityGroupRulesDao.java | 48 + .../security/dao/SecurityGroupRulesDaoImpl.java | 96 + .../security/dao/SecurityGroupVMMapDao.java | 38 + .../security/dao/SecurityGroupVMMapDaoImpl.java | 166 + .../network/security/dao/SecurityGroupWorkDao.java | 49 + .../security/dao/SecurityGroupWorkDaoImpl.java | 241 + .../network/security/dao/VmRulesetLogDao.java | 29 + .../network/security/dao/VmRulesetLogDaoImpl.java | 200 + .../src/com/cloud/network/vpc/PrivateIpVO.java | 103 + .../src/com/cloud/network/vpc/StaticRouteVO.java | 141 + .../src/com/cloud/network/vpc/VpcGatewayVO.java | 206 + .../cloud/network/vpc/VpcOfferingServiceMapVO.java | 89 + .../src/com/cloud/network/vpc/VpcOfferingVO.java | 151 + .../src/com/cloud/network/vpc/VpcServiceMapVO.java | 90 + engine/schema/src/com/cloud/network/vpc/VpcVO.java | 181 + .../com/cloud/network/vpc/dao/PrivateIpDao.java | 75 + .../cloud/network/vpc/dao/PrivateIpDaoImpl.java | 156 + .../com/cloud/network/vpc/dao/StaticRouteDao.java | 35 + .../cloud/network/vpc/dao/StaticRouteDaoImpl.java | 119 + .../src/com/cloud/network/vpc/dao/VpcDao.java | 47 + .../src/com/cloud/network/vpc/dao/VpcDaoImpl.java | 152 + .../com/cloud/network/vpc/dao/VpcGatewayDao.java | 26 + .../cloud/network/vpc/dao/VpcGatewayDaoImpl.java | 62 + .../com/cloud/network/vpc/dao/VpcOfferingDao.java | 32 + .../cloud/network/vpc/dao/VpcOfferingDaoImpl.java | 71 + .../network/vpc/dao/VpcOfferingServiceMapDao.java | 41 + .../vpc/dao/VpcOfferingServiceMapDaoImpl.java | 119 + .../cloud/network/vpc/dao/VpcServiceMapDao.java | 40 + .../network/vpc/dao/VpcServiceMapDaoImpl.java | 115 + .../offerings/NetworkOfferingServiceMapVO.java | 94 + .../src/com/cloud/offerings/NetworkOfferingVO.java | 391 ++ .../cloud/offerings/dao/NetworkOfferingDao.java | 60 + .../offerings/dao/NetworkOfferingDaoImpl.java | 169 + .../dao/NetworkOfferingServiceMapDao.java | 50 + .../dao/NetworkOfferingServiceMapDaoImpl.java | 171 + .../src/com/cloud/projects/ProjectAccountVO.java | 96 + .../com/cloud/projects/ProjectInvitationVO.java | 150 + .../schema/src/com/cloud/projects/ProjectVO.java | 163 + .../com/cloud/projects/dao/ProjectAccountDao.java | 43 + .../cloud/projects/dao/ProjectAccountDaoImpl.java | 157 + .../src/com/cloud/projects/dao/ProjectDao.java | 37 + .../src/com/cloud/projects/dao/ProjectDaoImpl.java | 124 + .../cloud/projects/dao/ProjectInvitationDao.java | 44 + .../projects/dao/ProjectInvitationDaoImpl.java | 171 + .../com/cloud/secstorage/CommandExecLogDao.java | 25 + .../cloud/secstorage/CommandExecLogDaoImpl.java | 49 + .../src/com/cloud/secstorage/CommandExecLogVO.java | 112 + .../src/com/cloud/service/ServiceOfferingVO.java | 211 + .../com/cloud/service/dao/ServiceOfferingDao.java | 34 + .../cloud/service/dao/ServiceOfferingDaoImpl.java | 157 + .../src/com/cloud/storage/DiskOfferingVO.java | 318 + .../src/com/cloud/storage/GuestOSCategoryVO.java | 68 + engine/schema/src/com/cloud/storage/GuestOSVO.java | 90 + .../src/com/cloud/storage/LaunchPermissionVO.java | 57 + engine/schema/src/com/cloud/storage/S3VO.java | 209 + .../src/com/cloud/storage/SnapshotPolicyVO.java | 133 + .../src/com/cloud/storage/SnapshotScheduleVO.java | 125 + .../schema/src/com/cloud/storage/SnapshotVO.java | 228 + .../com/cloud/storage/StoragePoolHostAssoc.java | 35 + .../src/com/cloud/storage/StoragePoolHostVO.java | 109 + .../src/com/cloud/storage/StoragePoolWorkVO.java | 118 + engine/schema/src/com/cloud/storage/SwiftVO.java | 108 + engine/schema/src/com/cloud/storage/UploadVO.java | 268 + .../src/com/cloud/storage/VMTemplateDetailVO.java | 84 + .../src/com/cloud/storage/VMTemplateHostVO.java | 339 + .../src/com/cloud/storage/VMTemplateS3VO.java | 204 + .../com/cloud/storage/VMTemplateStoragePoolVO.java | 290 + .../src/com/cloud/storage/VMTemplateSwiftVO.java | 107 + .../schema/src/com/cloud/storage/VMTemplateVO.java | 529 ++ .../src/com/cloud/storage/VMTemplateZoneVO.java | 116 + .../schema/src/com/cloud/storage/VolumeHostVO.java | 364 + engine/schema/src/com/cloud/storage/VolumeVO.java | 454 ++ .../src/com/cloud/storage/dao/DiskOfferingDao.java | 31 + .../com/cloud/storage/dao/DiskOfferingDaoImpl.java | 152 + .../com/cloud/storage/dao/GuestOSCategoryDao.java | 24 + .../cloud/storage/dao/GuestOSCategoryDaoImpl.java | 34 + .../src/com/cloud/storage/dao/GuestOSDao.java | 26 + .../src/com/cloud/storage/dao/GuestOSDaoImpl.java | 51 + .../com/cloud/storage/dao/LaunchPermissionDao.java | 61 + .../cloud/storage/dao/LaunchPermissionDaoImpl.java | 158 + engine/schema/src/com/cloud/storage/dao/S3Dao.java | 29 + .../src/com/cloud/storage/dao/S3DaoImpl.java | 50 + .../src/com/cloud/storage/dao/SnapshotDao.java | 53 + .../src/com/cloud/storage/dao/SnapshotDaoImpl.java | 340 + .../com/cloud/storage/dao/SnapshotPolicyDao.java | 38 + .../cloud/storage/dao/SnapshotPolicyDaoImpl.java | 105 + .../com/cloud/storage/dao/SnapshotScheduleDao.java | 41 + .../cloud/storage/dao/SnapshotScheduleDaoImpl.java | 134 + .../storage/dao/StoragePoolDetailsDaoImpl.java | 85 + .../com/cloud/storage/dao/StoragePoolHostDao.java | 42 + .../cloud/storage/dao/StoragePoolHostDaoImpl.java | 184 + .../com/cloud/storage/dao/StoragePoolWorkDao.java | 38 + .../cloud/storage/dao/StoragePoolWorkDaoImpl.java | 136 + .../schema/src/com/cloud/storage/dao/SwiftDao.java | 31 + .../src/com/cloud/storage/dao/SwiftDaoImpl.java | 58 + .../src/com/cloud/storage/dao/UploadDao.java | 36 + .../src/com/cloud/storage/dao/UploadDaoImpl.java | 92 + .../src/com/cloud/storage/dao/VMTemplateDao.java | 66 + .../com/cloud/storage/dao/VMTemplateDaoImpl.java | 1128 +++ .../cloud/storage/dao/VMTemplateDetailsDao.java | 32 + .../storage/dao/VMTemplateDetailsDaoImpl.java | 99 + .../com/cloud/storage/dao/VMTemplateHostDao.java | 67 + .../cloud/storage/dao/VMTemplateHostDaoImpl.java | 427 ++ .../com/cloud/storage/dao/VMTemplatePoolDao.java | 49 + .../cloud/storage/dao/VMTemplatePoolDaoImpl.java | 304 + .../src/com/cloud/storage/dao/VMTemplateS3Dao.java | 36 + .../com/cloud/storage/dao/VMTemplateS3DaoImpl.java | 105 + .../com/cloud/storage/dao/VMTemplateSwiftDao.java | 37 + .../cloud/storage/dao/VMTemplateSwiftDaoImpl.java | 87 + .../com/cloud/storage/dao/VMTemplateZoneDao.java | 33 + .../cloud/storage/dao/VMTemplateZoneDaoImpl.java | 89 + .../src/com/cloud/storage/dao/VolumeDao.java | 92 + .../src/com/cloud/storage/dao/VolumeDaoImpl.java | 459 ++ .../src/com/cloud/storage/dao/VolumeHostDao.java | 40 + .../com/cloud/storage/dao/VolumeHostDaoImpl.java | 165 + .../schema/src/com/cloud/tags/ResourceTagVO.java | 160 + .../src/com/cloud/tags/dao/ResourceTagDao.java | 37 + .../com/cloud/tags/dao/ResourceTagsDaoImpl.java | 62 + .../src/com/cloud/upgrade/DatabaseCreator.java | 233 + .../cloud/upgrade/DatabaseIntegrityChecker.java | 264 + .../com/cloud/upgrade/DatabaseUpgradeChecker.java | 369 + .../upgrade/PremiumDatabaseUpgradeChecker.java | 148 + .../src/com/cloud/upgrade/dao/DbUpgrade.java | 45 + .../src/com/cloud/upgrade/dao/DbUpgradeUtils.java | 106 + .../src/com/cloud/upgrade/dao/Upgrade217to218.java | 66 + .../src/com/cloud/upgrade/dao/Upgrade218to22.java | 2382 +++++++ .../upgrade/dao/Upgrade218to224DomainVlans.java | 140 + .../cloud/upgrade/dao/Upgrade218to22Premium.java | 100 + .../com/cloud/upgrade/dao/Upgrade2210to2211.java | 64 + .../com/cloud/upgrade/dao/Upgrade2211to2212.java | 139 + .../upgrade/dao/Upgrade2211to2212Premium.java | 55 + .../com/cloud/upgrade/dao/Upgrade2212to2213.java | 104 + .../com/cloud/upgrade/dao/Upgrade2213to2214.java | 308 + .../src/com/cloud/upgrade/dao/Upgrade2214to30.java | 1326 ++++ .../src/com/cloud/upgrade/dao/Upgrade221to222.java | 66 + .../cloud/upgrade/dao/Upgrade221to222Premium.java | 61 + .../src/com/cloud/upgrade/dao/Upgrade222to224.java | 610 ++ .../cloud/upgrade/dao/Upgrade222to224Premium.java | 87 + .../src/com/cloud/upgrade/dao/Upgrade224to225.java | 351 + .../src/com/cloud/upgrade/dao/Upgrade225to226.java | 108 + .../src/com/cloud/upgrade/dao/Upgrade227to228.java | 157 + .../cloud/upgrade/dao/Upgrade227to228Premium.java | 132 + .../src/com/cloud/upgrade/dao/Upgrade228to229.java | 138 + .../com/cloud/upgrade/dao/Upgrade229to2210.java | 194 + .../src/com/cloud/upgrade/dao/Upgrade301to302.java | 229 + .../src/com/cloud/upgrade/dao/Upgrade302to40.java | 1033 +++ .../src/com/cloud/upgrade/dao/Upgrade30to301.java | 124 + .../src/com/cloud/upgrade/dao/Upgrade30xBase.java | 311 + .../src/com/cloud/upgrade/dao/Upgrade40to41.java | 164 + .../src/com/cloud/upgrade/dao/Upgrade410to420.java | 404 ++ .../cloud/upgrade/dao/UpgradeSnapshot217to224.java | 60 + .../cloud/upgrade/dao/UpgradeSnapshot223to224.java | 60 + .../src/com/cloud/upgrade/dao/VersionDao.java | 25 + .../src/com/cloud/upgrade/dao/VersionDaoImpl.java | 172 + .../src/com/cloud/upgrade/dao/VersionVO.java | 91 + .../cloud/usage/ExternalPublicIpStatisticsVO.java | 98 + .../src/com/cloud/usage/UsageIPAddressVO.java | 121 + engine/schema/src/com/cloud/usage/UsageJobVO.java | 180 + .../com/cloud/usage/UsageLoadBalancerPolicyVO.java | 91 + .../com/cloud/usage/UsageNetworkOfferingVO.java | 117 + .../schema/src/com/cloud/usage/UsageNetworkVO.java | 144 + .../com/cloud/usage/UsagePortForwardingRuleVO.java | 91 + .../src/com/cloud/usage/UsageSecurityGroupVO.java | 97 + .../schema/src/com/cloud/usage/UsageStorageVO.java | 115 + .../src/com/cloud/usage/UsageVMInstanceVO.java | 121 + engine/schema/src/com/cloud/usage/UsageVO.java | 260 + .../schema/src/com/cloud/usage/UsageVPNUserVO.java | 105 + .../schema/src/com/cloud/usage/UsageVolumeVO.java | 115 + .../usage/dao/ExternalPublicIpStatisticsDao.java | 33 + .../dao/ExternalPublicIpStatisticsDaoImpl.java | 77 + .../schema/src/com/cloud/usage/dao/UsageDao.java | 39 + .../src/com/cloud/usage/dao/UsageDaoImpl.java | 273 + .../src/com/cloud/usage/dao/UsageIPAddressDao.java | 28 + .../com/cloud/usage/dao/UsageIPAddressDaoImpl.java | 145 + .../src/com/cloud/usage/dao/UsageJobDao.java | 34 + .../src/com/cloud/usage/dao/UsageJobDaoImpl.java | 200 + .../usage/dao/UsageLoadBalancerPolicyDao.java | 29 + .../usage/dao/UsageLoadBalancerPolicyDaoImpl.java | 169 + .../src/com/cloud/usage/dao/UsageNetworkDao.java | 27 + .../com/cloud/usage/dao/UsageNetworkDaoImpl.java | 98 + .../cloud/usage/dao/UsageNetworkOfferingDao.java | 28 + .../usage/dao/UsageNetworkOfferingDaoImpl.java | 153 + .../usage/dao/UsagePortForwardingRuleDao.java | 29 + .../usage/dao/UsagePortForwardingRuleDaoImpl.java | 169 + .../com/cloud/usage/dao/UsageSecurityGroupDao.java | 28 + .../cloud/usage/dao/UsageSecurityGroupDaoImpl.java | 151 + .../src/com/cloud/usage/dao/UsageStorageDao.java | 31 + .../com/cloud/usage/dao/UsageStorageDaoImpl.java | 211 + .../com/cloud/usage/dao/UsageVMInstanceDao.java | 29 + .../cloud/usage/dao/UsageVMInstanceDaoImpl.java | 137 + .../src/com/cloud/usage/dao/UsageVPNUserDao.java | 28 + .../com/cloud/usage/dao/UsageVPNUserDaoImpl.java | 150 + .../src/com/cloud/usage/dao/UsageVolumeDao.java | 29 + .../com/cloud/usage/dao/UsageVolumeDaoImpl.java | 178 + .../schema/src/com/cloud/user/AccountDetailVO.java | 75 + .../src/com/cloud/user/AccountDetailsDao.java | 37 + .../src/com/cloud/user/AccountDetailsDaoImpl.java | 96 + engine/schema/src/com/cloud/user/AccountVO.java | 189 + engine/schema/src/com/cloud/user/SSHKeyPairVO.java | 119 + .../schema/src/com/cloud/user/UserAccountVO.java | 284 + .../src/com/cloud/user/UserStatisticsVO.java | 165 + .../schema/src/com/cloud/user/UserStatsLogVO.java | 132 + engine/schema/src/com/cloud/user/UserVO.java | 274 + .../schema/src/com/cloud/user/dao/AccountDao.java | 52 + .../src/com/cloud/user/dao/AccountDaoImpl.java | 267 + .../src/com/cloud/user/dao/SSHKeyPairDao.java | 38 + .../src/com/cloud/user/dao/SSHKeyPairDaoImpl.java | 85 + .../src/com/cloud/user/dao/UserAccountDao.java | 27 + .../src/com/cloud/user/dao/UserAccountDaoImpl.java | 69 + engine/schema/src/com/cloud/user/dao/UserDao.java | 52 + .../schema/src/com/cloud/user/dao/UserDaoImpl.java | 131 + .../src/com/cloud/user/dao/UserStatisticsDao.java | 35 + .../com/cloud/user/dao/UserStatisticsDaoImpl.java | 137 + .../src/com/cloud/user/dao/UserStatsLogDao.java | 23 + .../com/cloud/user/dao/UserStatsLogDaoImpl.java | 31 + engine/schema/src/com/cloud/vm/ConsoleProxyVO.java | 287 + engine/schema/src/com/cloud/vm/DomainRouterVO.java | 246 + .../src/com/cloud/vm/InstanceGroupVMMapVO.java | 71 + .../schema/src/com/cloud/vm/InstanceGroupVO.java | 120 + engine/schema/src/com/cloud/vm/ItWorkDao.java | 45 + engine/schema/src/com/cloud/vm/ItWorkDaoImpl.java | 108 + engine/schema/src/com/cloud/vm/ItWorkVO.java | 179 + engine/schema/src/com/cloud/vm/NicVO.java | 365 + .../src/com/cloud/vm/SecondaryStorageVmVO.java | 135 + .../src/com/cloud/vm/UserVmCloneSettingVO.java | 50 + engine/schema/src/com/cloud/vm/UserVmDetailVO.java | 85 + engine/schema/src/com/cloud/vm/UserVmVO.java | 141 + engine/schema/src/com/cloud/vm/VMInstanceVO.java | 482 ++ .../src/com/cloud/vm/dao/ConsoleProxyDao.java | 47 + .../src/com/cloud/vm/dao/ConsoleProxyDaoImpl.java | 353 + .../src/com/cloud/vm/dao/DomainRouterDao.java | 149 + .../src/com/cloud/vm/dao/DomainRouterDaoImpl.java | 358 + .../src/com/cloud/vm/dao/InstanceGroupDao.java | 36 + .../src/com/cloud/vm/dao/InstanceGroupDaoImpl.java | 80 + .../com/cloud/vm/dao/InstanceGroupVMMapDao.java | 28 + .../cloud/vm/dao/InstanceGroupVMMapDaoImpl.java | 75 + engine/schema/src/com/cloud/vm/dao/NicDao.java | 69 + engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java | 241 + .../src/com/cloud/vm/dao/NicSecondaryIpDao.java | 53 + .../com/cloud/vm/dao/NicSecondaryIpDaoImpl.java | 138 + .../src/com/cloud/vm/dao/NicSecondaryIpVO.java | 160 + .../com/cloud/vm/dao/SecondaryStorageVmDao.java | 42 + .../cloud/vm/dao/SecondaryStorageVmDaoImpl.java | 269 + .../com/cloud/vm/dao/UserVmCloneSettingDao.java | 37 + .../cloud/vm/dao/UserVmCloneSettingDaoImpl.java | 74 + engine/schema/src/com/cloud/vm/dao/UserVmDao.java | 76 + .../schema/src/com/cloud/vm/dao/UserVmDaoImpl.java | 585 ++ engine/schema/src/com/cloud/vm/dao/UserVmData.java | 723 ++ .../src/com/cloud/vm/dao/UserVmDetailsDao.java | 32 + .../src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java | 99 + .../schema/src/com/cloud/vm/dao/VMInstanceDao.java | 119 + .../src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 628 ++ .../src/com/cloud/vm/snapshot/VMSnapshotVO.java | 224 + .../com/cloud/vm/snapshot/dao/VMSnapshotDao.java | 39 + .../cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java | 161 + .../cloudstack/affinity/AffinityGroupVMMapVO.java | 66 + .../cloudstack/affinity/AffinityGroupVO.java | 114 + .../cloudstack/affinity/dao/AffinityGroupDao.java | 30 + .../affinity/dao/AffinityGroupDaoImpl.java | 102 + .../affinity/dao/AffinityGroupVMMapDao.java | 47 + .../affinity/dao/AffinityGroupVMMapDaoImpl.java | 167 + .../org/apache/cloudstack/region/RegionSyncVO.java | 93 + .../src/org/apache/cloudstack/region/RegionVO.java | 87 + .../apache/cloudstack/region/dao/RegionDao.java | 27 + .../cloudstack/region/dao/RegionDaoImpl.java | 48 + .../region/gslb/GlobalLoadBalancerDaoImpl.java | 58 + .../gslb/GlobalLoadBalancerLbRuleMapDao.java | 30 + .../gslb/GlobalLoadBalancerLbRuleMapDaoImpl.java | 63 + .../region/gslb/GlobalLoadBalancerLbRuleMapVO.java | 83 + .../region/gslb/GlobalLoadBalancerRuleDao.java | 28 + .../region/gslb/GlobalLoadBalancerRuleVO.java | 183 + .../storage/motion/AncientDataMotionStrategy.java | 59 +- .../storage/motion/DataMotionServiceImpl.java | 16 + .../storage/image/TemplateDataFactoryImpl.java | 2 +- .../storage/image/TemplateServiceImpl.java | 50 +- .../storage/image/store/TemplateObject.java | 4 +- engine/storage/integration-test/pom.xml | 12 + .../MockLocalNfsSecondaryStorageResource.java | 25 +- .../StorageAllocatorTestConfiguration.java | 4 +- .../storage/test/ChildTestConfiguration.java | 4 +- .../storage/test/DirectAgentManagerSimpleImpl.java | 49 +- .../cloudstack/storage/test/DirectAgentTest.java | 19 +- .../test/MockHypervisorHostEndPointRpcServer.java | 72 + .../test/MockHypervsiorHostEndPointRpcServer.java | 72 - .../storage/test/MockStorageMotionStrategy.java | 20 + .../cloudstack/storage/test/S3TemplateTest.java | 16 + .../cloudstack/storage/test/TemplateTest.java | 16 + .../cloudstack/storage/test/VolumeTestVmware.java | 445 ++ .../integration-test/test/resource/component.xml | 2 +- .../storage/snapshot/SnapshotObject.java | 6 +- .../storage/snapshot/SnapshotStrategyBase.java | 16 + .../snapshot/XenserverSnapshotStrategy.java | 16 + .../storage/HypervisorHostEndPointRpcServer.java | 119 + .../storage/HypervsiorHostEndPointRpcServer.java | 119 - .../cloudstack/storage/LocalHostEndpoint.java | 30 +- .../cloudstack/storage/RemoteHostEndPoint.java | 96 +- .../allocator/AbstractStoragePoolAllocator.java | 2 +- .../allocator/ZoneWideStoragePoolAllocator.java | 2 +- .../storage/datastore/DataObjectManagerImpl.java | 6 +- .../datastore/ObjectInDataStoreManager.java | 2 +- .../datastore/ObjectInDataStoreManagerImpl.java | 2 +- .../cloudstack/storage/db/ObjectInDataStoreVO.java | 2 +- .../storage/endpoint/DefaultEndPointSelector.java | 2 +- .../storage/datastore/PrimaryDataStoreImpl.java | 2 +- .../volume/TemplateInstallStrategyImpl.java | 6 +- .../cloudstack/storage/volume/VolumeObject.java | 6 +- .../storage/volume/VolumeServiceImpl.java | 216 +- framework/api/pom.xml | 42 - .../framework/async/AsyncCallFuture.java | 84 - .../framework/async/AsyncCompletionCallback.java | 23 - framework/events/pom.xml | 51 +- framework/ipc/pom.xml | 20 +- .../framework/async/AsyncCallFuture.java | 84 + .../framework/async/AsyncCompletionCallback.java | 23 + .../framework/client/ClientEventBus.java | 4 +- .../framework/client/ClientTransportProvider.java | 2 +- .../cloudstack/framework/eventbus/EventBus.java | 32 - .../framework/eventbus/EventBusBase.java | 308 - .../framework/eventbus/EventBusEndpoint.java | 61 - .../framework/eventbus/EventDispatcher.java | 104 - .../framework/eventbus/EventHandler.java | 30 - .../framework/eventbus/PublishScope.java | 24 - .../cloudstack/framework/eventbus/Subscriber.java | 24 - .../framework/messagebus/MessageBus.java | 34 + .../framework/messagebus/MessageBusBase.java | 408 ++ .../framework/messagebus/MessageBusEndpoint.java | 61 + .../framework/messagebus/MessageDispatcher.java | 104 + .../framework/messagebus/MessageHandler.java | 30 + .../framework/messagebus/MessageSubscriber.java | 24 + .../framework/messagebus/PublishScope.java | 24 + .../framework/server/ServerEventBus.java | 4 +- .../sampleserver/SampleManagerComponent.java | 12 +- .../sampleserver/SampleManagerComponent2.java | 12 +- .../cloudstack/messagebus/TestMessageBus.java | 116 + .../ipc/test/resources/MessageBusTestContext.xml | 51 + framework/jobs/pom.xml | 33 +- framework/pom.xml | 2 +- packaging/centos63/cloud-agent.rc | 3 +- packaging/centos63/cloud-usage.rc | 2 +- packaging/centos63/cloud.spec | 32 +- packaging/centos63/package.sh | 219 +- packaging/centos63/replace.properties | 2 +- packaging/debian/init/cloud-management | 2 +- packaging/debian/replace.properties | 2 +- patches/systemvm/debian/config/etc/dnsmasq.conf | 634 -- .../systemvm/debian/config/etc/dnsmasq.conf.tmpl | 634 ++ .../debian/config/etc/init.d/cloud-early-config | 74 +- patches/systemvm/debian/config/etc/vpcdnsmasq.conf | 3 - .../config/opt/cloud/bin/vpc_privateGateway.sh | 2 +- patches/systemvm/debian/config/root/edithosts.sh | 30 +- .../host-anti-affinity/pom.xml | 33 + .../affinity/HostAntiAffinityProcessor.java | 93 + .../cloudstack/syslog/AlertsSyslogAppender.java | 4 +- .../discovery/ApiDiscoveryServiceImpl.java | 4 + .../manager/allocator/impl/RandomAllocator.java | 56 + .../hypervisor/kvm/resource/KVMHAMonitor.java | 54 +- .../kvm/resource/LibvirtComputingResource.java | 217 +- .../hypervisor/kvm/resource/LibvirtConnection.java | 14 +- .../hypervisor/kvm/resource/LibvirtVMDef.java | 6 +- .../kvm/storage/KVMStoragePoolManager.java | 12 +- .../kvm/storage/KVMStorageProcessor.java | 879 +++ .../hypervisor/kvm/storage/KVMStorageResource.java | 87 + .../com/cloud/ovm/hypervisor/OvmResourceBase.java | 26 +- plugins/hypervisors/simulator/pom.xml | 5 + .../cloud/agent/manager/SimulatorManagerImpl.java | 82 +- .../com/cloud/resource/AgentStorageResource.java | 2 +- .../resource/SimulatorSecondaryDiscoverer.java | 3 +- .../src/com/cloud/simulator/MockSecStorageVO.java | 3 +- .../src/com/cloud/simulator/MockStoragePoolVO.java | 3 +- .../src/com/cloud/simulator/MockVolumeVO.java | 3 +- plugins/hypervisors/vmware/pom.xml | 5 + .../src/com/cloud/hypervisor/guru/VMwareGuru.java | 89 +- .../vmware/manager/VmwareManagerImpl.java | 6 +- .../vmware/manager/VmwareStorageManager.java | 4 + .../vmware/manager/VmwareStorageManagerImpl.java | 401 +- .../hypervisor/vmware/resource/VmwareResource.java | 383 +- .../resource/PremiumSecondaryStorageResource.java | 2 + .../VmwareSecondaryStorageResourceHandler.java | 40 +- .../storage/resource/VmwareStorageProcessor.java | 1157 ++++ .../xen/discoverer/XcpServerDiscoverer.java | 7 +- .../hypervisor/xen/resource/CitrixHelper.java | 90 +- .../xen/resource/CitrixResourceBase.java | 104 +- .../hypervisor/xen/resource/XcpServerResource.java | 11 +- .../xen/resource/XenServer56FP1Resource.java | 22 +- .../xen/resource/XenServer610Resource.java | 364 +- .../xen/resource/XenServerStorageProcessor.java | 1404 ++++ .../xen/resource/XenServerStorageResource.java | 1327 ---- .../motion/XenServerStorageMotionStrategy.java | 242 + .../cloud/network/element/BigSwitchVnsElement.java | 4 +- plugins/network-elements/cisco-vnmc/pom.xml | 42 + .../scripts/network/cisco/assoc-asa1000v.xml | 34 + .../network/cisco/associate-acl-policy-set.xml | 37 + .../network/cisco/associate-dhcp-policy.xml | 34 + .../network/cisco/associate-dhcp-server.xml | 32 + .../network/cisco/associate-nat-policy-set.xml | 35 + .../network/cisco/associate-route-policy.xml | 33 + .../network/cisco/create-acl-policy-ref.xml | 38 + .../network/cisco/create-acl-policy-set.xml | 36 + .../scripts/network/cisco/create-acl-policy.xml | 35 + .../network/cisco/create-acl-rule-for-dnat.xml | 82 + .../network/cisco/create-acl-rule-for-pf.xml | 156 + .../scripts/network/cisco/create-dhcp-policy.xml | 72 + .../scripts/network/cisco/create-dnat-rule.xml | 91 + .../network/cisco/create-edge-device-profile.xml | 32 + .../cisco/create-edge-device-route-policy.xml | 30 + .../network/cisco/create-edge-device-route.xml | 35 + .../scripts/network/cisco/create-edge-firewall.xml | 89 + .../network/cisco/create-edge-security-profile.xml | 41 + .../network/cisco/create-egress-acl-rule.xml | 201 + .../cisco/create-generic-egress-acl-rule.xml | 122 + .../cisco/create-generic-ingress-acl-rule.xml | 121 + .../network/cisco/create-ingress-acl-rule.xml | 201 + .../scripts/network/cisco/create-ip-pool.xml | 58 + .../network/cisco/create-nat-policy-ref.xml | 38 + .../network/cisco/create-nat-policy-set.xml | 37 + .../scripts/network/cisco/create-nat-policy.xml | 33 + .../scripts/network/cisco/create-pf-rule.xml | 166 + .../scripts/network/cisco/create-port-pool.xml | 72 + .../network/cisco/create-source-nat-pool.xml | 58 + .../network/cisco/create-source-nat-rule.xml | 103 + .../scripts/network/cisco/create-tenant.xml | 29 + .../scripts/network/cisco/create-vdc.xml | 30 + .../network/cisco/delete-acl-policy-set.xml | 30 + .../scripts/network/cisco/delete-acl-policy.xml | 33 + .../scripts/network/cisco/delete-edge-firewall.xml | 30 + .../network/cisco/delete-edge-security-profile.xml | 38 + .../network/cisco/delete-nat-policy-set.xml | 30 + .../scripts/network/cisco/delete-nat-policy.xml | 33 + .../scripts/network/cisco/delete-rule.xml | 31 + .../scripts/network/cisco/delete-tenant.xml | 30 + .../scripts/network/cisco/delete-vdc.xml | 30 + .../scripts/network/cisco/disassoc-asa1000v.xml | 30 + .../scripts/network/cisco/list-acl-policies.xml | 31 + .../scripts/network/cisco/list-children.xml | 27 + .../scripts/network/cisco/list-nat-policies.xml | 31 + .../network/cisco/list-policyrefs-in-policyset.xml | 31 + .../scripts/network/cisco/list-tenants.xml | 26 + .../network/cisco/list-unassigned-asa1000v.xml | 39 + .../cisco-vnmc/scripts/network/cisco/login.xml | 20 + ...AssociateAsaWithLogicalEdgeFirewallCommand.java | 53 + .../api/CleanupLogicalEdgeFirewallCommand.java | 43 + .../agent/api/ConfigureNexusVsmForAsaCommand.java | 95 + .../api/CreateLogicalEdgeFirewallCommand.java | 94 + .../api/commands/AddCiscoAsa1000vResourceCmd.java | 116 + .../api/commands/AddCiscoVnmcResourceCmd.java | 115 + .../commands/DeleteCiscoAsa1000vResourceCmd.java | 93 + .../api/commands/DeleteCiscoVnmcResourceCmd.java | 93 + .../commands/ListCiscoAsa1000vResourcesCmd.java | 110 + .../api/commands/ListCiscoVnmcResourcesCmd.java | 106 + .../response/CiscoAsa1000vResourceResponse.java | 88 + .../api/response/CiscoVnmcResourceResponse.java | 75 + .../cloud/network/cisco/CiscoAsa1000vDevice.java | 39 + .../cloud/network/cisco/CiscoAsa1000vDeviceVO.java | 101 + .../cloud/network/cisco/CiscoVnmcConnection.java | 196 + .../network/cisco/CiscoVnmcConnectionImpl.java | 1415 ++++ .../cloud/network/cisco/CiscoVnmcController.java | 40 + .../cloud/network/cisco/CiscoVnmcControllerVO.java | 102 + .../cloud/network/cisco/NetworkAsa1000vMap.java | 31 + .../cloud/network/cisco/NetworkAsa1000vMapVO.java | 73 + .../com/cloud/network/dao/CiscoAsa1000vDao.java | 33 + .../cloud/network/dao/CiscoAsa1000vDaoImpl.java | 63 + .../src/com/cloud/network/dao/CiscoVnmcDao.java | 32 + .../com/cloud/network/dao/CiscoVnmcDaoImpl.java | 51 + .../cloud/network/dao/NetworkAsa1000vMapDao.java | 28 + .../network/dao/NetworkAsa1000vMapDaoImpl.java | 61 + .../network/element/CiscoAsa1000vService.java | 43 + .../cloud/network/element/CiscoVnmcElement.java | 926 +++ .../network/element/CiscoVnmcElementService.java | 42 + .../cloud/network/resource/CiscoVnmcResource.java | 780 +++ .../contrib/ssl/EasySSLProtocolSocketFactory.java | 232 + .../contrib/ssl/EasyX509TrustManager.java | 114 + .../network/cisco/CiscoVnmcConnectionTest.java | 248 + .../network/element/CiscoVnmcElementTest.java | 401 ++ .../network/resource/CiscoVnmcResourceTest.java | 285 + .../dns-notifier/resources/components-example.xml | 2 +- .../element/F5ExternalLoadBalancerElement.java | 15 +- .../element/JuniperSRXExternalFirewallElement.java | 60 +- .../cloud/network/resource/JuniperSrxResource.java | 322 +- plugins/network-elements/netscaler/pom.xml | 6 +- .../cloud/network/element/NetscalerElement.java | 73 +- .../cloud/network/resource/NetscalerResource.java | 109 +- .../api/commands/DeleteNiciraNvpDeviceCmd.java | 2 +- .../cloud/network/element/NiciraNvpElement.java | 5 + .../src/com/cloud/network/nicira/NiciraNvpTag.java | 17 +- .../network/element/NiciraNvpElementTest.java | 238 +- .../com/cloud/network/nicira/NiciraTagTest.java | 54 + plugins/pom.xml | 5 +- .../driver/CloudStackImageStoreDriverImpl.java | 19 +- .../datastore/driver/S3ImageStoreDriverImpl.java | 19 +- .../driver/SampleImageStoreDriverImpl.java | 4 +- .../driver/SwiftImageStoreDriverImpl.java | 10 +- .../CloudStackPrimaryDataStoreDriverImpl.java | 4 +- .../CloudStackPrimaryDataStoreLifeCycleImpl.java | 45 +- .../CloudStackPrimaryDataStoreProviderImpl.java | 6 +- .../driver/SamplePrimaryDataStoreDriverImpl.java | 6 +- .../SamplePrimaryDatastoreProviderImpl.java | 6 +- .../driver/SolidfirePrimaryDataStoreDriver.java | 2 +- pom.xml | 161 +- scripts/network/exdhcp/dnsmasq_edithosts.sh | 19 +- scripts/network/juniper/application-add.xml | 2 +- scripts/network/juniper/security-policy-add.xml | 4 +- scripts/vm/hypervisor/kvm/patchviasocket.pl | 2 +- scripts/vm/network/security_group.py | 2 +- scripts/vm/systemvm/injectkeys.sh | 26 +- server/pom.xml | 101 +- .../agent/manager/allocator/HostAllocator.java | 23 +- .../manager/allocator/impl/FirstFitAllocator.java | 47 + .../manager/allocator/impl/TestingAllocator.java | 7 + server/src/com/cloud/alert/AlertManager.java | 58 + server/src/com/cloud/alert/AlertManagerImpl.java | 30 +- server/src/com/cloud/alert/dao/AlertDao.java | 33 - server/src/com/cloud/alert/dao/AlertDaoImpl.java | 156 - server/src/com/cloud/api/ApiDBUtils.java | 68 +- server/src/com/cloud/api/ApiDispatcher.java | 9 - server/src/com/cloud/api/ApiResponseHelper.java | 435 +- server/src/com/cloud/api/ApiServer.java | 168 +- server/src/com/cloud/api/ApiServerService.java | 1 + server/src/com/cloud/api/ApiServlet.java | 6 +- .../src/com/cloud/api/query/QueryManagerImpl.java | 232 +- .../com/cloud/api/query/ViewResponseHelper.java | 57 +- .../cloud/api/query/dao/AccountJoinDaoImpl.java | 14 +- .../cloud/api/query/dao/AffinityGroupJoinDao.java | 37 + .../api/query/dao/AffinityGroupJoinDaoImpl.java | 143 + .../api/query/dao/DomainRouterJoinDaoImpl.java | 7 +- .../src/com/cloud/api/query/dao/HostJoinDao.java | 5 + .../com/cloud/api/query/dao/HostJoinDaoImpl.java | 142 +- .../api/query/dao/SecurityGroupJoinDaoImpl.java | 6 +- .../cloud/api/query/dao/StoragePoolJoinDao.java | 6 + .../api/query/dao/StoragePoolJoinDaoImpl.java | 66 +- .../api/query/dao/UserAccountJoinDaoImpl.java | 7 +- .../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 34 +- .../com/cloud/api/query/dao/VolumeJoinDaoImpl.java | 9 +- .../src/com/cloud/api/query/vo/AccountJoinVO.java | 16 +- .../cloud/api/query/vo/AffinityGroupJoinVO.java | 259 + .../com/cloud/api/query/vo/DomainRouterJoinVO.java | 18 +- server/src/com/cloud/api/query/vo/HostJoinVO.java | 17 +- .../cloud/api/query/vo/SecurityGroupJoinVO.java | 6 +- .../com/cloud/api/query/vo/StoragePoolJoinVO.java | 17 +- .../com/cloud/api/query/vo/UserAccountJoinVO.java | 22 +- .../src/com/cloud/api/query/vo/UserVmJoinVO.java | 56 +- .../src/com/cloud/api/query/vo/VolumeJoinVO.java | 21 +- server/src/com/cloud/async/AsyncJobVO.java | 401 ++ server/src/com/cloud/async/SyncQueueItemVO.java | 141 + server/src/com/cloud/async/SyncQueueVO.java | 137 + .../com/cloud/capacity/CapacityManagerImpl.java | 92 +- .../cloud/capacity/StorageCapacityListener.java | 16 +- server/src/com/cloud/capacity/dao/CapacityDao.java | 45 - .../com/cloud/capacity/dao/CapacityDaoImpl.java | 806 --- .../com/cloud/certificate/dao/CertificateDao.java | 24 - .../cloud/certificate/dao/CertificateDaoImpl.java | 63 - server/src/com/cloud/cluster/CheckPointVO.java | 121 - .../cluster/ClusterInvalidSessionException.java | 33 - .../cloud/cluster/ManagementServerHostPeerVO.java | 120 - .../com/cloud/cluster/ManagementServerHostVO.java | 182 - .../cloud/cluster/agentlb/HostTransferMapVO.java | 98 - .../cluster/agentlb/dao/HostTransferMapDao.java | 45 - .../agentlb/dao/HostTransferMapDaoImpl.java | 146 - .../cloud/cluster/dao/ManagementServerHostDao.java | 48 - .../cluster/dao/ManagementServerHostDaoImpl.java | 276 - .../cluster/dao/ManagementServerHostPeerDao.java | 27 - .../dao/ManagementServerHostPeerDaoImpl.java | 108 - server/src/com/cloud/cluster/dao/StackMaidDao.java | 44 - .../com/cloud/cluster/dao/StackMaidDaoImpl.java | 208 - server/src/com/cloud/configuration/Config.java | 107 +- .../cloud/configuration/ConfigurationManager.java | 7 +- .../configuration/ConfigurationManagerImpl.java | 411 +- .../cloud/configuration/dao/ConfigurationDao.java | 68 - .../configuration/dao/ConfigurationDaoImpl.java | 225 - .../cloud/configuration/dao/ResourceCountDao.java | 58 - .../configuration/dao/ResourceCountDaoImpl.java | 222 - .../cloud/configuration/dao/ResourceLimitDao.java | 35 - .../configuration/dao/ResourceLimitDaoImpl.java | 100 - .../AgentBasedConsoleProxyManager.java | 188 +- server/src/com/cloud/consoleproxy/AgentHook.java | 5 +- .../src/com/cloud/consoleproxy/AgentHookBase.java | 289 + .../cloud/consoleproxy/ConsoleProxyManager.java | 18 +- .../consoleproxy/ConsoleProxyManagerImpl.java | 573 +-- .../cloud/consoleproxy/ConsoleProxyService.java | 25 + .../consoleproxy/StaticConsoleProxyManager.java | 84 +- server/src/com/cloud/dc/AccountVlanMapVO.java | 65 - server/src/com/cloud/dc/ClusterDetailsDao.java | 32 - server/src/com/cloud/dc/ClusterDetailsDaoImpl.java | 125 - server/src/com/cloud/dc/ClusterDetailsVO.java | 74 - server/src/com/cloud/dc/ClusterVO.java | 189 - server/src/com/cloud/dc/ClusterVSMMapVO.java | 62 - server/src/com/cloud/dc/DataCenterIpAddressVO.java | 115 - .../cloud/dc/DataCenterLinkLocalIpAddressVO.java | 108 - server/src/com/cloud/dc/DataCenterVO.java | 460 -- server/src/com/cloud/dc/DataCenterVnetVO.java | 109 - server/src/com/cloud/dc/DcDetailVO.java | 73 - server/src/com/cloud/dc/HostPodVO.java | 197 - server/src/com/cloud/dc/PodCluster.java | 67 - server/src/com/cloud/dc/PodVlanMapVO.java | 62 - server/src/com/cloud/dc/PodVlanVO.java | 98 - .../com/cloud/dc/StorageNetworkIpAddressVO.java | 120 - .../src/com/cloud/dc/StorageNetworkIpRangeVO.java | 184 - server/src/com/cloud/dc/VlanVO.java | 196 - server/src/com/cloud/dc/dao/AccountVlanMapDao.java | 30 - .../com/cloud/dc/dao/AccountVlanMapDaoImpl.java | 75 - server/src/com/cloud/dc/dao/ClusterDao.java | 37 - server/src/com/cloud/dc/dao/ClusterDaoImpl.java | 241 - server/src/com/cloud/dc/dao/ClusterVSMMapDao.java | 29 - .../src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java | 95 - server/src/com/cloud/dc/dao/DataCenterDao.java | 80 - server/src/com/cloud/dc/dao/DataCenterDaoImpl.java | 404 -- .../com/cloud/dc/dao/DataCenterIpAddressDao.java | 38 - .../cloud/dc/dao/DataCenterIpAddressDaoImpl.java | 225 - .../dc/dao/DataCenterLinkLocalIpAddressDao.java | 32 - .../dao/DataCenterLinkLocalIpAddressDaoImpl.java | 188 - server/src/com/cloud/dc/dao/DataCenterVnetDao.java | 38 - .../com/cloud/dc/dao/DataCenterVnetDaoImpl.java | 186 - server/src/com/cloud/dc/dao/DcDetailsDao.java | 32 - server/src/com/cloud/dc/dao/DcDetailsDaoImpl.java | 97 - server/src/com/cloud/dc/dao/HostPodDao.java | 35 - server/src/com/cloud/dc/dao/HostPodDaoImpl.java | 134 - server/src/com/cloud/dc/dao/PodVlanDao.java | 30 - server/src/com/cloud/dc/dao/PodVlanDaoImpl.java | 139 - server/src/com/cloud/dc/dao/PodVlanMapDao.java | 30 - server/src/com/cloud/dc/dao/PodVlanMapDaoImpl.java | 75 - .../cloud/dc/dao/StorageNetworkIpAddressDao.java | 32 - .../dc/dao/StorageNetworkIpAddressDaoImpl.java | 114 - .../com/cloud/dc/dao/StorageNetworkIpRangeDao.java | 32 - .../cloud/dc/dao/StorageNetworkIpRangeDaoImpl.java | 78 - server/src/com/cloud/dc/dao/VlanDao.java | 53 - server/src/com/cloud/dc/dao/VlanDaoImpl.java | 315 - .../cloud/deploy/DeploymentPlanningManager.java | 45 + .../deploy/DeploymentPlanningManagerImpl.java | 106 + server/src/com/cloud/deploy/FirstFitPlanner.java | 158 +- server/src/com/cloud/domain/DomainVO.java | 215 - server/src/com/cloud/domain/dao/DomainDao.java | 34 - server/src/com/cloud/domain/dao/DomainDaoImpl.java | 275 - server/src/com/cloud/host/dao/HostDao.java | 83 - server/src/com/cloud/host/dao/HostDaoImpl.java | 920 --- server/src/com/cloud/host/dao/HostDetailsDao.java | 32 - .../src/com/cloud/host/dao/HostDetailsDaoImpl.java | 110 - server/src/com/cloud/host/dao/HostTagsDao.java | 30 - server/src/com/cloud/host/dao/HostTagsDaoImpl.java | 75 - .../com/cloud/hypervisor/HypervisorGuruBase.java | 9 +- .../hypervisor/dao/HypervisorCapabilitiesDao.java | 36 - .../dao/HypervisorCapabilitiesDaoImpl.java | 98 - server/src/com/cloud/keystore/KeystoreDao.java | 29 - server/src/com/cloud/keystore/KeystoreDaoImpl.java | 118 - server/src/com/cloud/keystore/KeystoreVO.java | 101 - server/src/com/cloud/maint/AgentUpgradeVO.java | 63 - server/src/com/cloud/maint/UpgradeManager.java | 47 - server/src/com/cloud/maint/UpgradeManagerImpl.java | 189 - .../src/com/cloud/maint/UpgradeManagerMBean.java | 23 - server/src/com/cloud/maint/UpgradeMonitor.java | 34 - server/src/com/cloud/maint/Version.java | 66 - .../src/com/cloud/maint/dao/AgentUpgradeDao.java | 23 - .../com/cloud/maint/dao/AgentUpgradeDaoImpl.java | 29 - .../com/cloud/migration/Db21to22MigrationUtil.java | 228 - .../migration/Db22beta4to22GAMigrationUtil.java | 128 - .../src/com/cloud/migration/DiskOffering20Dao.java | 22 - .../com/cloud/migration/DiskOffering20DaoImpl.java | 27 - .../src/com/cloud/migration/DiskOffering20VO.java | 113 - .../src/com/cloud/migration/DiskOffering21Dao.java | 23 - .../com/cloud/migration/DiskOffering21DaoImpl.java | 27 - .../src/com/cloud/migration/DiskOffering21VO.java | 257 - .../com/cloud/migration/ServiceOffering20Dao.java | 22 - .../cloud/migration/ServiceOffering20DaoImpl.java | 27 - .../com/cloud/migration/ServiceOffering20VO.java | 199 - .../com/cloud/migration/ServiceOffering21Dao.java | 22 - .../cloud/migration/ServiceOffering21DaoImpl.java | 27 - .../com/cloud/migration/ServiceOffering21VO.java | 178 - .../cloud/network/ExteralIpAddressAllocator.java | 165 - .../network/ExternalFirewallDeviceManagerImpl.java | 26 +- .../cloud/network/ExternalIpAddressAllocator.java | 165 + .../ExternalLoadBalancerDeviceManagerImpl.java | 6 +- server/src/com/cloud/network/IpAddrAllocator.java | 2 +- .../com/cloud/network/LBHealthCheckPolicyVO.java | 157 - .../src/com/cloud/network/NetworkManagerImpl.java | 416 +- server/src/com/cloud/network/NetworkModelImpl.java | 53 +- .../src/com/cloud/network/NetworkServiceImpl.java | 991 ++- server/src/com/cloud/network/UserIpv6Address.java | 52 - .../src/com/cloud/network/UserIpv6AddressVO.java | 188 - server/src/com/cloud/network/addr/PublicIp.java | 18 +- .../network/as/AutoScalePolicyConditionMapVO.java | 61 - .../com/cloud/network/as/AutoScalePolicyVO.java | 134 - .../network/as/AutoScaleVmGroupPolicyMapVO.java | 64 - .../com/cloud/network/as/AutoScaleVmGroupVO.java | 191 - .../com/cloud/network/as/AutoScaleVmProfileVO.java | 218 - server/src/com/cloud/network/as/ConditionVO.java | 129 - server/src/com/cloud/network/as/CounterVO.java | 111 - .../as/dao/AutoScalePolicyConditionMapDao.java | 28 - .../as/dao/AutoScalePolicyConditionMapDaoImpl.java | 61 - .../cloud/network/as/dao/AutoScalePolicyDao.java | 24 - .../network/as/dao/AutoScalePolicyDaoImpl.java | 38 - .../cloud/network/as/dao/AutoScaleVmGroupDao.java | 28 - .../network/as/dao/AutoScaleVmGroupDaoImpl.java | 65 - .../as/dao/AutoScaleVmGroupPolicyMapDao.java | 30 - .../as/dao/AutoScaleVmGroupPolicyMapDaoImpl.java | 77 - .../network/as/dao/AutoScaleVmProfileDao.java | 25 - .../network/as/dao/AutoScaleVmProfileDaoImpl.java | 38 - .../src/com/cloud/network/as/dao/ConditionDao.java | 28 - .../com/cloud/network/as/dao/ConditionDaoImpl.java | 56 - .../src/com/cloud/network/as/dao/CounterDao.java | 29 - .../com/cloud/network/as/dao/CounterDaoImpl.java | 70 - .../network/dao/ExternalFirewallDeviceDao.java | 58 - .../network/dao/ExternalFirewallDeviceDaoImpl.java | 96 - .../network/dao/ExternalFirewallDeviceVO.java | 161 - .../network/dao/ExternalLoadBalancerDeviceDao.java | 74 - .../dao/ExternalLoadBalancerDeviceDaoImpl.java | 127 - .../network/dao/ExternalLoadBalancerDeviceVO.java | 227 - .../cloud/network/dao/FirewallRulesCidrsDao.java | 29 - .../network/dao/FirewallRulesCidrsDaoImpl.java | 70 - .../cloud/network/dao/FirewallRulesCidrsVO.java | 65 - .../com/cloud/network/dao/FirewallRulesDao.java | 65 - .../cloud/network/dao/FirewallRulesDaoImpl.java | 352 - server/src/com/cloud/network/dao/IPAddressDao.java | 71 - .../com/cloud/network/dao/IPAddressDaoImpl.java | 376 - server/src/com/cloud/network/dao/IPAddressVO.java | 309 - .../network/dao/InlineLoadBalancerNicMapDao.java | 24 - .../dao/InlineLoadBalancerNicMapDaoImpl.java | 46 - .../network/dao/InlineLoadBalancerNicMapVO.java | 60 - .../cloud/network/dao/LBHealthCheckPolicyDao.java | 35 - .../network/dao/LBHealthCheckPolicyDaoImpl.java | 71 - .../cloud/network/dao/LBStickinessPolicyDao.java | 34 - .../network/dao/LBStickinessPolicyDaoImpl.java | 69 - .../cloud/network/dao/LBStickinessPolicyVO.java | 145 - .../src/com/cloud/network/dao/LoadBalancerDao.java | 36 - .../com/cloud/network/dao/LoadBalancerDaoImpl.java | 137 - .../cloud/network/dao/LoadBalancerVMMapDao.java | 31 - .../network/dao/LoadBalancerVMMapDaoImpl.java | 97 - .../com/cloud/network/dao/LoadBalancerVMMapVO.java | 89 - .../src/com/cloud/network/dao/LoadBalancerVO.java | 98 - .../com/cloud/network/dao/NetworkAccountDao.java | 22 - .../cloud/network/dao/NetworkAccountDaoImpl.java | 29 - .../com/cloud/network/dao/NetworkAccountVO.java | 72 - server/src/com/cloud/network/dao/NetworkDao.java | 114 - .../src/com/cloud/network/dao/NetworkDaoImpl.java | 621 -- .../com/cloud/network/dao/NetworkDomainDao.java | 27 - .../cloud/network/dao/NetworkDomainDaoImpl.java | 75 - .../src/com/cloud/network/dao/NetworkDomainVO.java | 72 - .../network/dao/NetworkExternalFirewallDao.java | 38 - .../dao/NetworkExternalFirewallDaoImpl.java | 61 - .../network/dao/NetworkExternalFirewallVO.java | 88 - .../dao/NetworkExternalLoadBalancerDao.java | 38 - .../dao/NetworkExternalLoadBalancerDaoImpl.java | 62 - .../network/dao/NetworkExternalLoadBalancerVO.java | 89 - server/src/com/cloud/network/dao/NetworkOpDao.java | 26 - .../com/cloud/network/dao/NetworkOpDaoImpl.java | 84 - server/src/com/cloud/network/dao/NetworkOpVO.java | 76 - .../cloud/network/dao/NetworkRuleConfigDao.java | 26 - .../network/dao/NetworkRuleConfigDaoImpl.java | 51 - .../com/cloud/network/dao/NetworkRuleConfigVO.java | 93 - .../cloud/network/dao/NetworkServiceMapDao.java | 38 - .../network/dao/NetworkServiceMapDaoImpl.java | 167 - .../com/cloud/network/dao/NetworkServiceMapVO.java | 92 - server/src/com/cloud/network/dao/NetworkVO.java | 543 -- .../com/cloud/network/dao/PhysicalNetworkDao.java | 28 - .../cloud/network/dao/PhysicalNetworkDaoImpl.java | 79 - .../dao/PhysicalNetworkIsolationMethodDaoImpl.java | 70 - .../dao/PhysicalNetworkIsolationMethodVO.java | 68 - .../dao/PhysicalNetworkServiceProviderDao.java | 28 - .../dao/PhysicalNetworkServiceProviderDaoImpl.java | 131 - .../dao/PhysicalNetworkServiceProviderVO.java | 322 - .../network/dao/PhysicalNetworkTagDaoImpl.java | 63 - .../cloud/network/dao/PhysicalNetworkTagVO.java | 68 - .../network/dao/PhysicalNetworkTrafficTypeDao.java | 33 - .../dao/PhysicalNetworkTrafficTypeDaoImpl.java | 143 - .../network/dao/PhysicalNetworkTrafficTypeVO.java | 149 - .../com/cloud/network/dao/PhysicalNetworkVO.java | 234 - .../src/com/cloud/network/dao/PortProfileDao.java | 50 - .../com/cloud/network/dao/PortProfileDaoImpl.java | 89 - .../src/com/cloud/network/dao/PortProfileVO.java | 204 - .../com/cloud/network/dao/RemoteAccessVpnDao.java | 30 - .../cloud/network/dao/RemoteAccessVpnDaoImpl.java | 84 - .../com/cloud/network/dao/RemoteAccessVpnVO.java | 142 - .../com/cloud/network/dao/RouterNetworkDao.java | 26 - .../cloud/network/dao/RouterNetworkDaoImpl.java | 62 - .../src/com/cloud/network/dao/RouterNetworkVO.java | 75 - .../network/dao/Site2SiteCustomerGatewayDao.java | 27 - .../dao/Site2SiteCustomerGatewayDaoImpl.java | 66 - .../network/dao/Site2SiteCustomerGatewayVO.java | 206 - .../network/dao/Site2SiteVpnConnectionDao.java | 29 - .../network/dao/Site2SiteVpnConnectionDaoImpl.java | 97 - .../network/dao/Site2SiteVpnConnectionVO.java | 143 - .../cloud/network/dao/Site2SiteVpnGatewayDao.java | 23 - .../network/dao/Site2SiteVpnGatewayDaoImpl.java | 50 - .../cloud/network/dao/Site2SiteVpnGatewayVO.java | 114 - .../com/cloud/network/dao/UserIpv6AddressDao.java | 41 - .../cloud/network/dao/UserIpv6AddressDaoImpl.java | 122 - .../network/dao/VirtualRouterProviderDao.java | 31 - .../network/dao/VirtualRouterProviderDaoImpl.java | 79 - server/src/com/cloud/network/dao/VpnUserDao.java | 28 - .../src/com/cloud/network/dao/VpnUserDaoImpl.java | 87 - .../network/element/VirtualRouterElement.java | 2 +- .../network/element/VirtualRouterProviderVO.java | 120 - .../network/firewall/FirewallManagerImpl.java | 12 +- .../com/cloud/network/guru/GuestNetworkGuru.java | 14 +- .../router/VirtualNetworkApplianceManagerImpl.java | 26 +- .../VpcVirtualNetworkApplianceManagerImpl.java | 4 +- .../com/cloud/network/rules/FirewallRuleVO.java | 270 - .../cloud/network/rules/PortForwardingRuleVO.java | 96 - .../com/cloud/network/rules/RulesManagerImpl.java | 29 +- .../network/rules/dao/PortForwardingRulesDao.java | 47 - .../rules/dao/PortForwardingRulesDaoImpl.java | 162 - .../network/security/dao/SecurityGroupDao.java | 30 - .../network/security/dao/SecurityGroupDaoImpl.java | 136 - .../network/security/dao/SecurityGroupRuleDao.java | 35 - .../security/dao/SecurityGroupRuleDaoImpl.java | 176 - .../security/dao/SecurityGroupRulesDao.java | 48 - .../security/dao/SecurityGroupRulesDaoImpl.java | 87 - .../security/dao/SecurityGroupVMMapDao.java | 38 - .../security/dao/SecurityGroupVMMapDaoImpl.java | 166 - .../network/security/dao/SecurityGroupWorkDao.java | 49 - .../security/dao/SecurityGroupWorkDaoImpl.java | 242 - .../network/security/dao/VmRulesetLogDao.java | 29 - .../network/security/dao/VmRulesetLogDaoImpl.java | 200 - .../cloud/network/vpc/PrivateGatewayProfile.java | 5 + .../com/cloud/network/vpc/PrivateIpAddress.java | 7 + server/src/com/cloud/network/vpc/PrivateIpVO.java | 95 - .../src/com/cloud/network/vpc/StaticRouteVO.java | 141 - server/src/com/cloud/network/vpc/VpcGatewayVO.java | 196 - .../src/com/cloud/network/vpc/VpcManagerImpl.java | 48 +- .../cloud/network/vpc/VpcOfferingServiceMapVO.java | 89 - .../src/com/cloud/network/vpc/VpcOfferingVO.java | 151 - .../src/com/cloud/network/vpc/VpcServiceMapVO.java | 90 - server/src/com/cloud/network/vpc/VpcVO.java | 181 - .../com/cloud/network/vpc/dao/PrivateIpDao.java | 75 - .../cloud/network/vpc/dao/PrivateIpDaoImpl.java | 156 - .../com/cloud/network/vpc/dao/StaticRouteDao.java | 35 - .../cloud/network/vpc/dao/StaticRouteDaoImpl.java | 119 - server/src/com/cloud/network/vpc/dao/VpcDao.java | 47 - .../src/com/cloud/network/vpc/dao/VpcDaoImpl.java | 152 - .../com/cloud/network/vpc/dao/VpcGatewayDao.java | 26 - .../cloud/network/vpc/dao/VpcGatewayDaoImpl.java | 62 - .../com/cloud/network/vpc/dao/VpcOfferingDao.java | 32 - .../cloud/network/vpc/dao/VpcOfferingDaoImpl.java | 71 - .../network/vpc/dao/VpcOfferingServiceMapDao.java | 41 - .../vpc/dao/VpcOfferingServiceMapDaoImpl.java | 119 - .../cloud/network/vpc/dao/VpcServiceMapDao.java | 40 - .../network/vpc/dao/VpcServiceMapDaoImpl.java | 115 - .../network/vpn/RemoteAccessVpnManagerImpl.java | 6 +- .../offerings/NetworkOfferingServiceMapVO.java | 94 - .../src/com/cloud/offerings/NetworkOfferingVO.java | 381 - .../cloud/offerings/dao/NetworkOfferingDao.java | 60 - .../offerings/dao/NetworkOfferingDaoImpl.java | 169 - .../dao/NetworkOfferingServiceMapDao.java | 50 - .../dao/NetworkOfferingServiceMapDaoImpl.java | 171 - .../src/com/cloud/projects/ProjectAccountVO.java | 96 - .../com/cloud/projects/ProjectInvitationVO.java | 150 - server/src/com/cloud/projects/ProjectVO.java | 163 - .../com/cloud/projects/dao/ProjectAccountDao.java | 43 - .../cloud/projects/dao/ProjectAccountDaoImpl.java | 157 - server/src/com/cloud/projects/dao/ProjectDao.java | 37 - .../src/com/cloud/projects/dao/ProjectDaoImpl.java | 124 - .../cloud/projects/dao/ProjectInvitationDao.java | 44 - .../projects/dao/ProjectInvitationDaoImpl.java | 171 - .../com/cloud/resource/ResourceManagerImpl.java | 42 +- .../resourcelimit/ResourceLimitManagerImpl.java | 2 +- .../com/cloud/secstorage/CommandExecLogDao.java | 25 - .../cloud/secstorage/CommandExecLogDaoImpl.java | 49 - .../src/com/cloud/secstorage/CommandExecLogVO.java | 112 - .../PremiumSecondaryStorageManagerImpl.java | 6 +- .../src/com/cloud/server/ConfigurationServer.java | 5 + .../com/cloud/server/ConfigurationServerImpl.java | 135 +- server/src/com/cloud/server/Criteria.java | 12 +- server/src/com/cloud/server/ManagementServer.java | 3 + .../src/com/cloud/server/ManagementServerImpl.java | 642 ++- server/src/com/cloud/server/StatsCollector.java | 2 +- .../src/com/cloud/service/ServiceOfferingVO.java | 211 - .../com/cloud/service/dao/ServiceOfferingDao.java | 34 - .../cloud/service/dao/ServiceOfferingDaoImpl.java | 157 - .../ConsoleProxyPasswordBasedEncryptor.java | 99 +- .../src/com/cloud/servlet/ConsoleProxyServlet.java | 41 +- .../com/cloud/storage/CreateSnapshotPayload.java | 16 + server/src/com/cloud/storage/OCFS2ManagerImpl.java | 48 +- server/src/com/cloud/storage/StorageManager.java | 2 + .../src/com/cloud/storage/StorageManagerImpl.java | 60 +- server/src/com/cloud/storage/VolumeManager.java | 8 + .../src/com/cloud/storage/VolumeManagerImpl.java | 267 +- .../src/com/cloud/storage/dao/DiskOfferingDao.java | 31 - .../com/cloud/storage/dao/DiskOfferingDaoImpl.java | 152 - .../com/cloud/storage/dao/GuestOSCategoryDao.java | 24 - .../cloud/storage/dao/GuestOSCategoryDaoImpl.java | 34 - server/src/com/cloud/storage/dao/GuestOSDao.java | 26 - .../src/com/cloud/storage/dao/GuestOSDaoImpl.java | 51 - .../com/cloud/storage/dao/LaunchPermissionDao.java | 61 - .../cloud/storage/dao/LaunchPermissionDaoImpl.java | 158 - server/src/com/cloud/storage/dao/S3Dao.java | 29 - server/src/com/cloud/storage/dao/S3DaoImpl.java | 50 - server/src/com/cloud/storage/dao/SnapshotDao.java | 53 - .../src/com/cloud/storage/dao/SnapshotDaoImpl.java | 340 - .../com/cloud/storage/dao/SnapshotPolicyDao.java | 38 - .../cloud/storage/dao/SnapshotPolicyDaoImpl.java | 105 - .../com/cloud/storage/dao/SnapshotScheduleDao.java | 41 - .../cloud/storage/dao/SnapshotScheduleDaoImpl.java | 134 - .../storage/dao/StoragePoolDetailsDaoImpl.java | 75 - .../com/cloud/storage/dao/StoragePoolHostDao.java | 42 - .../cloud/storage/dao/StoragePoolHostDaoImpl.java | 184 - .../com/cloud/storage/dao/StoragePoolWorkDao.java | 38 - .../cloud/storage/dao/StoragePoolWorkDaoImpl.java | 136 - server/src/com/cloud/storage/dao/SwiftDao.java | 31 - server/src/com/cloud/storage/dao/SwiftDaoImpl.java | 58 - server/src/com/cloud/storage/dao/UploadDao.java | 36 - .../src/com/cloud/storage/dao/UploadDaoImpl.java | 92 - .../src/com/cloud/storage/dao/VMTemplateDao.java | 87 - .../com/cloud/storage/dao/VMTemplateDaoImpl.java | 1114 --- .../cloud/storage/dao/VMTemplateDetailsDao.java | 32 - .../storage/dao/VMTemplateDetailsDaoImpl.java | 99 - .../com/cloud/storage/dao/VMTemplateHostDao.java | 67 - .../cloud/storage/dao/VMTemplateHostDaoImpl.java | 427 -- .../com/cloud/storage/dao/VMTemplatePoolDao.java | 49 - .../cloud/storage/dao/VMTemplatePoolDaoImpl.java | 304 - .../src/com/cloud/storage/dao/VMTemplateS3Dao.java | 36 - .../com/cloud/storage/dao/VMTemplateS3DaoImpl.java | 105 - .../com/cloud/storage/dao/VMTemplateSwiftDao.java | 37 - .../cloud/storage/dao/VMTemplateSwiftDaoImpl.java | 87 - .../com/cloud/storage/dao/VMTemplateZoneDao.java | 33 - .../cloud/storage/dao/VMTemplateZoneDaoImpl.java | 89 - server/src/com/cloud/storage/dao/VolumeDao.java | 92 - .../src/com/cloud/storage/dao/VolumeDaoImpl.java | 459 -- .../src/com/cloud/storage/dao/VolumeHostDao.java | 40 - .../com/cloud/storage/dao/VolumeHostDaoImpl.java | 165 - .../cloud/storage/download/DownloadListener.java | 43 +- .../storage/download/DownloadMonitorImpl.java | 42 +- .../secondary/SecondaryStorageDiscoverer.java | 319 - .../secondary/SecondaryStorageManagerImpl.java | 7 +- .../storage/snapshot/SnapshotManagerImpl.java | 38 +- .../com/cloud/storage/upload/UploadListener.java | 814 ++-- .../cloud/storage/upload/UploadMonitorImpl.java | 12 +- server/src/com/cloud/tags/ResourceTagVO.java | 160 - server/src/com/cloud/tags/dao/ResourceTagDao.java | 37 - .../com/cloud/tags/dao/ResourceTagsDaoImpl.java | 62 - .../cloud/template/HypervisorTemplateAdapter.java | 73 +- server/src/com/cloud/template/TemplateAdapter.java | 3 + .../com/cloud/template/TemplateAdapterBase.java | 25 +- .../com/cloud/template/TemplateManagerImpl.java | 59 +- server/src/com/cloud/upgrade/DatabaseCreator.java | 233 - .../cloud/upgrade/DatabaseIntegrityChecker.java | 264 - .../com/cloud/upgrade/DatabaseUpgradeChecker.java | 369 - .../upgrade/PremiumDatabaseUpgradeChecker.java | 139 - server/src/com/cloud/upgrade/dao/DbUpgrade.java | 45 - .../src/com/cloud/upgrade/dao/DbUpgradeUtils.java | 106 - .../src/com/cloud/upgrade/dao/Upgrade217to218.java | 66 - .../src/com/cloud/upgrade/dao/Upgrade218to22.java | 2385 ------- .../upgrade/dao/Upgrade218to224DomainVlans.java | 140 - .../cloud/upgrade/dao/Upgrade218to22Premium.java | 100 - .../com/cloud/upgrade/dao/Upgrade2210to2211.java | 64 - .../com/cloud/upgrade/dao/Upgrade2211to2212.java | 139 - .../upgrade/dao/Upgrade2211to2212Premium.java | 55 - .../com/cloud/upgrade/dao/Upgrade2212to2213.java | 104 - .../com/cloud/upgrade/dao/Upgrade2213to2214.java | 308 - .../src/com/cloud/upgrade/dao/Upgrade2214to30.java | 1326 ---- .../src/com/cloud/upgrade/dao/Upgrade221to222.java | 66 - .../cloud/upgrade/dao/Upgrade221to222Premium.java | 61 - .../src/com/cloud/upgrade/dao/Upgrade222to224.java | 610 -- .../cloud/upgrade/dao/Upgrade222to224Premium.java | 87 - .../src/com/cloud/upgrade/dao/Upgrade224to225.java | 351 - .../src/com/cloud/upgrade/dao/Upgrade225to226.java | 108 - .../src/com/cloud/upgrade/dao/Upgrade227to228.java | 157 - .../cloud/upgrade/dao/Upgrade227to228Premium.java | 132 - .../src/com/cloud/upgrade/dao/Upgrade228to229.java | 138 - .../com/cloud/upgrade/dao/Upgrade229to2210.java | 194 - .../src/com/cloud/upgrade/dao/Upgrade301to302.java | 229 - .../src/com/cloud/upgrade/dao/Upgrade302to40.java | 1033 --- .../src/com/cloud/upgrade/dao/Upgrade30to301.java | 124 - .../src/com/cloud/upgrade/dao/Upgrade30xBase.java | 311 - .../src/com/cloud/upgrade/dao/Upgrade40to41.java | 164 - .../src/com/cloud/upgrade/dao/Upgrade410to420.java | 310 - .../cloud/upgrade/dao/UpgradeSnapshot217to224.java | 60 - .../cloud/upgrade/dao/UpgradeSnapshot223to224.java | 60 - server/src/com/cloud/upgrade/dao/VersionDao.java | 25 - .../src/com/cloud/upgrade/dao/VersionDaoImpl.java | 172 - server/src/com/cloud/upgrade/dao/VersionVO.java | 91 - .../cloud/usage/ExternalPublicIpStatisticsVO.java | 98 - server/src/com/cloud/usage/UsageIPAddressVO.java | 121 - server/src/com/cloud/usage/UsageJobVO.java | 180 - .../com/cloud/usage/UsageLoadBalancerPolicyVO.java | 91 - .../com/cloud/usage/UsageNetworkOfferingVO.java | 105 - server/src/com/cloud/usage/UsageNetworkVO.java | 144 - .../com/cloud/usage/UsagePortForwardingRuleVO.java | 91 - .../src/com/cloud/usage/UsageSecurityGroupVO.java | 97 - server/src/com/cloud/usage/UsageStorageVO.java | 115 - server/src/com/cloud/usage/UsageVMInstanceVO.java | 121 - server/src/com/cloud/usage/UsageVO.java | 260 - server/src/com/cloud/usage/UsageVPNUserVO.java | 105 - server/src/com/cloud/usage/UsageVolumeVO.java | 115 - .../usage/dao/ExternalPublicIpStatisticsDao.java | 33 - .../dao/ExternalPublicIpStatisticsDaoImpl.java | 77 - server/src/com/cloud/usage/dao/UsageDao.java | 41 - server/src/com/cloud/usage/dao/UsageDaoImpl.java | 272 - .../src/com/cloud/usage/dao/UsageIPAddressDao.java | 28 - .../com/cloud/usage/dao/UsageIPAddressDaoImpl.java | 145 - server/src/com/cloud/usage/dao/UsageJobDao.java | 34 - .../src/com/cloud/usage/dao/UsageJobDaoImpl.java | 200 - .../usage/dao/UsageLoadBalancerPolicyDao.java | 29 - .../usage/dao/UsageLoadBalancerPolicyDaoImpl.java | 169 - .../src/com/cloud/usage/dao/UsageNetworkDao.java | 27 - .../com/cloud/usage/dao/UsageNetworkDaoImpl.java | 98 - .../cloud/usage/dao/UsageNetworkOfferingDao.java | 28 - .../usage/dao/UsageNetworkOfferingDaoImpl.java | 152 - .../usage/dao/UsagePortForwardingRuleDao.java | 29 - .../usage/dao/UsagePortForwardingRuleDaoImpl.java | 169 - .../com/cloud/usage/dao/UsageSecurityGroupDao.java | 28 - .../cloud/usage/dao/UsageSecurityGroupDaoImpl.java | 151 - .../src/com/cloud/usage/dao/UsageStorageDao.java | 31 - .../com/cloud/usage/dao/UsageStorageDaoImpl.java | 211 - .../com/cloud/usage/dao/UsageVMInstanceDao.java | 29 - .../cloud/usage/dao/UsageVMInstanceDaoImpl.java | 137 - .../src/com/cloud/usage/dao/UsageVPNUserDao.java | 28 - .../com/cloud/usage/dao/UsageVPNUserDaoImpl.java | 150 - server/src/com/cloud/usage/dao/UsageVolumeDao.java | 29 - .../com/cloud/usage/dao/UsageVolumeDaoImpl.java | 178 - server/src/com/cloud/user/AccountDetailVO.java | 75 - server/src/com/cloud/user/AccountDetailsDao.java | 37 - .../src/com/cloud/user/AccountDetailsDaoImpl.java | 96 - server/src/com/cloud/user/AccountManagerImpl.java | 52 +- server/src/com/cloud/user/dao/AccountDao.java | 52 - server/src/com/cloud/user/dao/AccountDaoImpl.java | 267 - server/src/com/cloud/user/dao/SSHKeyPairDao.java | 38 - .../src/com/cloud/user/dao/SSHKeyPairDaoImpl.java | 85 - server/src/com/cloud/user/dao/UserAccountDao.java | 27 - .../src/com/cloud/user/dao/UserAccountDaoImpl.java | 69 - server/src/com/cloud/user/dao/UserDao.java | 52 - server/src/com/cloud/user/dao/UserDaoImpl.java | 131 - .../src/com/cloud/user/dao/UserStatisticsDao.java | 35 - .../com/cloud/user/dao/UserStatisticsDaoImpl.java | 137 - server/src/com/cloud/user/dao/UserStatsLogDao.java | 23 - .../com/cloud/user/dao/UserStatsLogDaoImpl.java | 31 - server/src/com/cloud/vm/ItWorkDao.java | 45 - server/src/com/cloud/vm/ItWorkDaoImpl.java | 108 - server/src/com/cloud/vm/ItWorkVO.java | 179 - server/src/com/cloud/vm/NicVO.java | 365 - server/src/com/cloud/vm/UserVmManagerImpl.java | 409 +- server/src/com/cloud/vm/UserVmStateListener.java | 21 +- server/src/com/cloud/vm/VirtualMachineManager.java | 4 + .../com/cloud/vm/VirtualMachineManagerImpl.java | 420 +- .../com/cloud/vm/VirtualMachineProfileImpl.java | 11 +- server/src/com/cloud/vm/dao/ConsoleProxyDao.java | 47 - .../src/com/cloud/vm/dao/ConsoleProxyDaoImpl.java | 353 - server/src/com/cloud/vm/dao/DomainRouterDao.java | 149 - .../src/com/cloud/vm/dao/DomainRouterDaoImpl.java | 358 - server/src/com/cloud/vm/dao/InstanceGroupDao.java | 36 - .../src/com/cloud/vm/dao/InstanceGroupDaoImpl.java | 80 - .../com/cloud/vm/dao/InstanceGroupVMMapDao.java | 28 - .../cloud/vm/dao/InstanceGroupVMMapDaoImpl.java | 75 - server/src/com/cloud/vm/dao/NicDao.java | 69 - server/src/com/cloud/vm/dao/NicDaoImpl.java | 241 - server/src/com/cloud/vm/dao/NicSecondaryIpDao.java | 53 - .../com/cloud/vm/dao/NicSecondaryIpDaoImpl.java | 138 - server/src/com/cloud/vm/dao/NicSecondaryIpVO.java | 160 - .../com/cloud/vm/dao/SecondaryStorageVmDao.java | 42 - .../cloud/vm/dao/SecondaryStorageVmDaoImpl.java | 269 - .../com/cloud/vm/dao/UserVmCloneSettingDao.java | 37 - .../cloud/vm/dao/UserVmCloneSettingDaoImpl.java | 74 - server/src/com/cloud/vm/dao/UserVmDao.java | 76 - server/src/com/cloud/vm/dao/UserVmDaoImpl.java | 585 -- server/src/com/cloud/vm/dao/UserVmData.java | 723 -- server/src/com/cloud/vm/dao/UserVmDetailsDao.java | 32 - .../src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java | 99 - server/src/com/cloud/vm/dao/VMInstanceDao.java | 119 - server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 628 -- .../cloud/vm/snapshot/VMSnapshotManagerImpl.java | 13 +- server/src/com/cloud/vm/snapshot/VMSnapshotVO.java | 224 - .../com/cloud/vm/snapshot/dao/VMSnapshotDao.java | 39 - .../cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java | 161 - .../affinity/AffinityGroupServiceImpl.java | 346 + .../org/apache/cloudstack/region/RegionSyncVO.java | 93 - .../src/org/apache/cloudstack/region/RegionVO.java | 87 - .../apache/cloudstack/region/dao/RegionDao.java | 27 - .../cloudstack/region/dao/RegionDaoImpl.java | 48 - .../region/gslb/GlobalLoadBalancerDaoImpl.java | 58 - .../gslb/GlobalLoadBalancerLbRuleMapDao.java | 30 - .../gslb/GlobalLoadBalancerLbRuleMapDaoImpl.java | 63 - .../region/gslb/GlobalLoadBalancerLbRuleMapVO.java | 83 - .../region/gslb/GlobalLoadBalancerRuleDao.java | 28 - .../region/gslb/GlobalLoadBalancerRuleVO.java | 183 - .../gslb/GlobalLoadBalancingRulesServiceImpl.java | 25 + .../configuration/ConfigurationManagerTest.java | 413 ++ .../cloud/network/DedicateGuestVlanRangesTest.java | 378 + .../com/cloud/network/MockNetworkManagerImpl.java | 75 +- .../com/cloud/network/MockNetworkModelImpl.java | 9 +- .../com/cloud/network/MockRulesManagerImpl.java | 3 +- .../cloud/network/UpdatePhysicalNetworkTest.java | 68 + .../SecurityGroupManagerTestConfiguration.java | 4 +- .../network/security/SecurityGroupQueueTest.java | 2 +- .../snapshot/SnapshotDaoTestConfiguration.java | 4 +- .../dao/StoragePoolDaoTestConfiguration.java | 4 +- .../test/com/cloud/vm/MockUserVmManagerImpl.java | 60 +- .../cloud/vm/MockVirtualMachineManagerImpl.java | 10 + server/test/com/cloud/vm/UserVmManagerTest.java | 47 +- .../cloud/vm/VirtualMachineManagerImplTest.java | 231 +- .../UserVmCloneSettingDaoTestConfiguration.java | 4 +- .../test/com/cloud/vm/dao/UserVmDaoImplTest.java | 43 +- .../cloud/vm/dao/UserVmDaoTestConfiguration.java | 50 + .../cloud/vm/snapshot/VMSnapshotManagerTest.java | 20 +- .../cloud/vpc/MockConfigurationManagerImpl.java | 32 +- .../test/com/cloud/vpc/MockNetworkManagerImpl.java | 88 +- .../test/com/cloud/vpc/MockNetworkModelImpl.java | 9 +- server/test/com/cloud/vpc/MockVpcManagerImpl.java | 2 +- server/test/com/cloud/vpc/Site2SiteVpnTest.java | 2 +- server/test/com/cloud/vpc/VpcApiUnitTest.java | 167 +- .../test/com/cloud/vpc/VpcTestConfiguration.java | 75 +- .../cloudstack/affinity/AffinityApiUnitTest.java | 256 + .../networkoffering/ChildTestConfiguration.java | 46 +- .../networkoffering/CreateNetworkOfferingTest.java | 1 - server/test/resources/UserVMDaoTestContext.xml | 44 + server/test/resources/network-mgr-component.xml | 2 +- services/console-proxy/plugin/pom.xml | 8 +- services/console-proxy/pom.xml | 4 +- .../console-proxy/server/conf/agent.properties | 17 - .../server/conf/environment.properties | 2 + services/console-proxy/server/conf/log4j-cloud.xml | 2 +- services/console-proxy/server/css/ajaxviewer.css | 6 +- services/console-proxy/server/js/ajaxkeys.js | 295 +- services/console-proxy/server/js/ajaxviewer.js | 128 +- services/console-proxy/server/pom.xml | 43 +- services/console-proxy/server/scripts/_run.sh | 3 +- .../console-proxy/server/scripts/consoleproxy.sh | 33 + .../console-proxy/server/scripts/secstorage.sh | 33 + .../src/com/cloud/consoleproxy/ConsoleProxy.java | 16 +- .../cloud/consoleproxy/ConsoleProxyClientBase.java | 1 + .../ConsoleProxyPasswordBasedEncryptor.java | 253 +- services/pom.xml | 3 +- services/secondary-storage/conf/agent.properties | 2 + .../secondary-storage/conf/environment.properties | 2 + services/secondary-storage/conf/log4j-cloud.xml | 102 + services/secondary-storage/pom.xml | 103 + services/secondary-storage/scripts/_run.sh | 64 + services/secondary-storage/scripts/config_auth.sh | 69 + services/secondary-storage/scripts/config_ssl.sh | 174 + services/secondary-storage/scripts/ipfirewall.sh | 50 + services/secondary-storage/scripts/run-proxy.sh | 48 + services/secondary-storage/scripts/run.bat | 18 + services/secondary-storage/scripts/run.sh | 45 + services/secondary-storage/scripts/ssvm-check.sh | 136 + .../resource/LocalNfsSecondaryStorageResource.java | 192 + .../resource/LocalSecondaryStorageResource.java | 248 + .../resource/NfsSecondaryStorageResource.java | 2177 ++++++ .../resource/SecondaryStorageDiscoverer.java | 317 + .../storage/resource/SecondaryStorageResource.java | 28 + .../resource/SecondaryStorageResourceHandler.java | 24 + .../storage/template/DownloadManager.java | 112 + .../storage/template/DownloadManagerImpl.java | 1164 ++++ .../cloudstack/storage/template/UploadManager.java | 87 + .../storage/template/UploadManagerImpl.java | 648 ++ setup/db/db/schema-2214to30.sql | 1 + setup/db/db/schema-40to410.sql | 37 +- setup/db/db/schema-410to420.sql | 777 ++- setup/db/templates.sql | 12 + setup/dev/advanced.cfg | 9 +- setup/dev/basic.cfg | 9 +- setup/dev/local.cfg | 44 + test/integration/component/test_accounts.py | 106 +- .../component/test_allocation_states.py | 4 +- test/integration/component/test_asa1000v_fw.py | 134 + test/integration/component/test_blocker_bugs.py | 98 +- test/integration/component/test_egress_rules.py | 213 +- test/integration/component/test_eip_elb.py | 127 +- .../component/test_multiple_ip_ranges.py | 428 ++ .../integration/component/test_network_offering.py | 225 +- test/integration/component/test_project_configs.py | 148 +- test/integration/component/test_project_limits.py | 34 +- .../component/test_project_resources.py | 67 +- test/integration/component/test_project_usage.py | 70 +- test/integration/component/test_projects.py | 94 +- test/integration/component/test_regions.py | 140 + .../integration/component/test_regions_accounts.py | 206 + test/integration/component/test_resource_limits.py | 102 +- test/integration/component/test_routers.py | 125 +- test/integration/component/test_security_groups.py | 217 +- test/integration/component/test_snapshots.py | 100 +- test/integration/component/test_storage_motion.py | 309 + test/integration/component/test_templates.py | 49 +- test/integration/component/test_usage.py | 116 +- .../integration/component/test_vm_passwdenabled.py | 13 +- test/integration/component/test_volumes.py | 80 +- test/integration/component/test_vpn_users.py | 447 ++ test/integration/smoke/test_ScaleVm.py | 221 - test/integration/smoke/test_affinity_groups.py | 194 + .../smoke/test_deploy_vm_with_userdata.py | 146 + test/integration/smoke/test_global_settings.py | 72 + test/integration/smoke/test_guest_vlan_range.py | 160 + test/integration/smoke/test_iso.py | 21 +- test/integration/smoke/test_network.py | 172 +- test/integration/smoke/test_nic.py | 8 +- test/integration/smoke/test_non_contigiousvlan.py | 86 + test/integration/smoke/test_public_ip_range.py | 173 + test/integration/smoke/test_regions.py | 93 + test/integration/smoke/test_routers.py | 62 +- test/integration/smoke/test_scale_vm.py | 221 + test/integration/smoke/test_templates.py | 48 +- test/integration/smoke/test_vm_life_cycle.py | 32 +- test/integration/smoke/test_vm_snapshots.py | 308 + test/integration/smoke/test_volumes.py | 80 +- test/selenium/ReadMe.txt | 36 +- test/selenium/lib/initialize.py | 17 +- test/selenium/smoke/Login_and_Accounts.py | 5 +- test/selenium/smoke/main.py | 2 +- tools/apidoc/build-apidoc.sh | 2 +- tools/apidoc/gen_toc.py | 9 +- tools/apidoc/pom.xml | 3 +- tools/appliance/build.sh | 5 +- .../definitions/systemvmtemplate/cleanup.sh | 1 - .../definitions/systemvmtemplate/definition.rb | 6 +- .../definitions/systemvmtemplate/postinstall.sh | 22 +- .../definitions/systemvmtemplate/preseed.cfg | 14 +- .../definitions/systemvmtemplate64/cleanup.sh | 1 - .../definitions/systemvmtemplate64/definition.rb | 6 +- .../definitions/systemvmtemplate64/postinstall.sh | 22 +- .../definitions/systemvmtemplate64/preseed.cfg | 14 +- tools/build/build_asf.sh | 91 +- tools/build/build_docs.sh | 19 +- tools/build/setnextversion.sh | 75 + tools/cli/cloudmonkey/requester.py | 4 +- tools/devcloud/devcloud.cfg | 1 + tools/devcloud/pom.xml | 33 + tools/devcloud/quickcloud.cfg | 121 + tools/marvin/marvin/asyncJobMgr.py | 72 +- tools/marvin/marvin/cloudstackConnection.py | 279 +- tools/marvin/marvin/cloudstackTestClient.py | 56 +- tools/marvin/marvin/codegenerator.py | 4 +- tools/marvin/marvin/configGenerator.py | 1 + tools/marvin/marvin/dbConnection.py | 6 +- tools/marvin/marvin/deployDataCenter.py | 55 +- tools/marvin/marvin/integration/lib/base.py | 864 +++- tools/marvin/marvin/integration/lib/common.py | 4 +- tools/marvin/marvin/integration/lib/utils.py | 17 +- tools/marvin/marvin/jsonHelper.py | 7 +- tools/marvin/marvin/remoteSSHClient.py | 18 +- .../marvin/marvin/sandbox/advanced/advanced_env.py | 3 + tools/marvin/marvin/sandbox/basic/basic_env.py | 1 + .../sandbox/demo/simulator/simulator_setup.py | 2 + tools/marvin/pom.xml | 91 +- tools/marvin/setup.py | 1 + tools/transifex/.tx/config | 32 + tools/transifex/README-transifex.txt | 71 + tools/transifex/sync-transifex-ui.sh | 160 + ui/css/cloudstack3.css | 241 +- ui/dictionary.jsp | 1714 +++--- ui/images/icons.png | Bin 50745 -> 50052 bytes ui/images/sprites.png | Bin 188552 -> 192407 bytes ui/index.jsp | 39 +- ui/modules/modules.js | 20 + ui/scripts/accounts.js | 58 + ui/scripts/affinity.js | 183 + ui/scripts/cloud.core.callbacks.js | 41 +- ui/scripts/cloudStack.js | 33 +- ui/scripts/dashboard.js | 2 +- ui/scripts/domains.js | 2 +- ui/scripts/events.js | 8 +- ui/scripts/instanceWizard.js | 932 ++-- ui/scripts/instances.js | 462 ++- ui/scripts/network.js | 754 ++- ui/scripts/plugins.js | 114 +- ui/scripts/regions.js | 419 ++- ui/scripts/sharedFunctions.js | 34 +- ui/scripts/storage.js | 99 +- ui/scripts/system.js | 1228 +++-- ui/scripts/templates.js | 80 +- ui/scripts/ui-custom/affinity.js | 173 + ui/scripts/ui-custom/granularSettings.js | 46 + ui/scripts/ui-custom/healthCheck.js | 10 +- ui/scripts/ui-custom/instanceWizard.js | 42 +- ui/scripts/ui-custom/pluginListing.js | 109 + ui/scripts/ui-custom/plugins.js | 109 - ui/scripts/ui-custom/projectSelect.js | 66 + ui/scripts/ui-custom/projects.js | 6 +- ui/scripts/ui-custom/regions.js | 4 +- ui/scripts/ui-custom/zoneFilter.js | 39 + ui/scripts/ui/widgets/detailView.js | 157 +- ui/scripts/ui/widgets/listView.js | 22 +- ui/scripts/ui/widgets/multiEdit.js | 21 +- ui/scripts/vm_snapshots.js | 2 +- ui/scripts/vpc.js | 6 + ui/scripts/zoneWizard.js | 55 +- usage/pom.xml | 5 + usage/src/com/cloud/usage/UsageManagerImpl.java | 10 +- usage/src/com/cloud/usage/UsageServer.java | 16 +- .../cloud/usage/UsageManagerTestConfiguration.java | 5 +- utils/pom.xml | 12 +- utils/src/com/cloud/maint/Version.java | 66 + utils/src/com/cloud/utils/AnnotationHelper.java | 28 +- utils/src/com/cloud/utils/SerialVersionUID.java | 1 + .../cloud/utils/cisco/n1kv/vsm/NetconfHelper.java | 22 + .../com/cloud/utils/cisco/n1kv/vsm/VsmCommand.java | 218 + .../cloud/utils/component/ComponentContext.java | 4 +- .../utils/component/SpringComponentScanUtils.java | 41 - utils/src/com/cloud/utils/net/NetUtils.java | 10 +- utils/src/com/cloud/utils/nio/NioClient.java | 3 +- utils/src/com/cloud/utils/nio/NioConnection.java | 2 +- .../apache/cloudstack/test/utils/SpringUtils.java | 113 + vmware-base/pom.xml | 4 - .../hypervisor/vmware/mo/HypervisorHostHelper.java | 45 +- .../hypervisor/vmware/mo/VirtualMachineMO.java | 6 +- .../cloud/hypervisor/vmware/util/VmwareClient.java | 2 +- .../vmware/util/VmwareGuestOsMapper.java | 11 +- .../vmware/mo/TestVmwareContextFactory.java | 43 - .../cloud/hypervisor/vmware/mo/TestVmwareMO.java | 39 - .../hypervisor/vmware/util/TestVmwareUtil.java | 107 - vmware-base/test/com/cloud/vmware/TestVMWare.java | 1342 ---- 2444 files changed, 156959 insertions(+), 114941 deletions(-) ----------------------------------------------------------------------