This is an automated email from the ASF dual-hosted git repository. dahn pushed a change to branch healthcheck-main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
discard d434ad7c0b9 4.20/main Health Check, please don't merge this! add 4d46bece4a7 fix priority for volume copy operation (#11109) add ed7bd5e5804 ui: fix handler for deploy button menu (#11116) add 80f46ad55d6 [VMware to KVM Migration] Fix for converted instance npe issue when source vmware instance ovf is exported from management server (#11003) add 1cbf1cd2cd8 fix volumes search filter (#11168) add 49c6fbdfaf3 schema: fix missing columns index (#11171) add 39c8c4dbae9 Normalize naming of Kubernetes clusters (#10778) add e47b78b2bbb directdownload: fix keytool importcert (#11113) add c782835f012 [Vmware to KVM Migration] Fix issue with vCenter Standalone hosts for VM listing (#11091) add 67a1ea35f4e .github: restrict codecov in UI build to apache/cloudstack repo (#11158) add 7715b3dc298 Improve the error throws when a template to owned by a non root-admin is registered for all zones. (#11170) add 61e74e086b5 Merge branch '4.19' into 4.20 add 0dbd761fbbd Merge branch '4.20' add 54b44cc316e KVM: Option to deploy a VM with existing volume/snapshot (#10503) add e44f7268990 4.20/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 (d434ad7c0b9) \ N -- N -- N refs/heads/healthcheck-main (e44f7268990) 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: .github/workflows/ui.yml | 1 + .../java/com/cloud/storage/VolumeApiService.java | 7 + api/src/main/java/com/cloud/vm/UserVmService.java | 8 +- .../api/command/user/vm/DeployVMCmd.java | 29 +- .../com/cloud/agent/api/ConvertInstanceAnswer.java | 16 -- .../cloud/agent/api/ConvertInstanceCommand.java | 11 +- .../download/HttpsDirectTemplateDownloader.java | 11 +- .../direct/download/HttpsMultiTrustManager.java | 102 ------- .../java/com/cloud/vm/VirtualMachineManager.java | 8 +- .../service/VolumeOrchestrationService.java | 2 +- .../engine/service/api/OrchestrationService.java | 16 +- .../com/cloud/vm/VirtualMachineManagerImpl.java | 17 +- .../engine/orchestration/CloudOrchestrator.java | 21 +- .../engine/orchestration/VolumeOrchestrator.java | 59 +++- .../com/cloud/upgrade/dao/Upgrade42000to42010.java | 2 - .../LibvirtConvertInstanceCommandWrapper.java | 205 +------------ ...tupDirectDownloadCertificateCommandWrapper.java | 2 +- .../LibvirtConvertInstanceCommandWrapperTest.java | 70 ----- ...ernetesClusterResourceModifierActionWorker.java | 42 ++- .../KubernetesClusterStartWorker.java | 12 +- ...tesClusterResourceModifierActionWorkerTest.java | 138 +++++++++ .../cloud/network/lb/LoadBalanceRuleHandler.java | 2 +- .../lb/InternalLoadBalancerVMManagerImpl.java | 2 +- .../lb/InternalLoadBalancerVMManagerImplTest.java | 10 +- .../contrail/management/ServiceManagerImpl.java | 2 +- .../cloud/network/vm/NetScalerVMManagerImpl.java | 2 +- .../lifecycle/StorageVmSharedFSLifeCycle.java | 52 ++-- .../lifecycle/StorageVmSharedFSLifeCycleTest.java | 67 +++-- .../datastore/adapter/primera/PrimeraAdapter.java | 1 + .../driver/StorPoolPrimaryDataStoreDriver.java | 77 +++-- .../consoleproxy/ConsoleProxyManagerImpl.java | 2 +- .../com/cloud/network/as/AutoScaleManagerImpl.java | 6 +- .../cloud/network/router/NetworkHelperImpl.java | 2 +- .../cloud/network/router/VpcNetworkHelperImpl.java | 2 +- .../com/cloud/template/TemplateAdapterBase.java | 3 +- .../main/java/com/cloud/vm/UserVmManagerImpl.java | 150 +++++++--- .../cloudstack/vm/UnmanagedVMsManagerImpl.java | 59 +--- .../cloud/network/as/AutoScaleManagerImplTest.java | 12 +- .../java/com/cloud/vm/UserVmManagerImplTest.java | 106 ++++++- .../cloudstack/vm/UnmanagedVMsManagerImplTest.java | 2 - .../SecondaryStorageManagerImpl.java | 2 +- .../plugins/storpool/test_storpool_tiers.py | 99 ++++++- .../test_vm_lifecycle_with_snapshot_or_volume.py | 318 +++++++++++++++++++++ tools/marvin/marvin/lib/base.py | 29 +- ui/src/components/view/SearchView.vue | 2 +- ui/src/views/compute/DeployVM.vue | 4 +- ui/src/views/compute/DeployVnfAppliance.vue | 4 +- ui/src/views/compute/wizard/DeployButtons.vue | 47 ++- .../main/java/com/cloud/utils/net/NetUtils.java | 22 +- .../com/cloud/hypervisor/vmware/mo/BaseMO.java | 21 +- 50 files changed, 1188 insertions(+), 698 deletions(-) delete mode 100644 core/src/main/java/org/apache/cloudstack/direct/download/HttpsMultiTrustManager.java create mode 100644 plugins/integrations/kubernetes-service/src/test/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorkerTest.java create mode 100644 test/integration/smoke/test_vm_lifecycle_with_snapshot_or_volume.py