From ad2777c54774854d54f6ce6e361b418a23e8888f Mon Sep 17 00:00:00 2001 From: Alex Huang Date: Wed, 1 May 2013 05:46:15 -0700 Subject: [PATCH] Moved agent commands to core and out of api --- .../AgentControlChannelException.java | 0 .../resource/UnableDeleteHostException.java | 0 .../cloud/storage/StoragePoolDiscoverer.java | 8 +- core/src/com/cloud/agent/RecoveryHandler.java | 31 ------ .../cloud/agent/api/AgentControlAnswer.java | 0 .../cloud/agent/api/AgentControlCommand.java | 0 .../com/cloud/agent/api/AttachIsoCommand.java | 0 .../cloud/agent/api/AttachVolumeAnswer.java | 0 .../cloud/agent/api/AttachVolumeCommand.java | 0 .../cloud/agent/api/BackupSnapshotAnswer.java | 0 .../agent/api/BackupSnapshotCommand.java | 0 .../agent/api/BumpUpPriorityCommand.java | 0 .../com/cloud/agent/api/CancelCommand.java | 0 .../cloud/agent/api/ChangeAgentAnswer.java | 0 .../cloud/agent/api/ChangeAgentCommand.java | 0 .../cloud/agent/api/CheckHealthAnswer.java | 0 .../cloud/agent/api/CheckHealthCommand.java | 0 .../cloud/agent/api/CheckNetworkAnswer.java | 0 .../cloud/agent/api/CheckNetworkCommand.java | 0 .../cloud/agent/api/CheckOnHostAnswer.java | 0 .../cloud/agent/api/CheckOnHostCommand.java | 0 .../cloud/agent/api/CheckRouterAnswer.java | 0 .../cloud/agent/api/CheckRouterCommand.java | 0 .../api/CheckS2SVpnConnectionsAnswer.java | 0 .../api/CheckS2SVpnConnectionsCommand.java | 0 .../com/cloud/agent/api/CheckStateAnswer.java | 0 .../cloud/agent/api/CheckStateCommand.java | 0 .../agent/api/CheckVirtualMachineAnswer.java | 0 .../agent/api/CheckVirtualMachineCommand.java | 0 .../agent/api/CleanupNetworkRulesCmd.java | 0 .../api/CleanupSnapshotBackupCommand.java | 0 .../cloud/agent/api/ClusterSyncAnswer.java | 0 .../cloud/agent/api/ClusterSyncCommand.java | 0 .../agent/api/ComputeChecksumCommand.java | 0 .../ConsoleAccessAuthenticationAnswer.java | 0 .../ConsoleAccessAuthenticationCommand.java | 0 .../api/ConsoleProxyLoadReportCommand.java | 0 ...atePrivateTemplateFromSnapshotCommand.java | 0 ...reatePrivateTemplateFromVolumeCommand.java | 0 .../agent/api/CreateStoragePoolCommand.java | 0 .../agent/api/CreateVMSnapshotAnswer.java | 0 .../agent/api/CreateVMSnapshotCommand.java | 0 .../api/CreateVolumeFromSnapshotAnswer.java | 0 .../api/CreateVolumeFromSnapshotCommand.java | 0 .../api/CreateVolumeFromVMSnapshotAnswer.java | 0 .../CreateVolumeFromVMSnapshotCommand.java | 0 .../src/com/cloud/agent/api/CronCommand.java | 0 .../api/DeleteObjectFromSwiftCommand.java | 0 .../agent/api/DeleteSnapshotBackupAnswer.java | 0 .../api/DeleteSnapshotBackupCommand.java | 0 .../agent/api/DeleteSnapshotsDirCommand.java | 0 .../agent/api/DeleteStoragePoolCommand.java | 0 .../api/DeleteTemplateFromS3Command.java | 0 .../agent/api/DeleteVMSnapshotAnswer.java | 0 .../agent/api/DeleteVMSnapshotCommand.java | 0 .../api/DownloadSnapshotFromS3Command.java | 0 ...mplateFromS3ToSecondaryStorageCommand.java | 0 .../src/com/cloud/agent/api/FenceAnswer.java | 0 .../src/com/cloud/agent/api/FenceCommand.java | 0 .../cloud/agent/api/GetDomRVersionAnswer.java | 0 .../cloud/agent/api/GetDomRVersionCmd.java | 0 .../cloud/agent/api/GetFileStatsAnswer.java | 0 .../cloud/agent/api/GetFileStatsCommand.java | 0 .../cloud/agent/api/GetHostStatsAnswer.java | 0 .../cloud/agent/api/GetHostStatsCommand.java | 0 .../agent/api/GetStorageStatsAnswer.java | 0 .../agent/api/GetStorageStatsCommand.java | 0 .../com/cloud/agent/api/GetVmStatsAnswer.java | 0 .../cloud/agent/api/GetVmStatsCommand.java | 0 .../com/cloud/agent/api/GetVncPortAnswer.java | 0 .../cloud/agent/api/GetVncPortCommand.java | 0 .../com/cloud/agent/api/HostStatsEntry.java | 0 .../com/cloud/agent/api/MaintainAnswer.java | 0 .../com/cloud/agent/api/MaintainCommand.java | 0 .../cloud/agent/api/ManageSnapshotAnswer.java | 0 .../agent/api/ManageSnapshotCommand.java | 0 .../com/cloud/agent/api/MigrateAnswer.java | 0 .../com/cloud/agent/api/MigrateCommand.java | 0 .../agent/api/MigrateWithStorageAnswer.java | 0 .../agent/api/MigrateWithStorageCommand.java | 0 .../api/MigrateWithStorageCompleteAnswer.java | 0 .../MigrateWithStorageCompleteCommand.java | 0 .../api/MigrateWithStorageReceiveAnswer.java | 0 .../api/MigrateWithStorageReceiveCommand.java | 0 .../api/MigrateWithStorageSendAnswer.java | 0 .../api/MigrateWithStorageSendCommand.java | 0 .../cloud/agent/api/ModifySshKeysCommand.java | 0 .../agent/api/ModifyStoragePoolAnswer.java | 0 .../agent/api/ModifyStoragePoolCommand.java | 0 .../cloud/agent/api/NetworkUsageAnswer.java | 0 .../cloud/agent/api/NetworkUsageCommand.java | 0 .../src/com/cloud/agent/api/PingAnswer.java | 0 .../src/com/cloud/agent/api/PingCommand.java | 0 .../cloud/agent/api/PingRoutingCommand.java | 0 .../api/PingRoutingWithNwGroupsCommand.java | 0 .../agent/api/PingRoutingWithOvsCommand.java | 0 .../cloud/agent/api/PingStorageCommand.java | 0 .../com/cloud/agent/api/PingTestCommand.java | 0 .../com/cloud/agent/api/PlugNicAnswer.java | 0 .../com/cloud/agent/api/PlugNicCommand.java | 0 .../com/cloud/agent/api/PoolEjectCommand.java | 0 .../agent/api/PrepareForMigrationAnswer.java | 0 .../agent/api/PrepareForMigrationCommand.java | 0 .../agent/api/PrepareOCFS2NodesCommand.java | 0 .../api/PropagateResourceEventCommand.java | 0 .../src/com/cloud/agent/api/ReadyAnswer.java | 0 .../src/com/cloud/agent/api/ReadyCommand.java | 0 .../src/com/cloud/agent/api/RebootAnswer.java | 0 .../com/cloud/agent/api/RebootCommand.java | 0 .../cloud/agent/api/RebootRouterCommand.java | 0 .../agent/api/RevertToVMSnapshotAnswer.java | 0 .../agent/api/RevertToVMSnapshotCommand.java | 0 .../com/cloud/agent/api/ScaleVmAnswer.java | 0 .../com/cloud/agent/api/ScaleVmCommand.java | 0 .../api/ScheduleHostScanTaskCommand.java | 0 .../api/SecStorageFirewallCfgCommand.java | 0 .../agent/api/SecStorageSetupAnswer.java | 0 .../agent/api/SecStorageSetupCommand.java | 0 .../agent/api/SecStorageVMSetupCommand.java | 0 .../agent/api/SecurityGroupRuleAnswer.java | 0 .../agent/api/SecurityGroupRulesCmd.java | 0 .../src/com/cloud/agent/api/SetupAnswer.java | 0 .../src/com/cloud/agent/api/SetupCommand.java | 0 .../agent/api/SetupGuestNetworkAnswer.java | 0 .../agent/api/SetupGuestNetworkCommand.java | 0 .../com/cloud/agent/api/ShutdownCommand.java | 0 .../com/cloud/agent/api/SnapshotCommand.java | 0 .../src/com/cloud/agent/api/StartAnswer.java | 0 .../src/com/cloud/agent/api/StartCommand.java | 0 .../com/cloud/agent/api/StartupAnswer.java | 0 .../com/cloud/agent/api/StartupCommand.java | 0 .../agent/api/StartupExternalDhcpCommand.java | 0 .../api/StartupExternalFirewallCommand.java | 0 .../StartupExternalLoadBalancerCommand.java | 0 .../cloud/agent/api/StartupProxyCommand.java | 0 .../agent/api/StartupPxeServerCommand.java | 0 .../agent/api/StartupRoutingCommand.java | 0 .../api/StartupSecondaryStorageCommand.java | 0 .../agent/api/StartupStorageCommand.java | 0 .../api/StartupTrafficMonitorCommand.java | 0 .../src/com/cloud/agent/api/StopAnswer.java | 0 .../src/com/cloud/agent/api/StopCommand.java | 0 .../cloud/agent/api/TransferAgentCommand.java | 0 .../com/cloud/agent/api/UnPlugNicAnswer.java | 0 .../com/cloud/agent/api/UnPlugNicCommand.java | 0 .../cloud/agent/api/UnregisterVMCommand.java | 0 .../agent/api/UpdateHostPasswordCommand.java | 0 .../com/cloud/agent/api/UpgradeAnswer.java | 0 .../com/cloud/agent/api/UpgradeCommand.java | 0 .../agent/api/UpgradeSnapshotCommand.java | 0 ...mplateToS3FromSecondaryStorageCommand.java | 0 .../agent/api/VMSnapshotBaseCommand.java | 0 .../src/com/cloud/agent/api/VMSnapshotTO.java | 0 .../agent/api/ValidateSnapshotAnswer.java | 0 .../agent/api/ValidateSnapshotCommand.java | 0 .../src/com/cloud/agent/api/VmStatsEntry.java | 0 .../api/baremetal/IpmISetBootDevCommand.java | 0 .../api/baremetal/IpmiBootorResetCommand.java | 0 .../api/baremetal/PreparePxeServerAnswer.java | 0 .../baremetal/PreparePxeServerCommand.java | 0 .../prepareCreateTemplateCommand.java | 0 .../cloud/agent/api/check/CheckSshAnswer.java | 0 .../agent/api/check/CheckSshCommand.java | 0 .../api/downloadSnapshotFromSwiftCommand.java | 0 ...ateFromSwiftToSecondaryStorageCommand.java | 0 .../proxy/CheckConsoleProxyLoadCommand.java | 0 .../api/proxy/ConsoleProxyLoadAnswer.java | 0 .../cloud/agent/api/proxy/ProxyCommand.java | 0 ...rtConsoleProxyAgentHttpHandlerCommand.java | 0 .../proxy/WatchConsoleProxyLoadCommand.java | 0 .../CreateLoadBalancerApplianceCommand.java | 0 .../DestroyLoadBalancerApplianceCommand.java | 0 .../agent/api/routing/DhcpEntryCommand.java | 0 .../GlobalLoadBalancerConfigAnswer.java | 0 .../GlobalLoadBalancerConfigCommand.java | 0 .../routing/HealthCheckLBConfigAnswer.java | 0 .../routing/HealthCheckLBConfigCommand.java | 0 .../agent/api/routing/IpAssocAnswer.java | 0 .../agent/api/routing/IpAssocCommand.java | 0 .../agent/api/routing/IpAssocVpcCommand.java | 0 .../routing/LoadBalancerConfigCommand.java | 0 .../api/routing/NetworkElementCommand.java | 0 .../routing/RemoteAccessVpnCfgCommand.java | 0 .../api/routing/SavePasswordCommand.java | 0 .../api/routing/SetFirewallRulesAnswer.java | 0 .../api/routing/SetFirewallRulesCommand.java | 0 .../api/routing/SetNetworkACLAnswer.java | 0 .../api/routing/SetNetworkACLCommand.java | 0 .../routing/SetPortForwardingRulesAnswer.java | 0 .../SetPortForwardingRulesCommand.java | 0 .../SetPortForwardingRulesVpcCommand.java | 0 .../agent/api/routing/SetSourceNatAnswer.java | 0 .../api/routing/SetSourceNatCommand.java | 0 .../api/routing/SetStaticNatRulesAnswer.java | 0 .../api/routing/SetStaticNatRulesCommand.java | 0 .../api/routing/SetStaticRouteAnswer.java | 0 .../api/routing/SetStaticRouteCommand.java | 0 .../api/routing/Site2SiteVpnCfgCommand.java | 0 .../api/routing/SiteLoadBalancerConfig.java | 0 .../agent/api/routing/UserDataCommand.java | 0 .../agent/api/routing/VmDataCommand.java | 0 .../agent/api/routing/VpnUsersCfgCommand.java | 0 .../api/storage/AbstractDownloadCommand.java | 0 .../api/storage/AbstractUploadCommand.java | 0 .../agent/api/storage/CopyVolumeAnswer.java | 0 .../agent/api/storage/CopyVolumeCommand.java | 0 .../cloud/agent/api/storage/CreateAnswer.java | 0 .../agent/api/storage/CreateCommand.java | 0 .../CreateEntityDownloadURLAnswer.java | 0 .../CreateEntityDownloadURLCommand.java | 0 .../storage/CreatePrivateTemplateAnswer.java | 0 .../storage/CreatePrivateTemplateCommand.java | 0 .../DeleteEntityDownloadURLAnswer.java | 0 .../DeleteEntityDownloadURLCommand.java | 0 .../api/storage/DeleteTemplateCommand.java | 0 .../api/storage/DeleteVolumeCommand.java | 0 .../agent/api/storage/DestroyAnswer.java | 0 .../agent/api/storage/DestroyCommand.java | 0 .../agent/api/storage/DownloadAnswer.java | 0 .../agent/api/storage/DownloadCommand.java | 0 .../api/storage/DownloadProgressCommand.java | 0 .../agent/api/storage/ListTemplateAnswer.java | 0 .../api/storage/ListTemplateCommand.java | 0 .../agent/api/storage/ListVolumeAnswer.java | 0 .../agent/api/storage/ListVolumeCommand.java | 0 .../ManageVolumeAvailabilityAnswer.java | 0 .../ManageVolumeAvailabilityCommand.java | 0 .../api/storage/MigrateVolumeAnswer.java | 0 .../api/storage/MigrateVolumeCommand.java | 0 .../storage/PrimaryStorageDownloadAnswer.java | 0 .../PrimaryStorageDownloadCommand.java | 0 .../agent/api/storage/ResizeVolumeAnswer.java | 0 .../api/storage/ResizeVolumeCommand.java | 0 .../agent/api/storage/StorageCommand.java | 0 .../agent/api/storage/UpgradeDiskAnswer.java | 0 .../agent/api/storage/UpgradeDiskCommand.java | 0 .../cloud/agent/api/storage/UploadAnswer.java | 0 .../agent/api/storage/UploadCommand.java | 0 .../api/storage/UploadProgressCommand.java | 0 .../cloud/agent/api/storage/ssCommand.java | 0 ...ateToSwiftFromSecondaryStorageCommand.java | 0 .../com/cloud/resource/ResourceListener.java | 40 ++++---- .../storage/resource/StoragePoolResource.java | 0 .../agent/test/AgentControlAnswerTest.java | 0 .../agent/test/AgentControlCommandTest.java | 0 .../cloudstack/api/agent/test/AnswerTest.java | 0 .../api/agent/test/AttachIsoCommandTest.java | 0 .../agent/test/AttachVolumeAnswerTest.java | 0 .../agent/test/AttachVolumeCommandTest.java | 0 .../agent/test/BackupSnapshotAnswerTest.java | 0 .../agent/test/BackupSnapshotCommandTest.java | 0 .../agent/test/BumpUpPriorityCommandTest.java | 0 .../api/agent/test/CancelCommandTest.java | 0 .../api/agent/test/ChangeAgentAnswerTest.java | 0 .../agent/test/ChangeAgentCommandTest.java | 0 .../api/agent/test/CheckHealthAnswerTest.java | 0 .../agent/test/CheckHealthCommandTest.java | 0 .../agent/test/CheckNetworkAnswerTest.java | 0 .../agent/test/CheckNetworkCommandTest.java | 0 .../agent/test/CheckOnHostCommandTest.java | 0 .../api/agent/test/SnapshotCommandTest.java | 0 .../api/test/ResizeVolumeCommandTest.java | 0 .../src/com/cloud/capacity/CapacityVO.java | 0 .../com/cloud/certificate/CertificateVO.java | 0 .../schema}/src/com/cloud/host/DetailVO.java | 0 .../schema}/src/com/cloud/host/HostTagVO.java | 0 .../schema}/src/com/cloud/host/HostVO.java | 0 .../hypervisor/HypervisorCapabilitiesVO.java | 0 .../src/com/cloud/network/VpnUserVO.java | 0 .../network/security/SecurityGroupRuleVO.java | 0 .../security/SecurityGroupRulesVO.java | 0 .../security/SecurityGroupVMMapVO.java | 0 .../network/security/SecurityGroupVO.java | 0 .../network/security/SecurityGroupWork.java | 0 .../network/security/SecurityGroupWorkVO.java | 0 .../network/security/VmRulesetLogVO.java | 0 .../src/com/cloud/storage/DiskOfferingVO.java | 0 .../com/cloud/storage/GuestOSCategoryVO.java | 0 .../src/com/cloud/storage/GuestOSVO.java | 0 .../com/cloud/storage/LaunchPermissionVO.java | 0 .../schema}/src/com/cloud/storage/S3VO.java | 0 .../com/cloud/storage/SnapshotPolicyVO.java | 0 .../com/cloud/storage/SnapshotScheduleVO.java | 0 .../src/com/cloud/storage/SnapshotVO.java | 0 .../cloud/storage/StoragePoolHostAssoc.java | 0 .../com/cloud/storage/StoragePoolHostVO.java | 20 ++-- .../com/cloud/storage/StoragePoolWorkVO.java | 0 .../src/com/cloud/storage/SwiftVO.java | 0 .../src/com/cloud/storage/UploadVO.java | 0 .../com/cloud/storage/VMTemplateDetailVO.java | 0 .../com/cloud/storage/VMTemplateHostVO.java | 0 .../src/com/cloud/storage/VMTemplateS3VO.java | 0 .../storage/VMTemplateStoragePoolVO.java | 0 .../com/cloud/storage/VMTemplateSwiftVO.java | 0 .../src/com/cloud/storage/VMTemplateVO.java | 0 .../com/cloud/storage/VMTemplateZoneVO.java | 0 .../src/com/cloud/storage/VolumeHostVO.java | 0 .../src/com/cloud/storage/VolumeVO.java | 0 framework/jobs/pom.xml | 33 +++++-- framework/pom.xml | 1 + ...oudStackPrimaryDataStoreLifeCycleImpl.java | 44 +++------ server/pom.xml | 5 + .../src/com/cloud/alert/AlertManager.java | 0 .../src/com/cloud/async/AsyncJobVO.java | 0 .../src/com/cloud/async/SyncQueueItemVO.java | 0 .../src/com/cloud/async/SyncQueueVO.java | 0 .../cloud/capacity/CapacityManagerImpl.java | 99 +++++++++---------- .../com/cloud/storage/OCFS2ManagerImpl.java | 48 ++++----- 308 files changed, 148 insertions(+), 181 deletions(-) rename {core => api}/src/com/cloud/exception/AgentControlChannelException.java (100%) rename {core => api}/src/com/cloud/resource/UnableDeleteHostException.java (100%) rename {core => api}/src/com/cloud/storage/StoragePoolDiscoverer.java (73%) delete mode 100644 core/src/com/cloud/agent/RecoveryHandler.java rename {api => core}/src/com/cloud/agent/api/AgentControlAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/AgentControlCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/AttachIsoCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/AttachVolumeAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/AttachVolumeCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/BackupSnapshotAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/BackupSnapshotCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/BumpUpPriorityCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/CancelCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/ChangeAgentAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/ChangeAgentCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/CheckHealthAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/CheckHealthCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/CheckNetworkAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/CheckNetworkCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/CheckOnHostAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/CheckOnHostCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/CheckRouterAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/CheckRouterCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/CheckS2SVpnConnectionsCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/CheckStateAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/CheckStateCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/CheckVirtualMachineAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/CheckVirtualMachineCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/CleanupNetworkRulesCmd.java (100%) rename {api => core}/src/com/cloud/agent/api/CleanupSnapshotBackupCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/ClusterSyncAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/ClusterSyncCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/ComputeChecksumCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/ConsoleAccessAuthenticationAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/ConsoleAccessAuthenticationCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/ConsoleProxyLoadReportCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/CreateStoragePoolCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/CreateVMSnapshotAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/CreateVMSnapshotCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/CreateVolumeFromSnapshotAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/CreateVolumeFromSnapshotCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/CronCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/DeleteObjectFromSwiftCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/DeleteSnapshotBackupAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/DeleteSnapshotBackupCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/DeleteSnapshotsDirCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/DeleteStoragePoolCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/DeleteTemplateFromS3Command.java (100%) rename {api => core}/src/com/cloud/agent/api/DeleteVMSnapshotAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/DeleteVMSnapshotCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/DownloadSnapshotFromS3Command.java (100%) rename {api => core}/src/com/cloud/agent/api/DownloadTemplateFromS3ToSecondaryStorageCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/FenceAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/FenceCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/GetDomRVersionAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/GetDomRVersionCmd.java (100%) rename {api => core}/src/com/cloud/agent/api/GetFileStatsAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/GetFileStatsCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/GetHostStatsAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/GetHostStatsCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/GetStorageStatsAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/GetStorageStatsCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/GetVmStatsAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/GetVmStatsCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/GetVncPortAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/GetVncPortCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/HostStatsEntry.java (100%) rename {api => core}/src/com/cloud/agent/api/MaintainAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/MaintainCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/ManageSnapshotAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/ManageSnapshotCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/MigrateAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/MigrateCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/MigrateWithStorageAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/MigrateWithStorageCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/MigrateWithStorageCompleteAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/MigrateWithStorageCompleteCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/MigrateWithStorageReceiveAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/MigrateWithStorageSendAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/MigrateWithStorageSendCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/ModifySshKeysCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/ModifyStoragePoolAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/ModifyStoragePoolCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/NetworkUsageAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/NetworkUsageCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/PingAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/PingCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/PingRoutingCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/PingRoutingWithNwGroupsCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/PingStorageCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/PingTestCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/PlugNicAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/PlugNicCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/PoolEjectCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/PrepareForMigrationAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/PrepareForMigrationCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/PrepareOCFS2NodesCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/PropagateResourceEventCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/ReadyAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/ReadyCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/RebootAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/RebootCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/RebootRouterCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/RevertToVMSnapshotAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/RevertToVMSnapshotCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/ScaleVmAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/ScaleVmCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/ScheduleHostScanTaskCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/SecStorageFirewallCfgCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/SecStorageSetupAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/SecStorageSetupCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/SecStorageVMSetupCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/SecurityGroupRuleAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/SecurityGroupRulesCmd.java (100%) rename {api => core}/src/com/cloud/agent/api/SetupAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/SetupCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/SetupGuestNetworkAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/SetupGuestNetworkCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/ShutdownCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/SnapshotCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/StartAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/StartCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/StartupAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/StartupCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/StartupExternalDhcpCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/StartupExternalFirewallCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/StartupExternalLoadBalancerCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/StartupProxyCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/StartupPxeServerCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/StartupRoutingCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/StartupSecondaryStorageCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/StartupStorageCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/StartupTrafficMonitorCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/StopAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/StopCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/TransferAgentCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/UnPlugNicAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/UnPlugNicCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/UnregisterVMCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/UpdateHostPasswordCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/UpgradeAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/UpgradeCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/UpgradeSnapshotCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/UploadTemplateToS3FromSecondaryStorageCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/VMSnapshotBaseCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/VMSnapshotTO.java (100%) rename {api => core}/src/com/cloud/agent/api/ValidateSnapshotAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/ValidateSnapshotCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/VmStatsEntry.java (100%) rename {api => core}/src/com/cloud/agent/api/baremetal/IpmISetBootDevCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/baremetal/IpmiBootorResetCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/baremetal/PreparePxeServerAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/baremetal/PreparePxeServerCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/baremetal/prepareCreateTemplateCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/check/CheckSshAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/check/CheckSshCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/downloadSnapshotFromSwiftCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/downloadTemplateFromSwiftToSecondaryStorageCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/proxy/CheckConsoleProxyLoadCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/proxy/ConsoleProxyLoadAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/proxy/ProxyCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/proxy/StartConsoleProxyAgentHttpHandlerCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/routing/CreateLoadBalancerApplianceCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/routing/DestroyLoadBalancerApplianceCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/routing/DhcpEntryCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/routing/HealthCheckLBConfigAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/routing/HealthCheckLBConfigCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/routing/IpAssocAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/routing/IpAssocCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/routing/IpAssocVpcCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/routing/NetworkElementCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/routing/RemoteAccessVpnCfgCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/routing/SavePasswordCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/routing/SetFirewallRulesAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/routing/SetNetworkACLAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/routing/SetNetworkACLCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/routing/SetPortForwardingRulesAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/routing/SetPortForwardingRulesCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/routing/SetPortForwardingRulesVpcCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/routing/SetSourceNatAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/routing/SetSourceNatCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/routing/SetStaticNatRulesAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/routing/SetStaticNatRulesCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/routing/SetStaticRouteAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/routing/SetStaticRouteCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/routing/Site2SiteVpnCfgCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/routing/SiteLoadBalancerConfig.java (100%) rename {api => core}/src/com/cloud/agent/api/routing/UserDataCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/routing/VmDataCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/routing/VpnUsersCfgCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/storage/AbstractDownloadCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/storage/AbstractUploadCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/storage/CopyVolumeAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/storage/CopyVolumeCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/storage/CreateAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/storage/CreateCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/storage/CreateEntityDownloadURLAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/storage/CreateEntityDownloadURLCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/storage/CreatePrivateTemplateCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/storage/DeleteEntityDownloadURLAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/storage/DeleteEntityDownloadURLCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/storage/DeleteTemplateCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/storage/DeleteVolumeCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/storage/DestroyAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/storage/DestroyCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/storage/DownloadAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/storage/DownloadCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/storage/DownloadProgressCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/storage/ListTemplateAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/storage/ListTemplateCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/storage/ListVolumeAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/storage/ListVolumeCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/storage/MigrateVolumeAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/storage/MigrateVolumeCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/storage/PrimaryStorageDownloadAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/storage/ResizeVolumeAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/storage/ResizeVolumeCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/storage/StorageCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/storage/UpgradeDiskAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/storage/UpgradeDiskCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/storage/UploadAnswer.java (100%) rename {api => core}/src/com/cloud/agent/api/storage/UploadCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/storage/UploadProgressCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/storage/ssCommand.java (100%) rename {api => core}/src/com/cloud/agent/api/uploadTemplateToSwiftFromSecondaryStorageCommand.java (100%) rename {api => core}/src/com/cloud/storage/resource/StoragePoolResource.java (100%) rename {api => core}/test/org/apache/cloudstack/api/agent/test/AgentControlAnswerTest.java (100%) rename {api => core}/test/org/apache/cloudstack/api/agent/test/AgentControlCommandTest.java (100%) rename {api => core}/test/org/apache/cloudstack/api/agent/test/AnswerTest.java (100%) rename {api => core}/test/org/apache/cloudstack/api/agent/test/AttachIsoCommandTest.java (100%) rename {api => core}/test/org/apache/cloudstack/api/agent/test/AttachVolumeAnswerTest.java (100%) rename {api => core}/test/org/apache/cloudstack/api/agent/test/AttachVolumeCommandTest.java (100%) rename {api => core}/test/org/apache/cloudstack/api/agent/test/BackupSnapshotAnswerTest.java (100%) rename {api => core}/test/org/apache/cloudstack/api/agent/test/BackupSnapshotCommandTest.java (100%) rename {api => core}/test/org/apache/cloudstack/api/agent/test/BumpUpPriorityCommandTest.java (100%) rename {api => core}/test/org/apache/cloudstack/api/agent/test/CancelCommandTest.java (100%) rename {api => core}/test/org/apache/cloudstack/api/agent/test/ChangeAgentAnswerTest.java (100%) rename {api => core}/test/org/apache/cloudstack/api/agent/test/ChangeAgentCommandTest.java (100%) rename {api => core}/test/org/apache/cloudstack/api/agent/test/CheckHealthAnswerTest.java (100%) rename {api => core}/test/org/apache/cloudstack/api/agent/test/CheckHealthCommandTest.java (100%) rename {api => core}/test/org/apache/cloudstack/api/agent/test/CheckNetworkAnswerTest.java (100%) rename {api => core}/test/org/apache/cloudstack/api/agent/test/CheckNetworkCommandTest.java (100%) rename {api => core}/test/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java (100%) rename {api => core}/test/org/apache/cloudstack/api/agent/test/SnapshotCommandTest.java (100%) rename {api => core}/test/src/com/cloud/agent/api/test/ResizeVolumeCommandTest.java (100%) rename {core => engine/schema}/src/com/cloud/capacity/CapacityVO.java (100%) rename {core => engine/schema}/src/com/cloud/certificate/CertificateVO.java (100%) rename {core => engine/schema}/src/com/cloud/host/DetailVO.java (100%) rename {core => engine/schema}/src/com/cloud/host/HostTagVO.java (100%) rename {core => engine/schema}/src/com/cloud/host/HostVO.java (100%) rename {core => engine/schema}/src/com/cloud/hypervisor/HypervisorCapabilitiesVO.java (100%) rename {core => engine/schema}/src/com/cloud/network/VpnUserVO.java (100%) rename {core => engine/schema}/src/com/cloud/network/security/SecurityGroupRuleVO.java (100%) rename {core => engine/schema}/src/com/cloud/network/security/SecurityGroupRulesVO.java (100%) rename {core => engine/schema}/src/com/cloud/network/security/SecurityGroupVMMapVO.java (100%) rename {core => engine/schema}/src/com/cloud/network/security/SecurityGroupVO.java (100%) rename {core => engine/schema}/src/com/cloud/network/security/SecurityGroupWork.java (100%) rename {core => engine/schema}/src/com/cloud/network/security/SecurityGroupWorkVO.java (100%) rename {core => engine/schema}/src/com/cloud/network/security/VmRulesetLogVO.java (100%) rename {core => engine/schema}/src/com/cloud/storage/DiskOfferingVO.java (100%) rename {core => engine/schema}/src/com/cloud/storage/GuestOSCategoryVO.java (100%) rename {core => engine/schema}/src/com/cloud/storage/GuestOSVO.java (100%) rename {core => engine/schema}/src/com/cloud/storage/LaunchPermissionVO.java (100%) rename {core => engine/schema}/src/com/cloud/storage/S3VO.java (100%) rename {core => engine/schema}/src/com/cloud/storage/SnapshotPolicyVO.java (100%) rename {core => engine/schema}/src/com/cloud/storage/SnapshotScheduleVO.java (100%) rename {core => engine/schema}/src/com/cloud/storage/SnapshotVO.java (100%) rename {core => engine/schema}/src/com/cloud/storage/StoragePoolHostAssoc.java (100%) rename {core => engine/schema}/src/com/cloud/storage/StoragePoolHostVO.java (94%) rename {core => engine/schema}/src/com/cloud/storage/StoragePoolWorkVO.java (100%) rename {core => engine/schema}/src/com/cloud/storage/SwiftVO.java (100%) rename {core => engine/schema}/src/com/cloud/storage/UploadVO.java (100%) rename {core => engine/schema}/src/com/cloud/storage/VMTemplateDetailVO.java (100%) rename {core => engine/schema}/src/com/cloud/storage/VMTemplateHostVO.java (100%) rename {core => engine/schema}/src/com/cloud/storage/VMTemplateS3VO.java (100%) rename {core => engine/schema}/src/com/cloud/storage/VMTemplateStoragePoolVO.java (100%) rename {core => engine/schema}/src/com/cloud/storage/VMTemplateSwiftVO.java (100%) rename {core => engine/schema}/src/com/cloud/storage/VMTemplateVO.java (100%) rename {core => engine/schema}/src/com/cloud/storage/VMTemplateZoneVO.java (100%) rename {core => engine/schema}/src/com/cloud/storage/VolumeHostVO.java (100%) rename {core => engine/schema}/src/com/cloud/storage/VolumeVO.java (100%) rename {core => server}/src/com/cloud/alert/AlertManager.java (100%) rename {core => server}/src/com/cloud/async/AsyncJobVO.java (100%) rename {core => server}/src/com/cloud/async/SyncQueueItemVO.java (100%) rename {core => server}/src/com/cloud/async/SyncQueueVO.java (100%) diff --git a/core/src/com/cloud/exception/AgentControlChannelException.java b/api/src/com/cloud/exception/AgentControlChannelException.java similarity index 100% rename from core/src/com/cloud/exception/AgentControlChannelException.java rename to api/src/com/cloud/exception/AgentControlChannelException.java diff --git a/core/src/com/cloud/resource/UnableDeleteHostException.java b/api/src/com/cloud/resource/UnableDeleteHostException.java similarity index 100% rename from core/src/com/cloud/resource/UnableDeleteHostException.java rename to api/src/com/cloud/resource/UnableDeleteHostException.java diff --git a/core/src/com/cloud/storage/StoragePoolDiscoverer.java b/api/src/com/cloud/storage/StoragePoolDiscoverer.java similarity index 73% rename from core/src/com/cloud/storage/StoragePoolDiscoverer.java rename to api/src/com/cloud/storage/StoragePoolDiscoverer.java index c7dd362a5c3..40a925dc73e 100644 --- a/core/src/com/cloud/storage/StoragePoolDiscoverer.java +++ b/api/src/com/cloud/storage/StoragePoolDiscoverer.java @@ -19,8 +19,6 @@ package com.cloud.storage; import java.net.URI; import java.util.Map; -import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; - import com.cloud.exception.DiscoveryException; import com.cloud.utils.component.Adapter; @@ -29,7 +27,7 @@ import com.cloud.utils.component.Adapter; */ public interface StoragePoolDiscoverer extends Adapter { - Map> find(long dcId, Long podId, URI uri, Map details) throws DiscoveryException; - - Map> find(long dcId, Long podId, URI uri, Map details, String username, String password) throws DiscoveryException; + Map> find(long dcId, Long podId, URI uri, Map details) throws DiscoveryException; + + Map> find(long dcId, Long podId, URI uri, Map details, String username, String password) throws DiscoveryException; } diff --git a/core/src/com/cloud/agent/RecoveryHandler.java b/core/src/com/cloud/agent/RecoveryHandler.java deleted file mode 100644 index 418c7b1034f..00000000000 --- a/core/src/com/cloud/agent/RecoveryHandler.java +++ /dev/null @@ -1,31 +0,0 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. -package com.cloud.agent; - -import com.cloud.agent.api.Command; - -public interface RecoveryHandler { - /** - * Perform the necessary recovery because the success of this command - * is not known. - * - * @param agentId agent the commands were sent to. - * @param seq sequence number. - * @param cmds commands that failed. - */ - public void handle(long agentId, long seq, Command[] cmds); -} diff --git a/api/src/com/cloud/agent/api/AgentControlAnswer.java b/core/src/com/cloud/agent/api/AgentControlAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/AgentControlAnswer.java rename to core/src/com/cloud/agent/api/AgentControlAnswer.java diff --git a/api/src/com/cloud/agent/api/AgentControlCommand.java b/core/src/com/cloud/agent/api/AgentControlCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/AgentControlCommand.java rename to core/src/com/cloud/agent/api/AgentControlCommand.java diff --git a/api/src/com/cloud/agent/api/AttachIsoCommand.java b/core/src/com/cloud/agent/api/AttachIsoCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/AttachIsoCommand.java rename to core/src/com/cloud/agent/api/AttachIsoCommand.java diff --git a/api/src/com/cloud/agent/api/AttachVolumeAnswer.java b/core/src/com/cloud/agent/api/AttachVolumeAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/AttachVolumeAnswer.java rename to core/src/com/cloud/agent/api/AttachVolumeAnswer.java diff --git a/api/src/com/cloud/agent/api/AttachVolumeCommand.java b/core/src/com/cloud/agent/api/AttachVolumeCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/AttachVolumeCommand.java rename to core/src/com/cloud/agent/api/AttachVolumeCommand.java diff --git a/api/src/com/cloud/agent/api/BackupSnapshotAnswer.java b/core/src/com/cloud/agent/api/BackupSnapshotAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/BackupSnapshotAnswer.java rename to core/src/com/cloud/agent/api/BackupSnapshotAnswer.java diff --git a/api/src/com/cloud/agent/api/BackupSnapshotCommand.java b/core/src/com/cloud/agent/api/BackupSnapshotCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/BackupSnapshotCommand.java rename to core/src/com/cloud/agent/api/BackupSnapshotCommand.java diff --git a/api/src/com/cloud/agent/api/BumpUpPriorityCommand.java b/core/src/com/cloud/agent/api/BumpUpPriorityCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/BumpUpPriorityCommand.java rename to core/src/com/cloud/agent/api/BumpUpPriorityCommand.java diff --git a/api/src/com/cloud/agent/api/CancelCommand.java b/core/src/com/cloud/agent/api/CancelCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/CancelCommand.java rename to core/src/com/cloud/agent/api/CancelCommand.java diff --git a/api/src/com/cloud/agent/api/ChangeAgentAnswer.java b/core/src/com/cloud/agent/api/ChangeAgentAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/ChangeAgentAnswer.java rename to core/src/com/cloud/agent/api/ChangeAgentAnswer.java diff --git a/api/src/com/cloud/agent/api/ChangeAgentCommand.java b/core/src/com/cloud/agent/api/ChangeAgentCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/ChangeAgentCommand.java rename to core/src/com/cloud/agent/api/ChangeAgentCommand.java diff --git a/api/src/com/cloud/agent/api/CheckHealthAnswer.java b/core/src/com/cloud/agent/api/CheckHealthAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/CheckHealthAnswer.java rename to core/src/com/cloud/agent/api/CheckHealthAnswer.java diff --git a/api/src/com/cloud/agent/api/CheckHealthCommand.java b/core/src/com/cloud/agent/api/CheckHealthCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/CheckHealthCommand.java rename to core/src/com/cloud/agent/api/CheckHealthCommand.java diff --git a/api/src/com/cloud/agent/api/CheckNetworkAnswer.java b/core/src/com/cloud/agent/api/CheckNetworkAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/CheckNetworkAnswer.java rename to core/src/com/cloud/agent/api/CheckNetworkAnswer.java diff --git a/api/src/com/cloud/agent/api/CheckNetworkCommand.java b/core/src/com/cloud/agent/api/CheckNetworkCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/CheckNetworkCommand.java rename to core/src/com/cloud/agent/api/CheckNetworkCommand.java diff --git a/api/src/com/cloud/agent/api/CheckOnHostAnswer.java b/core/src/com/cloud/agent/api/CheckOnHostAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/CheckOnHostAnswer.java rename to core/src/com/cloud/agent/api/CheckOnHostAnswer.java diff --git a/api/src/com/cloud/agent/api/CheckOnHostCommand.java b/core/src/com/cloud/agent/api/CheckOnHostCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/CheckOnHostCommand.java rename to core/src/com/cloud/agent/api/CheckOnHostCommand.java diff --git a/api/src/com/cloud/agent/api/CheckRouterAnswer.java b/core/src/com/cloud/agent/api/CheckRouterAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/CheckRouterAnswer.java rename to core/src/com/cloud/agent/api/CheckRouterAnswer.java diff --git a/api/src/com/cloud/agent/api/CheckRouterCommand.java b/core/src/com/cloud/agent/api/CheckRouterCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/CheckRouterCommand.java rename to core/src/com/cloud/agent/api/CheckRouterCommand.java diff --git a/api/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java b/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java rename to core/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java diff --git a/api/src/com/cloud/agent/api/CheckS2SVpnConnectionsCommand.java b/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/CheckS2SVpnConnectionsCommand.java rename to core/src/com/cloud/agent/api/CheckS2SVpnConnectionsCommand.java diff --git a/api/src/com/cloud/agent/api/CheckStateAnswer.java b/core/src/com/cloud/agent/api/CheckStateAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/CheckStateAnswer.java rename to core/src/com/cloud/agent/api/CheckStateAnswer.java diff --git a/api/src/com/cloud/agent/api/CheckStateCommand.java b/core/src/com/cloud/agent/api/CheckStateCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/CheckStateCommand.java rename to core/src/com/cloud/agent/api/CheckStateCommand.java diff --git a/api/src/com/cloud/agent/api/CheckVirtualMachineAnswer.java b/core/src/com/cloud/agent/api/CheckVirtualMachineAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/CheckVirtualMachineAnswer.java rename to core/src/com/cloud/agent/api/CheckVirtualMachineAnswer.java diff --git a/api/src/com/cloud/agent/api/CheckVirtualMachineCommand.java b/core/src/com/cloud/agent/api/CheckVirtualMachineCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/CheckVirtualMachineCommand.java rename to core/src/com/cloud/agent/api/CheckVirtualMachineCommand.java diff --git a/api/src/com/cloud/agent/api/CleanupNetworkRulesCmd.java b/core/src/com/cloud/agent/api/CleanupNetworkRulesCmd.java similarity index 100% rename from api/src/com/cloud/agent/api/CleanupNetworkRulesCmd.java rename to core/src/com/cloud/agent/api/CleanupNetworkRulesCmd.java diff --git a/api/src/com/cloud/agent/api/CleanupSnapshotBackupCommand.java b/core/src/com/cloud/agent/api/CleanupSnapshotBackupCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/CleanupSnapshotBackupCommand.java rename to core/src/com/cloud/agent/api/CleanupSnapshotBackupCommand.java diff --git a/api/src/com/cloud/agent/api/ClusterSyncAnswer.java b/core/src/com/cloud/agent/api/ClusterSyncAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/ClusterSyncAnswer.java rename to core/src/com/cloud/agent/api/ClusterSyncAnswer.java diff --git a/api/src/com/cloud/agent/api/ClusterSyncCommand.java b/core/src/com/cloud/agent/api/ClusterSyncCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/ClusterSyncCommand.java rename to core/src/com/cloud/agent/api/ClusterSyncCommand.java diff --git a/api/src/com/cloud/agent/api/ComputeChecksumCommand.java b/core/src/com/cloud/agent/api/ComputeChecksumCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/ComputeChecksumCommand.java rename to core/src/com/cloud/agent/api/ComputeChecksumCommand.java diff --git a/api/src/com/cloud/agent/api/ConsoleAccessAuthenticationAnswer.java b/core/src/com/cloud/agent/api/ConsoleAccessAuthenticationAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/ConsoleAccessAuthenticationAnswer.java rename to core/src/com/cloud/agent/api/ConsoleAccessAuthenticationAnswer.java diff --git a/api/src/com/cloud/agent/api/ConsoleAccessAuthenticationCommand.java b/core/src/com/cloud/agent/api/ConsoleAccessAuthenticationCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/ConsoleAccessAuthenticationCommand.java rename to core/src/com/cloud/agent/api/ConsoleAccessAuthenticationCommand.java diff --git a/api/src/com/cloud/agent/api/ConsoleProxyLoadReportCommand.java b/core/src/com/cloud/agent/api/ConsoleProxyLoadReportCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/ConsoleProxyLoadReportCommand.java rename to core/src/com/cloud/agent/api/ConsoleProxyLoadReportCommand.java diff --git a/api/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java b/core/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java rename to core/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java diff --git a/api/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java b/core/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java rename to core/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java diff --git a/api/src/com/cloud/agent/api/CreateStoragePoolCommand.java b/core/src/com/cloud/agent/api/CreateStoragePoolCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/CreateStoragePoolCommand.java rename to core/src/com/cloud/agent/api/CreateStoragePoolCommand.java diff --git a/api/src/com/cloud/agent/api/CreateVMSnapshotAnswer.java b/core/src/com/cloud/agent/api/CreateVMSnapshotAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/CreateVMSnapshotAnswer.java rename to core/src/com/cloud/agent/api/CreateVMSnapshotAnswer.java diff --git a/api/src/com/cloud/agent/api/CreateVMSnapshotCommand.java b/core/src/com/cloud/agent/api/CreateVMSnapshotCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/CreateVMSnapshotCommand.java rename to core/src/com/cloud/agent/api/CreateVMSnapshotCommand.java diff --git a/api/src/com/cloud/agent/api/CreateVolumeFromSnapshotAnswer.java b/core/src/com/cloud/agent/api/CreateVolumeFromSnapshotAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/CreateVolumeFromSnapshotAnswer.java rename to core/src/com/cloud/agent/api/CreateVolumeFromSnapshotAnswer.java diff --git a/api/src/com/cloud/agent/api/CreateVolumeFromSnapshotCommand.java b/core/src/com/cloud/agent/api/CreateVolumeFromSnapshotCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/CreateVolumeFromSnapshotCommand.java rename to core/src/com/cloud/agent/api/CreateVolumeFromSnapshotCommand.java diff --git a/api/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotAnswer.java b/core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotAnswer.java rename to core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotAnswer.java diff --git a/api/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotCommand.java b/core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotCommand.java rename to core/src/com/cloud/agent/api/CreateVolumeFromVMSnapshotCommand.java diff --git a/api/src/com/cloud/agent/api/CronCommand.java b/core/src/com/cloud/agent/api/CronCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/CronCommand.java rename to core/src/com/cloud/agent/api/CronCommand.java diff --git a/api/src/com/cloud/agent/api/DeleteObjectFromSwiftCommand.java b/core/src/com/cloud/agent/api/DeleteObjectFromSwiftCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/DeleteObjectFromSwiftCommand.java rename to core/src/com/cloud/agent/api/DeleteObjectFromSwiftCommand.java diff --git a/api/src/com/cloud/agent/api/DeleteSnapshotBackupAnswer.java b/core/src/com/cloud/agent/api/DeleteSnapshotBackupAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/DeleteSnapshotBackupAnswer.java rename to core/src/com/cloud/agent/api/DeleteSnapshotBackupAnswer.java diff --git a/api/src/com/cloud/agent/api/DeleteSnapshotBackupCommand.java b/core/src/com/cloud/agent/api/DeleteSnapshotBackupCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/DeleteSnapshotBackupCommand.java rename to core/src/com/cloud/agent/api/DeleteSnapshotBackupCommand.java diff --git a/api/src/com/cloud/agent/api/DeleteSnapshotsDirCommand.java b/core/src/com/cloud/agent/api/DeleteSnapshotsDirCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/DeleteSnapshotsDirCommand.java rename to core/src/com/cloud/agent/api/DeleteSnapshotsDirCommand.java diff --git a/api/src/com/cloud/agent/api/DeleteStoragePoolCommand.java b/core/src/com/cloud/agent/api/DeleteStoragePoolCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/DeleteStoragePoolCommand.java rename to core/src/com/cloud/agent/api/DeleteStoragePoolCommand.java diff --git a/api/src/com/cloud/agent/api/DeleteTemplateFromS3Command.java b/core/src/com/cloud/agent/api/DeleteTemplateFromS3Command.java similarity index 100% rename from api/src/com/cloud/agent/api/DeleteTemplateFromS3Command.java rename to core/src/com/cloud/agent/api/DeleteTemplateFromS3Command.java diff --git a/api/src/com/cloud/agent/api/DeleteVMSnapshotAnswer.java b/core/src/com/cloud/agent/api/DeleteVMSnapshotAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/DeleteVMSnapshotAnswer.java rename to core/src/com/cloud/agent/api/DeleteVMSnapshotAnswer.java diff --git a/api/src/com/cloud/agent/api/DeleteVMSnapshotCommand.java b/core/src/com/cloud/agent/api/DeleteVMSnapshotCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/DeleteVMSnapshotCommand.java rename to core/src/com/cloud/agent/api/DeleteVMSnapshotCommand.java diff --git a/api/src/com/cloud/agent/api/DownloadSnapshotFromS3Command.java b/core/src/com/cloud/agent/api/DownloadSnapshotFromS3Command.java similarity index 100% rename from api/src/com/cloud/agent/api/DownloadSnapshotFromS3Command.java rename to core/src/com/cloud/agent/api/DownloadSnapshotFromS3Command.java diff --git a/api/src/com/cloud/agent/api/DownloadTemplateFromS3ToSecondaryStorageCommand.java b/core/src/com/cloud/agent/api/DownloadTemplateFromS3ToSecondaryStorageCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/DownloadTemplateFromS3ToSecondaryStorageCommand.java rename to core/src/com/cloud/agent/api/DownloadTemplateFromS3ToSecondaryStorageCommand.java diff --git a/api/src/com/cloud/agent/api/FenceAnswer.java b/core/src/com/cloud/agent/api/FenceAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/FenceAnswer.java rename to core/src/com/cloud/agent/api/FenceAnswer.java diff --git a/api/src/com/cloud/agent/api/FenceCommand.java b/core/src/com/cloud/agent/api/FenceCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/FenceCommand.java rename to core/src/com/cloud/agent/api/FenceCommand.java diff --git a/api/src/com/cloud/agent/api/GetDomRVersionAnswer.java b/core/src/com/cloud/agent/api/GetDomRVersionAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/GetDomRVersionAnswer.java rename to core/src/com/cloud/agent/api/GetDomRVersionAnswer.java diff --git a/api/src/com/cloud/agent/api/GetDomRVersionCmd.java b/core/src/com/cloud/agent/api/GetDomRVersionCmd.java similarity index 100% rename from api/src/com/cloud/agent/api/GetDomRVersionCmd.java rename to core/src/com/cloud/agent/api/GetDomRVersionCmd.java diff --git a/api/src/com/cloud/agent/api/GetFileStatsAnswer.java b/core/src/com/cloud/agent/api/GetFileStatsAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/GetFileStatsAnswer.java rename to core/src/com/cloud/agent/api/GetFileStatsAnswer.java diff --git a/api/src/com/cloud/agent/api/GetFileStatsCommand.java b/core/src/com/cloud/agent/api/GetFileStatsCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/GetFileStatsCommand.java rename to core/src/com/cloud/agent/api/GetFileStatsCommand.java diff --git a/api/src/com/cloud/agent/api/GetHostStatsAnswer.java b/core/src/com/cloud/agent/api/GetHostStatsAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/GetHostStatsAnswer.java rename to core/src/com/cloud/agent/api/GetHostStatsAnswer.java diff --git a/api/src/com/cloud/agent/api/GetHostStatsCommand.java b/core/src/com/cloud/agent/api/GetHostStatsCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/GetHostStatsCommand.java rename to core/src/com/cloud/agent/api/GetHostStatsCommand.java diff --git a/api/src/com/cloud/agent/api/GetStorageStatsAnswer.java b/core/src/com/cloud/agent/api/GetStorageStatsAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/GetStorageStatsAnswer.java rename to core/src/com/cloud/agent/api/GetStorageStatsAnswer.java diff --git a/api/src/com/cloud/agent/api/GetStorageStatsCommand.java b/core/src/com/cloud/agent/api/GetStorageStatsCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/GetStorageStatsCommand.java rename to core/src/com/cloud/agent/api/GetStorageStatsCommand.java diff --git a/api/src/com/cloud/agent/api/GetVmStatsAnswer.java b/core/src/com/cloud/agent/api/GetVmStatsAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/GetVmStatsAnswer.java rename to core/src/com/cloud/agent/api/GetVmStatsAnswer.java diff --git a/api/src/com/cloud/agent/api/GetVmStatsCommand.java b/core/src/com/cloud/agent/api/GetVmStatsCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/GetVmStatsCommand.java rename to core/src/com/cloud/agent/api/GetVmStatsCommand.java diff --git a/api/src/com/cloud/agent/api/GetVncPortAnswer.java b/core/src/com/cloud/agent/api/GetVncPortAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/GetVncPortAnswer.java rename to core/src/com/cloud/agent/api/GetVncPortAnswer.java diff --git a/api/src/com/cloud/agent/api/GetVncPortCommand.java b/core/src/com/cloud/agent/api/GetVncPortCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/GetVncPortCommand.java rename to core/src/com/cloud/agent/api/GetVncPortCommand.java diff --git a/api/src/com/cloud/agent/api/HostStatsEntry.java b/core/src/com/cloud/agent/api/HostStatsEntry.java similarity index 100% rename from api/src/com/cloud/agent/api/HostStatsEntry.java rename to core/src/com/cloud/agent/api/HostStatsEntry.java diff --git a/api/src/com/cloud/agent/api/MaintainAnswer.java b/core/src/com/cloud/agent/api/MaintainAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/MaintainAnswer.java rename to core/src/com/cloud/agent/api/MaintainAnswer.java diff --git a/api/src/com/cloud/agent/api/MaintainCommand.java b/core/src/com/cloud/agent/api/MaintainCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/MaintainCommand.java rename to core/src/com/cloud/agent/api/MaintainCommand.java diff --git a/api/src/com/cloud/agent/api/ManageSnapshotAnswer.java b/core/src/com/cloud/agent/api/ManageSnapshotAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/ManageSnapshotAnswer.java rename to core/src/com/cloud/agent/api/ManageSnapshotAnswer.java diff --git a/api/src/com/cloud/agent/api/ManageSnapshotCommand.java b/core/src/com/cloud/agent/api/ManageSnapshotCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/ManageSnapshotCommand.java rename to core/src/com/cloud/agent/api/ManageSnapshotCommand.java diff --git a/api/src/com/cloud/agent/api/MigrateAnswer.java b/core/src/com/cloud/agent/api/MigrateAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/MigrateAnswer.java rename to core/src/com/cloud/agent/api/MigrateAnswer.java diff --git a/api/src/com/cloud/agent/api/MigrateCommand.java b/core/src/com/cloud/agent/api/MigrateCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/MigrateCommand.java rename to core/src/com/cloud/agent/api/MigrateCommand.java diff --git a/api/src/com/cloud/agent/api/MigrateWithStorageAnswer.java b/core/src/com/cloud/agent/api/MigrateWithStorageAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/MigrateWithStorageAnswer.java rename to core/src/com/cloud/agent/api/MigrateWithStorageAnswer.java diff --git a/api/src/com/cloud/agent/api/MigrateWithStorageCommand.java b/core/src/com/cloud/agent/api/MigrateWithStorageCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/MigrateWithStorageCommand.java rename to core/src/com/cloud/agent/api/MigrateWithStorageCommand.java diff --git a/api/src/com/cloud/agent/api/MigrateWithStorageCompleteAnswer.java b/core/src/com/cloud/agent/api/MigrateWithStorageCompleteAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/MigrateWithStorageCompleteAnswer.java rename to core/src/com/cloud/agent/api/MigrateWithStorageCompleteAnswer.java diff --git a/api/src/com/cloud/agent/api/MigrateWithStorageCompleteCommand.java b/core/src/com/cloud/agent/api/MigrateWithStorageCompleteCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/MigrateWithStorageCompleteCommand.java rename to core/src/com/cloud/agent/api/MigrateWithStorageCompleteCommand.java diff --git a/api/src/com/cloud/agent/api/MigrateWithStorageReceiveAnswer.java b/core/src/com/cloud/agent/api/MigrateWithStorageReceiveAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/MigrateWithStorageReceiveAnswer.java rename to core/src/com/cloud/agent/api/MigrateWithStorageReceiveAnswer.java diff --git a/api/src/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java b/core/src/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java rename to core/src/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java diff --git a/api/src/com/cloud/agent/api/MigrateWithStorageSendAnswer.java b/core/src/com/cloud/agent/api/MigrateWithStorageSendAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/MigrateWithStorageSendAnswer.java rename to core/src/com/cloud/agent/api/MigrateWithStorageSendAnswer.java diff --git a/api/src/com/cloud/agent/api/MigrateWithStorageSendCommand.java b/core/src/com/cloud/agent/api/MigrateWithStorageSendCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/MigrateWithStorageSendCommand.java rename to core/src/com/cloud/agent/api/MigrateWithStorageSendCommand.java diff --git a/api/src/com/cloud/agent/api/ModifySshKeysCommand.java b/core/src/com/cloud/agent/api/ModifySshKeysCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/ModifySshKeysCommand.java rename to core/src/com/cloud/agent/api/ModifySshKeysCommand.java diff --git a/api/src/com/cloud/agent/api/ModifyStoragePoolAnswer.java b/core/src/com/cloud/agent/api/ModifyStoragePoolAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/ModifyStoragePoolAnswer.java rename to core/src/com/cloud/agent/api/ModifyStoragePoolAnswer.java diff --git a/api/src/com/cloud/agent/api/ModifyStoragePoolCommand.java b/core/src/com/cloud/agent/api/ModifyStoragePoolCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/ModifyStoragePoolCommand.java rename to core/src/com/cloud/agent/api/ModifyStoragePoolCommand.java diff --git a/api/src/com/cloud/agent/api/NetworkUsageAnswer.java b/core/src/com/cloud/agent/api/NetworkUsageAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/NetworkUsageAnswer.java rename to core/src/com/cloud/agent/api/NetworkUsageAnswer.java diff --git a/api/src/com/cloud/agent/api/NetworkUsageCommand.java b/core/src/com/cloud/agent/api/NetworkUsageCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/NetworkUsageCommand.java rename to core/src/com/cloud/agent/api/NetworkUsageCommand.java diff --git a/api/src/com/cloud/agent/api/PingAnswer.java b/core/src/com/cloud/agent/api/PingAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/PingAnswer.java rename to core/src/com/cloud/agent/api/PingAnswer.java diff --git a/api/src/com/cloud/agent/api/PingCommand.java b/core/src/com/cloud/agent/api/PingCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/PingCommand.java rename to core/src/com/cloud/agent/api/PingCommand.java diff --git a/api/src/com/cloud/agent/api/PingRoutingCommand.java b/core/src/com/cloud/agent/api/PingRoutingCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/PingRoutingCommand.java rename to core/src/com/cloud/agent/api/PingRoutingCommand.java diff --git a/api/src/com/cloud/agent/api/PingRoutingWithNwGroupsCommand.java b/core/src/com/cloud/agent/api/PingRoutingWithNwGroupsCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/PingRoutingWithNwGroupsCommand.java rename to core/src/com/cloud/agent/api/PingRoutingWithNwGroupsCommand.java diff --git a/api/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java b/core/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java rename to core/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java diff --git a/api/src/com/cloud/agent/api/PingStorageCommand.java b/core/src/com/cloud/agent/api/PingStorageCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/PingStorageCommand.java rename to core/src/com/cloud/agent/api/PingStorageCommand.java diff --git a/api/src/com/cloud/agent/api/PingTestCommand.java b/core/src/com/cloud/agent/api/PingTestCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/PingTestCommand.java rename to core/src/com/cloud/agent/api/PingTestCommand.java diff --git a/api/src/com/cloud/agent/api/PlugNicAnswer.java b/core/src/com/cloud/agent/api/PlugNicAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/PlugNicAnswer.java rename to core/src/com/cloud/agent/api/PlugNicAnswer.java diff --git a/api/src/com/cloud/agent/api/PlugNicCommand.java b/core/src/com/cloud/agent/api/PlugNicCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/PlugNicCommand.java rename to core/src/com/cloud/agent/api/PlugNicCommand.java diff --git a/api/src/com/cloud/agent/api/PoolEjectCommand.java b/core/src/com/cloud/agent/api/PoolEjectCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/PoolEjectCommand.java rename to core/src/com/cloud/agent/api/PoolEjectCommand.java diff --git a/api/src/com/cloud/agent/api/PrepareForMigrationAnswer.java b/core/src/com/cloud/agent/api/PrepareForMigrationAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/PrepareForMigrationAnswer.java rename to core/src/com/cloud/agent/api/PrepareForMigrationAnswer.java diff --git a/api/src/com/cloud/agent/api/PrepareForMigrationCommand.java b/core/src/com/cloud/agent/api/PrepareForMigrationCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/PrepareForMigrationCommand.java rename to core/src/com/cloud/agent/api/PrepareForMigrationCommand.java diff --git a/api/src/com/cloud/agent/api/PrepareOCFS2NodesCommand.java b/core/src/com/cloud/agent/api/PrepareOCFS2NodesCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/PrepareOCFS2NodesCommand.java rename to core/src/com/cloud/agent/api/PrepareOCFS2NodesCommand.java diff --git a/api/src/com/cloud/agent/api/PropagateResourceEventCommand.java b/core/src/com/cloud/agent/api/PropagateResourceEventCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/PropagateResourceEventCommand.java rename to core/src/com/cloud/agent/api/PropagateResourceEventCommand.java diff --git a/api/src/com/cloud/agent/api/ReadyAnswer.java b/core/src/com/cloud/agent/api/ReadyAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/ReadyAnswer.java rename to core/src/com/cloud/agent/api/ReadyAnswer.java diff --git a/api/src/com/cloud/agent/api/ReadyCommand.java b/core/src/com/cloud/agent/api/ReadyCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/ReadyCommand.java rename to core/src/com/cloud/agent/api/ReadyCommand.java diff --git a/api/src/com/cloud/agent/api/RebootAnswer.java b/core/src/com/cloud/agent/api/RebootAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/RebootAnswer.java rename to core/src/com/cloud/agent/api/RebootAnswer.java diff --git a/api/src/com/cloud/agent/api/RebootCommand.java b/core/src/com/cloud/agent/api/RebootCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/RebootCommand.java rename to core/src/com/cloud/agent/api/RebootCommand.java diff --git a/api/src/com/cloud/agent/api/RebootRouterCommand.java b/core/src/com/cloud/agent/api/RebootRouterCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/RebootRouterCommand.java rename to core/src/com/cloud/agent/api/RebootRouterCommand.java diff --git a/api/src/com/cloud/agent/api/RevertToVMSnapshotAnswer.java b/core/src/com/cloud/agent/api/RevertToVMSnapshotAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/RevertToVMSnapshotAnswer.java rename to core/src/com/cloud/agent/api/RevertToVMSnapshotAnswer.java diff --git a/api/src/com/cloud/agent/api/RevertToVMSnapshotCommand.java b/core/src/com/cloud/agent/api/RevertToVMSnapshotCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/RevertToVMSnapshotCommand.java rename to core/src/com/cloud/agent/api/RevertToVMSnapshotCommand.java diff --git a/api/src/com/cloud/agent/api/ScaleVmAnswer.java b/core/src/com/cloud/agent/api/ScaleVmAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/ScaleVmAnswer.java rename to core/src/com/cloud/agent/api/ScaleVmAnswer.java diff --git a/api/src/com/cloud/agent/api/ScaleVmCommand.java b/core/src/com/cloud/agent/api/ScaleVmCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/ScaleVmCommand.java rename to core/src/com/cloud/agent/api/ScaleVmCommand.java diff --git a/api/src/com/cloud/agent/api/ScheduleHostScanTaskCommand.java b/core/src/com/cloud/agent/api/ScheduleHostScanTaskCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/ScheduleHostScanTaskCommand.java rename to core/src/com/cloud/agent/api/ScheduleHostScanTaskCommand.java diff --git a/api/src/com/cloud/agent/api/SecStorageFirewallCfgCommand.java b/core/src/com/cloud/agent/api/SecStorageFirewallCfgCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/SecStorageFirewallCfgCommand.java rename to core/src/com/cloud/agent/api/SecStorageFirewallCfgCommand.java diff --git a/api/src/com/cloud/agent/api/SecStorageSetupAnswer.java b/core/src/com/cloud/agent/api/SecStorageSetupAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/SecStorageSetupAnswer.java rename to core/src/com/cloud/agent/api/SecStorageSetupAnswer.java diff --git a/api/src/com/cloud/agent/api/SecStorageSetupCommand.java b/core/src/com/cloud/agent/api/SecStorageSetupCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/SecStorageSetupCommand.java rename to core/src/com/cloud/agent/api/SecStorageSetupCommand.java diff --git a/api/src/com/cloud/agent/api/SecStorageVMSetupCommand.java b/core/src/com/cloud/agent/api/SecStorageVMSetupCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/SecStorageVMSetupCommand.java rename to core/src/com/cloud/agent/api/SecStorageVMSetupCommand.java diff --git a/api/src/com/cloud/agent/api/SecurityGroupRuleAnswer.java b/core/src/com/cloud/agent/api/SecurityGroupRuleAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/SecurityGroupRuleAnswer.java rename to core/src/com/cloud/agent/api/SecurityGroupRuleAnswer.java diff --git a/api/src/com/cloud/agent/api/SecurityGroupRulesCmd.java b/core/src/com/cloud/agent/api/SecurityGroupRulesCmd.java similarity index 100% rename from api/src/com/cloud/agent/api/SecurityGroupRulesCmd.java rename to core/src/com/cloud/agent/api/SecurityGroupRulesCmd.java diff --git a/api/src/com/cloud/agent/api/SetupAnswer.java b/core/src/com/cloud/agent/api/SetupAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/SetupAnswer.java rename to core/src/com/cloud/agent/api/SetupAnswer.java diff --git a/api/src/com/cloud/agent/api/SetupCommand.java b/core/src/com/cloud/agent/api/SetupCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/SetupCommand.java rename to core/src/com/cloud/agent/api/SetupCommand.java diff --git a/api/src/com/cloud/agent/api/SetupGuestNetworkAnswer.java b/core/src/com/cloud/agent/api/SetupGuestNetworkAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/SetupGuestNetworkAnswer.java rename to core/src/com/cloud/agent/api/SetupGuestNetworkAnswer.java diff --git a/api/src/com/cloud/agent/api/SetupGuestNetworkCommand.java b/core/src/com/cloud/agent/api/SetupGuestNetworkCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/SetupGuestNetworkCommand.java rename to core/src/com/cloud/agent/api/SetupGuestNetworkCommand.java diff --git a/api/src/com/cloud/agent/api/ShutdownCommand.java b/core/src/com/cloud/agent/api/ShutdownCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/ShutdownCommand.java rename to core/src/com/cloud/agent/api/ShutdownCommand.java diff --git a/api/src/com/cloud/agent/api/SnapshotCommand.java b/core/src/com/cloud/agent/api/SnapshotCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/SnapshotCommand.java rename to core/src/com/cloud/agent/api/SnapshotCommand.java diff --git a/api/src/com/cloud/agent/api/StartAnswer.java b/core/src/com/cloud/agent/api/StartAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/StartAnswer.java rename to core/src/com/cloud/agent/api/StartAnswer.java diff --git a/api/src/com/cloud/agent/api/StartCommand.java b/core/src/com/cloud/agent/api/StartCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/StartCommand.java rename to core/src/com/cloud/agent/api/StartCommand.java diff --git a/api/src/com/cloud/agent/api/StartupAnswer.java b/core/src/com/cloud/agent/api/StartupAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/StartupAnswer.java rename to core/src/com/cloud/agent/api/StartupAnswer.java diff --git a/api/src/com/cloud/agent/api/StartupCommand.java b/core/src/com/cloud/agent/api/StartupCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/StartupCommand.java rename to core/src/com/cloud/agent/api/StartupCommand.java diff --git a/api/src/com/cloud/agent/api/StartupExternalDhcpCommand.java b/core/src/com/cloud/agent/api/StartupExternalDhcpCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/StartupExternalDhcpCommand.java rename to core/src/com/cloud/agent/api/StartupExternalDhcpCommand.java diff --git a/api/src/com/cloud/agent/api/StartupExternalFirewallCommand.java b/core/src/com/cloud/agent/api/StartupExternalFirewallCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/StartupExternalFirewallCommand.java rename to core/src/com/cloud/agent/api/StartupExternalFirewallCommand.java diff --git a/api/src/com/cloud/agent/api/StartupExternalLoadBalancerCommand.java b/core/src/com/cloud/agent/api/StartupExternalLoadBalancerCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/StartupExternalLoadBalancerCommand.java rename to core/src/com/cloud/agent/api/StartupExternalLoadBalancerCommand.java diff --git a/api/src/com/cloud/agent/api/StartupProxyCommand.java b/core/src/com/cloud/agent/api/StartupProxyCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/StartupProxyCommand.java rename to core/src/com/cloud/agent/api/StartupProxyCommand.java diff --git a/api/src/com/cloud/agent/api/StartupPxeServerCommand.java b/core/src/com/cloud/agent/api/StartupPxeServerCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/StartupPxeServerCommand.java rename to core/src/com/cloud/agent/api/StartupPxeServerCommand.java diff --git a/api/src/com/cloud/agent/api/StartupRoutingCommand.java b/core/src/com/cloud/agent/api/StartupRoutingCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/StartupRoutingCommand.java rename to core/src/com/cloud/agent/api/StartupRoutingCommand.java diff --git a/api/src/com/cloud/agent/api/StartupSecondaryStorageCommand.java b/core/src/com/cloud/agent/api/StartupSecondaryStorageCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/StartupSecondaryStorageCommand.java rename to core/src/com/cloud/agent/api/StartupSecondaryStorageCommand.java diff --git a/api/src/com/cloud/agent/api/StartupStorageCommand.java b/core/src/com/cloud/agent/api/StartupStorageCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/StartupStorageCommand.java rename to core/src/com/cloud/agent/api/StartupStorageCommand.java diff --git a/api/src/com/cloud/agent/api/StartupTrafficMonitorCommand.java b/core/src/com/cloud/agent/api/StartupTrafficMonitorCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/StartupTrafficMonitorCommand.java rename to core/src/com/cloud/agent/api/StartupTrafficMonitorCommand.java diff --git a/api/src/com/cloud/agent/api/StopAnswer.java b/core/src/com/cloud/agent/api/StopAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/StopAnswer.java rename to core/src/com/cloud/agent/api/StopAnswer.java diff --git a/api/src/com/cloud/agent/api/StopCommand.java b/core/src/com/cloud/agent/api/StopCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/StopCommand.java rename to core/src/com/cloud/agent/api/StopCommand.java diff --git a/api/src/com/cloud/agent/api/TransferAgentCommand.java b/core/src/com/cloud/agent/api/TransferAgentCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/TransferAgentCommand.java rename to core/src/com/cloud/agent/api/TransferAgentCommand.java diff --git a/api/src/com/cloud/agent/api/UnPlugNicAnswer.java b/core/src/com/cloud/agent/api/UnPlugNicAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/UnPlugNicAnswer.java rename to core/src/com/cloud/agent/api/UnPlugNicAnswer.java diff --git a/api/src/com/cloud/agent/api/UnPlugNicCommand.java b/core/src/com/cloud/agent/api/UnPlugNicCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/UnPlugNicCommand.java rename to core/src/com/cloud/agent/api/UnPlugNicCommand.java diff --git a/api/src/com/cloud/agent/api/UnregisterVMCommand.java b/core/src/com/cloud/agent/api/UnregisterVMCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/UnregisterVMCommand.java rename to core/src/com/cloud/agent/api/UnregisterVMCommand.java diff --git a/api/src/com/cloud/agent/api/UpdateHostPasswordCommand.java b/core/src/com/cloud/agent/api/UpdateHostPasswordCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/UpdateHostPasswordCommand.java rename to core/src/com/cloud/agent/api/UpdateHostPasswordCommand.java diff --git a/api/src/com/cloud/agent/api/UpgradeAnswer.java b/core/src/com/cloud/agent/api/UpgradeAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/UpgradeAnswer.java rename to core/src/com/cloud/agent/api/UpgradeAnswer.java diff --git a/api/src/com/cloud/agent/api/UpgradeCommand.java b/core/src/com/cloud/agent/api/UpgradeCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/UpgradeCommand.java rename to core/src/com/cloud/agent/api/UpgradeCommand.java diff --git a/api/src/com/cloud/agent/api/UpgradeSnapshotCommand.java b/core/src/com/cloud/agent/api/UpgradeSnapshotCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/UpgradeSnapshotCommand.java rename to core/src/com/cloud/agent/api/UpgradeSnapshotCommand.java diff --git a/api/src/com/cloud/agent/api/UploadTemplateToS3FromSecondaryStorageCommand.java b/core/src/com/cloud/agent/api/UploadTemplateToS3FromSecondaryStorageCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/UploadTemplateToS3FromSecondaryStorageCommand.java rename to core/src/com/cloud/agent/api/UploadTemplateToS3FromSecondaryStorageCommand.java diff --git a/api/src/com/cloud/agent/api/VMSnapshotBaseCommand.java b/core/src/com/cloud/agent/api/VMSnapshotBaseCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/VMSnapshotBaseCommand.java rename to core/src/com/cloud/agent/api/VMSnapshotBaseCommand.java diff --git a/api/src/com/cloud/agent/api/VMSnapshotTO.java b/core/src/com/cloud/agent/api/VMSnapshotTO.java similarity index 100% rename from api/src/com/cloud/agent/api/VMSnapshotTO.java rename to core/src/com/cloud/agent/api/VMSnapshotTO.java diff --git a/api/src/com/cloud/agent/api/ValidateSnapshotAnswer.java b/core/src/com/cloud/agent/api/ValidateSnapshotAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/ValidateSnapshotAnswer.java rename to core/src/com/cloud/agent/api/ValidateSnapshotAnswer.java diff --git a/api/src/com/cloud/agent/api/ValidateSnapshotCommand.java b/core/src/com/cloud/agent/api/ValidateSnapshotCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/ValidateSnapshotCommand.java rename to core/src/com/cloud/agent/api/ValidateSnapshotCommand.java diff --git a/api/src/com/cloud/agent/api/VmStatsEntry.java b/core/src/com/cloud/agent/api/VmStatsEntry.java similarity index 100% rename from api/src/com/cloud/agent/api/VmStatsEntry.java rename to core/src/com/cloud/agent/api/VmStatsEntry.java diff --git a/api/src/com/cloud/agent/api/baremetal/IpmISetBootDevCommand.java b/core/src/com/cloud/agent/api/baremetal/IpmISetBootDevCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/baremetal/IpmISetBootDevCommand.java rename to core/src/com/cloud/agent/api/baremetal/IpmISetBootDevCommand.java diff --git a/api/src/com/cloud/agent/api/baremetal/IpmiBootorResetCommand.java b/core/src/com/cloud/agent/api/baremetal/IpmiBootorResetCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/baremetal/IpmiBootorResetCommand.java rename to core/src/com/cloud/agent/api/baremetal/IpmiBootorResetCommand.java diff --git a/api/src/com/cloud/agent/api/baremetal/PreparePxeServerAnswer.java b/core/src/com/cloud/agent/api/baremetal/PreparePxeServerAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/baremetal/PreparePxeServerAnswer.java rename to core/src/com/cloud/agent/api/baremetal/PreparePxeServerAnswer.java diff --git a/api/src/com/cloud/agent/api/baremetal/PreparePxeServerCommand.java b/core/src/com/cloud/agent/api/baremetal/PreparePxeServerCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/baremetal/PreparePxeServerCommand.java rename to core/src/com/cloud/agent/api/baremetal/PreparePxeServerCommand.java diff --git a/api/src/com/cloud/agent/api/baremetal/prepareCreateTemplateCommand.java b/core/src/com/cloud/agent/api/baremetal/prepareCreateTemplateCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/baremetal/prepareCreateTemplateCommand.java rename to core/src/com/cloud/agent/api/baremetal/prepareCreateTemplateCommand.java diff --git a/api/src/com/cloud/agent/api/check/CheckSshAnswer.java b/core/src/com/cloud/agent/api/check/CheckSshAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/check/CheckSshAnswer.java rename to core/src/com/cloud/agent/api/check/CheckSshAnswer.java diff --git a/api/src/com/cloud/agent/api/check/CheckSshCommand.java b/core/src/com/cloud/agent/api/check/CheckSshCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/check/CheckSshCommand.java rename to core/src/com/cloud/agent/api/check/CheckSshCommand.java diff --git a/api/src/com/cloud/agent/api/downloadSnapshotFromSwiftCommand.java b/core/src/com/cloud/agent/api/downloadSnapshotFromSwiftCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/downloadSnapshotFromSwiftCommand.java rename to core/src/com/cloud/agent/api/downloadSnapshotFromSwiftCommand.java diff --git a/api/src/com/cloud/agent/api/downloadTemplateFromSwiftToSecondaryStorageCommand.java b/core/src/com/cloud/agent/api/downloadTemplateFromSwiftToSecondaryStorageCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/downloadTemplateFromSwiftToSecondaryStorageCommand.java rename to core/src/com/cloud/agent/api/downloadTemplateFromSwiftToSecondaryStorageCommand.java diff --git a/api/src/com/cloud/agent/api/proxy/CheckConsoleProxyLoadCommand.java b/core/src/com/cloud/agent/api/proxy/CheckConsoleProxyLoadCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/proxy/CheckConsoleProxyLoadCommand.java rename to core/src/com/cloud/agent/api/proxy/CheckConsoleProxyLoadCommand.java diff --git a/api/src/com/cloud/agent/api/proxy/ConsoleProxyLoadAnswer.java b/core/src/com/cloud/agent/api/proxy/ConsoleProxyLoadAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/proxy/ConsoleProxyLoadAnswer.java rename to core/src/com/cloud/agent/api/proxy/ConsoleProxyLoadAnswer.java diff --git a/api/src/com/cloud/agent/api/proxy/ProxyCommand.java b/core/src/com/cloud/agent/api/proxy/ProxyCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/proxy/ProxyCommand.java rename to core/src/com/cloud/agent/api/proxy/ProxyCommand.java diff --git a/api/src/com/cloud/agent/api/proxy/StartConsoleProxyAgentHttpHandlerCommand.java b/core/src/com/cloud/agent/api/proxy/StartConsoleProxyAgentHttpHandlerCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/proxy/StartConsoleProxyAgentHttpHandlerCommand.java rename to core/src/com/cloud/agent/api/proxy/StartConsoleProxyAgentHttpHandlerCommand.java diff --git a/api/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java b/core/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java rename to core/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java diff --git a/api/src/com/cloud/agent/api/routing/CreateLoadBalancerApplianceCommand.java b/core/src/com/cloud/agent/api/routing/CreateLoadBalancerApplianceCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/routing/CreateLoadBalancerApplianceCommand.java rename to core/src/com/cloud/agent/api/routing/CreateLoadBalancerApplianceCommand.java diff --git a/api/src/com/cloud/agent/api/routing/DestroyLoadBalancerApplianceCommand.java b/core/src/com/cloud/agent/api/routing/DestroyLoadBalancerApplianceCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/routing/DestroyLoadBalancerApplianceCommand.java rename to core/src/com/cloud/agent/api/routing/DestroyLoadBalancerApplianceCommand.java diff --git a/api/src/com/cloud/agent/api/routing/DhcpEntryCommand.java b/core/src/com/cloud/agent/api/routing/DhcpEntryCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/routing/DhcpEntryCommand.java rename to core/src/com/cloud/agent/api/routing/DhcpEntryCommand.java diff --git a/api/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigAnswer.java b/core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigAnswer.java rename to core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigAnswer.java diff --git a/api/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigCommand.java b/core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigCommand.java rename to core/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigCommand.java diff --git a/api/src/com/cloud/agent/api/routing/HealthCheckLBConfigAnswer.java b/core/src/com/cloud/agent/api/routing/HealthCheckLBConfigAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/routing/HealthCheckLBConfigAnswer.java rename to core/src/com/cloud/agent/api/routing/HealthCheckLBConfigAnswer.java diff --git a/api/src/com/cloud/agent/api/routing/HealthCheckLBConfigCommand.java b/core/src/com/cloud/agent/api/routing/HealthCheckLBConfigCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/routing/HealthCheckLBConfigCommand.java rename to core/src/com/cloud/agent/api/routing/HealthCheckLBConfigCommand.java diff --git a/api/src/com/cloud/agent/api/routing/IpAssocAnswer.java b/core/src/com/cloud/agent/api/routing/IpAssocAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/routing/IpAssocAnswer.java rename to core/src/com/cloud/agent/api/routing/IpAssocAnswer.java diff --git a/api/src/com/cloud/agent/api/routing/IpAssocCommand.java b/core/src/com/cloud/agent/api/routing/IpAssocCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/routing/IpAssocCommand.java rename to core/src/com/cloud/agent/api/routing/IpAssocCommand.java diff --git a/api/src/com/cloud/agent/api/routing/IpAssocVpcCommand.java b/core/src/com/cloud/agent/api/routing/IpAssocVpcCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/routing/IpAssocVpcCommand.java rename to core/src/com/cloud/agent/api/routing/IpAssocVpcCommand.java diff --git a/api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java b/core/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java rename to core/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java diff --git a/api/src/com/cloud/agent/api/routing/NetworkElementCommand.java b/core/src/com/cloud/agent/api/routing/NetworkElementCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/routing/NetworkElementCommand.java rename to core/src/com/cloud/agent/api/routing/NetworkElementCommand.java diff --git a/api/src/com/cloud/agent/api/routing/RemoteAccessVpnCfgCommand.java b/core/src/com/cloud/agent/api/routing/RemoteAccessVpnCfgCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/routing/RemoteAccessVpnCfgCommand.java rename to core/src/com/cloud/agent/api/routing/RemoteAccessVpnCfgCommand.java diff --git a/api/src/com/cloud/agent/api/routing/SavePasswordCommand.java b/core/src/com/cloud/agent/api/routing/SavePasswordCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/routing/SavePasswordCommand.java rename to core/src/com/cloud/agent/api/routing/SavePasswordCommand.java diff --git a/api/src/com/cloud/agent/api/routing/SetFirewallRulesAnswer.java b/core/src/com/cloud/agent/api/routing/SetFirewallRulesAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/routing/SetFirewallRulesAnswer.java rename to core/src/com/cloud/agent/api/routing/SetFirewallRulesAnswer.java diff --git a/api/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java b/core/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java rename to core/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java diff --git a/api/src/com/cloud/agent/api/routing/SetNetworkACLAnswer.java b/core/src/com/cloud/agent/api/routing/SetNetworkACLAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/routing/SetNetworkACLAnswer.java rename to core/src/com/cloud/agent/api/routing/SetNetworkACLAnswer.java diff --git a/api/src/com/cloud/agent/api/routing/SetNetworkACLCommand.java b/core/src/com/cloud/agent/api/routing/SetNetworkACLCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/routing/SetNetworkACLCommand.java rename to core/src/com/cloud/agent/api/routing/SetNetworkACLCommand.java diff --git a/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesAnswer.java b/core/src/com/cloud/agent/api/routing/SetPortForwardingRulesAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/routing/SetPortForwardingRulesAnswer.java rename to core/src/com/cloud/agent/api/routing/SetPortForwardingRulesAnswer.java diff --git a/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesCommand.java b/core/src/com/cloud/agent/api/routing/SetPortForwardingRulesCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/routing/SetPortForwardingRulesCommand.java rename to core/src/com/cloud/agent/api/routing/SetPortForwardingRulesCommand.java diff --git a/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesVpcCommand.java b/core/src/com/cloud/agent/api/routing/SetPortForwardingRulesVpcCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/routing/SetPortForwardingRulesVpcCommand.java rename to core/src/com/cloud/agent/api/routing/SetPortForwardingRulesVpcCommand.java diff --git a/api/src/com/cloud/agent/api/routing/SetSourceNatAnswer.java b/core/src/com/cloud/agent/api/routing/SetSourceNatAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/routing/SetSourceNatAnswer.java rename to core/src/com/cloud/agent/api/routing/SetSourceNatAnswer.java diff --git a/api/src/com/cloud/agent/api/routing/SetSourceNatCommand.java b/core/src/com/cloud/agent/api/routing/SetSourceNatCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/routing/SetSourceNatCommand.java rename to core/src/com/cloud/agent/api/routing/SetSourceNatCommand.java diff --git a/api/src/com/cloud/agent/api/routing/SetStaticNatRulesAnswer.java b/core/src/com/cloud/agent/api/routing/SetStaticNatRulesAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/routing/SetStaticNatRulesAnswer.java rename to core/src/com/cloud/agent/api/routing/SetStaticNatRulesAnswer.java diff --git a/api/src/com/cloud/agent/api/routing/SetStaticNatRulesCommand.java b/core/src/com/cloud/agent/api/routing/SetStaticNatRulesCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/routing/SetStaticNatRulesCommand.java rename to core/src/com/cloud/agent/api/routing/SetStaticNatRulesCommand.java diff --git a/api/src/com/cloud/agent/api/routing/SetStaticRouteAnswer.java b/core/src/com/cloud/agent/api/routing/SetStaticRouteAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/routing/SetStaticRouteAnswer.java rename to core/src/com/cloud/agent/api/routing/SetStaticRouteAnswer.java diff --git a/api/src/com/cloud/agent/api/routing/SetStaticRouteCommand.java b/core/src/com/cloud/agent/api/routing/SetStaticRouteCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/routing/SetStaticRouteCommand.java rename to core/src/com/cloud/agent/api/routing/SetStaticRouteCommand.java diff --git a/api/src/com/cloud/agent/api/routing/Site2SiteVpnCfgCommand.java b/core/src/com/cloud/agent/api/routing/Site2SiteVpnCfgCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/routing/Site2SiteVpnCfgCommand.java rename to core/src/com/cloud/agent/api/routing/Site2SiteVpnCfgCommand.java diff --git a/api/src/com/cloud/agent/api/routing/SiteLoadBalancerConfig.java b/core/src/com/cloud/agent/api/routing/SiteLoadBalancerConfig.java similarity index 100% rename from api/src/com/cloud/agent/api/routing/SiteLoadBalancerConfig.java rename to core/src/com/cloud/agent/api/routing/SiteLoadBalancerConfig.java diff --git a/api/src/com/cloud/agent/api/routing/UserDataCommand.java b/core/src/com/cloud/agent/api/routing/UserDataCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/routing/UserDataCommand.java rename to core/src/com/cloud/agent/api/routing/UserDataCommand.java diff --git a/api/src/com/cloud/agent/api/routing/VmDataCommand.java b/core/src/com/cloud/agent/api/routing/VmDataCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/routing/VmDataCommand.java rename to core/src/com/cloud/agent/api/routing/VmDataCommand.java diff --git a/api/src/com/cloud/agent/api/routing/VpnUsersCfgCommand.java b/core/src/com/cloud/agent/api/routing/VpnUsersCfgCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/routing/VpnUsersCfgCommand.java rename to core/src/com/cloud/agent/api/routing/VpnUsersCfgCommand.java diff --git a/api/src/com/cloud/agent/api/storage/AbstractDownloadCommand.java b/core/src/com/cloud/agent/api/storage/AbstractDownloadCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/AbstractDownloadCommand.java rename to core/src/com/cloud/agent/api/storage/AbstractDownloadCommand.java diff --git a/api/src/com/cloud/agent/api/storage/AbstractUploadCommand.java b/core/src/com/cloud/agent/api/storage/AbstractUploadCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/AbstractUploadCommand.java rename to core/src/com/cloud/agent/api/storage/AbstractUploadCommand.java diff --git a/api/src/com/cloud/agent/api/storage/CopyVolumeAnswer.java b/core/src/com/cloud/agent/api/storage/CopyVolumeAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/CopyVolumeAnswer.java rename to core/src/com/cloud/agent/api/storage/CopyVolumeAnswer.java diff --git a/api/src/com/cloud/agent/api/storage/CopyVolumeCommand.java b/core/src/com/cloud/agent/api/storage/CopyVolumeCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/CopyVolumeCommand.java rename to core/src/com/cloud/agent/api/storage/CopyVolumeCommand.java diff --git a/api/src/com/cloud/agent/api/storage/CreateAnswer.java b/core/src/com/cloud/agent/api/storage/CreateAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/CreateAnswer.java rename to core/src/com/cloud/agent/api/storage/CreateAnswer.java diff --git a/api/src/com/cloud/agent/api/storage/CreateCommand.java b/core/src/com/cloud/agent/api/storage/CreateCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/CreateCommand.java rename to core/src/com/cloud/agent/api/storage/CreateCommand.java diff --git a/api/src/com/cloud/agent/api/storage/CreateEntityDownloadURLAnswer.java b/core/src/com/cloud/agent/api/storage/CreateEntityDownloadURLAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/CreateEntityDownloadURLAnswer.java rename to core/src/com/cloud/agent/api/storage/CreateEntityDownloadURLAnswer.java diff --git a/api/src/com/cloud/agent/api/storage/CreateEntityDownloadURLCommand.java b/core/src/com/cloud/agent/api/storage/CreateEntityDownloadURLCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/CreateEntityDownloadURLCommand.java rename to core/src/com/cloud/agent/api/storage/CreateEntityDownloadURLCommand.java diff --git a/api/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java b/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java rename to core/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java diff --git a/api/src/com/cloud/agent/api/storage/CreatePrivateTemplateCommand.java b/core/src/com/cloud/agent/api/storage/CreatePrivateTemplateCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/CreatePrivateTemplateCommand.java rename to core/src/com/cloud/agent/api/storage/CreatePrivateTemplateCommand.java diff --git a/api/src/com/cloud/agent/api/storage/DeleteEntityDownloadURLAnswer.java b/core/src/com/cloud/agent/api/storage/DeleteEntityDownloadURLAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/DeleteEntityDownloadURLAnswer.java rename to core/src/com/cloud/agent/api/storage/DeleteEntityDownloadURLAnswer.java diff --git a/api/src/com/cloud/agent/api/storage/DeleteEntityDownloadURLCommand.java b/core/src/com/cloud/agent/api/storage/DeleteEntityDownloadURLCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/DeleteEntityDownloadURLCommand.java rename to core/src/com/cloud/agent/api/storage/DeleteEntityDownloadURLCommand.java diff --git a/api/src/com/cloud/agent/api/storage/DeleteTemplateCommand.java b/core/src/com/cloud/agent/api/storage/DeleteTemplateCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/DeleteTemplateCommand.java rename to core/src/com/cloud/agent/api/storage/DeleteTemplateCommand.java diff --git a/api/src/com/cloud/agent/api/storage/DeleteVolumeCommand.java b/core/src/com/cloud/agent/api/storage/DeleteVolumeCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/DeleteVolumeCommand.java rename to core/src/com/cloud/agent/api/storage/DeleteVolumeCommand.java diff --git a/api/src/com/cloud/agent/api/storage/DestroyAnswer.java b/core/src/com/cloud/agent/api/storage/DestroyAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/DestroyAnswer.java rename to core/src/com/cloud/agent/api/storage/DestroyAnswer.java diff --git a/api/src/com/cloud/agent/api/storage/DestroyCommand.java b/core/src/com/cloud/agent/api/storage/DestroyCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/DestroyCommand.java rename to core/src/com/cloud/agent/api/storage/DestroyCommand.java diff --git a/api/src/com/cloud/agent/api/storage/DownloadAnswer.java b/core/src/com/cloud/agent/api/storage/DownloadAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/DownloadAnswer.java rename to core/src/com/cloud/agent/api/storage/DownloadAnswer.java diff --git a/api/src/com/cloud/agent/api/storage/DownloadCommand.java b/core/src/com/cloud/agent/api/storage/DownloadCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/DownloadCommand.java rename to core/src/com/cloud/agent/api/storage/DownloadCommand.java diff --git a/api/src/com/cloud/agent/api/storage/DownloadProgressCommand.java b/core/src/com/cloud/agent/api/storage/DownloadProgressCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/DownloadProgressCommand.java rename to core/src/com/cloud/agent/api/storage/DownloadProgressCommand.java diff --git a/api/src/com/cloud/agent/api/storage/ListTemplateAnswer.java b/core/src/com/cloud/agent/api/storage/ListTemplateAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/ListTemplateAnswer.java rename to core/src/com/cloud/agent/api/storage/ListTemplateAnswer.java diff --git a/api/src/com/cloud/agent/api/storage/ListTemplateCommand.java b/core/src/com/cloud/agent/api/storage/ListTemplateCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/ListTemplateCommand.java rename to core/src/com/cloud/agent/api/storage/ListTemplateCommand.java diff --git a/api/src/com/cloud/agent/api/storage/ListVolumeAnswer.java b/core/src/com/cloud/agent/api/storage/ListVolumeAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/ListVolumeAnswer.java rename to core/src/com/cloud/agent/api/storage/ListVolumeAnswer.java diff --git a/api/src/com/cloud/agent/api/storage/ListVolumeCommand.java b/core/src/com/cloud/agent/api/storage/ListVolumeCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/ListVolumeCommand.java rename to core/src/com/cloud/agent/api/storage/ListVolumeCommand.java diff --git a/api/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityAnswer.java b/core/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityAnswer.java rename to core/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityAnswer.java diff --git a/api/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityCommand.java b/core/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityCommand.java rename to core/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityCommand.java diff --git a/api/src/com/cloud/agent/api/storage/MigrateVolumeAnswer.java b/core/src/com/cloud/agent/api/storage/MigrateVolumeAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/MigrateVolumeAnswer.java rename to core/src/com/cloud/agent/api/storage/MigrateVolumeAnswer.java diff --git a/api/src/com/cloud/agent/api/storage/MigrateVolumeCommand.java b/core/src/com/cloud/agent/api/storage/MigrateVolumeCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/MigrateVolumeCommand.java rename to core/src/com/cloud/agent/api/storage/MigrateVolumeCommand.java diff --git a/api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadAnswer.java b/core/src/com/cloud/agent/api/storage/PrimaryStorageDownloadAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadAnswer.java rename to core/src/com/cloud/agent/api/storage/PrimaryStorageDownloadAnswer.java diff --git a/api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java b/core/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java rename to core/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java diff --git a/api/src/com/cloud/agent/api/storage/ResizeVolumeAnswer.java b/core/src/com/cloud/agent/api/storage/ResizeVolumeAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/ResizeVolumeAnswer.java rename to core/src/com/cloud/agent/api/storage/ResizeVolumeAnswer.java diff --git a/api/src/com/cloud/agent/api/storage/ResizeVolumeCommand.java b/core/src/com/cloud/agent/api/storage/ResizeVolumeCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/ResizeVolumeCommand.java rename to core/src/com/cloud/agent/api/storage/ResizeVolumeCommand.java diff --git a/api/src/com/cloud/agent/api/storage/StorageCommand.java b/core/src/com/cloud/agent/api/storage/StorageCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/StorageCommand.java rename to core/src/com/cloud/agent/api/storage/StorageCommand.java diff --git a/api/src/com/cloud/agent/api/storage/UpgradeDiskAnswer.java b/core/src/com/cloud/agent/api/storage/UpgradeDiskAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/UpgradeDiskAnswer.java rename to core/src/com/cloud/agent/api/storage/UpgradeDiskAnswer.java diff --git a/api/src/com/cloud/agent/api/storage/UpgradeDiskCommand.java b/core/src/com/cloud/agent/api/storage/UpgradeDiskCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/UpgradeDiskCommand.java rename to core/src/com/cloud/agent/api/storage/UpgradeDiskCommand.java diff --git a/api/src/com/cloud/agent/api/storage/UploadAnswer.java b/core/src/com/cloud/agent/api/storage/UploadAnswer.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/UploadAnswer.java rename to core/src/com/cloud/agent/api/storage/UploadAnswer.java diff --git a/api/src/com/cloud/agent/api/storage/UploadCommand.java b/core/src/com/cloud/agent/api/storage/UploadCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/UploadCommand.java rename to core/src/com/cloud/agent/api/storage/UploadCommand.java diff --git a/api/src/com/cloud/agent/api/storage/UploadProgressCommand.java b/core/src/com/cloud/agent/api/storage/UploadProgressCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/UploadProgressCommand.java rename to core/src/com/cloud/agent/api/storage/UploadProgressCommand.java diff --git a/api/src/com/cloud/agent/api/storage/ssCommand.java b/core/src/com/cloud/agent/api/storage/ssCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/storage/ssCommand.java rename to core/src/com/cloud/agent/api/storage/ssCommand.java diff --git a/api/src/com/cloud/agent/api/uploadTemplateToSwiftFromSecondaryStorageCommand.java b/core/src/com/cloud/agent/api/uploadTemplateToSwiftFromSecondaryStorageCommand.java similarity index 100% rename from api/src/com/cloud/agent/api/uploadTemplateToSwiftFromSecondaryStorageCommand.java rename to core/src/com/cloud/agent/api/uploadTemplateToSwiftFromSecondaryStorageCommand.java diff --git a/core/src/com/cloud/resource/ResourceListener.java b/core/src/com/cloud/resource/ResourceListener.java index 0efea12aee5..17fba6cd52d 100755 --- a/core/src/com/cloud/resource/ResourceListener.java +++ b/core/src/com/cloud/resource/ResourceListener.java @@ -20,7 +20,7 @@ import java.net.URI; import java.util.List; import java.util.Map; -import com.cloud.host.HostVO; +import com.cloud.host.Host; public interface ResourceListener { static final Integer EVENT_DISCOVER_BEFORE = 0x1; @@ -33,9 +33,9 @@ public interface ResourceListener { static final Integer EVENT_PREPARE_MAINTENANCE_AFTER = 0x1 << 7; static final Integer EVENT_ALL = (EVENT_DISCOVER_BEFORE | EVENT_DISCOVER_AFTER | EVENT_DELETE_HOST_BEFORE | EVENT_DELETE_HOST_AFTER | EVENT_CANCEL_MAINTENANCE_BEFORE | EVENT_CANCEL_MAINTENANCE_AFTER | EVENT_PREPARE_MAINTENANCE_BEFORE | EVENT_PREPARE_MAINTENANCE_AFTER); - + /** - * + * * @param dcid * @param podId * @param clusterId @@ -43,63 +43,63 @@ public interface ResourceListener { * @param username * @param password * @param hostTags - * + * * Called before Discover.find() */ void processDiscoverEventBefore(Long dcid, Long podId, Long clusterId, URI uri, String username, String password, List hostTags); /** - * + * * @param resources - * + * * Called after Discover.find() */ void processDiscoverEventAfter(Map> resources); /** - * + * * @param host - * + * * Called before host delete */ - void processDeleteHostEventBefore(HostVO host); + void processDeleteHostEventBefore(Host host); /** - * + * * @param host - * + * * Called after host delete. NOTE param host includes stale data which has been removed from database */ - void processDeletHostEventAfter(HostVO host); + void processDeletHostEventAfter(Host host); /** - * + * * @param hostId - * + * * Called before AgentManager.cancelMaintenance */ void processCancelMaintenaceEventBefore(Long hostId); /** - * + * * @param hostId - * + * * Called after AgentManager.cancelMaintenance */ void processCancelMaintenaceEventAfter(Long hostId); /** - * + * * @param hostId - * + * * Called before AgentManager.main */ void processPrepareMaintenaceEventBefore(Long hostId); /** - * + * * @param hostId - * + * * Called after AgentManager.main */ void processPrepareMaintenaceEventAfter(Long hostId); diff --git a/api/src/com/cloud/storage/resource/StoragePoolResource.java b/core/src/com/cloud/storage/resource/StoragePoolResource.java similarity index 100% rename from api/src/com/cloud/storage/resource/StoragePoolResource.java rename to core/src/com/cloud/storage/resource/StoragePoolResource.java diff --git a/api/test/org/apache/cloudstack/api/agent/test/AgentControlAnswerTest.java b/core/test/org/apache/cloudstack/api/agent/test/AgentControlAnswerTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/agent/test/AgentControlAnswerTest.java rename to core/test/org/apache/cloudstack/api/agent/test/AgentControlAnswerTest.java diff --git a/api/test/org/apache/cloudstack/api/agent/test/AgentControlCommandTest.java b/core/test/org/apache/cloudstack/api/agent/test/AgentControlCommandTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/agent/test/AgentControlCommandTest.java rename to core/test/org/apache/cloudstack/api/agent/test/AgentControlCommandTest.java diff --git a/api/test/org/apache/cloudstack/api/agent/test/AnswerTest.java b/core/test/org/apache/cloudstack/api/agent/test/AnswerTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/agent/test/AnswerTest.java rename to core/test/org/apache/cloudstack/api/agent/test/AnswerTest.java diff --git a/api/test/org/apache/cloudstack/api/agent/test/AttachIsoCommandTest.java b/core/test/org/apache/cloudstack/api/agent/test/AttachIsoCommandTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/agent/test/AttachIsoCommandTest.java rename to core/test/org/apache/cloudstack/api/agent/test/AttachIsoCommandTest.java diff --git a/api/test/org/apache/cloudstack/api/agent/test/AttachVolumeAnswerTest.java b/core/test/org/apache/cloudstack/api/agent/test/AttachVolumeAnswerTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/agent/test/AttachVolumeAnswerTest.java rename to core/test/org/apache/cloudstack/api/agent/test/AttachVolumeAnswerTest.java diff --git a/api/test/org/apache/cloudstack/api/agent/test/AttachVolumeCommandTest.java b/core/test/org/apache/cloudstack/api/agent/test/AttachVolumeCommandTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/agent/test/AttachVolumeCommandTest.java rename to core/test/org/apache/cloudstack/api/agent/test/AttachVolumeCommandTest.java diff --git a/api/test/org/apache/cloudstack/api/agent/test/BackupSnapshotAnswerTest.java b/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotAnswerTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/agent/test/BackupSnapshotAnswerTest.java rename to core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotAnswerTest.java diff --git a/api/test/org/apache/cloudstack/api/agent/test/BackupSnapshotCommandTest.java b/core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotCommandTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/agent/test/BackupSnapshotCommandTest.java rename to core/test/org/apache/cloudstack/api/agent/test/BackupSnapshotCommandTest.java diff --git a/api/test/org/apache/cloudstack/api/agent/test/BumpUpPriorityCommandTest.java b/core/test/org/apache/cloudstack/api/agent/test/BumpUpPriorityCommandTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/agent/test/BumpUpPriorityCommandTest.java rename to core/test/org/apache/cloudstack/api/agent/test/BumpUpPriorityCommandTest.java diff --git a/api/test/org/apache/cloudstack/api/agent/test/CancelCommandTest.java b/core/test/org/apache/cloudstack/api/agent/test/CancelCommandTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/agent/test/CancelCommandTest.java rename to core/test/org/apache/cloudstack/api/agent/test/CancelCommandTest.java diff --git a/api/test/org/apache/cloudstack/api/agent/test/ChangeAgentAnswerTest.java b/core/test/org/apache/cloudstack/api/agent/test/ChangeAgentAnswerTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/agent/test/ChangeAgentAnswerTest.java rename to core/test/org/apache/cloudstack/api/agent/test/ChangeAgentAnswerTest.java diff --git a/api/test/org/apache/cloudstack/api/agent/test/ChangeAgentCommandTest.java b/core/test/org/apache/cloudstack/api/agent/test/ChangeAgentCommandTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/agent/test/ChangeAgentCommandTest.java rename to core/test/org/apache/cloudstack/api/agent/test/ChangeAgentCommandTest.java diff --git a/api/test/org/apache/cloudstack/api/agent/test/CheckHealthAnswerTest.java b/core/test/org/apache/cloudstack/api/agent/test/CheckHealthAnswerTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/agent/test/CheckHealthAnswerTest.java rename to core/test/org/apache/cloudstack/api/agent/test/CheckHealthAnswerTest.java diff --git a/api/test/org/apache/cloudstack/api/agent/test/CheckHealthCommandTest.java b/core/test/org/apache/cloudstack/api/agent/test/CheckHealthCommandTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/agent/test/CheckHealthCommandTest.java rename to core/test/org/apache/cloudstack/api/agent/test/CheckHealthCommandTest.java diff --git a/api/test/org/apache/cloudstack/api/agent/test/CheckNetworkAnswerTest.java b/core/test/org/apache/cloudstack/api/agent/test/CheckNetworkAnswerTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/agent/test/CheckNetworkAnswerTest.java rename to core/test/org/apache/cloudstack/api/agent/test/CheckNetworkAnswerTest.java diff --git a/api/test/org/apache/cloudstack/api/agent/test/CheckNetworkCommandTest.java b/core/test/org/apache/cloudstack/api/agent/test/CheckNetworkCommandTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/agent/test/CheckNetworkCommandTest.java rename to core/test/org/apache/cloudstack/api/agent/test/CheckNetworkCommandTest.java diff --git a/api/test/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java b/core/test/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java rename to core/test/org/apache/cloudstack/api/agent/test/CheckOnHostCommandTest.java diff --git a/api/test/org/apache/cloudstack/api/agent/test/SnapshotCommandTest.java b/core/test/org/apache/cloudstack/api/agent/test/SnapshotCommandTest.java similarity index 100% rename from api/test/org/apache/cloudstack/api/agent/test/SnapshotCommandTest.java rename to core/test/org/apache/cloudstack/api/agent/test/SnapshotCommandTest.java diff --git a/api/test/src/com/cloud/agent/api/test/ResizeVolumeCommandTest.java b/core/test/src/com/cloud/agent/api/test/ResizeVolumeCommandTest.java similarity index 100% rename from api/test/src/com/cloud/agent/api/test/ResizeVolumeCommandTest.java rename to core/test/src/com/cloud/agent/api/test/ResizeVolumeCommandTest.java diff --git a/core/src/com/cloud/capacity/CapacityVO.java b/engine/schema/src/com/cloud/capacity/CapacityVO.java similarity index 100% rename from core/src/com/cloud/capacity/CapacityVO.java rename to engine/schema/src/com/cloud/capacity/CapacityVO.java diff --git a/core/src/com/cloud/certificate/CertificateVO.java b/engine/schema/src/com/cloud/certificate/CertificateVO.java similarity index 100% rename from core/src/com/cloud/certificate/CertificateVO.java rename to engine/schema/src/com/cloud/certificate/CertificateVO.java diff --git a/core/src/com/cloud/host/DetailVO.java b/engine/schema/src/com/cloud/host/DetailVO.java similarity index 100% rename from core/src/com/cloud/host/DetailVO.java rename to engine/schema/src/com/cloud/host/DetailVO.java diff --git a/core/src/com/cloud/host/HostTagVO.java b/engine/schema/src/com/cloud/host/HostTagVO.java similarity index 100% rename from core/src/com/cloud/host/HostTagVO.java rename to engine/schema/src/com/cloud/host/HostTagVO.java diff --git a/core/src/com/cloud/host/HostVO.java b/engine/schema/src/com/cloud/host/HostVO.java similarity index 100% rename from core/src/com/cloud/host/HostVO.java rename to engine/schema/src/com/cloud/host/HostVO.java diff --git a/core/src/com/cloud/hypervisor/HypervisorCapabilitiesVO.java b/engine/schema/src/com/cloud/hypervisor/HypervisorCapabilitiesVO.java similarity index 100% rename from core/src/com/cloud/hypervisor/HypervisorCapabilitiesVO.java rename to engine/schema/src/com/cloud/hypervisor/HypervisorCapabilitiesVO.java diff --git a/core/src/com/cloud/network/VpnUserVO.java b/engine/schema/src/com/cloud/network/VpnUserVO.java similarity index 100% rename from core/src/com/cloud/network/VpnUserVO.java rename to engine/schema/src/com/cloud/network/VpnUserVO.java diff --git a/core/src/com/cloud/network/security/SecurityGroupRuleVO.java b/engine/schema/src/com/cloud/network/security/SecurityGroupRuleVO.java similarity index 100% rename from core/src/com/cloud/network/security/SecurityGroupRuleVO.java rename to engine/schema/src/com/cloud/network/security/SecurityGroupRuleVO.java diff --git a/core/src/com/cloud/network/security/SecurityGroupRulesVO.java b/engine/schema/src/com/cloud/network/security/SecurityGroupRulesVO.java similarity index 100% rename from core/src/com/cloud/network/security/SecurityGroupRulesVO.java rename to engine/schema/src/com/cloud/network/security/SecurityGroupRulesVO.java diff --git a/core/src/com/cloud/network/security/SecurityGroupVMMapVO.java b/engine/schema/src/com/cloud/network/security/SecurityGroupVMMapVO.java similarity index 100% rename from core/src/com/cloud/network/security/SecurityGroupVMMapVO.java rename to engine/schema/src/com/cloud/network/security/SecurityGroupVMMapVO.java diff --git a/core/src/com/cloud/network/security/SecurityGroupVO.java b/engine/schema/src/com/cloud/network/security/SecurityGroupVO.java similarity index 100% rename from core/src/com/cloud/network/security/SecurityGroupVO.java rename to engine/schema/src/com/cloud/network/security/SecurityGroupVO.java diff --git a/core/src/com/cloud/network/security/SecurityGroupWork.java b/engine/schema/src/com/cloud/network/security/SecurityGroupWork.java similarity index 100% rename from core/src/com/cloud/network/security/SecurityGroupWork.java rename to engine/schema/src/com/cloud/network/security/SecurityGroupWork.java diff --git a/core/src/com/cloud/network/security/SecurityGroupWorkVO.java b/engine/schema/src/com/cloud/network/security/SecurityGroupWorkVO.java similarity index 100% rename from core/src/com/cloud/network/security/SecurityGroupWorkVO.java rename to engine/schema/src/com/cloud/network/security/SecurityGroupWorkVO.java diff --git a/core/src/com/cloud/network/security/VmRulesetLogVO.java b/engine/schema/src/com/cloud/network/security/VmRulesetLogVO.java similarity index 100% rename from core/src/com/cloud/network/security/VmRulesetLogVO.java rename to engine/schema/src/com/cloud/network/security/VmRulesetLogVO.java diff --git a/core/src/com/cloud/storage/DiskOfferingVO.java b/engine/schema/src/com/cloud/storage/DiskOfferingVO.java similarity index 100% rename from core/src/com/cloud/storage/DiskOfferingVO.java rename to engine/schema/src/com/cloud/storage/DiskOfferingVO.java diff --git a/core/src/com/cloud/storage/GuestOSCategoryVO.java b/engine/schema/src/com/cloud/storage/GuestOSCategoryVO.java similarity index 100% rename from core/src/com/cloud/storage/GuestOSCategoryVO.java rename to engine/schema/src/com/cloud/storage/GuestOSCategoryVO.java diff --git a/core/src/com/cloud/storage/GuestOSVO.java b/engine/schema/src/com/cloud/storage/GuestOSVO.java similarity index 100% rename from core/src/com/cloud/storage/GuestOSVO.java rename to engine/schema/src/com/cloud/storage/GuestOSVO.java diff --git a/core/src/com/cloud/storage/LaunchPermissionVO.java b/engine/schema/src/com/cloud/storage/LaunchPermissionVO.java similarity index 100% rename from core/src/com/cloud/storage/LaunchPermissionVO.java rename to engine/schema/src/com/cloud/storage/LaunchPermissionVO.java diff --git a/core/src/com/cloud/storage/S3VO.java b/engine/schema/src/com/cloud/storage/S3VO.java similarity index 100% rename from core/src/com/cloud/storage/S3VO.java rename to engine/schema/src/com/cloud/storage/S3VO.java diff --git a/core/src/com/cloud/storage/SnapshotPolicyVO.java b/engine/schema/src/com/cloud/storage/SnapshotPolicyVO.java similarity index 100% rename from core/src/com/cloud/storage/SnapshotPolicyVO.java rename to engine/schema/src/com/cloud/storage/SnapshotPolicyVO.java diff --git a/core/src/com/cloud/storage/SnapshotScheduleVO.java b/engine/schema/src/com/cloud/storage/SnapshotScheduleVO.java similarity index 100% rename from core/src/com/cloud/storage/SnapshotScheduleVO.java rename to engine/schema/src/com/cloud/storage/SnapshotScheduleVO.java diff --git a/core/src/com/cloud/storage/SnapshotVO.java b/engine/schema/src/com/cloud/storage/SnapshotVO.java similarity index 100% rename from core/src/com/cloud/storage/SnapshotVO.java rename to engine/schema/src/com/cloud/storage/SnapshotVO.java diff --git a/core/src/com/cloud/storage/StoragePoolHostAssoc.java b/engine/schema/src/com/cloud/storage/StoragePoolHostAssoc.java similarity index 100% rename from core/src/com/cloud/storage/StoragePoolHostAssoc.java rename to engine/schema/src/com/cloud/storage/StoragePoolHostAssoc.java diff --git a/core/src/com/cloud/storage/StoragePoolHostVO.java b/engine/schema/src/com/cloud/storage/StoragePoolHostVO.java similarity index 94% rename from core/src/com/cloud/storage/StoragePoolHostVO.java rename to engine/schema/src/com/cloud/storage/StoragePoolHostVO.java index a8a2bac4886..1a4b9b87dce 100644 --- a/core/src/com/cloud/storage/StoragePoolHostVO.java +++ b/engine/schema/src/com/cloud/storage/StoragePoolHostVO.java @@ -28,7 +28,6 @@ import javax.persistence.Temporal; import javax.persistence.TemporalType; import com.cloud.utils.db.GenericDaoBase; -import org.apache.cloudstack.api.InternalIdentity; /** * Join table for storage pools and hosts @@ -40,24 +39,24 @@ public class StoragePoolHostVO implements StoragePoolHostAssoc { @Id @GeneratedValue(strategy=GenerationType.IDENTITY) private Long id; - + @Column(name="pool_id") private long poolId; - + @Column(name="host_id") private long hostId; - + @Column(name="local_path") private String localPath; - + @Column(name=GenericDaoBase.CREATED_COLUMN) - private Date created = null; - + private final Date created = null; + @Column(name="last_updated") @Temporal(value=TemporalType.TIMESTAMP) - private Date lastUpdated = null; - - + private final Date lastUpdated = null; + + public StoragePoolHostVO() { super(); } @@ -76,6 +75,7 @@ public class StoragePoolHostVO implements StoragePoolHostAssoc { } + @Override public long getId() { return id; } diff --git a/core/src/com/cloud/storage/StoragePoolWorkVO.java b/engine/schema/src/com/cloud/storage/StoragePoolWorkVO.java similarity index 100% rename from core/src/com/cloud/storage/StoragePoolWorkVO.java rename to engine/schema/src/com/cloud/storage/StoragePoolWorkVO.java diff --git a/core/src/com/cloud/storage/SwiftVO.java b/engine/schema/src/com/cloud/storage/SwiftVO.java similarity index 100% rename from core/src/com/cloud/storage/SwiftVO.java rename to engine/schema/src/com/cloud/storage/SwiftVO.java diff --git a/core/src/com/cloud/storage/UploadVO.java b/engine/schema/src/com/cloud/storage/UploadVO.java similarity index 100% rename from core/src/com/cloud/storage/UploadVO.java rename to engine/schema/src/com/cloud/storage/UploadVO.java diff --git a/core/src/com/cloud/storage/VMTemplateDetailVO.java b/engine/schema/src/com/cloud/storage/VMTemplateDetailVO.java similarity index 100% rename from core/src/com/cloud/storage/VMTemplateDetailVO.java rename to engine/schema/src/com/cloud/storage/VMTemplateDetailVO.java diff --git a/core/src/com/cloud/storage/VMTemplateHostVO.java b/engine/schema/src/com/cloud/storage/VMTemplateHostVO.java similarity index 100% rename from core/src/com/cloud/storage/VMTemplateHostVO.java rename to engine/schema/src/com/cloud/storage/VMTemplateHostVO.java diff --git a/core/src/com/cloud/storage/VMTemplateS3VO.java b/engine/schema/src/com/cloud/storage/VMTemplateS3VO.java similarity index 100% rename from core/src/com/cloud/storage/VMTemplateS3VO.java rename to engine/schema/src/com/cloud/storage/VMTemplateS3VO.java diff --git a/core/src/com/cloud/storage/VMTemplateStoragePoolVO.java b/engine/schema/src/com/cloud/storage/VMTemplateStoragePoolVO.java similarity index 100% rename from core/src/com/cloud/storage/VMTemplateStoragePoolVO.java rename to engine/schema/src/com/cloud/storage/VMTemplateStoragePoolVO.java diff --git a/core/src/com/cloud/storage/VMTemplateSwiftVO.java b/engine/schema/src/com/cloud/storage/VMTemplateSwiftVO.java similarity index 100% rename from core/src/com/cloud/storage/VMTemplateSwiftVO.java rename to engine/schema/src/com/cloud/storage/VMTemplateSwiftVO.java diff --git a/core/src/com/cloud/storage/VMTemplateVO.java b/engine/schema/src/com/cloud/storage/VMTemplateVO.java similarity index 100% rename from core/src/com/cloud/storage/VMTemplateVO.java rename to engine/schema/src/com/cloud/storage/VMTemplateVO.java diff --git a/core/src/com/cloud/storage/VMTemplateZoneVO.java b/engine/schema/src/com/cloud/storage/VMTemplateZoneVO.java similarity index 100% rename from core/src/com/cloud/storage/VMTemplateZoneVO.java rename to engine/schema/src/com/cloud/storage/VMTemplateZoneVO.java diff --git a/core/src/com/cloud/storage/VolumeHostVO.java b/engine/schema/src/com/cloud/storage/VolumeHostVO.java similarity index 100% rename from core/src/com/cloud/storage/VolumeHostVO.java rename to engine/schema/src/com/cloud/storage/VolumeHostVO.java diff --git a/core/src/com/cloud/storage/VolumeVO.java b/engine/schema/src/com/cloud/storage/VolumeVO.java similarity index 100% rename from core/src/com/cloud/storage/VolumeVO.java rename to engine/schema/src/com/cloud/storage/VolumeVO.java diff --git a/framework/jobs/pom.xml b/framework/jobs/pom.xml index 56490216f16..5ae63af77ad 100644 --- a/framework/jobs/pom.xml +++ b/framework/jobs/pom.xml @@ -18,12 +18,31 @@ --> 4.0.0 - org.apache.cloudstack cloud-framework-jobs - 4.0.0-SNAPSHOT - - org.quartz-scheduler - quartz - 2.1.6 - + + org.apache.cloudstack + cloudstack-framework + 4.2.0-SNAPSHOT + ../pom.xml + + + + org.quartz-scheduler + quartz + 2.1.6 + + + org.apache.cloudstack + cloud-utils + ${project.version} + + + org.apache.cloudstack + cloud-api + ${project.version} + + + + install + diff --git a/framework/pom.xml b/framework/pom.xml index 4dfb409f04e..ddcdcb0439a 100644 --- a/framework/pom.xml +++ b/framework/pom.xml @@ -33,5 +33,6 @@ ipc rest events + jobs diff --git a/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java b/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java index a0c991b5ad6..7153282a2aa 100644 --- a/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java +++ b/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java @@ -30,12 +30,10 @@ import javax.inject.Inject; import org.apache.cloudstack.engine.subsystem.api.storage.ClusterScope; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; -import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreRole; import org.apache.cloudstack.engine.subsystem.api.storage.HostScope; import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreInfo; import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreLifeCycle; import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreParameters; -import org.apache.cloudstack.engine.subsystem.api.storage.ScopeType; import org.apache.cloudstack.engine.subsystem.api.storage.ZoneScope; import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; @@ -46,17 +44,12 @@ import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; import com.cloud.agent.api.CreateStoragePoolCommand; import com.cloud.agent.api.DeleteStoragePoolCommand; -import com.cloud.agent.api.ModifyStoragePoolCommand; import com.cloud.agent.api.StoragePoolInfo; import com.cloud.alert.AlertManager; -import com.cloud.capacity.Capacity; -import com.cloud.capacity.CapacityVO; -import com.cloud.capacity.dao.CapacityDao; import com.cloud.exception.DiscoveryException; import com.cloud.exception.InvalidParameterValueException; import com.cloud.host.Host; import com.cloud.host.HostVO; -import com.cloud.host.Status; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.resource.ResourceManager; import com.cloud.server.ManagementServer; @@ -67,29 +60,14 @@ import com.cloud.storage.StoragePool; import com.cloud.storage.StoragePoolAutomation; import com.cloud.storage.StoragePoolDiscoverer; import com.cloud.storage.StoragePoolHostVO; -import com.cloud.storage.StoragePoolStatus; -import com.cloud.storage.StoragePoolWorkVO; -import com.cloud.storage.VolumeVO; import com.cloud.storage.dao.StoragePoolHostDao; import com.cloud.storage.dao.StoragePoolWorkDao; import com.cloud.storage.dao.VolumeDao; -import com.cloud.user.Account; -import com.cloud.user.User; -import com.cloud.user.UserContext; import com.cloud.user.dao.UserDao; import com.cloud.utils.NumbersUtil; import com.cloud.utils.UriUtils; import com.cloud.utils.db.DB; -import com.cloud.utils.db.Transaction; import com.cloud.utils.exception.CloudRuntimeException; -import com.cloud.utils.exception.ExecutionException; -import com.cloud.vm.ConsoleProxyVO; -import com.cloud.vm.DomainRouterVO; -import com.cloud.vm.SecondaryStorageVmVO; -import com.cloud.vm.UserVmVO; -import com.cloud.vm.VMInstanceVO; -import com.cloud.vm.VirtualMachine; -import com.cloud.vm.VirtualMachine.State; import com.cloud.vm.VirtualMachineManager; import com.cloud.vm.dao.ConsoleProxyDao; import com.cloud.vm.dao.DomainRouterDao; @@ -157,7 +135,7 @@ public class CloudStackPrimaryDataStoreLifeCycleImpl implements throw new InvalidParameterValueException( "Cluster id requires pod id"); } - + PrimaryDataStoreParameters parameters = new PrimaryDataStoreParameters(); URI uri = null; @@ -195,7 +173,7 @@ public class CloudStackPrimaryDataStoreLifeCycleImpl implements String tags = (String) dsInfos.get("tags"); Map details = (Map) dsInfos .get("details"); - + parameters.setTags(tags); parameters.setDetails(details); @@ -208,7 +186,7 @@ public class CloudStackPrimaryDataStoreLifeCycleImpl implements } String userInfo = uri.getUserInfo(); int port = uri.getPort(); - StoragePoolVO pool = null; + StoragePool pool = null; if (s_logger.isDebugEnabled()) { s_logger.debug("createPool Params @ scheme - " + scheme + " storageHost - " + storageHost + " hostPath - " @@ -272,7 +250,7 @@ public class CloudStackPrimaryDataStoreLifeCycleImpl implements parameters.setPath(hostPath); } else { for (StoragePoolDiscoverer discoverer : _discoverers) { - Map> pools; + Map> pools; try { pools = discoverer.find(zoneId, podId, uri, details); } catch (DiscoveryException e) { @@ -281,7 +259,7 @@ public class CloudStackPrimaryDataStoreLifeCycleImpl implements e); } if (pools != null) { - Map.Entry> entry = pools + Map.Entry> entry = pools .entrySet().iterator().next(); pool = entry.getKey(); details = entry.getValue(); @@ -310,7 +288,7 @@ public class CloudStackPrimaryDataStoreLifeCycleImpl implements parameters.setPath(hostPath); } else { StoragePoolType type = Enum.valueOf(StoragePoolType.class, scheme); - + if (type != null) { parameters.setType(type); parameters.setHost(storageHost); @@ -332,7 +310,7 @@ public class CloudStackPrimaryDataStoreLifeCycleImpl implements + " already in use by another pod (id=" + oldPodId + ")"); } } - + Object existingUuid = dsInfos.get("uuid"); String uuid = null; @@ -368,7 +346,7 @@ public class CloudStackPrimaryDataStoreLifeCycleImpl implements parameters.setName(poolName); parameters.setClusterId(clusterId); parameters.setProviderName(providerName); - + return dataStoreHelper.createPrimaryDataStore(parameters); } @@ -457,7 +435,7 @@ public class CloudStackPrimaryDataStoreLifeCycleImpl implements primaryDataStoreDao.expunge(primarystore.getId()); return false; } - + this.dataStoreHelper.attachCluster(store); return true; } @@ -527,11 +505,11 @@ public class CloudStackPrimaryDataStoreLifeCycleImpl implements } } } - + if (!deleteFlag) { throw new CloudRuntimeException("Failed to delete storage pool on host"); } - + return this.dataStoreHelper.deletePrimaryDataStore(store); } diff --git a/server/pom.xml b/server/pom.xml index 2d960bef303..808dd3eee0a 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -34,6 +34,11 @@ httpcore ${cs.httpcore.version} + + org.apache.cloudstack + cloud-framework-jobs + ${project.version} + org.apache.httpcomponents httpclient diff --git a/core/src/com/cloud/alert/AlertManager.java b/server/src/com/cloud/alert/AlertManager.java similarity index 100% rename from core/src/com/cloud/alert/AlertManager.java rename to server/src/com/cloud/alert/AlertManager.java diff --git a/core/src/com/cloud/async/AsyncJobVO.java b/server/src/com/cloud/async/AsyncJobVO.java similarity index 100% rename from core/src/com/cloud/async/AsyncJobVO.java rename to server/src/com/cloud/async/AsyncJobVO.java diff --git a/core/src/com/cloud/async/SyncQueueItemVO.java b/server/src/com/cloud/async/SyncQueueItemVO.java similarity index 100% rename from core/src/com/cloud/async/SyncQueueItemVO.java rename to server/src/com/cloud/async/SyncQueueItemVO.java diff --git a/core/src/com/cloud/async/SyncQueueVO.java b/server/src/com/cloud/async/SyncQueueVO.java similarity index 100% rename from core/src/com/cloud/async/SyncQueueVO.java rename to server/src/com/cloud/async/SyncQueueVO.java diff --git a/server/src/com/cloud/capacity/CapacityManagerImpl.java b/server/src/com/cloud/capacity/CapacityManagerImpl.java index 089307fc44c..1eb2fa5894a 100755 --- a/server/src/com/cloud/capacity/CapacityManagerImpl.java +++ b/server/src/com/cloud/capacity/CapacityManagerImpl.java @@ -28,12 +28,6 @@ import javax.inject.Inject; import javax.naming.ConfigurationException; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; -import com.cloud.dc.ClusterDetailsDao; -import com.cloud.dc.DataCenter; -import com.cloud.dc.dao.ClusterDao; -import com.cloud.exception.InsufficientCapacityException; -import com.cloud.exception.InsufficientServerCapacityException; -import com.cloud.resource.ResourceState; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -50,7 +44,10 @@ import com.cloud.capacity.dao.CapacityDao; import com.cloud.configuration.Config; import com.cloud.configuration.ConfigurationManager; import com.cloud.configuration.dao.ConfigurationDao; +import com.cloud.dc.ClusterDetailsDao; +import com.cloud.dc.dao.ClusterDao; import com.cloud.exception.ConnectionException; +import com.cloud.host.Host; import com.cloud.host.HostVO; import com.cloud.host.Status; import com.cloud.host.dao.HostDao; @@ -104,9 +101,9 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, HostDao _hostDao; @Inject VMInstanceDao _vmDao; - @Inject + @Inject VolumeDao _volumeDao; - @Inject + @Inject VMTemplatePoolDao _templatePoolDao; @Inject AgentManager _agentManager; @@ -115,16 +112,16 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, @Inject StorageManager _storageMgr; @Inject - SwiftManager _swiftMgr; + SwiftManager _swiftMgr; @Inject - ConfigurationManager _configMgr; + ConfigurationManager _configMgr; @Inject HypervisorCapabilitiesDao _hypervisorCapabilitiesDao; @Inject protected VMSnapshotDao _vmSnapshotDao; @Inject protected UserVmDao _userVMDao; - + @Inject ClusterDetailsDao _clusterDetailsDao; @Inject @@ -191,8 +188,8 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, long actualTotalCpu = capacityCpu.getTotalCapacity(); float cpuOvercommitRatio =Float.parseFloat(_clusterDetailsDao.findDetail(clusterId,"cpuOvercommitRatio").getValue()); float memoryOvercommitRatio = Float.parseFloat(_clusterDetailsDao.findDetail(clusterId,"memoryOvercommitRatio").getValue()); - int vmCPU = (int) (svo.getCpu() * svo.getSpeed()); - long vmMem = (long) (svo.getRamSize() * 1024L * 1024L); + int vmCPU = svo.getCpu() * svo.getSpeed(); + long vmMem = svo.getRamSize() * 1024L * 1024L; long actualTotalMem = capacityMemory.getTotalCapacity(); long totalMem = (long) (actualTotalMem * memoryOvercommitRatio); long totalCpu = (long) (actualTotalCpu * cpuOvercommitRatio); @@ -266,8 +263,8 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, return; } - int cpu = (int) (svo.getCpu() * svo.getSpeed()); - long ram = (long) (svo.getRamSize() * 1024L * 1024L); + int cpu = svo.getCpu() * svo.getSpeed(); + long ram = svo.getRamSize() * 1024L * 1024L; Transaction txn = Transaction.currentTxn(); @@ -398,10 +395,10 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, failureReason = "Host does not have enough reserved CPU available"; } } else { - + long reservedCpuValueToUse = reservedCpu; long reservedMemValueToUse = reservedMem; - + if(!considerReservedCapacity){ if (s_logger.isDebugEnabled()) { s_logger.debug("considerReservedCapacity is" + considerReservedCapacity + " , not considering reserved capacity for calculating free capacity"); @@ -458,7 +455,7 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, return hasCapacity; } - + private long getVMSnapshotAllocatedCapacity(StoragePoolVO pool){ List volumes = _volumeDao.findByPoolId(pool.getId()); long totalSize = 0; @@ -486,39 +483,39 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, } return totalSize; } - + @Override public long getAllocatedPoolCapacity(StoragePoolVO pool, VMTemplateVO templateForVmCreation){ - + // Get size for all the volumes Pair sizes = _volumeDao.getCountAndTotalByPool(pool.getId()); long totalAllocatedSize = sizes.second() + sizes.first() * _extraBytesPerVolume; - - // Get size for VM Snapshots + + // Get size for VM Snapshots totalAllocatedSize = totalAllocatedSize + getVMSnapshotAllocatedCapacity(pool); // Iterate through all templates on this storage pool boolean tmpinstalled = false; List templatePoolVOs; templatePoolVOs = _templatePoolDao.listByPoolId(pool.getId()); - - for (VMTemplateStoragePoolVO templatePoolVO : templatePoolVOs) { + + for (VMTemplateStoragePoolVO templatePoolVO : templatePoolVOs) { if ((templateForVmCreation != null) && !tmpinstalled && (templatePoolVO.getTemplateId() == templateForVmCreation.getId())) { tmpinstalled = true; } long templateSize = templatePoolVO.getTemplateSize(); totalAllocatedSize += templateSize + _extraBytesPerVolume; } - + // Add the size for the templateForVmCreation if its not already present /*if ((templateForVmCreation != null) && !tmpinstalled) { - + }*/ - + return totalAllocatedSize; } - - + + @DB @Override public void updateCapacityForHost(HostVO host){ @@ -528,7 +525,7 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, for (ServiceOfferingVO offering : offerings) { offeringsMap.put(offering.getId(), offering); } - + long usedCpu = 0; long usedMemory = 0; long reservedMemory = 0; @@ -574,7 +571,7 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, + usedCpu); cpuCap.setUsedCapacity(usedCpu); } - + if (memCap.getUsedCapacity() == usedMemory && memCap.getReservedCapacity() == reservedMemory) { s_logger.debug("No need to calibrate memory capacity, host:" + host.getId() + " usedMem: " + memCap.getUsedCapacity() + " reservedMem: " + memCap.getReservedCapacity()); @@ -591,7 +588,7 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, + " new usedMem: " + usedMemory); memCap.setUsedCapacity(usedMemory); } - + try { _capacityDao.update(cpuCap.getId(), cpuCap); _capacityDao.update(memCap.getId(), memCap); @@ -610,24 +607,24 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, capacity.setReservedCapacity(reservedMemory); capacity.setCapacityState(capacityState); _capacityDao.persist(capacity); - + capacity = new CapacityVO( host.getId(), host.getDataCenterId(), - host.getPodId(), + host.getPodId(), host.getClusterId(), usedCpu, - (long)(host.getCpus().longValue() * host.getSpeed().longValue()), + host.getCpus().longValue() * host.getSpeed().longValue(), CapacityVO.CAPACITY_TYPE_CPU); capacity.setReservedCapacity(reservedCpu); capacity.setCapacityState(capacityState); _capacityDao.persist(capacity); txn.commit(); - + } - + } - + @Override public boolean preStateTransitionEvent(State oldState, Event event, State newState, VirtualMachine vm, boolean transitionStatus, Object opaque) { return true; @@ -681,7 +678,7 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, releaseVmCapacity(vm, false, false, oldHostId); } } - + if ((newState == State.Starting || newState == State.Migrating || event == Event.AgentReportMigrated) && vm.getHostId() != null) { boolean fromLastHost = false; if (vm.getLastHostId() == vm.getHostId()) { @@ -729,7 +726,7 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, _capacityDao.update(CapacityVOCpu.getId(), CapacityVOCpu); } else { CapacityVO capacity = new CapacityVO(server.getId(), server.getDataCenterId(), server.getPodId(), server.getClusterId(), 0L, - (long) (server.getCpus().longValue() * server.getSpeed().longValue()), + server.getCpus().longValue() * server.getSpeed().longValue(), CapacityVO.CAPACITY_TYPE_CPU); _capacityDao.persist(capacity); } @@ -815,32 +812,32 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, @Override public void processCancelMaintenaceEventAfter(Long hostId) { - updateCapacityForHost(_hostDao.findById(hostId)); + updateCapacityForHost(_hostDao.findById(hostId)); } @Override public void processCancelMaintenaceEventBefore(Long hostId) { // TODO Auto-generated method stub - + } @Override - public void processDeletHostEventAfter(HostVO host) { + public void processDeletHostEventAfter(Host host) { // TODO Auto-generated method stub - + } @Override - public void processDeleteHostEventBefore(HostVO host) { + public void processDeleteHostEventBefore(Host host) { // TODO Auto-generated method stub - + } @Override public void processDiscoverEventAfter( Map> resources) { // TODO Auto-generated method stub - + } @Override @@ -848,11 +845,11 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, Long clusterId, URI uri, String username, String password, List hostTags) { // TODO Auto-generated method stub - + } @Override - public void processPrepareMaintenaceEventAfter(Long hostId) { + public void processPrepareMaintenaceEventAfter(Long hostId) { _capacityDao.removeBy(Capacity.CAPACITY_TYPE_MEMORY, null, null, null, hostId); _capacityDao.removeBy(Capacity.CAPACITY_TYPE_CPU, null, null, null, hostId); } @@ -860,7 +857,7 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, @Override public void processPrepareMaintenaceEventBefore(Long hostId) { // TODO Auto-generated method stub - + } @Override @@ -871,7 +868,7 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, Long maxGuestLimit = _hypervisorCapabilitiesDao.getMaxGuestsLimit(hypervisorType, hypervisorVersion); if(vmCount.longValue() >= maxGuestLimit.longValue()){ if (s_logger.isDebugEnabled()) { - s_logger.debug("Host name: " + host.getName() + ", hostId: "+ host.getId() + + s_logger.debug("Host name: " + host.getName() + ", hostId: "+ host.getId() + " already reached max Running VMs(count includes system VMs), limit is: " + maxGuestLimit + ",Running VM counts is: "+vmCount.longValue()); } return true; diff --git a/server/src/com/cloud/storage/OCFS2ManagerImpl.java b/server/src/com/cloud/storage/OCFS2ManagerImpl.java index 476bf04cae9..5eb9a4a5c44 100755 --- a/server/src/com/cloud/storage/OCFS2ManagerImpl.java +++ b/server/src/com/cloud/storage/OCFS2ManagerImpl.java @@ -56,7 +56,7 @@ import com.cloud.utils.exception.CloudRuntimeException; @Local(value ={OCFS2Manager.class}) public class OCFS2ManagerImpl extends ManagerBase implements OCFS2Manager, ResourceListener { private static final Logger s_logger = Logger.getLogger(OCFS2ManagerImpl.class); - + @Inject ClusterDetailsDao _clusterDetailsDao; @Inject AgentManager _agentMgr; @Inject HostDao _hostDao; @@ -64,7 +64,7 @@ public class OCFS2ManagerImpl extends ManagerBase implements OCFS2Manager, Resou @Inject ResourceManager _resourceMgr; @Inject StoragePoolHostDao _poolHostDao; @Inject PrimaryDataStoreDao _poolDao; - + @Override public boolean configure(String name, Map params) throws ConfigurationException { return true; @@ -96,8 +96,8 @@ public class OCFS2ManagerImpl extends ManagerBase implements OCFS2Manager, Resou } return lst; } - - + + private boolean prepareNodes(String clusterName, List hosts) { PrepareOCFS2NodesCommand cmd = new PrepareOCFS2NodesCommand(clusterName, marshalNodes(hosts)); for (HostVO h : hosts) { @@ -111,36 +111,36 @@ public class OCFS2ManagerImpl extends ManagerBase implements OCFS2Manager, Resou return false; } } - + return true; } - + private String getClusterName(Long clusterId) { ClusterVO cluster = _clusterDao.findById(clusterId); if (cluster == null) { throw new CloudRuntimeException("Cannot get cluster for id " + clusterId); } - - String clusterName = "OvmCluster" + cluster.getId(); + + String clusterName = "OvmCluster" + cluster.getId(); return clusterName; } - + @Override public boolean prepareNodes(List hosts, StoragePool pool) { if (pool.getPoolType() != StoragePoolType.OCFS2) { throw new CloudRuntimeException("None OCFS2 storage pool is getting into OCFS2 manager!"); } - + return prepareNodes(getClusterName(pool.getClusterId()), hosts); } @Override - public boolean prepareNodes(Long clusterId) { + public boolean prepareNodes(Long clusterId) { ClusterVO cluster = _clusterDao.findById(clusterId); if (cluster == null) { throw new CloudRuntimeException("Cannot find cluster for ID " + clusterId); } - + SearchCriteriaService sc = SearchCriteria2.create(HostVO.class); sc.addAnd(sc.getEntity().getClusterId(), Op.EQ, clusterId); sc.addAnd(sc.getEntity().getPodId(), Op.EQ, cluster.getPodId()); @@ -151,36 +151,36 @@ public class OCFS2ManagerImpl extends ManagerBase implements OCFS2Manager, Resou s_logger.debug("There is no host in cluster " + clusterId + ", no need to prepare OCFS2 nodes"); return true; } - + return prepareNodes(getClusterName(clusterId), hosts); } @Override public void processDiscoverEventBefore(Long dcid, Long podId, Long clusterId, URI uri, String username, String password, List hostTags) { // TODO Auto-generated method stub - + } @Override public void processDiscoverEventAfter(Map> resources) { // TODO Auto-generated method stub - + } @Override - public void processDeleteHostEventBefore(HostVO host) { + public void processDeleteHostEventBefore(Host host) { // TODO Auto-generated method stub - + } @Override - public void processDeletHostEventAfter(HostVO host) { + public void processDeletHostEventAfter(Host host) { String errMsg = String.format("Prepare OCFS2 nodes failed after delete host %1$s (zone:%2$s, pod:%3$s, cluster:%4$s", host.getId(), host.getDataCenterId(), host.getPodId(), host.getClusterId()); - + if (host.getHypervisorType() != HypervisorType.Ovm) { return; } - + boolean hasOcfs2 = false; List poolRefs = _poolHostDao.listByHostId(host.getId()); for (StoragePoolHostVO poolRef : poolRefs) { @@ -205,24 +205,24 @@ public class OCFS2ManagerImpl extends ManagerBase implements OCFS2Manager, Resou @Override public void processCancelMaintenaceEventBefore(Long hostId) { // TODO Auto-generated method stub - + } @Override public void processCancelMaintenaceEventAfter(Long hostId) { // TODO Auto-generated method stub - + } @Override public void processPrepareMaintenaceEventBefore(Long hostId) { // TODO Auto-generated method stub - + } @Override public void processPrepareMaintenaceEventAfter(Long hostId) { // TODO Auto-generated method stub - + } }