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
omit 012f1366e26 do not merge
add a15b706fbe7 Linstor: Allow snapshot backup also to work on non
hyperconverged setups (#8271)
add a6b570845f6 lower level and no stack traces at info or higher (#8278)
add 4c91cc7c6f5 ui: change ipaddress tab label for shared networks (#8305)
add b00fd6bb4d3 Merge remote-tracking branch 'apache/4.18'
add db6dd52f443 kvm: fix ide controller for rocky/alma vms (#8247)
add 14376ce2983 Merge release branch 4.18 to main
add fdfbb4fad13 Prioritize hypervisor.uri configuration (#8254)
add 371ad9f55b3 New Feature: Import VMware VMs into KVM (#7881)
add f6e6c665b22 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 (012f1366e26)
\
N -- N -- N refs/heads/dummy (f6e6c665b22)
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:
agent/conf/agent.properties | 3 +
.../cloud/agent/properties/AgentProperties.java | 7 +
.../com/cloud/agent/api/to/RemoteInstanceTO.java | 88 +++
.../main/java/com/cloud/dc}/VmwareDatacenter.java | 2 +-
.../java/com/cloud/hypervisor/HypervisorGuru.java | 22 +
.../main/java/com/cloud/vm/VmDetailConstants.java | 12 +
.../org/apache/cloudstack/api/ApiConstants.java | 6 +
.../apache/cloudstack/api/ResponseGenerator.java | 4 +
.../admin/vm/ImportUnmanagedInstanceCmd.java | 7 +-
.../api/command/admin/vm/ImportVmCmd.java | 180 ++++++
.../api/response/UnmanagedInstanceResponse.java | 12 +
.../api/response/VmwareDatacenterResponse.java | 2 +-
.../apache/cloudstack/vm/UnmanagedInstanceTO.java | 30 +
.../org/apache/cloudstack/vm/VmImportService.java | 12 +
...hawVMAnswer.java => ConvertInstanceAnswer.java} | 21 +-
.../cloud/agent/api/ConvertInstanceCommand.java | 63 ++
debian/control | 2 +-
.../java/com/cloud/storage/StorageManager.java | 8 +
.../engine/orchestration/NetworkOrchestrator.java | 30 +-
.../java/com/cloud/dc}/VmwareDatacenterVO.java | 2 +-
.../com/cloud/dc}/dao/VmwareDatacenterDao.java | 4 +-
.../vmware/dao/VmwareDatacenterDaoImpl.java | 3 +-
.../spring-engine-schema-core-daos-context.xml | 1 +
.../model/impl/DefaultModuleDefinitionSet.java | 20 +-
.../apache/cloudstack/sioc/SiocManagerImpl.java | 4 +-
.../cloudstack/backup/VeeamBackupProvider.java | 4 +-
.../kvm/resource/LibvirtComputingResource.java | 15 +-
.../hypervisor/kvm/resource/LibvirtConnection.java | 11 +-
.../hypervisor/kvm/resource/LibvirtVMDef.java | 14 +-
.../LibvirtConvertInstanceCommandWrapper.java | 400 ++++++++++++
.../LibvirtConvertInstanceCommandWrapperTest.java | 310 +++++++++
.../java/com/cloud/hypervisor/guru/VMwareGuru.java | 125 +++-
.../hypervisor/vmware/VmwareDatacenterService.java | 6 +
.../hypervisor/vmware/VmwareServerDiscoverer.java | 3 +-
.../vmware/manager/VmwareManagerImpl.java | 66 +-
.../hypervisor/vmware/resource/VmwareResource.java | 286 +--------
.../storage/resource/VmwareStorageProcessor.java | 2 +-
.../api/command/admin/zone/AddVmwareDcCmd.java | 2 +-
.../api/command/admin/zone/ListVmwareDcVmsCmd.java | 139 +++++
.../api/command/admin/zone/ListVmwareDcsCmd.java | 2 +-
.../api/command/admin/zone/UpdateVmwareDcCmd.java | 2 +-
.../cloudstack/core/spring-vmware-core-context.xml | 2 -
.../vmware/VmwareDatacenterApiUnitTest.java | 3 +-
.../vmware/manager/VmwareManagerImplTest.java | 6 +-
.../driver/LinstorPrimaryDataStoreDriverImpl.java | 87 ++-
.../util/LinstorConfigurationManager.java | 4 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 69 +++
.../com/cloud/hypervisor/HypervisorGuruBase.java | 12 +
.../java/com/cloud/storage/StorageManagerImpl.java | 3 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 31 +-
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 690 ++++++++++++++++-----
.../java/com/cloud/api/ApiResponseHelperTest.java | 29 +
.../java/com/cloud/vm/UserVmManagerImplTest.java | 21 +
.../cloudstack/vm/UnmanagedVMsManagerImplTest.java | 327 +++++++++-
tools/apidoc/gen_toc.py | 2 +
ui/public/locales/en.json | 18 +-
ui/src/components/view/ResourceView.vue | 8 +-
ui/src/components/widgets/TooltipLabel.vue | 1 +
ui/src/config/section/network.js | 2 +-
ui/src/views/compute/DeployVM.vue | 3 +
.../compute/wizard/ComputeOfferingSelection.vue | 8 +
.../views/compute/wizard/MultiNetworkSelection.vue | 34 +-
.../views/compute/wizard/NetworkConfiguration.vue | 5 +
ui/src/views/image/RegisterOrUploadTemplate.vue | 19 +-
ui/src/views/tools/ImportUnmanagedInstance.vue | 324 ++++++++--
ui/src/views/tools/ManageInstances.vue | 353 ++++++++---
ui/src/views/tools/SelectVmwareVcenter.vue | 273 ++++++++
.../com/cloud/utils/script/OutputInterpreter.java | 28 +
.../main/java/com/cloud/utils/script/Script.java | 19 +-
vmware-base/pom.xml | 6 +
.../cloud/hypervisor/vmware/mo/DatacenterMO.java | 22 +-
.../cloud/hypervisor/vmware/util/VmwareHelper.java | 291 +++++++++
.../hypervisor/vmware/util/VmwareHelperTest.java | 51 ++
73 files changed, 3995 insertions(+), 688 deletions(-)
create mode 100644
api/src/main/java/com/cloud/agent/api/to/RemoteInstanceTO.java
rename {plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware
=> api/src/main/java/com/cloud/dc}/VmwareDatacenter.java (96%)
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ImportVmCmd.java
rename {plugins/hypervisors/vmware =>
api}/src/main/java/org/apache/cloudstack/api/response/VmwareDatacenterResponse.java
(97%)
copy core/src/main/java/com/cloud/agent/api/{FreezeThawVMAnswer.java =>
ConvertInstanceAnswer.java} (62%)
create mode 100644
core/src/main/java/com/cloud/agent/api/ConvertInstanceCommand.java
rename {plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware
=> engine/schema/src/main/java/com/cloud/dc}/VmwareDatacenterVO.java (99%)
rename {plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware
=> engine/schema/src/main/java/com/cloud/dc}/dao/VmwareDatacenterDao.java (96%)
rename {plugins/hypervisors/vmware =>
engine/schema}/src/main/java/com/cloud/hypervisor/vmware/dao/VmwareDatacenterDaoImpl.java
(97%)
create mode 100644
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapper.java
create mode 100644
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapperTest.java
create mode 100644
plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcVmsCmd.java
create mode 100644 ui/src/views/tools/SelectVmwareVcenter.vue
