[cloudstack] branch master updated (3ede1ea -> 8c1d749)

[nv...@apache.org]

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

nvazquez pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


    from 3ede1ea  Merge remote-tracking branch 'origin/4.14'
     add 8c1d749  [VMware] Enable unmanaging guest VMs (#4103)

No new revisions were added by this update.

Summary of changes:
 api/src/main/java/com/cloud/event/EventTypes.java  |   2 +
 api/src/main/java/com/cloud/vm/UserVmService.java  |   5 +
 .../java/com/cloud/vm/VirtualMachineProfile.java   |   1 +
 .../com/cloud/vm/snapshot/VMSnapshotService.java   |   2 +-
 .../admin/vm/ImportUnmanagedInstanceCmd.java       |  10 ++
 .../vm/UnmanageVMInstanceCmd.java}                 | 116 +++++++-------
 ...sponse.java => UnmanageVMInstanceResponse.java} |  40 +++--
 .../apache/cloudstack/vm/UnmanageVMService.java    |  13 +-
 .../apache/cloudstack/vm/UnmanagedVMsManager.java  |  19 ++-
 .../org/apache/cloudstack/vm/VmImportService.java  |   4 +-
 ...r.java => PrepareUnmanageVMInstanceAnswer.java} |  13 +-
 ....java => PrepareUnmanageVMInstanceCommand.java} |  21 +--
 .../main/java/com/cloud/vm/VirtualMachineGuru.java |   2 +
 .../java/com/cloud/vm/VirtualMachineManager.java   |   7 +
 .../service/NetworkOrchestrationService.java       |   4 +-
 .../service/VolumeOrchestrationService.java        |   5 +
 .../subsystem/api/storage/VMSnapshotStrategy.java  |   2 +-
 .../subsystem/api/storage/VolumeService.java       |   2 +
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |  87 ++++++++++-
 .../engine/orchestration/NetworkOrchestrator.java  |  47 +++++-
 .../engine/orchestration/VolumeOrchestrator.java   |  23 +++
 .../orchestration/NetworkOrchestratorTest.java     |  20 +++
 .../vmsnapshot/DefaultVMSnapshotStrategy.java      |   7 +-
 .../storage/volume/VolumeServiceImpl.java          |  17 ++
 .../hypervisor/vmware/resource/VmwareResource.java |  26 ++++
 .../network/lb/ElasticLoadBalancerManagerImpl.java |   4 +
 .../lb/InternalLoadBalancerVMManagerImpl.java      |   4 +
 .../cloud/network/vm/NetScalerVMManagerImpl.java   |   4 +
 .../consoleproxy/ConsoleProxyManagerImpl.java      |   4 +
 .../router/VirtualNetworkApplianceManagerImpl.java |   4 +
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  | 146 ++++++++++++++++-
 .../cloud/vm/snapshot/VMSnapshotManagerImpl.java   |   4 +-
 ...nagerImpl.java => UnmanagedVMsManagerImpl.java} | 173 +++++++++++++++++++--
 .../spring-server-compute-context.xml              |   2 +-
 .../java/com/cloud/vpc/MockNetworkManagerImpl.java |   6 +-
 ...lTest.java => UnmanagedVMsManagerImplTest.java} |  95 +++++++++--
 .../SecondaryStorageManagerImpl.java               |   4 +
 test/integration/smoke/test_vm_life_cycle.py       | 161 ++++++++++++++++++-
 tools/marvin/marvin/lib/base.py                    |  14 ++
 39 files changed, 976 insertions(+), 144 deletions(-)
 copy api/src/main/java/org/apache/cloudstack/api/command/{user/backup/CreateBackupCmd.java => admin/vm/UnmanageVMInstanceCmd.java} (56%)
 copy api/src/main/java/org/apache/cloudstack/api/response/{DetailOptionsResponse.java => UnmanageVMInstanceResponse.java} (63%)
 copy services/console-proxy/rdpconsole/src/main/java/streamer/debug/Dumper.java => api/src/main/java/org/apache/cloudstack/vm/UnmanageVMService.java (78%)
 copy engine/schema/src/main/java/com/cloud/configuration/ManagementServiceConfiguration.java => api/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManager.java (59%)
 copy core/src/main/java/com/cloud/agent/api/{PerformanceMonitorAnswer.java => PrepareUnmanageVMInstanceAnswer.java} (79%)
 copy core/src/main/java/com/cloud/agent/api/{CheckVirtualMachineCommand.java => PrepareUnmanageVMInstanceCommand.java} (75%)
 rename server/src/main/java/org/apache/cloudstack/vm/{VmImportManagerImpl.java => UnmanagedVMsManagerImpl.java} (90%)
 rename server/src/test/java/org/apache/cloudstack/vm/{VmImportManagerImplTest.java => UnmanagedVMsManagerImplTest.java} (81%)