This is an automated email from the ASF dual-hosted git repository.
pearl11594 pushed a change to branch clvm-enhancements
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 70583a43f93 prevent snapshot backup for incremental clvm_ng snaps, fix
build failure, add unit tests
add b744824f658 Add code owners for nsx network elements plugin (#12838)
add 120a43648b8 set width of dropdown select items for Network Offering
during add tier dialog (#11899)
add 58916eb6080 Use lateral join (introduced in MySQL 8.0.14) with
subquery on user_statistics table in account_view for netstats (#12631)
add c3d6a8cff72 server: fix templatetype during iso upload (#12151)
add db836229564 ui: fix create network from global create menu (#12677)
add 7aa0558c5b9 ui: avoid 404 after deleting template zones (#12681)
add 71daf84c9e8 Show security group selection in Basic zone VM deployment
and fix SG listing for cross-domain deployments (#12775)
add 7f7d0b02e14 Remove unnecessary stubbings in
ManagementServerMaintenanceManagerImplTest (#11914) (#12623)
add 2359061f663 api: remove required flag of gatewayid in
CreateStaticRouteCmd (#12786)
add 27bce46a8e3 Clear System VM IP from NICs for PublicNetworkGuru (#11992)
add 3b42fbf3b24 Fixing CI failures (#12789)
add 70489448831 [Fix] VMware to KVM migration instances listing failure
(#12766)
add 09ee0927e9b [4.22] Prevent Load Balancer rule creation when adding a
VM from a different network (#12785)
add e93ae1a4f45 New config key "allow.import.volume.with.backing.file" to
skip volume backing (#12809)
add bce55945ece Mark VMs in error state when expunge fails during destroy
operation (#12749)
add 7107d28db82 [VMware to KVM] Add guest OS for importing VM based on the
source VM OS (#12802)
add 7c3637a2f58 Fix duplicate dummy templates, and update guest os for
dummy template (#12780)
add d6c39772b21 Set management server id from cookies after saml login
(#12858)
add 84676afd5cc Check for null host before proceeding with VM volume
operations in managed storage while restoring VM (#12879)
add c1af36f8fc9 [4.22] Prevent unmanaging or reinstalling a VM if it is
part of a CKS cluster (#12800)
add 1bff543e58e Merge branch '4.22'
add 237f074054a Merge branch 'main' of
https://github.com/apache/cloudstack into clvm-enhancements
No new revisions were added by this update.
Summary of changes:
.github/CODEOWNERS | 2 +
api/src/main/java/com/cloud/vm/UserVmService.java | 3 +-
api/src/main/java/com/cloud/vm/VirtualMachine.java | 3 +
.../api/command/admin/vm/ImportVmCmd.java | 12 ++
.../api/command/user/guest/ListGuestOsCmd.java | 9 ++
.../api/command/user/vpc/CreateStaticRouteCmd.java | 1 -
.../api/response/UnmanagedInstanceResponse.java | 24 ++++
.../volume/VolumeImportUnmanageService.java | 13 +-
.../apache/cloudstack/vm/UnmanagedInstanceTO.java | 19 +++
.../apache/cloudstack/vm/UnmanagedVMsManager.java | 2 +
.../engine/orchestration/NetworkOrchestrator.java | 7 +-
.../java/com/cloud/storage/dao/GuestOSDao.java | 2 +-
.../java/com/cloud/storage/dao/GuestOSDaoImpl.java | 6 +-
.../main/java/com/cloud/storage/dao/VolumeDao.java | 8 ++
.../java/com/cloud/storage/dao/VolumeDaoImpl.java | 12 ++
.../com/cloud/upgrade/dao/Upgrade42200to42210.java | 51 ++++++++
.../datastore/db/SnapshotDataStoreDaoImpl.java | 15 +--
.../META-INF/db/schema-42200to42210-cleanup.sql | 2 +
.../resources/META-INF/db/schema-42200to42210.sql | 2 +
.../db/views/cloud.account_netstats_view.sql | 31 -----
.../META-INF/db/views/cloud.account_view.sql | 15 ++-
.../motion/StorageSystemDataMotionStrategy.java | 4 +-
.../wrapper/LibvirtGetRemoteVmsCommandWrapper.java | 2 +
...LibvirtGetUnmanagedInstancesCommandWrapper.java | 2 +
.../java/org/apache/cloudstack/saml/SAMLUtils.java | 3 +
.../main/java/com/cloud/api/ApiResponseHelper.java | 17 ++-
.../deploy/DeploymentPlanningManagerImpl.java | 4 +-
.../com/cloud/server/ManagementServerImpl.java | 33 ++++--
.../com/cloud/template/TemplateManagerImpl.java | 3 +
.../src/main/java/com/cloud/vm/UserVmManager.java | 5 +
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 132 ++++++++++++++-------
.../volume/VolumeImportUnmanageManagerImpl.java | 15 ++-
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 100 ++++------------
.../java/com/cloud/vm/UserVmManagerImplTest.java | 54 +++++++++
.../cloudstack/vm/UnmanagedVMsManagerImplTest.java | 55 ++++++++-
test/integration/smoke/test_secondary_storage.py | 16 ++-
ui/public/locales/en.json | 1 +
ui/src/permission.js | 1 +
ui/src/views/compute/DeployVM.vue | 6 +
.../compute/wizard/SecurityGroupSelection.vue | 26 +++-
ui/src/views/image/TemplateZones.vue | 14 ++-
ui/src/views/network/CreateNetwork.vue | 2 +-
ui/src/views/network/VpcTiersTab.vue | 10 +-
ui/src/views/tools/ImportUnmanagedInstance.vue | 37 +++++-
ui/src/views/tools/ManageInstances.vue | 21 +++-
.../com/cloud/hypervisor/vmware/mo/BaseMO.java | 27 ++++-
.../cloud/hypervisor/vmware/util/VmwareHelper.java | 16 ++-
.../hypervisor/vmware/util/VmwareHelperTest.java | 23 ++++
48 files changed, 648 insertions(+), 220 deletions(-)
delete mode 100644
engine/schema/src/main/resources/META-INF/db/views/cloud.account_netstats_view.sql
