This is an automated email from the ASF dual-hosted git repository. dahn pushed a change to branch dummy in repository https://gitbox.apache.org/repos/asf/cloudstack.git
discard 684648c385a do not merge add ab20b1220fe KVM Ingestion - Import Instance (#7976) add 0bc7fb540a4 client/pom.xml: fix code coverage is not updated in some modules (#8346) add 464a8205383 do not merge 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 (684648c385a) \ N -- N -- N refs/heads/dummy (464a8205383) 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: api/src/main/java/com/cloud/vm/UserVmService.java | 4 +- .../main/java/com/cloud/vm/VmDetailConstants.java | 1 + .../org/apache/cloudstack/api/ApiConstants.java | 3 + .../admin/vm/ImportUnmanagedInstanceCmd.java | 2 +- .../api/command/admin/vm/ImportVmCmd.java | 134 ++- ...dInstancesCmd.java => ListVmsForImportCmd.java} | 80 +- .../apache/cloudstack/vm/UnmanagedInstanceTO.java | 20 + .../apache/cloudstack/vm/UnmanagedVMsManager.java | 7 + .../org/apache/cloudstack/vm/VmImportService.java | 4 + client/pom.xml | 66 ++ .../{FenceAnswer.java => CheckVolumeAnswer.java} | 23 +- ...ilitiesCommand.java => CheckVolumeCommand.java} | 34 +- .../cloud/agent/api/CopyRemoteVolumeAnswer.java | 47 +- .../cloud/agent/api/CopyRemoteVolumeCommand.java | 101 +++ ...nstancesAnswer.java => GetRemoteVmsAnswer.java} | 41 +- ...sswordCommand.java => GetRemoteVmsCommand.java} | 47 +- .../agent/api/GetUnmanagedInstancesAnswer.java | 4 + .../service/VolumeOrchestrationService.java | 3 + .../engine/orchestration/VolumeOrchestrator.java | 45 + .../main/java/com/cloud/storage/dao/VolumeDao.java | 2 + .../java/com/cloud/storage/dao/VolumeDaoImpl.java | 14 + .../kvm/resource/LibvirtComputingResource.java | 57 +- .../kvm/resource/LibvirtDomainXMLParser.java | 106 ++- .../hypervisor/kvm/resource/LibvirtVMDef.java | 18 +- .../wrapper/LibvirtCheckVolumeCommandWrapper.java | 86 ++ .../LibvirtCopyRemoteVolumeCommandWrapper.java | 93 ++ .../wrapper/LibvirtGetRemoteVmsCommandWrapper.java | 194 +++++ ...LibvirtGetUnmanagedInstancesCommandWrapper.java | 227 +++++ ...irtPrepareUnmanageVMInstanceCommandWrapper.java | 51 ++ pom.xml | 2 +- .../java/com/cloud/api/query/QueryManagerImpl.java | 31 +- .../main/java/com/cloud/vm/UserVmManagerImpl.java | 22 +- .../cloudstack/vm/UnmanagedVMsManagerImpl.java | 938 +++++++++++++++++++-- .../cloudstack/vm/UnmanagedVMsManagerImplTest.java | 141 +++- tools/apidoc/gen_toc.py | 4 +- ui/public/locales/en.json | 27 +- ui/src/config/section/compute.js | 2 +- .../compute/wizard/ComputeOfferingSelection.vue | 2 +- ui/src/views/compute/wizard/MultiDiskSelection.vue | 6 +- ui/src/views/tools/ImportUnmanagedInstance.vue | 266 +++++- ui/src/views/tools/ManageInstances.vue | 747 ++++++++++++---- .../main/java/com/cloud/utils/ssh/SshHelper.java | 21 +- 42 files changed, 3271 insertions(+), 452 deletions(-) copy api/src/main/java/org/apache/cloudstack/api/command/admin/vm/{ListUnmanagedInstancesCmd.java => ListVmsForImportCmd.java} (69%) copy core/src/main/java/com/cloud/agent/api/{FenceAnswer.java => CheckVolumeAnswer.java} (70%) copy core/src/main/java/com/cloud/agent/api/{GetStoragePoolCapabilitiesCommand.java => CheckVolumeCommand.java} (60%) copy plugins/network-elements/ovs/src/main/java/com/cloud/agent/api/OvsCreateGreTunnelCommand.java => core/src/main/java/com/cloud/agent/api/CopyRemoteVolumeAnswer.java (54%) create mode 100644 core/src/main/java/com/cloud/agent/api/CopyRemoteVolumeCommand.java copy core/src/main/java/com/cloud/agent/api/{GetUnmanagedInstancesAnswer.java => GetRemoteVmsAnswer.java} (61%) copy core/src/main/java/com/cloud/agent/api/{UpdateHostPasswordCommand.java => GetRemoteVmsCommand.java} (56%) create mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckVolumeCommandWrapper.java create mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCopyRemoteVolumeCommandWrapper.java create mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetRemoteVmsCommandWrapper.java create mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetUnmanagedInstancesCommandWrapper.java create mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPrepareUnmanageVMInstanceCommandWrapper.java