This is an automated email from the ASF dual-hosted git repository. weizhou pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 61118444d97f30185f7fea27dbac303e0c2b0152 Merge: 6003f22e47b 40cc10a73de Author: Wei Zhou <weiz...@apache.org> AuthorDate: Wed Jun 21 15:07:30 2023 +0200 Merge remote-tracking branch 'apache/4.18' .../cloudstack/api/command/user/vm/StartVMCmd.java | 3 +- .../java/com/cloud/vm/VirtualMachineManager.java | 2 + .../com/cloud/vm/VirtualMachineManagerImpl.java | 38 +- .../cloud/vm/VirtualMachineManagerImplTest.java | 57 +++ .../storage/volume/VolumeServiceImpl.java | 4 + .../hypervisor/kvm/resource/LibvirtConnection.java | 2 + .../LibvirtMigrateVolumeCommandWrapper.java | 232 ++++++++- .../kvm/storage/KVMStorageProcessor.java | 9 +- .../kvm/storage/ScaleIOStorageAdaptor.java | 1 + .../cloudstack/utils/qemu/QemuImageOptions.java | 11 +- .../LibvirtMigrateVolumeCommandWrapperTest.java | 388 +++++++++++++++ .../java/com/cloud/hypervisor/guru/VMwareGuru.java | 14 +- .../com/cloud/hypervisor/guru/VMwareGuruTest.java | 43 +- .../datastore/client/ScaleIOGatewayClientImpl.java | 2 +- .../driver/ScaleIOPrimaryDataStoreDriver.java | 281 ++++++++++- .../driver/ScaleIOPrimaryDataStoreDriverTest.java | 527 +++++++++++++++++++++ scripts/vm/hypervisor/versions.sh | 4 +- .../kvm/discoverer/LibvirtServerDiscoverer.java | 8 +- .../com/cloud/storage/VolumeApiServiceImpl.java | 21 +- .../main/java/com/cloud/vm/UserVmManagerImpl.java | 10 - .../SecondaryStorageManagerImpl.java | 49 +- .../SecondaryStorageManagerImplTest.java | 89 ++++ systemvm/agent/scripts/ssvm-check.sh | 27 +- .../plugins/scaleio/test_scaleio_volumes.py | 243 ++++++++++ ui/src/views/compute/StartVirtualMachine.vue | 14 +- utils/src/main/java/com/cloud/utils/UriUtils.java | 2 +- 26 files changed, 1972 insertions(+), 109 deletions(-)