This is an automated email from the ASF dual-hosted git repository.
nvazquez pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from d3f0700e978 Restore VMware-to-KVM migration changes from #13656
(#14256)
add 273b2ea32bf Fix importVM for use with dummy template (#14195)
add ac8d69c5c1d importVM improvements: RBD support, volume format, and
cluster selection (#14162)
add f23766d7c33 core: introduce a set of type adapters (#13624)
add 51c52490c95 Add schema upgrade path for 4.22.2 (#14179)
add 31b6855b708 linstor: escape dashes in the LVM volume group name of
snapshot paths (#14066)
add 250695ec331 Escape snapshot names in libvirt XML (#14201)
add 730d11fc57f [4.22] Fix CI Pre-commit failure (#14268)
add a772e8d13ba CKS/CSI: fix PVC deletion script to avoid '(standard
input)' and use kubectl -o name/jsonpath (#11968)
add 2e63c601fc2 Clarify KVM import template requirement (#13126)
add a4d3c664823 KVM: assign the hot-plugged NIC the next PCI slot above
existing NICs (monotonic interface naming) (#12826)
add 8261beca2fb ui: fix info card showing invalid template, iso link
(#13199)
add 8eeccdbb8a2 UI: don’t continue with session with an expired userid
(#13969)
add 5deb6a958df Improve date/timestamp handling performance in
GenericDaoBase and DateUtil (#13809)
add 4b2d387287a server: null-check requested IP in
assignSourceNatPublicIpAddress (#14025)
add cdd03d78748 Merge branch '4.20' into 4.22
add d4f5dff7311 Fix overly broad classpath scanning in
ReflectUtil.getClassesWithAnnotation() (#13427)
add 4e679ad8778 Ensure the detail value is not null when updating the vnc
access details of the vms with failed migrations on host maintenance (#13492)
add cc2f74f5c5d Ensure compliance with storage access groups when mounting
disabled storage pools (#13990)
add 2974af84f22 Make worker and API thread pool size configurable (#13565)
add 437adc81dec ui: add the missing label for the backup resource limit
(#14163)
add 1805dde42af kvm: look RBD volumes up through librbd instead of
refreshing the pool (#14188)
add 0931cf818e6 usage: widen usage_volume unique key to include vm_id
(#13933)
add 08831859497 Nasbackup quiesce fixes (#14305)
add dfff32edecf Netris: Improvements and fixes to the Netris plugin
(#13591)
add 546569bf24d Improve performance of listTemplates API (#13566)
add c7667d8c1fb VR: fix passive ftp through the virtual router on newer
system vm templates (#14330)
add 1e69e3a709c Allow removing VMs from instance groups (#14395)
add 768298a2111 Batch VM and host lookups in StorageManagerImpl to
eliminate N+1 queries during cleanup and pool connect (#13353)
add 99f348e0f94 Batch network lookups per NIC in NetworkOrchestrator to
eliminate N+1 queries during migration (#13354)
add b8a44e94951 lock only domains that have finite limits for checked
reservation (#14169)
add 5dfe75f77f3 Exclude Apache CXF dependency from kvm plugin (#13799)
add 376c1b40174 server: scope IPv6 security group member rules to the
exact host (#14037)
add dfaae63a461 Merge branch '4.20' into 4.22
add 60f88945d5e Merge branch '4.22'
add 2736abbeceb Fix build after merging 4.22
No new revisions were added by this update.
Summary of changes:
.../com/cloud/network/netris/NetrisService.java | 30 +-
.../org/apache/cloudstack/api/ApiConstants.java | 1 +
.../admin/network/NetworkOfferingBaseCmd.java | 8 +
.../admin/vm/ImportUnmanagedInstanceCmd.java | 2 +-
.../api/command/admin/vm/ImportVmCmd.java | 2 +-
.../api/command/admin/volume/ImportVolumeCmd.java | 2 +-
.../command/admin/vpc/CreateVPCOfferingCmd.java | 28 +-
.../api/command/user/vm/UpdateVMCmd.java | 2 +-
.../api/command/utils/OfferingUtils.java | 8 +-
.../api/response/VpcOfferingResponse.java | 8 +
.../org/apache/cloudstack/query/QueryService.java | 6 +
.../agent/transport/compat/AbstractTOAdaptor.java | 86 +++++
.../agent/transport/compat/DiskTOAdaptor.java | 11 +-
.../transport/compat/MigrateCommandAdaptor.java | 11 +-
.../agent/transport/compat/NetworkTOAdaptor.java | 14 +-
.../transport/compat/VirtualMachineTOAdaptor.java | 13 +-
.../main/java/com/cloud/serializer/GsonHelper.java | 44 +++
.../cloudstack/backup/TakeBackupCommand.java | 9 +
.../com/cloud/agent/transport/RequestTest.java | 138 ++++++-
.../service/VolumeOrchestrationService.java | 6 +-
.../java/com/cloud/storage/StorageManager.java | 4 +
.../engine/orchestration/NetworkOrchestrator.java | 40 +-
.../engine/orchestration/VolumeOrchestrator.java | 14 +-
.../orchestration/VolumeOrchestratorTest.java | 2 +-
.../cloud/configuration/dao/ResourceLimitDao.java | 11 +
.../configuration/dao/ResourceLimitDaoImpl.java | 31 ++
.../java/com/cloud/network/dao/NetworkDao.java | 2 +
.../java/com/cloud/network/dao/NetworkDaoImpl.java | 13 +
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 5 +-
.../src/main/java/com/cloud/vm/dao/NicDao.java | 2 +-
.../src/main/java/com/cloud/vm/dao/NicDaoImpl.java | 3 +-
.../main/java/com/cloud/vm/dao/VMInstanceDao.java | 2 +
.../java/com/cloud/vm/dao/VMInstanceDaoImpl.java | 16 +
.../org/apache/cloudstack/backup/BackupVO.java | 2 +-
.../storage/datastore/db/PrimaryDataStoreDao.java | 30 +-
.../datastore/db/PrimaryDataStoreDaoImpl.java | 59 ++-
.../resources/META-INF/db/schema-42300to2400.sql | 13 +
.../com/cloud/network/dao/NetworkDaoImplTest.java | 24 ++
.../java/com/cloud/utils/db/GenericDaoBase.java | 78 ++--
.../com/cloud/utils/db/GenericDaoBaseTest.java | 75 ++++
.../network/NetworkExtensionElement.java | 2 +-
.../framework/jobs/impl/AsyncJobManagerImpl.java | 19 +-
.../jobs/impl/AsyncJobManagerImplTest.java | 146 +++++++
.../cloudstack/backup/NASBackupProvider.java | 37 +-
.../cloudstack/backup/NASBackupProviderTest.java | 79 +++-
plugins/hypervisors/kvm/pom.xml | 36 ++
.../wrapper/LibvirtCheckVolumeCommandWrapper.java | 23 +-
.../LibvirtCreateVMSnapshotCommandWrapper.java | 3 +-
.../wrapper/LibvirtGetVncPortCommandWrapper.java | 1 +
.../LibvirtManageSnapshotCommandWrapper.java | 3 +-
.../wrapper/LibvirtPlugNicCommandWrapper.java | 105 +++++
.../wrapper/LibvirtTakeBackupCommandWrapper.java | 8 +-
.../resource/wrapper/LibvirtUtilitiesHelper.java | 5 +-
.../kvm/storage/LibvirtStorageAdaptor.java | 82 ++++
.../kvm/resource/LibvirtComputingResourceTest.java | 9 +
.../wrapper/LibvirtPlugNicCommandWrapperTest.java | 147 +++++++
.../LibvirtTakeBackupCommandWrapperTest.java | 102 +++++
.../wrapper/LibvirtUtilitiesHelperTest.java | 27 ++
.../cluster/KubernetesClusterManagerImpl.java | 50 ++-
.../KubernetesClusterActionWorker.java | 101 ++++-
.../KubernetesClusterDestroyWorker.java | 43 ++-
...ernetesClusterResourceModifierActionWorker.java | 23 ++
.../KubernetesClusterScaleWorker.java | 26 +-
.../KubernetesClusterStartWorker.java | 61 ++-
.../script/delete-pv-reclaimpolicy-delete | 82 ++--
.../agent/api/CreateNetrisVnetCommand.java | 22 +-
.../apache/cloudstack/agent/api/NetrisCommand.java | 9 +
.../resource/NetrisResourceObjectUtils.java | 19 +-
.../cloudstack/service/NetrisApiClientImpl.java | 426 ++++++++++++++++-----
.../apache/cloudstack/service/NetrisElement.java | 16 +-
.../cloudstack/service/NetrisGuestNetworkGuru.java | 148 +++++--
.../service/NetrisPublicNetworkGuru.java | 9 +-
.../cloudstack/service/NetrisServiceImpl.java | 26 +-
.../agent/api/CreateNetrisVnetCommandTest.java | 11 +-
.../resource/NetrisResourceObjectUtilsTest.java | 6 +-
.../cloudstack/service/NetrisElementTest.java | 2 +-
.../service/NetrisGuestNetworkGuruTest.java | 42 +-
...loudStackPrimaryDataStoreLifeCycleImplTest.java | 2 +
.../storage/datastore/util/LinstorUtil.java | 4 +-
.../storage/datastore/util/LinstorUtilTest.java | 14 +
.../ScaleIOPrimaryDataStoreLifeCycleTest.java | 3 +
scripts/vm/hypervisor/kvm/nasbackup.sh | 119 +++++-
server/src/main/java/com/cloud/api/ApiServer.java | 9 +-
.../java/com/cloud/api/doc/ApiXmlDocWriter.java | 5 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 160 +++++++-
.../com/cloud/api/query/dao/TemplateJoinDao.java | 15 +
.../cloud/api/query/dao/TemplateJoinDaoImpl.java | 371 ++++++++++++++++--
.../cloud/api/query/dao/TemplateListFilter.java | 258 +++++++++++++
.../api/query/dao/VpcOfferingJoinDaoImpl.java | 1 +
.../api/query/vo/BaseViewWithTagInformationVO.java | 4 +
.../com/cloud/api/query/vo/TemplateJoinVO.java | 4 +
.../com/cloud/network/IpAddressManagerImpl.java | 37 +-
.../java/com/cloud/network/NetworkModelImpl.java | 6 +-
.../com/cloud/network/guru/GuestNetworkGuru.java | 16 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 9 +
.../network/security/SecurityGroupManagerImpl.java | 2 +-
.../security/SecurityGroupManagerImpl2.java | 2 +-
.../java/com/cloud/network/vpc/VpcManagerImpl.java | 47 ++-
.../network/vpn/RemoteAccessVpnManagerImpl.java | 6 +
.../cloud/network/vpn/Site2SiteVpnManagerImpl.java | 3 +
.../com/cloud/resource/ResourceManagerImpl.java | 35 +-
.../resourcelimit/ResourceLimitManagerImpl.java | 153 +++++++-
.../java/com/cloud/storage/StorageManagerImpl.java | 21 +-
.../cloud/storage/listener/StoragePoolMonitor.java | 23 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 9 +-
.../cloudstack/backup/BackupManagerImpl.java | 27 +-
.../volume/VolumeImportUnmanageManagerImpl.java | 19 +-
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 58 ++-
.../src/test/java/com/cloud/api/ApiServerTest.java | 63 +++
.../dao/TemplateJoinDaoImplBypassExplainTest.java | 398 +++++++++++++++++++
.../api/query/dao/TemplateJoinDaoImplTest.java | 65 ++++
.../network/IpAddressManagerImplSourceNatTest.java | 58 +++
.../SecurityGroupManagerImpl2Ipv6RuleTest.java | 82 ++++
.../SecurityGroupManagerImplIpv6RuleTest.java | 90 +++++
.../cloud/resource/ResourceManagerImplTest.java | 2 +
.../ResourceLimitManagerImplTest.java | 256 +++++++++++++
.../storage/listener/StoragePoolMonitorTest.java | 116 +++++-
.../java/com/cloud/vm/UserVmManagerImplTest.java | 77 +++-
.../java/com/cloud/vpc/dao/MockNetworkDaoImpl.java | 5 +
.../cloudstack/backup/BackupManagerTest.java | 56 +++
.../cloudstack/service/NetrisServiceMockTest.java | 8 +-
.../VolumeImportUnmanageManagerImplTest.java | 15 +-
.../cloudstack/vm/UnmanagedVMsManagerImplTest.java | 63 ++-
systemvm/debian/opt/cloud/bin/configure.py | 22 +-
systemvm/debian/opt/cloud/bin/cs/CsAddress.py | 35 +-
systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 2 +-
systemvm/debian/opt/cloud/bin/cs/CsGuestNetwork.py | 3 +
systemvm/debian/opt/cloud/bin/setup/common.sh | 4 +-
systemvm/debian/opt/cloud/bin/setup/router.sh | 2 +-
systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh | 2 +-
systemvm/test/TestCsForwardingRules.py | 63 +++
ui/public/locales/en.json | 1 +
ui/src/components/view/DetailsTab.vue | 13 +
ui/src/composables/useServiceCapabilityParams.js | 19 +-
ui/src/config/section/network.js | 1 +
ui/src/config/section/offering.js | 2 +-
ui/src/store/modules/user.js | 155 ++++----
ui/src/views/compute/EditVM.vue | 11 +-
.../views/infra/zone/AdvancedGuestTrafficForm.vue | 4 +
ui/src/views/network/VpcTab.vue | 4 +-
ui/src/views/network/VpnDetails.vue | 28 +-
ui/src/views/offering/AddNetworkOffering.vue | 172 +++++----
ui/src/views/offering/AddVpcOffering.vue | 21 +-
utils/src/main/java/com/cloud/utils/DateUtil.java | 63 ++-
.../src/main/java/com/cloud/utils/ReflectUtil.java | 4 +
.../test/java/com/cloud/utils/DateUtilTest.java | 113 +++++-
146 files changed, 5582 insertions(+), 769 deletions(-)
create mode 100644
core/src/main/java/com/cloud/agent/transport/compat/AbstractTOAdaptor.java
copy
api/src/main/java/org/apache/cloudstack/dns/exception/DnsNotFoundException.java
=> core/src/main/java/com/cloud/agent/transport/compat/DiskTOAdaptor.java (77%)
copy
api/src/main/java/org/apache/cloudstack/dns/exception/DnsOperationException.java
=>
core/src/main/java/com/cloud/agent/transport/compat/MigrateCommandAdaptor.java
(71%)
copy
plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/nicira/RoutingTableRoutingConfig.java
=> core/src/main/java/com/cloud/agent/transport/compat/NetworkTOAdaptor.java
(74%)
copy
plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/nicira/RoutingTableRoutingConfig.java
=>
core/src/main/java/com/cloud/agent/transport/compat/VirtualMachineTOAdaptor.java
(74%)
create mode 100644
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPlugNicCommandWrapperTest.java
create mode 100644
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtTakeBackupCommandWrapperTest.java
create mode 100644
server/src/main/java/com/cloud/api/query/dao/TemplateListFilter.java
create mode 100644
server/src/test/java/com/cloud/api/query/dao/TemplateJoinDaoImplBypassExplainTest.java
create mode 100644
server/src/test/java/com/cloud/network/IpAddressManagerImplSourceNatTest.java
create mode 100644
server/src/test/java/com/cloud/network/security/SecurityGroupManagerImpl2Ipv6RuleTest.java
create mode 100644
server/src/test/java/com/cloud/network/security/SecurityGroupManagerImplIpv6RuleTest.java
create mode 100644 systemvm/test/TestCsForwardingRules.py
