This is an automated email from the ASF dual-hosted git repository.

weizhouapache pushed a change to branch healthcheck-main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


 discard 352f5644212 4.21/main Health Check, please don't merge this!
     add 0e43c6a818e tools/docker: Build docker image cloudstack-simulator 
(#13597)
     add 66132f83eae Introduce new backup provider (KBOSS) (#12758)
     add a6b31286f06 [Veeam] Fix for dirty context not being returned on el9
     add 028e1ef8eae Netapp ONTAP bugfixes for 4.23.0 (#13578)
     add 8a6a992f318 4.21/main Health Check, please don't merge this!

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (352f5644212)
            \
             N -- N -- N   refs/heads/healthcheck-main (8a6a992f318)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 agent/conf/agent.properties                        |   12 +
 .../cloud/agent/properties/AgentProperties.java    |   15 +-
 .../com/cloud/agent/api/to/DataObjectType.java     |    2 +-
 api/src/main/java/com/cloud/event/EventTypes.java  |    1 +
 .../java/com/cloud/hypervisor/HypervisorGuru.java  |    5 +-
 api/src/main/java/com/cloud/storage/Storage.java   |    3 +-
 api/src/main/java/com/cloud/storage/Volume.java    |   11 +-
 .../java/com/cloud/storage/VolumeApiService.java   |    4 +-
 .../java/com/cloud/user/ResourceLimitService.java  |    8 +-
 api/src/main/java/com/cloud/vm/UserVmService.java  |    3 +-
 api/src/main/java/com/cloud/vm/VirtualMachine.java |   19 +-
 .../main/java/com/cloud/vm/VmDetailConstants.java  |   10 +
 .../org/apache/cloudstack/alert/AlertService.java  |    3 +
 .../org/apache/cloudstack/api/ApiConstants.java    |   33 +-
 .../admin/vm/CreateVMFromBackupCmdByAdmin.java     |   15 +
 .../admin/volume/DestroyVolumeCmdByAdmin.java      |    2 +-
 .../api/command/user/backup/CreateBackupCmd.java   |   10 +
 .../user/backup/CreateBackupOfferingCmd.java       |  185 ++
 .../user/backup/CreateBackupScheduleCmd.java       |   10 +
 .../backup/DownloadValidationScreenshotCmd.java}   |   81 +-
 .../FinishBackupChainCmd.java}                     |   73 +-
 .../user/backup/ListBackupServiceJobsCmd.java      |  105 +
 .../api/command/user/backup/RestoreBackupCmd.java  |   20 +-
 .../RestoreVolumeFromBackupAndAttachToVMCmd.java   |   19 +-
 .../api/command/user/network/CreateNetworkCmd.java |   21 +
 .../api/command/user/vm/CreateVMFromBackupCmd.java |    9 +
 .../api/command/user/vm/DestroyVMCmd.java          |   10 +-
 .../api/command/user/volume/DeleteVolumeCmd.java   |    2 +-
 .../api/command/user/volume/DestroyVolumeCmd.java  |    2 +-
 .../api/response/BackupOfferingResponse.java       |    8 +
 .../cloudstack/api/response/BackupResponse.java    |   36 +
 .../api/response/BackupScheduleResponse.java       |    8 +
 .../api/response/BackupServiceJobResponse.java     |   79 +
 .../cloudstack/api/response/UserVmResponse.java    |   11 +
 .../java/org/apache/cloudstack/backup/Backup.java  |   22 +-
 .../apache/cloudstack/backup/BackupManager.java    |   17 +-
 .../apache/cloudstack/backup/BackupProvider.java   |   28 +-
 .../apache/cloudstack/backup/BackupSchedule.java   |    1 +
 .../cloudstack/backup/InternalBackupProvider.java  |  142 +
 .../cloudstack/backup/InternalBackupService.java   |   54 +
 .../org/apache/cloudstack/query/QueryService.java  |    6 +-
 .../secstorage/heuristics/HeuristicType.java       |    4 +-
 client/pom.xml                                     |    5 +
 ...ateBackupsBetweenSecondaryStoragesCommand.java} |   26 +-
 ...=> MigrateBetweenSecondaryStoragesCommand.java} |   30 +-
 ...rateBetweenSecondaryStoragesCommandAnswer.java} |   24 +-
 .../java/com/cloud/agent/api/StartCommand.java     |   14 +-
 .../storage/CreateDiskOnlyVmSnapshotAnswer.java    |   11 +-
 .../storage/CreateDiskOnlyVmSnapshotCommand.java   |   12 +-
 .../storage/MergeDiskOnlyVmSnapshotCommand.java    |   16 +-
 .../cloud/storage/resource/StorageProcessor.java   |    4 +
 .../StorageSubsystemCommandHandlerBase.java        |    2 +
 .../backup/CleanupKbossBackupErrorAnswer.java}     |   27 +-
 .../backup/CleanupKbossBackupErrorCommand.java     |   82 +
 ...and.java => CleanupKbossValidationCommand.java} |   16 +-
 .../cloudstack/backup/CompressBackupCommand.java   |   78 +
 .../backup/ConsolidateVolumesAnswer.java           |   30 +-
 .../backup/ConsolidateVolumesCommand.java}         |   29 +-
 ....java => FinalizeBackupCompressionCommand.java} |   22 +-
 .../backup/PrepareValidationCommand.java           |   36 +-
 .../backup/RestoreKbossBackupAnswer.java           |   26 +-
 .../backup/RestoreKbossBackupCommand.java          |   66 +
 ...tionCommand.java => TakeBackupHashCommand.java} |   26 +-
 .../cloudstack/backup/TakeKbossBackupAnswer.java   |   59 +
 .../cloudstack/backup/TakeKbossBackupCommand.java  |   92 +
 ...StatsAnswer.java => ValidateKbossVmAnswer.java} |   34 +-
 .../cloudstack/backup/ValidateKbossVmCommand.java  |  133 +
 .../storage/command/BackupDeleteAnswer.java        |   15 +-
 .../cloudstack/storage/command/DeleteCommand.java  |   10 +
 .../storage/command/RevertSnapshotCommand.java     |   10 +
 .../cloudstack/storage/to/BackupDeltaTO.java       |   56 +-
 .../cloudstack/storage/to/DeltaMergeTreeTO.java}   |   20 +-
 .../org/apache/cloudstack/storage/to/KbossTO.java  |  110 +
 .../cloudstack/storage/to/VolumeObjectTO.java      |   12 +-
 ...g-core-lifecycle-backup-context-inheritable.xml |    5 +
 .../core/spring-core-registry-core-context.xml     |    4 +
 .../service/VolumeOrchestrationService.java        |    2 +-
 .../java/com/cloud/storage/StorageManager.java     |    3 +
 .../main/java/com/cloud/vm/VmWorkDeleteBackup.java |   17 +-
 .../java/com/cloud/vm/VmWorkRestoreBackup.java     |   22 +-
 .../vm/VmWorkRestoreVolumeBackupAndAttach.java     |   32 +-
 .../main/java/com/cloud/vm/VmWorkTakeBackup.java   |   33 +-
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |   16 +-
 .../engine/orchestration/DataMigrationUtility.java |   89 +-
 .../engine/orchestration/StorageOrchestrator.java  |  148 +-
 .../engine/orchestration/VolumeOrchestrator.java   |   28 +-
 .../spring-engine-orchestration-core-context.xml   |    1 +
 .../src/main/java/com/cloud/host/dao/HostDao.java  |    4 +
 .../main/java/com/cloud/host/dao/HostDaoImpl.java  |   18 +
 .../java/com/cloud/network/dao/NetworkDao.java     |    2 +
 .../java/com/cloud/network/dao/NetworkDaoImpl.java |   12 +
 .../main/java/com/cloud/storage/SnapshotVO.java    |    4 +
 .../com/cloud/storage/dao/SnapshotDaoImpl.java     |   98 +-
 .../apache/cloudstack/backup/BackupOfferingVO.java |    5 +
 .../apache/cloudstack/backup/BackupScheduleVO.java |   16 +-
 .../org/apache/cloudstack/backup/BackupVO.java     |   55 +-
 .../backup/InternalBackupDataStoreVO.java          |   95 +
 .../cloudstack/backup/InternalBackupJoinVO.java    |  211 ++
 .../backup/InternalBackupServiceJobType.java       |    8 +-
 .../backup/InternalBackupServiceJobVO.java         |  179 ++
 .../backup/InternalBackupStoragePoolVO.java        |  101 +
 .../apache/cloudstack/backup/dao/BackupDao.java    |    1 +
 .../cloudstack/backup/dao/BackupDaoImpl.java       |   10 +
 .../cloudstack/backup/dao/BackupDetailsDao.java    |   15 +
 .../backup/dao/BackupDetailsDaoImpl.java           |   26 +
 .../backup/dao/BackupOfferingDaoImpl.java          |   13 +
 .../backup/dao/InternalBackupDataStoreDao.java     |   19 +-
 .../backup/dao/InternalBackupDataStoreDaoImpl.java |   74 +
 .../backup/dao/InternalBackupJoinDao.java          |   44 +
 .../backup/dao/InternalBackupJoinDaoImpl.java      |  158 +
 .../backup/dao/InternalBackupServiceJobDao.java    |   39 +
 .../dao/InternalBackupServiceJobDaoImpl.java       |  138 +
 .../backup/dao/InternalBackupStoragePoolDao.java   |   41 +-
 .../dao/InternalBackupStoragePoolDaoImpl.java      |   86 +
 .../storage/datastore/db/SnapshotDataStoreDao.java |    2 +
 .../datastore/db/SnapshotDataStoreDaoImpl.java     |   31 +-
 .../spring-engine-schema-core-daos-context.xml     |    4 +
 .../resources/META-INF/db/schema-42210to42300.sql  |   55 +
 .../db/views/cloud.internal_backup_view.sql        |   51 +
 .../motion/StorageSystemDataMotionStrategy.java    |    5 +
 .../storage/snapshot/SnapshotServiceImpl.java      |    4 +
 .../KvmFileBasedStorageVmSnapshotStrategy.java     |  249 +-
 .../vmsnapshot/StorageVMSnapshotStrategy.java      |   16 +
 .../vmsnapshot/VMSnapshotStrategyKVMTest.java      |    6 +
 .../cloudstack/storage/backup/BackupObject.java    |  198 ++
 .../storage/helper/VMSnapshotHelperImpl.java       |   43 +-
 .../storage/vmsnapshot/VMSnapshotHelper.java       |    3 +
 .../storage/volume/VolumeServiceImpl.java          |   20 +-
 .../framework/jobs/impl/VmWorkJobVO.java           |    8 +
 .../cloudstack/backup/DummyBackupProvider.java     |    9 +-
 plugins/backup/{nas => kboss}/pom.xml              |   24 +-
 .../cloudstack/backup/KbossBackupProvider.java     | 3068 ++++++++++++++++++++
 .../META-INF/cloudstack/kboss}/module.properties   |    2 +-
 .../kboss/spring-backup-kboss-context.xml}         |    4 +-
 .../cloudstack/backup/KbossBackupProviderTest.java | 2993 +++++++++++++++++++
 .../cloudstack/backup/NASBackupProvider.java       |   10 +-
 .../cloudstack/backup/NASBackupProviderTest.java   |    6 +-
 .../cloudstack/backup/NetworkerBackupProvider.java |    9 +-
 .../cloudstack/backup/VeeamBackupProvider.java     |    9 +-
 .../HypervResource/HypervResourceController.cs     |    6 +-
 .../resource/HypervDirectConnectResource.java      |    2 +-
 plugins/hypervisors/kvm/pom.xml                    |   15 +
 .../kvm/resource/BlockCommitListener.java          |   12 +-
 .../kvm/resource/LibvirtComputingResource.java     |  359 ++-
 .../kvm/resource/LibvirtDomainXMLParser.java       |   16 +
 ...irtMigrateResourceBetweenSecondaryStorages.java |  123 +
 .../resource/LibvirtStorageVolumeXMLParser.java    |   20 +
 .../hypervisor/kvm/resource/LibvirtVMDef.java      |    9 +
 ...ibvirtCleanupKbossValidationCommandWrapper.java |   50 +
 .../LibvirtCleanupKbossVmBackupCommandWrapper.java |  294 ++
 .../LibvirtCompressBackupCommandWrapper.java       |  150 +
 .../LibvirtConsolidateVolumesCommandWrapper.java   |   59 +
 ...virtCreateDiskOnlyVMSnapshotCommandWrapper.java |  178 +-
 ...irtFinalizeBackupCompressionCommandWrapper.java |   73 +
 .../LibvirtGetStorageStatsCommandWrapper.java      |    2 +-
 .../LibvirtGetVolumesOnStorageCommandWrapper.java  |    2 +-
 ...bvirtMergeDiskOnlyVMSnapshotCommandWrapper.java |   99 +-
 ...kupsBetweenSecondaryStoragesCommandWrapper.java |  132 +
 .../LibvirtPrepareValidationCommandWrapper.java    |   91 +
 .../LibvirtRestoreKbossBackupCommandWrapper.java   |  123 +
 .../LibvirtRevertSnapshotCommandWrapper.java       |   15 +-
 .../wrapper/LibvirtStartCommandWrapper.java        |   16 +
 .../LibvirtTakeBackupHashCommandWrapper.java       |   72 +
 .../LibvirtTakeKbossBackupCommandWrapper.java      |  394 +++
 .../LibvirtValidateKbossVmCommandWrapper.java      |  225 ++
 .../kvm/storage/KVMStoragePoolManager.java         |    9 +-
 .../kvm/storage/KVMStorageProcessor.java           |   25 +-
 .../kvm/storage/LibvirtStorageAdaptor.java         |    5 +-
 .../org/apache/cloudstack/utils/qemu/QemuImg.java  |  104 +-
 .../kvm/resource/LibvirtComputingResourceTest.java |   43 +-
 .../LibvirTakeKbossBackupCommandWrapperTest.java   |  377 +++
 ...bvirtGetVolumesOnStorageCommandWrapperTest.java |    2 +-
 ...ibvirtRestoreKbossBackupCommandWrapperTest.java |  181 ++
 .../LibvirtRevertSnapshotCommandWrapperTest.java   |   10 +-
 .../apache/cloudstack/utils/qemu/QemuImgTest.java  |  116 +-
 .../java/com/cloud/simulator/SimulatorGuru.java    |    5 +-
 .../java/com/cloud/hypervisor/guru/VMwareGuru.java |    7 +-
 .../cloudstack/veeam/adapter/ServerAdapter.java    |    4 +-
 .../veeam/adapter/ServerAdapterTest.java           |    2 +-
 plugins/pom.xml                                    |    1 +
 .../driver/CloudStackImageStoreDriverImpl.java     |    6 +-
 .../lifecycle/StorageVmSharedFSLifeCycle.java      |    2 +-
 .../CloudStackPrimaryDataStoreDriverImpl.java      |   14 +-
 plugins/storage/volume/ontap/pom.xml               |   17 +-
 .../driver/OntapPrimaryDatastoreDriver.java        |    4 +-
 .../cloudstack/storage/feign/model/Volume.java     |   75 +
 .../lifecycle/OntapPrimaryDatastoreLifecycle.java  |    9 +-
 .../storage/service/StorageStrategy.java           |   39 +-
 .../storage/service/UnifiedSANStrategy.java        |    4 +-
 .../storage/utils/OntapStorageConstants.java       |    1 +
 .../storage/utils/OntapStorageUtils.java           |   13 +-
 .../driver/OntapPrimaryDatastoreDriverTest.java    |    3 +
 .../OntapPrimaryDatastoreLifecycleTest.java        |   84 +-
 .../storage/service/StorageStrategyTest.java       |   77 +
 .../storage/service/UnifiedSANStrategyTest.java    |   16 +-
 .../storage/utils/OntapStorageUtilsTest.java       |   82 +
 .../vm/hypervisor/kvm/imageserver/backends/nbd.py  |   45 +-
 scripts/vm/hypervisor/kvm/imageserver/handler.py   |    5 +
 .../kvm/imageserver/tests/test_nbd_entries.py      |  194 ++
 .../main/java/com/cloud/api/ApiResponseHelper.java |    1 +
 .../java/com/cloud/api/query/QueryManagerImpl.java |   51 +-
 .../com/cloud/api/query/dao/UserVmJoinDaoImpl.java |    7 +
 .../consoleproxy/ConsoleProxyManagerImpl.java      |    7 +-
 .../com/cloud/hypervisor/HypervisorGuruBase.java   |    5 +-
 .../main/java/com/cloud/hypervisor/KVMGuru.java    |   21 +-
 .../com/cloud/network/as/AutoScaleManagerImpl.java |    2 +-
 .../resourcelimit/ResourceLimitManagerImpl.java    |   62 +-
 .../java/com/cloud/storage/StorageManagerImpl.java |    5 +-
 .../com/cloud/storage/VolumeApiServiceImpl.java    |   78 +-
 .../src/main/java/com/cloud/vm/UserVmManager.java  |   15 +-
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  |  277 +-
 .../BackupCompressionServiceJobController.java     |  241 ++
 .../cloudstack/backup/BackupManagerImpl.java       |  328 ++-
 .../BackupValidationServiceJobController.java      |  217 ++
 .../backup/InternalBackupServiceImpl.java          |  370 +++
 .../backup/InternalBackupServiceJobController.java |  307 ++
 .../to/BackupScreenshotObject.java}                |   26 +-
 .../to/BackupScreenshotTO.java}                    |   25 +-
 .../command/ReconcileCommandServiceImpl.java       |    2 +-
 .../storage/heuristics/HeuristicRuleHelper.java    |   24 +
 .../presetvariables/{Snapshot.java => Backup.java} |   22 +-
 .../presetvariables/PresetVariables.java           |   10 +
 .../cloudstack/vm/UnmanagedVMsManagerImpl.java     |    4 +-
 .../core/spring-server-core-managers-context.xml   |    5 +
 .../cloud/network/as/AutoScaleManagerImplTest.java |    5 +-
 .../ResourceLimitManagerImplTest.java              |   64 +-
 .../cloud/storage/VolumeApiServiceImplTest.java    |   40 +-
 .../cloud/template/TemplateManagerImplTest.java    |    5 +
 .../java/com/cloud/vm/UserVmManagerImplTest.java   |   37 +-
 .../cloud/vpc/MockResourceLimitManagerImpl.java    |   10 +-
 .../java/com/cloud/vpc/dao/MockNetworkDaoImpl.java |    5 +
 .../BackupCompressionServiceJobControllerTest.java |  528 ++++
 .../cloudstack/backup/BackupManagerTest.java       |  274 +-
 .../BackupValidationServiceJobControllerTest.java  |  150 +
 .../backup/InternalBackupServiceImplTest.java      |  482 +++
 .../heuristics/HeuristicRuleHelperTest.java        |   19 +
 .../resource/NfsSecondaryStorageResource.java      |   74 +-
 .../resource/NfsSecondaryStorageResourceTest.java  |  142 +-
 .../smoke/test_backup_recovery_kboss.py            |  336 +++
 test/integration/smoke/test_public_ip_range.py     |   18 +-
 tools/apidoc/gen_toc.py                            |    3 +-
 tools/docker/Dockerfile                            |   13 +-
 tools/docker/supervisord.conf                      |    2 +
 tools/marvin/marvin/lib/base.py                    |   31 +
 ui/public/locales/en.json                          |   13 +
 ui/public/locales/pt_BR.json                       |   10 +
 ui/src/components/view/DetailsTab.vue              |   15 +-
 ui/src/components/view/ListView.vue                |    6 +
 ui/src/components/widgets/Status.vue               |    8 +
 ui/src/config/section/compute.js                   |   15 +
 ui/src/config/section/offering.js                  |    9 +-
 ui/src/config/section/storage.js                   |   12 +-
 ui/src/core/lazy_lib/icons_use.js                  |    2 +
 ui/src/views/AutogenView.vue                       |    4 +
 ui/src/views/compute/InstanceTab.vue               |    2 +-
 ui/src/views/compute/StartBackup.vue               |   13 +-
 ui/src/views/compute/backup/BackupSchedule.vue     |    8 +
 ui/src/views/compute/backup/FormSchedule.vue       |   13 +-
 ...BackupOffering.vue => CreateBackupOffering.vue} |  180 +-
 ui/src/views/storage/CreateVMFromBackup.vue        |   12 +-
 ui/src/views/storage/RestoreAttachBackupVolume.vue |   74 +-
 utils/src/main/java/com/cloud/utils/DateUtil.java  |    6 +
 .../com/cloud/utils/exception/BackupException.java |   24 +-
 .../utils/exception/BackupProviderException.java}  |   12 +-
 264 files changed, 18290 insertions(+), 1559 deletions(-)
 create mode 100644 
api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupOfferingCmd.java
 copy 
api/src/main/java/org/apache/cloudstack/api/command/{admin/storage/DownloadImageStoreObjectCmd.java
 => user/backup/DownloadValidationScreenshotCmd.java} (52%)
 copy 
api/src/main/java/org/apache/cloudstack/api/command/user/{loadbalancer/DeleteSslCertCmd.java
 => backup/FinishBackupChainCmd.java} (58%)
 create mode 100644 
api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupServiceJobsCmd.java
 create mode 100644 
api/src/main/java/org/apache/cloudstack/api/response/BackupServiceJobResponse.java
 create mode 100644 
api/src/main/java/org/apache/cloudstack/backup/InternalBackupProvider.java
 create mode 100644 
api/src/main/java/org/apache/cloudstack/backup/InternalBackupService.java
 copy core/src/main/java/com/cloud/agent/api/{CheckNetworkCommand.java => 
MigrateBackupsBetweenSecondaryStoragesCommand.java} (59%)
 copy core/src/main/java/com/cloud/agent/api/{ClusterVMMetaDataSyncCommand.java 
=> MigrateBetweenSecondaryStoragesCommand.java} (62%)
 copy core/src/main/java/com/cloud/agent/api/{PingRoutingWithOvsCommand.java => 
MigrateBetweenSecondaryStoragesCommandAnswer.java} (58%)
 copy 
core/src/main/java/{com/cloud/agent/api/storage/CreateDiskOnlyVmSnapshotAnswer.java
 => org/apache/cloudstack/backup/CleanupKbossBackupErrorAnswer.java} (55%)
 create mode 100644 
core/src/main/java/org/apache/cloudstack/backup/CleanupKbossBackupErrorCommand.java
 copy 
core/src/main/java/org/apache/cloudstack/backup/{PrepareForBackupRestorationCommand.java
 => CleanupKbossValidationCommand.java} (74%)
 create mode 100644 
core/src/main/java/org/apache/cloudstack/backup/CompressBackupCommand.java
 copy 
plugins/storage/volume/storpool/src/main/java/com/cloud/agent/api/storage/StorPoolSetVolumeEncryptionAnswer.java
 => 
core/src/main/java/org/apache/cloudstack/backup/ConsolidateVolumesAnswer.java 
(64%)
 copy core/src/main/java/{com/cloud/agent/api/RecreateCheckpointsCommand.java 
=> org/apache/cloudstack/backup/ConsolidateVolumesCommand.java} (55%)
 copy 
core/src/main/java/org/apache/cloudstack/backup/{PrepareForBackupRestorationCommand.java
 => FinalizeBackupCompressionCommand.java} (63%)
 copy 
plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/agent/commands/ConfigureNetworkCommand.java
 => 
core/src/main/java/org/apache/cloudstack/backup/PrepareValidationCommand.java 
(56%)
 copy 
plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/agent/responses/ConfigureNetworkAnswer.java
 => 
core/src/main/java/org/apache/cloudstack/backup/RestoreKbossBackupAnswer.java 
(61%)
 create mode 100644 
core/src/main/java/org/apache/cloudstack/backup/RestoreKbossBackupCommand.java
 copy 
core/src/main/java/org/apache/cloudstack/backup/{PrepareForBackupRestorationCommand.java
 => TakeBackupHashCommand.java} (62%)
 create mode 100644 
core/src/main/java/org/apache/cloudstack/backup/TakeKbossBackupAnswer.java
 create mode 100644 
core/src/main/java/org/apache/cloudstack/backup/TakeKbossBackupCommand.java
 copy 
core/src/main/java/org/apache/cloudstack/backup/{BackupStorageStatsAnswer.java 
=> ValidateKbossVmAnswer.java} (59%)
 create mode 100644 
core/src/main/java/org/apache/cloudstack/backup/ValidateKbossVmCommand.java
 copy 
plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/agent/responses/ConfigurePortAnswer.java
 => 
core/src/main/java/org/apache/cloudstack/storage/command/BackupDeleteAnswer.java
 (74%)
 copy 
server/src/main/java/org/apache/cloudstack/diagnostics/to/DiagnosticsDataTO.java
 => core/src/main/java/org/apache/cloudstack/storage/to/BackupDeltaTO.java (53%)
 rename 
core/src/main/java/{com/cloud/agent/api/storage/SnapshotMergeTreeTO.java => 
org/apache/cloudstack/storage/to/DeltaMergeTreeTO.java} (71%)
 create mode 100644 
core/src/main/java/org/apache/cloudstack/storage/to/KbossTO.java
 copy 
server/src/main/java/org/apache/cloudstack/backup/VmWorkWaitForBackupFinalize.java
 => engine/components-api/src/main/java/com/cloud/vm/VmWorkDeleteBackup.java 
(73%)
 copy 
server/src/main/java/org/apache/cloudstack/backup/VmWorkWaitForBackupFinalize.java
 => engine/components-api/src/main/java/com/cloud/vm/VmWorkRestoreBackup.java 
(65%)
 copy 
server/src/main/java/org/apache/cloudstack/backup/VmWorkWaitForBackupFinalize.java
 => 
engine/components-api/src/main/java/com/cloud/vm/VmWorkRestoreVolumeBackupAndAttach.java
 (53%)
 copy server/src/main/java/com/cloud/vm/snapshot/VmWorkCreateVMSnapshot.java => 
engine/components-api/src/main/java/com/cloud/vm/VmWorkTakeBackup.java (63%)
 create mode 100644 
engine/schema/src/main/java/org/apache/cloudstack/backup/InternalBackupDataStoreVO.java
 create mode 100644 
engine/schema/src/main/java/org/apache/cloudstack/backup/InternalBackupJoinVO.java
 copy api/src/main/java/com/cloud/capacity/CapacityState.java => 
engine/schema/src/main/java/org/apache/cloudstack/backup/InternalBackupServiceJobType.java
 (85%)
 create mode 100644 
engine/schema/src/main/java/org/apache/cloudstack/backup/InternalBackupServiceJobVO.java
 create mode 100644 
engine/schema/src/main/java/org/apache/cloudstack/backup/InternalBackupStoragePoolVO.java
 copy 
framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaCreditsDao.java
 => 
engine/schema/src/main/java/org/apache/cloudstack/backup/dao/InternalBackupDataStoreDao.java
 (60%)
 create mode 100644 
engine/schema/src/main/java/org/apache/cloudstack/backup/dao/InternalBackupDataStoreDaoImpl.java
 create mode 100644 
engine/schema/src/main/java/org/apache/cloudstack/backup/dao/InternalBackupJoinDao.java
 create mode 100644 
engine/schema/src/main/java/org/apache/cloudstack/backup/dao/InternalBackupJoinDaoImpl.java
 create mode 100644 
engine/schema/src/main/java/org/apache/cloudstack/backup/dao/InternalBackupServiceJobDao.java
 create mode 100644 
engine/schema/src/main/java/org/apache/cloudstack/backup/dao/InternalBackupServiceJobDaoImpl.java
 copy api/src/main/java/org/apache/cloudstack/backup/BackupService.java => 
engine/schema/src/main/java/org/apache/cloudstack/backup/dao/InternalBackupStoragePoolDao.java
 (55%)
 create mode 100644 
engine/schema/src/main/java/org/apache/cloudstack/backup/dao/InternalBackupStoragePoolDaoImpl.java
 create mode 100644 
engine/schema/src/main/resources/META-INF/db/views/cloud.internal_backup_view.sql
 create mode 100644 
engine/storage/src/main/java/org/apache/cloudstack/storage/backup/BackupObject.java
 copy plugins/backup/{nas => kboss}/pom.xml (69%)
 create mode 100644 
plugins/backup/kboss/src/main/java/org/apache/cloudstack/backup/KbossBackupProvider.java
 copy plugins/backup/{nas/src/main/resources/META-INF/cloudstack/nas => 
kboss/src/main/resources/META-INF/cloudstack/kboss}/module.properties (98%)
 copy 
plugins/backup/{nas/src/main/resources/META-INF/cloudstack/nas/spring-backup-nas-context.xml
 => 
kboss/src/main/resources/META-INF/cloudstack/kboss/spring-backup-kboss-context.xml}
 (88%)
 create mode 100644 
plugins/backup/kboss/src/test/java/org/apache/cloudstack/backup/KbossBackupProviderTest.java
 create mode 100644 
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtMigrateResourceBetweenSecondaryStorages.java
 create mode 100644 
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCleanupKbossValidationCommandWrapper.java
 create mode 100644 
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCleanupKbossVmBackupCommandWrapper.java
 create mode 100644 
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCompressBackupCommandWrapper.java
 create mode 100644 
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConsolidateVolumesCommandWrapper.java
 create mode 100644 
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtFinalizeBackupCompressionCommandWrapper.java
 create mode 100644 
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateBackupsBetweenSecondaryStoragesCommandWrapper.java
 create mode 100644 
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPrepareValidationCommandWrapper.java
 create mode 100644 
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreKbossBackupCommandWrapper.java
 create mode 100644 
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtTakeBackupHashCommandWrapper.java
 create mode 100644 
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtTakeKbossBackupCommandWrapper.java
 create mode 100644 
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtValidateKbossVmCommandWrapper.java
 create mode 100644 
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirTakeKbossBackupCommandWrapperTest.java
 create mode 100644 
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreKbossBackupCommandWrapperTest.java
 create mode 100644 
plugins/storage/volume/ontap/src/test/java/org/apache/cloudstack/storage/utils/OntapStorageUtilsTest.java
 create mode 100644 
scripts/vm/hypervisor/kvm/imageserver/tests/test_nbd_entries.py
 create mode 100644 
server/src/main/java/org/apache/cloudstack/backup/BackupCompressionServiceJobController.java
 create mode 100644 
server/src/main/java/org/apache/cloudstack/backup/BackupValidationServiceJobController.java
 create mode 100644 
server/src/main/java/org/apache/cloudstack/backup/InternalBackupServiceImpl.java
 create mode 100644 
server/src/main/java/org/apache/cloudstack/backup/InternalBackupServiceJobController.java
 copy 
server/src/main/java/org/apache/cloudstack/{diagnostics/to/DiagnosticsDataObject.java
 => backup/to/BackupScreenshotObject.java} (82%)
 copy 
server/src/main/java/org/apache/cloudstack/{diagnostics/to/DiagnosticsDataTO.java
 => backup/to/BackupScreenshotTO.java} (70%)
 copy 
server/src/main/java/org/apache/cloudstack/storage/heuristics/presetvariables/{Snapshot.java
 => Backup.java} (67%)
 create mode 100644 
server/src/test/java/org/apache/cloudstack/backup/BackupCompressionServiceJobControllerTest.java
 create mode 100644 
server/src/test/java/org/apache/cloudstack/backup/BackupValidationServiceJobControllerTest.java
 create mode 100644 
server/src/test/java/org/apache/cloudstack/backup/InternalBackupServiceImplTest.java
 create mode 100644 test/integration/smoke/test_backup_recovery_kboss.py
 copy ui/src/views/offering/{ImportBackupOffering.vue => 
CreateBackupOffering.vue} (65%)
 copy 
plugins/network-elements/opendaylight/src/main/java/org/apache/cloudstack/network/opendaylight/api/NeutronRestApiException.java
 => utils/src/main/java/com/cloud/utils/exception/BackupException.java (54%)
 copy 
utils/src/main/java/{org/apache/cloudstack/utils/graphite/GraphiteException.java
 => com/cloud/utils/exception/BackupProviderException.java} (73%)

Reply via email to