This is an automated email from the ASF dual-hosted git repository.
sureshanaparti pushed a change to branch healthcheck-main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
discard 0ee7c4379f2 4.21/main Health Check, please don't merge this!
add f58372e97b5 [UI] Use GET request method for list API calls (#11354)
add 6b9615b2f9e Selected type on update traffic type is based on chosen
type in traffic types tab (#10902)
add 2944bd1eda1 API: Set Object name when expunging VM (#11352)
add 3850445b505 ui: fix delete traffic type (#11337)
add 6589235b718 Merge branch '4.19' into 4.20
add b9febe4b4fc Merge branch '4.20'
add a87c5c2b3a5 Create new Instance from VM backup (#10140)
add f62b85dffee fix fsvm-init.yml to detect virtio-scsi in kvm (#11070)
add 5ea1ada59a4 Allow full clone volumes with thin provisioning in KVM
(#11177)
add ed0d606e983 Find system VM templates for CKS clusters and SharedFS
honouring the preferred architecture (#10946)
add 8ac8a221630 Merge branch '4.20'
add 9f5828a0270 UI: Fix cpu & memory details on list view for unmanaged
k8s clusters (CAPC) (#11353)
add e805e45342a Show chain size in snapshot response for incremental
snapshots (#11313)
add bcd738caa60 Fix GPU discovery script to make it run with mdev for
SR-IOV enabled devices (#11340)
add 5aa15187b66 Refactoring StorPool tests (#11107)
add adccdf2c7be UI support for deploy a VM from volume/snapshot (#11164)
add a60c8cab144 api,server,ui: allow listing events by state (#11355)
add a6a3fdaa38d 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 (0ee7c4379f2)
\
N -- N -- N refs/heads/healthcheck-main (a6a3fdaa38d)
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 | 3 +
.../cloud/agent/properties/AgentProperties.java | 8 +
api/src/main/java/com/cloud/capacity/Capacity.java | 6 +-
api/src/main/java/com/cloud/event/EventTypes.java | 2 +
.../java/com/cloud/network/NetworkService.java | 2 +
.../java/com/cloud/offering/DiskOfferingInfo.java | 7 +
.../java/com/cloud/storage/StorageService.java | 2 +-
api/src/main/java/com/cloud/vm/UserVmService.java | 11 +-
api/src/main/java/com/cloud/vm/VirtualMachine.java | 1 -
.../src/main/java/com/cloud/vm/VmDiskInfo.java | 27 +-
.../org/apache/cloudstack/alert/AlertService.java | 2 +
.../org/apache/cloudstack/api/ApiConstants.java | 15 +
.../apache/cloudstack/api/ResponseGenerator.java | 4 -
.../command/admin/resource/ListCapacityCmd.java | 1 -
.../admin/storage/AddObjectStoragePoolCmd.java | 9 +-
.../admin/storage/UpdateObjectStoragePoolCmd.java | 6 +
...dmin.java => CreateVMFromBackupCmdByAdmin.java} | 30 +-
.../api/command/user/backup/CreateBackupCmd.java | 35 +-
.../user/backup/CreateBackupScheduleCmd.java | 13 +
.../api/command/user/backup/ListBackupsCmd.java | 34 +-
.../api/command/user/event/ListEventsCmd.java | 7 +
.../vm/{DeployVMCmd.java => BaseDeployVMCmd.java} | 219 ++--
.../api/command/user/vm/CreateVMFromBackupCmd.java | 153 +++
.../api/command/user/vm/DeployVMCmd.java | 749 +----------
.../api/command/user/vm/DestroyVMCmd.java | 3 +-
.../api/response/BackupOfferingResponse.java | 8 +
.../cloudstack/api/response/BackupResponse.java | 61 +
.../api/response/BackupScheduleResponse.java | 8 +
.../api/response/ObjectStoreResponse.java | 20 +-
.../cloudstack/api/response/SnapshotResponse.java | 8 +
.../java/org/apache/cloudstack/backup/Backup.java | 60 +-
.../apache/cloudstack/backup/BackupManager.java | 50 +-
.../apache/cloudstack/backup/BackupProvider.java | 48 +-
.../apache/cloudstack/backup/BackupRepository.java | 2 +
.../apache/cloudstack/backup/BackupSchedule.java | 1 +
.../admin/storage/AddObjectStoragePoolCmdTest.java | 7 +-
.../api/command/user/vm/DeployVMCmdTest.java | 483 +++++++
.../org/apache/cloudstack/backup/BackupAnswer.java | 12 +
.../backup/BackupStorageStatsAnswer.java} | 31 +-
...mand.java => GetBackupStorageStatsCommand.java} | 14 +-
.../cloudstack/backup/RestoreBackupCommand.java | 19 +-
.../cloudstack/backup/TakeBackupCommand.java | 9 +
.../java/com/cloud/vm/VirtualMachineManager.java | 3 +-
.../engine/service/api/OrchestrationService.java | 15 +-
.../java/com/cloud/storage/StorageManager.java | 10 +
.../com/cloud/vm/VirtualMachineManagerImpl.java | 27 +-
.../engine/orchestration/CloudOrchestrator.java | 30 +-
.../main/java/com/cloud/capacity/CapacityVO.java | 2 +
.../java/com/cloud/storage/dao/VMTemplateDao.java | 2 +-
.../com/cloud/storage/dao/VMTemplateDaoImpl.java | 11 +-
.../java/com/cloud/usage/dao/UsageBackupDao.java | 4 +-
.../com/cloud/usage/dao/UsageBackupDaoImpl.java | 8 +-
.../main/java/com/cloud/vm/dao/VMInstanceDao.java | 3 +-
.../java/com/cloud/vm/dao/VMInstanceDaoImpl.java | 12 +-
.../apache/cloudstack/backup/BackupDetailVO.java} | 16 +-
.../cloudstack/backup/BackupRepositoryVO.java | 10 +
.../apache/cloudstack/backup/BackupScheduleVO.java | 14 +-
.../org/apache/cloudstack/backup/BackupVO.java | 50 +-
.../apache/cloudstack/backup/dao/BackupDao.java | 8 +-
.../cloudstack/backup/dao/BackupDaoImpl.java | 142 ++-
.../cloudstack/backup/dao/BackupDetailsDao.java} | 6 +-
.../backup/dao/BackupDetailsDaoImpl.java} | 13 +-
.../backup/dao/BackupOfferingDaoImpl.java | 1 +
.../cloudstack/backup/dao/BackupRepositoryDao.java | 2 +
.../backup/dao/BackupRepositoryDaoImpl.java | 8 +
.../backup/dao/BackupScheduleDaoImpl.java | 3 +
.../storage/datastore/db/ObjectStoreDao.java | 2 +
.../storage/datastore/db/ObjectStoreDaoImpl.java | 32 +
.../storage/datastore/db/ObjectStoreVO.java | 23 +-
.../spring-engine-schema-core-daos-context.xml | 1 +
.../resources/META-INF/db/schema-42010to42100.sql | 82 ++
.../cloud/storage/dao/VMTemplateDaoImplTest.java | 21 +
.../cloudstack/backup/dao/BackupDaoImplTest.java | 73 ++
.../object/datastore/ObjectStoreHelper.java | 2 +
.../cloudstack/backup/DummyBackupProvider.java | 108 +-
.../cloudstack/backup/NASBackupProvider.java | 197 +--
.../cloudstack/backup/NASBackupProviderTest.java | 230 ++++
.../cloudstack/backup/NetworkerBackupProvider.java | 108 +-
.../backup/networker/NetworkerClient.java | 7 +
.../backup/networker/NetworkerClientTest.java | 7 +
.../cloudstack/backup/VeeamBackupProvider.java | 83 +-
.../cloudstack/backup/veeam/VeeamClient.java | 137 +-
.../cloudstack/backup/VeeamBackupProviderTest.java | 9 +-
.../cloudstack/backup/veeam/VeeamClientTest.java | 203 +--
.../hypervisor/kvm/resource/LibvirtGpuDef.java | 2 +-
...va => LibvirtGetBackupStatsCommandWrapper.java} | 40 +-
.../LibvirtRestoreBackupCommandWrapper.java | 32 +-
.../wrapper/LibvirtTakeBackupCommandWrapper.java | 9 +-
.../kvm/storage/LibvirtStorageAdaptor.java | 16 +-
.../hypervisor/kvm/resource/LibvirtGpuDefTest.java | 3 +-
.../java/com/cloud/simulator/SimulatorGuru.java | 33 +-
.../java/com/cloud/hypervisor/guru/VMwareGuru.java | 4 +-
.../com/cloud/hypervisor/guru/VMwareGuruTest.java | 16 +-
.../cluster/KubernetesClusterManagerImpl.java | 27 +-
.../KubernetesClusterActionWorker.java | 4 +-
...ernetesClusterResourceModifierActionWorker.java | 6 +-
.../KubernetesClusterStartWorker.java | 12 +-
.../cluster/KubernetesClusterManagerImplTest.java | 19 +
.../lifecycle/CephObjectStoreLifeCycleImpl.java | 2 +
.../lifecycle/MinIOObjectStoreLifeCycleImpl.java | 2 +
.../SimulatorObjectStoreLifeCycleImpl.java | 2 +
.../lifecycle/StorageVmSharedFSLifeCycle.java | 5 +-
.../src/main/resources/conf/fsvm-init.yml | 11 +-
.../lifecycle/StorageVmSharedFSLifeCycleTest.java | 5 +-
scripts/vm/hypervisor/kvm/gpudiscovery.sh | 111 +-
scripts/vm/hypervisor/kvm/nasbackup.sh | 88 +-
.../java/com/cloud/alert/AlertManagerImpl.java | 51 +-
server/src/main/java/com/cloud/api/ApiDBUtils.java | 20 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 13 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 15 +-
.../cloud/api/query/dao/SnapshotJoinDaoImpl.java | 19 +
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 2 +-
.../java/com/cloud/network/NetworkServiceImpl.java | 16 +
.../com/cloud/network/as/AutoScaleManagerImpl.java | 6 +-
.../com/cloud/server/ManagementServerImpl.java | 38 +-
.../java/com/cloud/storage/StorageManagerImpl.java | 30 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 11 +-
.../cloud/storage/snapshot/SnapshotManager.java | 4 +
.../storage/snapshot/SnapshotManagerImpl.java | 2 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 558 ++++++--
.../cloudstack/backup/BackupManagerImpl.java | 812 ++++++++++--
.../consoleproxy/ConsoleAccessManagerImpl.java | 2 +-
.../org/apache/cloudstack/gpu/GpuServiceImpl.java | 15 +-
.../resource/ResourceCleanupServiceImpl.java | 29 +-
.../storage/object/BucketApiServiceImpl.java | 23 +-
.../java/com/cloud/alert/AlertManagerImplTest.java | 49 +
.../com/cloud/network/NetworkServiceImplTest.java | 31 +
.../cloud/network/as/AutoScaleManagerImplTest.java | 12 +-
.../com/cloud/storage/StorageManagerImplTest.java | 197 ++-
.../java/com/cloud/vm/UserVmManagerImplTest.java | 436 ++++++-
.../java/com/cloud/vpc/MockNetworkManagerImpl.java | 5 +
.../cloudstack/backup/BackupManagerTest.java | 988 +++++++++++++--
.../resource/ResourceCleanupServiceImplTest.java | 47 +-
.../storage/object/BucketApiServiceImplTest.java | 1 +
.../plugins/storpool/MigrateVolumeToStorPool.py | 19 +-
.../plugins/storpool/TestEncryptedVolumes.py | 135 +-
.../plugins/storpool/TestStorPoolVolumes.py | 155 ++-
.../plugins/storpool/TestTagsOnStorPool.py | 51 +-
.../plugins/storpool/TestVmSnapshots.py | 20 +-
test/integration/plugins/storpool/sp_util.py | 78 ++
test/integration/plugins/storpool/storpool.cfg | 154 +++
.../plugins/storpool/test_storpool_tiers.py | 38 +-
.../smoke/test_attach_multiple_volumes.py | 4 +
.../smoke/test_backup_recovery_dummy.py | 92 +-
test/integration/smoke/test_backup_recovery_nas.py | 219 ++++
tools/marvin/marvin/lib/base.py | 123 +-
ui/public/locales/en.json | 23 +-
ui/src/api/index.js | 19 +
ui/src/components/view/BackupMetadata.vue | 133 ++
.../view/DeployVMFromBackup.vue} | 1328 ++++++--------------
ui/src/components/view/DetailsTab.vue | 20 +-
ui/src/components/view/GPUSummaryTab.vue | 15 +-
ui/src/components/view/ListView.vue | 31 +-
ui/src/components/view/SearchView.vue | 54 +-
ui/src/components/view/TreeView.vue | 8 +-
ui/src/components/widgets/Console.vue | 2 +-
ui/src/components/widgets/InfiniteScrollSelect.vue | 4 +-
ui/src/config/section/compute.js | 10 +-
ui/src/config/section/config.js | 2 +-
ui/src/config/section/event.js | 2 +-
ui/src/config/section/infra/objectStorages.js | 4 +-
ui/src/config/section/infra/phynetworks.js | 5 +-
ui/src/config/section/storage.js | 40 +-
ui/src/views/AutogenView.vue | 10 +-
ui/src/views/compute/CreateAutoScaleVmGroup.vue | 4 +-
ui/src/views/compute/DeployVM.vue | 223 +++-
ui/src/views/compute/DeployVnfAppliance.vue | 6 +-
ui/src/views/compute/InstanceTab.vue | 4 +-
ui/src/views/compute/StartBackup.vue | 166 +++
ui/src/views/compute/backup/BackupSchedule.vue | 23 +-
ui/src/views/compute/backup/FormSchedule.vue | 32 +-
.../views/compute/wizard/NetworkConfiguration.vue | 96 +-
ui/src/views/compute/wizard/NetworkSelection.vue | 7 +-
.../views/compute/wizard/OsBasedImageSelection.vue | 2 +
.../views/compute/wizard/TemplateIsoSelection.vue | 13 +-
.../wizard/VolumeDiskOfferingSelectView.vue | 280 +++++
ui/src/views/dashboard/CapacityDashboard.vue | 15 +-
ui/src/views/iam/DomainView.vue | 4 +-
ui/src/views/infra/AddObjectStorage.vue | 34 +-
ui/src/views/infra/network/EditTrafficLabel.vue | 7 +-
ui/src/views/infra/network/TrafficTypesTab.vue | 6 +-
.../views/infra/network/providers/ProviderItem.vue | 4 +-
.../network/tungsten/TungstenFabricTableView.vue | 6 +-
ui/src/views/storage/CreateVMFromBackup.vue | 263 ++++
ui/src/views/tools/ManageInstances.vue | 4 +-
ui/src/views/tools/ManageVolumes.vue | 2 +-
ui/tests/unit/views/AutogenView.spec.js | 24 +-
.../java/com/cloud/usage/UsageManagerImpl.java | 8 +-
188 files changed, 8453 insertions(+), 3374 deletions(-)
copy core/src/main/java/com/cloud/agent/api/ConvertSnapshotCommand.java =>
api/src/main/java/com/cloud/vm/VmDiskInfo.java (59%)
copy
api/src/main/java/org/apache/cloudstack/api/command/admin/vm/{DeployVMCmdByAdmin.java
=> CreateVMFromBackupCmdByAdmin.java} (72%)
copy
api/src/main/java/org/apache/cloudstack/api/command/user/vm/{DeployVMCmd.java
=> BaseDeployVMCmd.java} (85%)
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/user/vm/CreateVMFromBackupCmd.java
create mode 100644
api/src/test/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmdTest.java
copy core/src/main/java/{com/cloud/agent/api/proxy/ConsoleProxyLoadAnswer.java
=> org/apache/cloudstack/backup/BackupStorageStatsAnswer.java} (61%)
copy core/src/main/java/org/apache/cloudstack/backup/{DeleteBackupCommand.java
=> GetBackupStorageStatsCommand.java} (82%)
copy engine/schema/src/main/java/{com/cloud/storage/VMTemplateDetailVO.java =>
org/apache/cloudstack/backup/BackupDetailVO.java} (85%)
mode change 100755 => 100644
copy
engine/schema/src/main/java/{com/cloud/storage/dao/VMTemplateDetailsDao.java =>
org/apache/cloudstack/backup/dao/BackupDetailsDao.java} (81%)
copy
engine/schema/src/main/java/{com/cloud/storage/dao/VolumeDetailsDaoImpl.java =>
org/apache/cloudstack/backup/dao/BackupDetailsDaoImpl.java} (79%)
create mode 100644
engine/schema/src/test/java/org/apache/cloudstack/backup/dao/BackupDaoImplTest.java
create mode 100644
plugins/backup/nas/src/test/java/org/apache/cloudstack/backup/NASBackupProviderTest.java
copy
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/{LibvirtDeleteBackupCommandWrapper.java
=> LibvirtGetBackupStatsCommandWrapper.java} (60%)
create mode 100644 test/integration/plugins/storpool/storpool.cfg
create mode 100644 test/integration/smoke/test_backup_recovery_nas.py
create mode 100644 ui/src/components/view/BackupMetadata.vue
copy ui/src/{views/compute/DeployVM.vue =>
components/view/DeployVMFromBackup.vue} (69%)
create mode 100644 ui/src/views/compute/StartBackup.vue
create mode 100644 ui/src/views/compute/wizard/VolumeDiskOfferingSelectView.vue
create mode 100644 ui/src/views/storage/CreateVMFromBackup.vue
