This is an automated email from the ASF dual-hosted git repository.
Pearl1594 pushed a change to branch support-multi-vlan-guestnet
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 1e2048b2e4d Fix associated network state corruption from reaper race;
defer implement of associated network to VM start when stopped and ui support
for pri net change
add a945a7c203e Develocity integration (#14394)
add d3f0700e978 Restore VMware-to-KVM migration changes from #13656
(#14256)
add aa203a43b0c Merge branch 'main' of github.com:apache/cloudstack into
support-multi-vlan-guestnet
No new revisions were added by this update.
Summary of changes:
.github/workflows/build.yml | 2 +
.github/workflows/ci.yml | 8 +
.github/workflows/main-sonar-check.yml | 3 +
.github/workflows/rat.yml | 2 +
.github/workflows/sonar-check.yml | 3 +
.gitignore | 3 +
.mvn/develocity.xml | 50 +
.mvn/extensions.xml | 34 +
PendingReleaseNotes | 19 +
.../cloud/agent/properties/AgentProperties.java | 13 +
.../com/cloud/agent/api/to/RemoteInstanceTO.java | 14 +
.../agent/api/to/VmwareCbtChangedBlockRangeTO.java | 47 +
.../agent/api/to/VmwareCbtDiskSyncResultTO.java | 78 +
.../com/cloud/agent/api/to/VmwareCbtDiskTO.java | 85 +
.../cloud/agent/api/to/VmwareVddkSourceDiskTO.java | 53 +
api/src/main/java/com/cloud/event/EventTypes.java | 3 +
api/src/main/java/com/cloud/host/Host.java | 10 +
.../org/apache/cloudstack/api/ApiConstants.java | 23 +
.../admin/vm/CancelVmwareCbtMigrationCmd.java | 73 +
.../CheckVmwareCbtMigrationPrerequisitesCmd.java | 204 ++
.../admin/vm/CutoverVmwareCbtMigrationCmd.java | 110 +
.../admin/vm/DeleteVmwareCbtMigrationCmd.java | 81 +
.../api/command/admin/vm/ImportVmCmd.java | 36 +-
.../admin/vm/ListVmwareCbtMigrationsCmd.java | 109 +
.../admin/vm/StartVmwareCbtMigrationCmd.java | 361 +++
.../admin/vm/SyncVmwareCbtMigrationCmd.java | 110 +
.../response/VmwareCbtMigrationCycleResponse.java | 111 +
.../response/VmwareCbtMigrationDiskResponse.java | 117 +
.../VmwareCbtMigrationPreflightDiskResponse.java | 114 +
...VmwareCbtMigrationPreflightFindingResponse.java | 55 +
.../VmwareCbtMigrationPreflightResponse.java | 284 ++
.../api/response/VmwareCbtMigrationResponse.java | 288 ++
.../volume/VolumeImportUnmanageService.java | 3 +-
.../apache/cloudstack/vm/UnmanagedInstanceTO.java | 43 +
.../apache/cloudstack/vm/UnmanagedVMsManager.java | 50 +
.../cloudstack/vm/VmwareCbtChangedBlockInfo.java | 36 +
.../cloudstack/vm/VmwareCbtChangedDiskInfo.java | 46 +
.../apache/cloudstack/vm/VmwareCbtDiskInfo.java | 67 +
.../apache/cloudstack/vm/VmwareCbtMigration.java | 47 +
.../cloudstack/vm/VmwareCbtMigrationCycle.java | 30 +
.../cloudstack/vm/VmwareCbtMigrationDisk.java | 30 +
.../cloudstack/vm/VmwareCbtMigrationManager.java | 46 +
.../cloudstack/vm/VmwareCbtMigrationService.java | 47 +
.../cloudstack/vm/VmwareCbtPreflightDiskInfo.java | 59 +
.../cloudstack/vm/VmwareCbtPreflightInfo.java | 138 +
.../cloudstack/vm/VmwareCbtPreflightNicInfo.java | 87 +
.../cloudstack/vm/VmwareCbtSnapshotInfo.java | 46 +
.../agent/api/CheckConvertInstanceCommand.java | 18 +
.../cloud/agent/api/ConvertInstanceCommand.java | 21 +
.../agent/api/ImportConvertedInstanceCommand.java | 15 +
.../cloud/agent/api/VmwareCbtCleanupCommand.java | 100 +
.../cloud/agent/api/VmwareCbtCutoverCommand.java | 133 +
.../cloud/agent/api/VmwareCbtMigrationAnswer.java | 82 +
.../cloud/agent/api/VmwareCbtPrepareCommand.java | 110 +
.../cloud/agent/api/VmwareCbtRbdProbeCommand.java | 63 +
.../com/cloud/agent/api/VmwareCbtSyncCommand.java | 138 +
.../agent/api/to/VmwareCbtTargetStorageType.java | 28 +
docs/vmware-cbt-migration.md | 457 +++
docs/vmware-cbt/README.md | 1550 ++++++++++
docs/vmware-cbt/architecture.md | 266 ++
docs/vmware-linstor-migration.md | 238 ++
.../api/storage/PrimaryDataStoreDriver.java | 7 +
.../com/cloud/agent/manager/AgentManagerImpl.java | 74 +-
.../engine/orchestration/VolumeOrchestrator.java | 18 +-
.../orchestration/VolumeOrchestratorTest.java | 25 +
.../com/cloud/vm/VmwareCbtMigrationCycleVO.java | 171 ++
.../com/cloud/vm/VmwareCbtMigrationDiskVO.java | 197 ++
.../java/com/cloud/vm/VmwareCbtMigrationVO.java | 465 +++
.../cloud/vm/dao/VmwareCbtMigrationCycleDao.java | 26 +
.../vm/dao/VmwareCbtMigrationCycleDaoImpl.java | 46 +
.../com/cloud/vm/dao/VmwareCbtMigrationDao.java | 62 +
.../cloud/vm/dao/VmwareCbtMigrationDaoImpl.java | 129 +
.../cloud/vm/dao/VmwareCbtMigrationDiskDao.java | 26 +
.../vm/dao/VmwareCbtMigrationDiskDaoImpl.java | 44 +
.../spring-engine-schema-core-daos-context.xml | 3 +
.../resources/META-INF/db/schema-42300to2400.sql | 126 +
.../kvm/resource/LibvirtComputingResource.java | 261 +-
.../wrapper/LibvirtBaseConvertCommandWrapper.java | 73 +-
.../LibvirtCheckConvertInstanceCommandWrapper.java | 15 +
.../wrapper/LibvirtCheckVolumeCommandWrapper.java | 53 +-
.../LibvirtConvertInstanceCommandWrapper.java | 748 ++++-
.../LibvirtGetVolumesOnStorageCommandWrapper.java | 32 +-
...bvirtImportConvertedInstanceCommandWrapper.java | 21 +-
.../wrapper/LibvirtReadyCommandWrapper.java | 10 +
.../LibvirtVmwareCbtCleanupCommandWrapper.java | 339 +++
.../LibvirtVmwareCbtCutoverCommandWrapper.java | 794 ++++++
.../LibvirtVmwareCbtPrepareCommandWrapper.java | 506 ++++
.../LibvirtVmwareCbtRbdProbeCommandWrapper.java | 218 ++
.../LibvirtVmwareCbtSyncCommandWrapper.java | 489 ++++
.../wrapper/VmwareCbtCommandOutputLogger.java | 83 +
.../resource/wrapper/VmwareCbtCommandResult.java | 41 +
.../kvm/resource/wrapper/VmwareCbtSyncPlan.java | 273 ++
.../hypervisor/kvm/storage/KVMStoragePool.java | 43 +
.../hypervisor/kvm/storage/LibvirtStoragePool.java | 31 +-
.../org/apache/cloudstack/utils/qemu/QemuImg.java | 48 +-
.../kvm/resource/LibvirtComputingResourceTest.java | 32 +
...virtCheckConvertInstanceCommandWrapperTest.java | 65 +
.../LibvirtCheckVolumeCommandWrapperTest.java | 238 ++
.../LibvirtConvertInstanceCommandWrapperTest.java | 123 +-
...tImportConvertedInstanceCommandWrapperTest.java | 110 +
.../wrapper/LibvirtLinstorImportListingTest.java | 123 +
.../LibvirtVmwareCbtCleanupCommandWrapperTest.java | 239 ++
.../LibvirtVmwareCbtCutoverCommandWrapperTest.java | 412 +++
.../LibvirtVmwareCbtPrepareCommandWrapperTest.java | 254 ++
...LibvirtVmwareCbtRbdProbeCommandWrapperTest.java | 167 ++
.../LibvirtVmwareCbtSyncCommandWrapperTest.java | 246 ++
.../resource/wrapper/VmwareCbtSyncPlanTest.java | 98 +
.../kvm/storage/LibvirtStoragePoolTest.java | 56 +
.../manager/VmwareCbtMigrationServiceImpl.java | 602 ++++
.../cloudstack/core/spring-vmware-core-context.xml | 2 +
.../manager/VmwareCbtMigrationServiceImplTest.java | 70 +
.../kvm/storage/LinstorStorageAdaptor.java | 33 +-
.../hypervisor/kvm/storage/LinstorStoragePool.java | 28 +
.../driver/LinstorPrimaryDataStoreDriverImpl.java | 7 +
.../datastore/util/LinstorImportHelper.java | 201 ++
.../storage/datastore/util/LinstorUtil.java | 85 +-
.../util/LinstorApiPaginationContractTest.java | 74 +
.../datastore/util/LinstorImportHelperTest.java | 306 ++
.../com/cloud/server/ManagementServerImpl.java | 7 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 11 +-
.../volume/VolumeImportUnmanageManagerImpl.java | 8 +
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 658 ++++-
.../vm/VmwareCbtMigrationCutoverPolicy.java | 81 +
.../vm/VmwareCbtMigrationManagerImpl.java | 3008 ++++++++++++++++++++
.../cloudstack/vm/VmwareCbtStorageTarget.java | 89 +
.../spring-server-compute-context.xml | 2 +
.../com/cloud/vm/UserVmImportTemplateTest.java | 206 ++
.../VolumeImportUnmanageManagerImplTest.java | 72 +
.../cloudstack/vm/UnmanagedVMsManagerImplTest.java | 416 +++
.../vm/VmwareCbtMigrationCheckpointTest.java | 52 +
.../vm/VmwareCbtMigrationCutoverFailureTest.java | 78 +
.../vm/VmwareCbtMigrationCutoverPolicyTest.java | 75 +
.../vm/VmwareCbtMigrationDeletePolicyTest.java | 179 ++
.../vm/VmwareCbtMigrationImportTest.java | 126 +
.../vm/VmwareCbtMigrationNicValidationTest.java | 144 +
.../VmwareCbtMigrationOfferingValidationTest.java | 135 +
.../cloudstack/vm/VmwareCbtStorageTargetTest.java | 205 ++
ui/public/locales/en.json | 47 +-
ui/public/locales/pt_BR.json | 8 +-
ui/public/locales/te.json | 8 +-
ui/src/config/section/tools.js | 17 +-
ui/src/utils/vmware.js | 41 +
ui/src/views/infra/HostInfo.vue | 88 +-
ui/src/views/tools/ImportUnmanagedInstance.vue | 346 ++-
ui/src/views/tools/ManageInstances.vue | 416 ++-
ui/src/views/tools/SelectVmwareVcenter.vue | 4 +-
ui/src/views/tools/VmwareCbtMigrations.vue | 493 ++++
ui/tests/unit/utils/vmware.spec.js | 51 +
.../cloud/hypervisor/vmware/util/VmwareHelper.java | 59 +
149 files changed, 22456 insertions(+), 239 deletions(-)
create mode 100644 .mvn/develocity.xml
create mode 100644 .mvn/extensions.xml
create mode 100644
api/src/main/java/com/cloud/agent/api/to/VmwareCbtChangedBlockRangeTO.java
create mode 100644
api/src/main/java/com/cloud/agent/api/to/VmwareCbtDiskSyncResultTO.java
create mode 100644
api/src/main/java/com/cloud/agent/api/to/VmwareCbtDiskTO.java
create mode 100644
api/src/main/java/com/cloud/agent/api/to/VmwareVddkSourceDiskTO.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/vm/CancelVmwareCbtMigrationCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/vm/CheckVmwareCbtMigrationPrerequisitesCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/vm/CutoverVmwareCbtMigrationCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/vm/DeleteVmwareCbtMigrationCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ListVmwareCbtMigrationsCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/vm/StartVmwareCbtMigrationCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/vm/SyncVmwareCbtMigrationCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/response/VmwareCbtMigrationCycleResponse.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/response/VmwareCbtMigrationDiskResponse.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/response/VmwareCbtMigrationPreflightDiskResponse.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/response/VmwareCbtMigrationPreflightFindingResponse.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/response/VmwareCbtMigrationPreflightResponse.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/response/VmwareCbtMigrationResponse.java
create mode 100644
api/src/main/java/org/apache/cloudstack/vm/VmwareCbtChangedBlockInfo.java
create mode 100644
api/src/main/java/org/apache/cloudstack/vm/VmwareCbtChangedDiskInfo.java
create mode 100644
api/src/main/java/org/apache/cloudstack/vm/VmwareCbtDiskInfo.java
create mode 100644
api/src/main/java/org/apache/cloudstack/vm/VmwareCbtMigration.java
create mode 100644
api/src/main/java/org/apache/cloudstack/vm/VmwareCbtMigrationCycle.java
create mode 100644
api/src/main/java/org/apache/cloudstack/vm/VmwareCbtMigrationDisk.java
create mode 100644
api/src/main/java/org/apache/cloudstack/vm/VmwareCbtMigrationManager.java
create mode 100644
api/src/main/java/org/apache/cloudstack/vm/VmwareCbtMigrationService.java
create mode 100644
api/src/main/java/org/apache/cloudstack/vm/VmwareCbtPreflightDiskInfo.java
create mode 100644
api/src/main/java/org/apache/cloudstack/vm/VmwareCbtPreflightInfo.java
create mode 100644
api/src/main/java/org/apache/cloudstack/vm/VmwareCbtPreflightNicInfo.java
create mode 100644
api/src/main/java/org/apache/cloudstack/vm/VmwareCbtSnapshotInfo.java
create mode 100644
core/src/main/java/com/cloud/agent/api/VmwareCbtCleanupCommand.java
create mode 100644
core/src/main/java/com/cloud/agent/api/VmwareCbtCutoverCommand.java
create mode 100644
core/src/main/java/com/cloud/agent/api/VmwareCbtMigrationAnswer.java
create mode 100644
core/src/main/java/com/cloud/agent/api/VmwareCbtPrepareCommand.java
create mode 100644
core/src/main/java/com/cloud/agent/api/VmwareCbtRbdProbeCommand.java
create mode 100644
core/src/main/java/com/cloud/agent/api/VmwareCbtSyncCommand.java
create mode 100644
core/src/main/java/com/cloud/agent/api/to/VmwareCbtTargetStorageType.java
create mode 100644 docs/vmware-cbt-migration.md
create mode 100644 docs/vmware-cbt/README.md
create mode 100644 docs/vmware-cbt/architecture.md
create mode 100644 docs/vmware-linstor-migration.md
create mode 100644
engine/schema/src/main/java/com/cloud/vm/VmwareCbtMigrationCycleVO.java
create mode 100644
engine/schema/src/main/java/com/cloud/vm/VmwareCbtMigrationDiskVO.java
create mode 100644
engine/schema/src/main/java/com/cloud/vm/VmwareCbtMigrationVO.java
create mode 100644
engine/schema/src/main/java/com/cloud/vm/dao/VmwareCbtMigrationCycleDao.java
create mode 100644
engine/schema/src/main/java/com/cloud/vm/dao/VmwareCbtMigrationCycleDaoImpl.java
create mode 100644
engine/schema/src/main/java/com/cloud/vm/dao/VmwareCbtMigrationDao.java
create mode 100644
engine/schema/src/main/java/com/cloud/vm/dao/VmwareCbtMigrationDaoImpl.java
create mode 100644
engine/schema/src/main/java/com/cloud/vm/dao/VmwareCbtMigrationDiskDao.java
create mode 100644
engine/schema/src/main/java/com/cloud/vm/dao/VmwareCbtMigrationDiskDaoImpl.java
create mode 100644
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtVmwareCbtCleanupCommandWrapper.java
create mode 100644
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtVmwareCbtCutoverCommandWrapper.java
create mode 100644
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtVmwareCbtPrepareCommandWrapper.java
create mode 100644
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtVmwareCbtRbdProbeCommandWrapper.java
create mode 100644
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtVmwareCbtSyncCommandWrapper.java
create mode 100644
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/VmwareCbtCommandOutputLogger.java
create mode 100644
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/VmwareCbtCommandResult.java
create mode 100644
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/VmwareCbtSyncPlan.java
create mode 100644
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckVolumeCommandWrapperTest.java
create mode 100644
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtLinstorImportListingTest.java
create mode 100644
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtVmwareCbtCleanupCommandWrapperTest.java
create mode 100644
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtVmwareCbtCutoverCommandWrapperTest.java
create mode 100644
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtVmwareCbtPrepareCommandWrapperTest.java
create mode 100644
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtVmwareCbtRbdProbeCommandWrapperTest.java
create mode 100644
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtVmwareCbtSyncCommandWrapperTest.java
create mode 100644
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/VmwareCbtSyncPlanTest.java
create mode 100644
plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareCbtMigrationServiceImpl.java
create mode 100644
plugins/hypervisors/vmware/src/test/java/com/cloud/hypervisor/vmware/manager/VmwareCbtMigrationServiceImplTest.java
create mode 100644
plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/util/LinstorImportHelper.java
create mode 100644
plugins/storage/volume/linstor/src/test/java/org/apache/cloudstack/storage/datastore/util/LinstorApiPaginationContractTest.java
create mode 100644
plugins/storage/volume/linstor/src/test/java/org/apache/cloudstack/storage/datastore/util/LinstorImportHelperTest.java
create mode 100644
server/src/main/java/org/apache/cloudstack/vm/VmwareCbtMigrationCutoverPolicy.java
create mode 100644
server/src/main/java/org/apache/cloudstack/vm/VmwareCbtMigrationManagerImpl.java
create mode 100644
server/src/main/java/org/apache/cloudstack/vm/VmwareCbtStorageTarget.java
create mode 100644
server/src/test/java/com/cloud/vm/UserVmImportTemplateTest.java
create mode 100644
server/src/test/java/org/apache/cloudstack/vm/VmwareCbtMigrationCheckpointTest.java
create mode 100644
server/src/test/java/org/apache/cloudstack/vm/VmwareCbtMigrationCutoverFailureTest.java
create mode 100644
server/src/test/java/org/apache/cloudstack/vm/VmwareCbtMigrationCutoverPolicyTest.java
create mode 100644
server/src/test/java/org/apache/cloudstack/vm/VmwareCbtMigrationDeletePolicyTest.java
create mode 100644
server/src/test/java/org/apache/cloudstack/vm/VmwareCbtMigrationImportTest.java
create mode 100644
server/src/test/java/org/apache/cloudstack/vm/VmwareCbtMigrationNicValidationTest.java
create mode 100644
server/src/test/java/org/apache/cloudstack/vm/VmwareCbtMigrationOfferingValidationTest.java
create mode 100644
server/src/test/java/org/apache/cloudstack/vm/VmwareCbtStorageTargetTest.java
create mode 100644 ui/src/utils/vmware.js
create mode 100644 ui/src/views/tools/VmwareCbtMigrations.vue
create mode 100644 ui/tests/unit/utils/vmware.spec.js
