This is an automated email from the ASF dual-hosted git repository.
sureshanaparti pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 0dbd761fbbd Merge branch '4.20'
add 54b44cc316e KVM: Option to deploy a VM with existing volume/snapshot
(#10503)
No new revisions were added by this update.
Summary of changes:
api/src/main/java/com/cloud/vm/UserVmService.java | 8 +-
.../api/command/user/vm/DeployVMCmd.java | 29 +-
.../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 +++-
...ernetesClusterResourceModifierActionWorker.java | 4 +-
.../KubernetesClusterStartWorker.java | 12 +-
.../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 +++--
.../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 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 150 +++++++---
.../cloud/network/as/AutoScaleManagerImplTest.java | 12 +-
.../java/com/cloud/vm/UserVmManagerImplTest.java | 106 ++++++-
.../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 +-
29 files changed, 929 insertions(+), 189 deletions(-)
create mode 100644
test/integration/smoke/test_vm_lifecycle_with_snapshot_or_volume.py