This is an automated email from the ASF dual-hosted git repository.
Pearl1594 pushed a change to branch improve-listtemplates-perf
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 42fe302204f Fix issue with listing templates when filtered on name /
keyword - count is correct, but lists all templates
add 57671274d86 linstor: fix encrypted volume snapshot backup and restore
(#13486)
add ff9ee24d125 Fix local upload from browser failing due to ssvm cert not
trusted (#13204)
add b642bbe38e1 Fix the validation of CPVMs states in multiple zones
(#13021)
add 357186d64d0 flasharray: fall back to array capacity when pod has no
quota (#13050)
add a3970bb1530 Fix convert command's timeout for snapshot commands
(#13210)
add 7bc458ff85e Fix for usage server getting stuck due to duplicate VM
events (#13019)
add d35c1cd3ffe Remove the duplicate configkey json.content.type (#13264)
add 0bbea200626 server: fix NPE when migrate vm away with volumes (#13131)
add b26b70c40d6 Fix public IP range addition form (#13356)
add 4244c2cc102 UI: Allow selecting network for VNF nics if template is a
non deploy-as-is template (#13423)
add 78d9cb5abd6 dynamic vm.network.throttling.rate global configuration
(#12567)
add b36f06482fa fix misleading error message (#13450)
add 2eb9820f3cb framework-jobs,server: fix password obfuscation for job
result and password with display=false (#13388)
add c8b7816d5ee marvin: install mysql-connector-python >= 8.4.0 (#13482)
add a4b102fb3f9 Fix skip DRS for a VM (#12994)
add c7e2c748f74 Merge remote-tracking branch 'apache/4.20' into 4.22
add 265b554d608 Fix 4.22 build failures after forward-merge and rename
42010to42100 to 42040to42100
add 1c1611df2fd Ubuntu 26.04: remove requiretty from
/etc/sudoers.d/cloudstack and fix setup-sysvm-tmplt (#13476)
add 8225668688d Fix QEMU convert command timeout for incremental snapshots
(#13212)
add 63c142be261 KVM: fix LUKS/volume-encryption detection for qemu-img >=
10.1.0 (#13587)
add ec2d3ea1e6d Fix `findHostsForMigration` never returning hosts from
other clusters (#13452)
add e8df87e89be flasharray: authenticate via REST 2.x api-token and
discover API version (#13060)
add 76a4bc8c9de Merge remote-tracking branch 'apache/4.20' into 4.22
add 17e5947a6d2 server: add removed Tests for listHostsForMigrationOfVM
and fix test failures
add f4c0c312f6b ConfigureStorageAccessCmd: Allow storage access
configuration on empt… (#578) (#13551)
add 0339f31fb5e UI: fix blank page when list Other OSes in VNF appliance
deployment (#13620)
add 532852824a9 Add debug logging when storage pool has insufficient IOPS
capacity (#13579)
add 5dcb8abaf34 Fix checkRoleEscalation performance and bugs in access
checking (#12973)
add 9b9d0cf63be api,server: improve async job storage
add 72bdf5989bd add access validation for the deleteUserData,
linkUserDataToTemplate and resetUserDataForVirtualMachine APIs
add d463cb42a84 api: add ACL on ApiConstants.USER_DATA_ID
add a72f60519f5 ldap: improve config access
add 6b9fdd0d06c Add proper access check before proceeding with adding or
removing nodes from a CKS cluster
add 56ad044865b api,server,kvm: improve backup repository mount handling
add 443f20bf1c0 Allow only authorized users to add and list entity's
annotations
add a40d068228d Restrict domain admin access to project roles within their
own domain and add tests to cover perm check for proj role permissions
add 8221f625115 webhook: improve deliveries access
add fb758afbbc3 server: fix access for disable user 2fa
add 6c0e152ad2f Upgrade axios to 0.31.1 which has the config merge fix
add 53a7c294658 Fix issue in direct download and NFS templates
add f52f9da27bc Prevent command injections in get/run diagnostics API
add aa77259f481 oauth2: improve list providers api for access
add b98e1f568c6 oauth2: improve google provider flow
add e8f200afa3b Fix database connection leak
add 1790275babd webhook: additional check for payload url
add f2df4d9754a saml: reject signed SAMLResponse when IdP has no signing
certificate registered
add 9c32086e605 Restrict listHostTags to hosts dedicated to the caller's
domain (including sub-domains and accounts in a domain)
add 90f6b2a4cd5 Validate URL before obtaining remote size
add 2a027330579 Escape HTML in username, VM display name and diagnostics
output
add 549daae01ff correction in vpc limit assignment (#13627)
add f8a3762f076 do not send jetty version on failure to start (#13744)
add 69fc541737e server: ignore projectid=-1 for finding owner (#12695)
add 1e5d534c3ca guard against stopping stats background threads (#13659)
add 2bc8d299733 Don't allow adding of existing host to another zone, pod
or cluster (#13182)
add 5432a04ae6e Ensure VM IP is removed from VR DHCP records in
dnsmasq.leases after expunge VM (#13194)
add 18c1a30028d Allow only authorized users to add and list entity's
annotations
add 30e6abb63fb Restrict domain admin access to project roles within their
own domain and add tests to cover perm check for proj role permissions
add 4ae69bc7fd3 Restrict listHostTags to hosts dedicated to the caller's
domain (including sub-domains and accounts in a domain)
add e6640803ed9 webhook: improve deliveries access
add bbd37271c62 Validate URL before obtaining remote size
add 19d31cf6faf ldap: improve config access
add 57a2b4d5051 server: fix access for disable user 2fa
add 113ccb28e3b Upgrade axios to 0.31.1 which has the config merge fix
add 3eb928bc72d Escape HTML in username, VM display name and diagnostics
output
add 07e09db0af5 Fix issue in direct download and NFS templates
add 7c872a988ac api,server: improve async job storage
add 5b325dd49e4 Prevent command injections in get/run diagnostics API
add f320f552c33 oauth2: improve list providers api for access
add b17edb538e0 oauth2: improve google provider flow
add 9781fb906a7 api,server,kvm: improve backup repository mount handling
add ea75dc3c437 Fix database connection leak
add 2c7f13b709f webhook: additional check for payload url
add 04598336311 saml: reject signed SAMLResponse when IdP has no signing
certificate registered
add 8985a1fc7c2 add access validation for the deleteUserData,
linkUserDataToTemplate and resetUserDataForVirtualMachine APIs
add 6136ac93854 api: add ACL on ApiConstants.USER_DATA_ID
add 7fd56e573b8 Merge remote-tracking branch 'apache/4.20' into 4.22
add 7fc063ec13d build: fix after forward-merge
add 85bcdb1cc48 Fix NAS backup filename for legacy LINSTOR path (#13538)
add 7ea1dca5167 Add NULL check during restoreVM operation when host is
removed (#13779)
add 7d45dcb4301 Migrations triggered by Maintenance (system) not reported
on VM events list (#13931)
add 5b49d6aa3f7 Errorprone static analysis tool integration and fixes of
reported issues (#12419)
add b09005faaa9 UI: make serviceofferingid optional when add network
offering (#13502)
add 3dc23056b73 server: fix lastpinged of hosts (#13030)
add f2dec381726 Merge branch '4.20' into 4.22
add c7605686190 ui: label instance volume sizes as GiB (#13831)
add a5954f94cf6 fix domain cleanup when a removed account owns templates
(#13630)
add 167320eb9fe Propagate StopAnswer error details up the call chain when
stopping a VM (#13558)
add 6434ff2c62a make sure virtual machine params exist (#12771)
add 8d26cb3da6c Support for migration of system VMs with volumes in the
GUI (#13144)
add 042ec7e1655 UI: fix usage records end date with local timezone (#13769)
add 2cd8c5eddc7 Create bridge on dest host during SSVM migration when
using storage networks with dedicated vlan (#13379)
add e3c7b767998 Merge remote-tracking branch 'origin/4.20' into 4.22
add 2b3cca6cf47 SAML SLO does not clear session cookies on logout (#14017)
add 6ad0d75885f volume: reset pool_id on failed volume create for
zone-wide storage (#13611)
add f725211250a fix label key for gpudisplay (#13272)
add cdbda0ae158 engine: key removeNic work job lookup on nic uuid to fix
concurrent removal race (#13700)
add c860e0c214e kvm: fix RBD exclusive-lock leak that breaks
revertSnapshot on Ceph (#13835)
add f493d993dbf sharedfs: skip hypervisors without system templates
(#13830)
add 74e7105c9a5 ui: show selected template hypervisor in deploy form
(#13813)
add c7f2efad719 kvm: fix restore-and-attach of a backed up volume (#14007)
add a9b2f333d13 ui: filter accessible pools on live migration with storage
wizard (#14064)
add 10d3e115122 KVM: fix UEFI disk-only instance snapshot NVRAM handling
(#13020)
add c467686e4b9 [ConsoleProxy] Performance fixes on concurrency and
closing console sessions sockets and introduce reconnection window for console
sessions (#13683)
add af8691c6a95 Routed: get vm network statistics on Routed network
(#13105)
add 17098c15eb3 Fix lscpu speed checking order (#12190)
add 2327e83ed3e UI: Fix listing of resources for ASG belonging to a
project (#13187)
add c2c74c56e8f api: fix ProjectResponse.setVpcLimit assigning the network
limit (#14022)
add ac45be45e9e Change 2FA Field Type From Password to Text (#13723)
add 3a797993f3a Make `domainid` optional in `assignVirtualMachine` (#13213)
add 6a2e033322b apply the restored volume max IOPS to the max IOPS field
(#14024)
add bbf8c1a05ca server: do not NPE when a VPN provider returns no per-user
result (#14047)
add 223351c7a59 Add VR's system offering to network listing (#12862)
add 215ef984993 Allow cleaning up of networks stuck in Implementing state
(#12409)
add 245bbd9fe64 server: null-check public IP before the DNS/Source NAT
guard in createPublicLoadBalancerRule (#14027)
add 9c8bdf35843 config: persist config subgroups with their name and group
id (#14050)
add 1f761f0853a Update pmd config to make it pmd 7 compatible (#13168)
add 6e4413d59b7 engine: do not stall the host command queue on a failed
send in AgentAttache.sendNext (#14040)
add b93f603d315 api: fix inverted value comparison in
ImageStoreDetailResponse.equals (#14023)
add 02da97d172c Merge remote-tracking branch 'apache/4.20' into 4.22
add d0d49bc864a ui: fix build
add b9a5977a2bb fix: use auth_client_required instead of removed
auth_supported for RBD (#13991)
add 90180340814 Add basic `.editorconfig` file to help maintain consistent
coding styles (#7562)
add 9030443eac5 SharedFS: fix NPE when accessing systemvm templates for
unsupported hypervisors (#13930)
add 2e450cbddf3 marvin: use pycryptodome instead of PyCrypt (#13594)
add a01fb0be34b server: copy template details to vm instance details when
import VM (#12793)
add e38b7a724b1 kvm: apply rbd_default_data_pool when creating volumes
from templates on RBD (#13361)
add 10037c85d61 Nas backup: Fix mount/unmount error handling and timeout
in LibvirtRestoreBackupCommandWrapper (#14006)
add cffa6e3603a backport: Incremental NAS backup support for KVM (#13074)
(#13877)
add a8c8c18e56a xenserver/xcpng: do not bypass secondary storage when copy
volumes between pools (#13750)
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 79dbb93ef7d Merge remote-tracking branch 'origin/4.22' into
improve-listtemplates-perf
add 0f81e122f5d listTemplates bypass: honor templatetype/isvnf/forcks,
EXTERNAL ready format and view-consistent showunique paging
No new revisions were added by this update.
Summary of changes:
...cloudstack-agent-profile.sh.in => .editorconfig | 12 +-
.github/linters/codespell.txt | 1 +
PendingReleaseNotes | 14 +
.../java/com/cloud/agent/mockvm/MockVmMgr.java | 2 +-
api/src/main/java/com/cloud/host/Host.java | 1 +
.../java/com/cloud/resource/ResourceService.java | 2 +-
.../java/com/cloud/vm/VirtualMachineProfile.java | 1 +
.../java/org/apache/cloudstack/acl/APIChecker.java | 28 +
.../org/apache/cloudstack/api/ApiArgValidator.java | 73 +-
.../org/apache/cloudstack/api/ApiConstants.java | 1 +
.../admin/backup/UpdateBackupOfferingCmd.java | 4 +-
.../admin/vm/ImportUnmanagedInstanceCmd.java | 2 +-
.../api/command/admin/vm/ImportVmCmd.java | 2 +-
.../admin/vm/ResetVMPasswordCmdByAdmin.java | 2 +-
.../api/command/admin/volume/ImportVolumeCmd.java | 2 +-
.../autoscale/CreateAutoScaleVmProfileCmd.java | 2 +
.../autoscale/UpdateAutoScaleVmProfileCmd.java | 1 +
.../backup/repository/AddBackupRepositoryCmd.java | 4 +-
.../repository/UpdateBackupRepositoryCmd.java | 8 +-
.../command/user/userdata/DeleteUserDataCmd.java | 17 +-
.../user/userdata/LinkUserDataToTemplateCmd.java | 3 +
.../api/command/user/vm/BaseDeployVMCmd.java | 1 +
.../api/command/user/vm/CreateVMFromBackupCmd.java | 9 +
.../api/command/user/vm/ResetVMPasswordCmd.java | 2 +-
.../api/command/user/vm/ResetVMUserDataCmd.java | 1 +
.../api/command/user/vm/UpdateVMCmd.java | 1 +
.../user/vmsnapshot/CreateVMSnapshotCmd.java | 3 +-
.../cloudstack/api/response/DomainResponse.java | 2 +-
.../cloudstack/api/response/HostTagResponse.java | 6 +-
.../api/response/ImageStoreDetailResponse.java | 4 +-
.../api/response/NetworkOfferingResponse.java | 12 +
.../cloudstack/api/response/ProjectResponse.java | 2 +-
.../java/org/apache/cloudstack/backup/Backup.java | 6 +-
.../apache/cloudstack/backup/BackupProvider.java | 12 +
.../direct/download/DirectDownloadManager.java | 10 +
.../com/cloud/network/IsolationMethodTest.java | 2 +-
.../user/userdata/DeleteUserDataCmdTest.java | 31 +-
...Test.java => ImageStoreDetailResponseTest.java} | 34 +-
.../ProjectResponseTest.java} | 18 +-
.../storage/CreateDiskOnlyVmSnapshotAnswer.java | 11 +
.../storage/CreateDiskOnlyVmSnapshotCommand.java | 17 +
.../storage/DeleteDiskOnlyVmSnapshotCommand.java | 25 +-
.../storage/RevertDiskOnlyVmSnapshotCommand.java | 22 +
.../facade/AbstractConfigItemFacade.java | 2 +-
.../agent/transport/compat/AbstractTOAdaptor.java | 86 ++
.../agent/transport/compat/DiskTOAdaptor.java | 14 +-
.../transport/compat/MigrateCommandAdaptor.java | 14 +-
.../agent/transport/compat/NetworkTOAdaptor.java | 14 +-
.../transport/compat/VirtualMachineTOAdaptor.java | 13 +-
.../com/cloud/network/HAProxyConfigurator.java | 2 +-
.../java/com/cloud/resource/RequestWrapper.java | 2 +-
.../main/java/com/cloud/serializer/GsonHelper.java | 44 +
.../template/MetalinkTemplateDownloader.java | 7 +
.../directdownload/DirectDownloadCommand.java | 12 +-
.../org/apache/cloudstack/backup/BackupAnswer.java | 23 +
.../cloudstack/backup/TakeBackupCommand.java | 43 +
.../direct/download/DirectDownloadHelper.java | 5 +-
.../download/MetalinkDirectTemplateDownloader.java | 55 +-
.../download/NfsDirectTemplateDownloader.java | 79 +-
.../com/cloud/agent/transport/RequestTest.java | 138 +-
.../com/cloud/resource/ServerResourceBaseTest.java | 23 +-
.../download/NfsDirectTemplateDownloaderTest.java | 73 +
debian/rules | 1 +
.../service/NetworkOrchestrationService.java | 3 +
.../service/VolumeOrchestrationService.java | 6 +-
.../java/com/cloud/agent/manager/AgentAttache.java | 12 +-
.../com/cloud/agent/manager/AgentManagerImpl.java | 38 +-
.../cloud/agent/manager/DirectAgentAttache.java | 5 +
.../com/cloud/vm/VirtualMachineManagerImpl.java | 112 +-
.../engine/orchestration/NetworkOrchestrator.java | 4 +-
.../engine/orchestration/VolumeOrchestrator.java | 14 +-
.../agent/manager/AgentAttacheSendNextTest.java | 85 ++
.../cloud/agent/manager/AgentManagerImplTest.java | 37 +-
.../agent/manager/ConnectedAgentAttacheTest.java | 6 +-
.../cloud/vm/VirtualMachineManagerImplTest.java | 107 +-
.../orchestration/VolumeOrchestratorTest.java | 2 +-
.../main/java/com/cloud/event/dao/EventDao.java | 13 +
.../java/com/cloud/event/dao/EventDaoImpl.java | 21 +-
.../java/com/cloud/host/dao/HostTagsDaoImpl.java | 1 -
.../com/cloud/offerings/NetworkOfferingVO.java | 2 +-
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 8 +-
.../upgrade/SystemVmTemplateRegistration.java | 59 +-
.../cloud/upgrade/dao/DatabaseAccessObject.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade41500to41510.java | 79 +-
...e42020to42030.java => Upgrade42030to42040.java} | 22 +-
...e42010to42100.java => Upgrade42040to42100.java} | 8 +-
...grade431to440.java => Upgrade42210to42220.java} | 12 +-
.../org/apache/cloudstack/backup/BackupVO.java | 8 +-
.../resourcedetail/ResourceDetailsDao.java | 2 +
.../resourcedetail/ResourceDetailsDaoBase.java | 14 +
.../META-INF/db/schema-42010to42100-cleanup.sql | 20 -
...cleanup.sql => schema-42040to42100-cleanup.sql} | 2 +-
...ma-42010to42100.sql => schema-42040to42100.sql} | 2 +-
...cleanup.sql => schema-42210to42220-cleanup.sql} | 2 +-
...21to430-cleanup.sql => schema-42210to42220.sql} | 2 +-
.../cloud/network/as/AutoScaleVmProfileVOTest.java | 22 +-
.../cloud/upgrade/DatabaseUpgradeCheckerTest.java | 32 +-
.../upgrade/SystemVmTemplateRegistrationTest.java | 1 +
...42100Test.java => Upgrade42040to42100Test.java} | 4 +-
.../storage/motion/AncientDataMotionStrategy.java | 8 +
.../motion/AncientDataMotionStrategyTest.java | 15 +
.../KvmFileBasedStorageVmSnapshotStrategy.java | 269 +++-
.../vmsnapshot/ScaleIOVMSnapshotStrategy.java | 2 +-
.../KvmFileBasedStorageVmSnapshotStrategyTest.java | 550 ++++++++
.../storage/endpoint/DefaultEndPointSelector.java | 8 +-
.../storage/volume/VolumeServiceImpl.java | 4 +-
.../framework/config/impl/ConfigDepotImpl.java | 14 +-
.../framework/config/impl/ConfigDepotImplTest.java | 25 +
.../java/com/cloud/utils/db/GenericDaoBase.java | 15 +-
.../framework/serializer/OnwireClassRegistry.java | 2 +-
.../framework/jobs/AsyncJobDataHelper.java | 150 +++
.../framework/jobs/impl/AsyncJobManagerImpl.java | 126 +-
.../cloudstack/framework/jobs/impl/AsyncJobVO.java | 22 +-
.../framework/jobs/AsyncJobDataHelperTest.java | 249 ++++
.../framework/jobs/AsyncJobManagerTest.java | 18 +
.../factory/ModuleBasedContextFactoryTest.java | 3 +-
packaging/systemd/cloudstack-management.default | 2 +-
.../acl/DynamicRoleBasedAPIAccessChecker.java | 36 +-
.../acl/DynamicRoleBasedAPIAccessCheckerTest.java | 132 ++
.../acl/ProjectRoleBasedApiAccessChecker.java | 5 +
.../acl/StaticRoleBasedAPIAccessChecker.java | 16 +
.../cloudstack/backup/NASBackupChainKeys.java | 62 +
.../cloudstack/backup/NASBackupProvider.java | 658 ++++++++-
.../cloudstack/backup/NASBackupProviderTest.java | 691 ++++++++++
.../cloudstack/ca/provider/RootCAProvider.java | 2 +-
.../mom/webhook/WebhookApiServiceImpl.java | 79 +-
.../mom/webhook/WebhookDeliveryThread.java | 117 +-
.../cloudstack/mom/webhook/WebhookService.java | 38 +-
.../cloudstack/mom/webhook/WebhookServiceImpl.java | 61 +-
.../mom/webhook/WebhookUrlValidator.java | 123 ++
.../mom/webhook/dao/WebhookDeliveryDao.java | 3 +-
.../mom/webhook/dao/WebhookDeliveryDaoImpl.java | 14 +-
.../mom/webhook/dao/WebhookDeliveryJoinDao.java | 6 +-
.../webhook/dao/WebhookDeliveryJoinDaoImpl.java | 9 +-
.../mom/webhook/WebhookApiServiceImplTest.java | 198 ++-
.../mom/webhook/WebhookDeliveryThreadTest.java | 7 +
.../mom/webhook/WebhookUrlValidatorTest.java | 100 ++
.../test/HypervDirectConnectResourceTest.java | 3 +
.../hypervisor/kvm/resource/BridgeVifDriver.java | 9 +-
.../kvm/resource/LibvirtComputingResource.java | 17 +-
.../wrapper/LibvirtCheckVolumeCommandWrapper.java | 29 +-
...virtCreateDiskOnlyVMSnapshotCommandWrapper.java | 254 +++-
.../LibvirtCreateVMSnapshotCommandWrapper.java | 3 +-
...virtDeleteDiskOnlyVMSnapshotCommandWrapper.java | 38 +
.../LibvirtManageSnapshotCommandWrapper.java | 3 +-
.../wrapper/LibvirtReadyCommandWrapper.java | 1 +
.../LibvirtRestoreBackupCommandWrapper.java | 222 ++-
...virtRevertDiskOnlyVMSnapshotCommandWrapper.java | 94 +-
.../wrapper/LibvirtTakeBackupCommandWrapper.java | 159 ++-
.../resource/wrapper/LibvirtUtilitiesHelper.java | 5 +-
.../hypervisor/kvm/storage/KVMPhysicalDisk.java | 4 +-
.../kvm/storage/KVMStorageProcessor.java | 114 +-
.../kvm/storage/LibvirtStorageAdaptor.java | 10 +
.../kvm/storage/MultipathSCSIAdapterBase.java | 12 +-
.../apache/cloudstack/utils/linux/KVMHostInfo.java | 14 +-
.../org/apache/cloudstack/utils/qemu/QemuImg.java | 11 +-
.../kvm/resource/LibvirtComputingResourceTest.java | 3 +
...ibvirtDiskOnlyVMSnapshotCommandWrapperTest.java | 816 +++++++++++
.../LibvirtRestoreBackupCommandWrapperTest.java | 351 ++++-
.../wrapper/LibvirtUtilitiesHelperTest.java | 27 +
.../kvm/storage/KVMPhysicalDiskTest.java | 6 +-
.../kvm/storage/KVMStorageProcessorTest.java | 77 ++
.../kvm/storage/ScaleIOStoragePoolTest.java | 2 +
.../apache/cloudstack/utils/qemu/QemuImgTest.java | 15 +
.../hypervisor/ovm3/objects/ConnectionTest.java | 2 +-
.../com/cloud/hypervisor/ovm3/objects/NtpTest.java | 2 +
.../java/com/cloud/hypervisor/guru/VMwareGuru.java | 2 +-
.../vmware/VmwareDatacenterApiUnitTest.java | 15 +-
.../java/com/cloud/hypervisor/XenServerGuru.java | 7 +-
.../xenserver/resource/CitrixResourceBaseTest.java | 3 +
.../cluster/KubernetesClusterManagerImpl.java | 8 +-
.../script/delete-pv-reclaimpolicy-delete | 82 +-
.../guru/BrocadeVcsGuestNetworkGuruTest.java | 2 -
.../network/cisco/CiscoVnmcConnectionTest.java | 3 +-
.../network/resource/CiscoVnmcResourceTest.java | 3 +
.../contrail/management/MockAccountManager.java | 5 +
.../guru/NiciraNvpGuestNetworkGuruTest.java | 6 -
.../com/cloud/network/nicira/NiciraNvpApiIT.java | 2 -
.../cloudstack/agent/api/NsxNetworkCommand.java | 2 +-
.../AddTungstenFabricPolicyRuleCmdTest.java | 2 +
.../CreateTungstenFabricFirewallRuleCmdTest.java | 2 +
.../CreateTungstenFabricProviderCmdTest.java | 2 +
.../command/DeleteTungstenFabricTagCmdTest.java | 2 +
.../command/RemoveTungstenFabricTagCmdTest.java | 2 +
.../driver/redfish/RedfishWrapper.java | 2 +-
.../lifecycle/StorageVmSharedFSLifeCycle.java | 10 +-
.../lifecycle/StorageVmSharedFSLifeCycleTest.java | 62 +-
.../adapter/flasharray/FlashArrayAdapter.java | 222 ++-
plugins/storage/volume/linstor/CHANGELOG.md | 8 +
.../LinstorBackupSnapshotCommandWrapper.java | 46 +-
.../LinstorRevertBackupSnapshotCommandWrapper.java | 28 +-
.../driver/LinstorPrimaryDataStoreDriverImpl.java | 14 +-
.../storage/datastore/util/LinstorUtil.java | 4 +-
.../storage/datastore/util/LinstorUtilTest.java | 14 +
.../datastore/util/NexentaStorAppliance.java | 13 +-
.../driver/StorPoolPrimaryDataStoreDriver.java | 2 +-
.../storage/motion/StorPoolDataMotionStrategy.java | 2 +-
.../api/response/LdapConfigurationResponse.java | 17 +-
.../cloudstack/ldap/ADLdapUserManagerImpl.java | 1 +
.../apache/cloudstack/ldap/LdapManagerImpl.java | 25 +-
.../cloudstack/ldap/OpenLdapUserManagerImpl.java | 4 +
.../ldap/LdapDirectoryServerConnectionTest.java | 3 +
.../ldap/LdapUnboundidZapdotConnectionTest.java | 3 +
.../oauth2/api/command/ListOAuthProvidersCmd.java | 52 +-
.../oauth2/google/GoogleOAuth2Provider.java | 121 +-
.../oauth2/google/GoogleOAuth2ProviderTest.java | 177 +--
.../api/command/SAML2LoginAPIAuthenticatorCmd.java | 78 +-
.../command/SAML2LogoutAPIAuthenticatorCmd.java | 3 +
.../SAML2LogoutAPIAuthenticatorCmdTest.java | 26 +
scripts/storage/secondary/createtmplt.sh | 2 +-
scripts/storage/secondary/setup-sysvm-tmplt | 2 +-
scripts/vm/hypervisor/kvm/nasbackup.sh | 293 +++-
.../src/main/java/com/cloud/acl/DomainChecker.java | 2 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 3 +-
server/src/main/java/com/cloud/api/ApiServer.java | 12 +-
server/src/main/java/com/cloud/api/ApiServlet.java | 48 +-
.../com/cloud/api/dispatch/ParamProcessWorker.java | 6 +
.../java/com/cloud/api/doc/ApiXmlDocWriter.java | 2 +-
.../src/main/java/com/cloud/api/doc/Argument.java | 12 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 72 +-
.../com/cloud/api/query/dao/HostJoinDaoImpl.java | 9 +-
.../com/cloud/api/query/dao/TemplateJoinDao.java | 2 +-
.../cloud/api/query/dao/TemplateJoinDaoImpl.java | 34 +-
.../cloud/api/query/dao/TemplateListFilter.java | 14 +-
.../com/cloud/api/query/vo/AsyncJobJoinVO.java | 3 +-
.../main/java/com/cloud/configuration/Config.java | 9 -
.../configuration/ConfigurationManagerImpl.java | 4 +-
.../cloud/consoleproxy/ConsoleProxyManager.java | 3 +
.../consoleproxy/ConsoleProxyManagerImpl.java | 15 +-
.../com/cloud/dc/dao/DedicatedResourceDao.java | 6 +
.../com/cloud/dc/dao/DedicatedResourceDaoImpl.java | 12 +
.../java/com/cloud/event/ActionEventUtils.java | 14 +
.../com/cloud/ha/HighAvailabilityManagerImpl.java | 113 +-
.../main/java/com/cloud/hypervisor/KVMGuru.java | 2 +-
.../com/cloud/network/IpAddressManagerImpl.java | 2 +-
.../network/element/VirtualRouterElement.java | 24 +-
.../network/lb/LoadBalancingRulesManagerImpl.java | 2 +-
.../network/vpn/RemoteAccessVpnManagerImpl.java | 2 +-
.../com/cloud/resource/ResourceManagerImpl.java | 90 +-
.../resourcelimit/ResourceLimitManagerImpl.java | 2 +-
.../com/cloud/server/ManagementServerImpl.java | 69 +-
.../main/java/com/cloud/server/StatsCollector.java | 53 +-
.../java/com/cloud/storage/StorageManagerImpl.java | 8 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 18 +-
.../com/cloud/template/TemplateManagerImpl.java | 25 +-
.../main/java/com/cloud/user/AccountManager.java | 3 +
.../java/com/cloud/user/AccountManagerImpl.java | 83 +-
.../src/main/java/com/cloud/vm/UserVmManager.java | 4 +
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 129 +-
.../cloud/vm/snapshot/VMSnapshotManagerImpl.java | 10 +-
.../cloudstack/acl/ProjectRoleManagerImpl.java | 17 +-
.../org/apache/cloudstack/acl/RoleManagerImpl.java | 3 +
.../annotation/AnnotationManagerImpl.java | 9 +-
.../cloudstack/backup/BackupManagerImpl.java | 17 +-
.../cloudstack/cluster/ClusterDrsServiceImpl.java | 34 +-
.../diagnostics/DiagnosticsServiceImpl.java | 37 +-
.../direct/download/DirectDownloadManagerImpl.java | 27 +-
.../cloudstack/network/RoutedIpv4ManagerImpl.java | 8 +-
.../gslb/GlobalLoadBalancingRulesServiceImpl.java | 11 +-
.../volume/VolumeImportUnmanageManagerImpl.java | 19 +-
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 56 +-
.../test/java/com/cloud/acl/DomainCheckerTest.java | 27 +-
.../cloud/api/dispatch/ParamProcessWorkerTest.java | 20 +
.../com/cloud/api/query/QueryManagerImplTest.java | 231 +++-
.../api/query/dao/TemplateJoinDaoImplTest.java | 43 +
.../deploy/DeploymentPlanningManagerImplTest.java | 57 +-
.../cloud/ha/HighAvailabilityManagerImplTest.java | 8 +-
.../cloud/network/as/AutoScaleManagerImplTest.java | 5 +-
.../lb/LoadBalancingRulesManagerImplTest.java | 74 +-
.../vpn/RemoteAccessVpnManagerImplTest.java | 50 +
.../cloud/resource/MockResourceManagerImpl.java | 2 +-
.../cloud/resource/ResourceManagerImplTest.java | 182 +++
.../ResourceLimitManagerImplTest.java | 31 +
.../com/cloud/server/ManagementServerImplTest.java | 1411 +++++++++++++++++++-
.../java/com/cloud/server/StatsCollectorTest.java | 131 ++
.../template/HypervisorTemplateAdapterTest.java | 2 +
.../cloud/template/TemplateManagerImplTest.java | 208 ++-
.../com/cloud/user/AccountManagerImplTest.java | 151 ++-
.../java/com/cloud/user/DomainManagerImplTest.java | 7 +-
.../java/com/cloud/vm/UserVmManagerImplTest.java | 273 +++-
.../test/java/com/cloud/vm/UserVmManagerTest.java | 3 +
.../cloud/vm/snapshot/VMSnapshotManagerTest.java | 7 +-
.../cloudstack/acl/ProjectRoleManagerImplTest.java | 245 ++++
.../cluster/ClusterDrsServiceImplTest.java | 46 +-
.../diagnostics/DiagnosticsServiceImplTest.java | 133 ++
.../deployment/RouterDeploymentDefinitionTest.java | 2 +-
.../VolumeImportUnmanageManagerImplTest.java | 11 +-
.../cloudstack/vm/UnmanagedVMsManagerImplTest.java | 63 +-
.../rdpclient/ntlmssp/ServerNtlmsspChallenge.java | 5 +-
.../src/main/java/streamer/ByteBuffer.java | 2 +-
.../src/test/java/streamer/ByteBufferTest.java | 1 +
.../java/com/cloud/consoleproxy/ConsoleProxy.java | 90 +-
.../cloud/consoleproxy/ConsoleProxyGCThread.java | 1 +
.../consoleproxy/ConsoleProxyNoVNCHandler.java | 16 +-
.../consoleproxy/ConsoleProxyNoVNCServer.java | 10 +-
.../consoleproxy/ConsoleProxyNoVncClient.java | 4 +
.../com/cloud/consoleproxy/vnc/NoVncClient.java | 22 +
.../cloud/consoleproxy/vnc/network/NioSocket.java | 24 +
.../consoleproxy/vnc/network/NioSocketHandler.java | 1 +
.../vnc/network/NioSocketHandlerImpl.java | 7 +
systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 67 +-
test/integration/plugins/linstor/README.md | 18 +
.../linstor/test_linstor_encrypted_snapshots.py | 444 ++++++
test/integration/smoke/test_backup_recovery_nas.py | 329 +++++
test/integration/smoke/test_webhook_delivery.py | 67 +-
test/integration/smoke/test_webhook_lifecycle.py | 83 +-
tools/checkstyle/src/main/resources/cloud-pmd.xml | 117 +-
tools/marvin/setup.py | 4 +-
ui/package.json | 2 +-
ui/public/locales/en.json | 18 +-
ui/public/locales/pt_BR.json | 1 +
ui/src/components/view/DetailsTab.vue | 2 +-
ui/src/components/view/InfoCard.vue | 2 +-
.../InstanceVolumesStoragePoolSelectListView.vue | 9 +-
ui/src/components/view/ListView.vue | 10 +-
ui/src/components/view/StoragePoolSelectView.vue | 15 +-
.../view/VolumeStoragePoolSelectForm.vue | 6 +
ui/src/components/view/VolumesTab.vue | 2 +-
ui/src/config/section/compute.js | 4 +-
ui/src/config/section/infra/hosts.js | 2 +-
ui/src/config/section/infra/routers.js | 3 +-
ui/src/config/section/infra/systemVms.js | 3 +-
ui/src/config/section/network.js | 4 +-
ui/src/config/section/offering.js | 8 +-
ui/src/config/section/user.js | 3 +-
ui/src/style/vars.less | 2 +-
ui/src/utils/{permissions.js => ssvmProbe.js} | 13 +-
ui/src/utils/util.js | 18 +
ui/src/views/compute/AutoScaleDownPolicyTab.vue | 19 +-
ui/src/views/compute/AutoScaleLoadBalancing.vue | 20 +-
ui/src/views/compute/AutoScaleUpPolicyTab.vue | 19 +-
ui/src/views/compute/AutoScaleVmProfile.vue | 57 +-
ui/src/views/compute/DeployVM.vue | 18 +-
ui/src/views/compute/DeployVnfAppliance.vue | 2 +-
ui/src/views/compute/MigrateWizard.vue | 19 +-
ui/src/views/dashboard/SetupTwoFaAtLogin.vue | 4 +-
ui/src/views/dashboard/VerifyTwoFa.vue | 6 +-
ui/src/views/iam/SetupTwoFaAtUserProfile.vue | 4 +-
ui/src/views/image/RegisterOrUploadIso.vue | 50 +-
ui/src/views/image/RegisterOrUploadTemplate.vue | 45 +-
ui/src/views/infra/UsageRecords.vue | 4 +-
ui/src/views/infra/network/IpRangesTabPublic.vue | 4 +
ui/src/views/offering/AddComputeOffering.vue | 2 +-
ui/src/views/offering/AddNetworkOffering.vue | 1 -
ui/src/views/storage/UploadLocalVolume.vue | 133 +-
ui/src/views/tools/ManageInstances.vue | 4 +-
ui/tests/unit/components/view/DetailsTab.spec.js | 67 +
ui/tests/unit/components/view/InfoCard.spec.js | 64 +
ui/tests/unit/components/view/VolumesTab.spec.js | 58 +
.../compute/DeployVMTemplateHypervisor.spec.js | 153 +++
ui/tests/unit/views/infra/UsageRecords.spec.js | 81 ++
.../src/main/java/com/cloud/utils/StringUtils.java | 23 +
utils/src/main/java/com/cloud/utils/UriUtils.java | 145 +-
.../hypervisor/vmware/mo/HypervisorHostHelper.java | 8 +-
354 files changed, 14609 insertions(+), 1780 deletions(-)
copy agent/bindir/cloudstack-agent-profile.sh.in => .editorconfig (83%)
copy
api/src/test/java/org/apache/cloudstack/api/response/{VnfTemplateResponseTest.java
=> ImageStoreDetailResponseTest.java} (51%)
copy
api/src/test/java/org/apache/cloudstack/api/{command/admin/resource/ListCapacityCmdTest.java
=> response/ProjectResponseTest.java} (66%)
create mode 100644
core/src/main/java/com/cloud/agent/transport/compat/AbstractTOAdaptor.java
copy
plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/nicira/RoutingTableRoutingConfig.java
=> core/src/main/java/com/cloud/agent/transport/compat/DiskTOAdaptor.java (77%)
copy
plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/nicira/RoutingTableRoutingConfig.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
core/src/test/java/org/apache/cloudstack/direct/download/NfsDirectTemplateDownloaderTest.java
create mode 100644
engine/orchestration/src/test/java/com/cloud/agent/manager/AgentAttacheSendNextTest.java
copy
engine/schema/src/main/java/com/cloud/upgrade/dao/{Upgrade42020to42030.java =>
Upgrade42030to42040.java} (71%)
rename
engine/schema/src/main/java/com/cloud/upgrade/dao/{Upgrade42010to42100.java =>
Upgrade42040to42100.java} (97%)
copy engine/schema/src/main/java/com/cloud/upgrade/dao/{Upgrade431to440.java
=> Upgrade42210to42220.java} (79%)
delete mode 100644
engine/schema/src/main/resources/META-INF/db/schema-42010to42100-cleanup.sql
copy engine/schema/src/main/resources/META-INF/db/{schema-40to410-cleanup.sql
=> schema-42040to42100-cleanup.sql} (93%)
rename engine/schema/src/main/resources/META-INF/db/{schema-42010to42100.sql
=> schema-42040to42100.sql} (99%)
copy engine/schema/src/main/resources/META-INF/db/{schema-40to410-cleanup.sql
=> schema-42210to42220-cleanup.sql} (93%)
copy engine/schema/src/main/resources/META-INF/db/{schema-421to430-cleanup.sql
=> schema-42210to42220.sql} (94%)
rename
engine/schema/src/test/java/com/cloud/upgrade/dao/{Upgrade42010to42100Test.java
=> Upgrade42040to42100Test.java} (98%)
create mode 100644
engine/storage/snapshot/src/test/java/org/apache/cloudstack/storage/vmsnapshot/KvmFileBasedStorageVmSnapshotStrategyTest.java
create mode 100644
framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/AsyncJobDataHelper.java
create mode 100644
framework/jobs/src/test/java/org/apache/cloudstack/framework/jobs/AsyncJobDataHelperTest.java
create mode 100644
plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupChainKeys.java
create mode 100644
plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/WebhookUrlValidator.java
create mode 100644
plugins/event-bus/webhook/src/test/java/org/apache/cloudstack/mom/webhook/WebhookUrlValidatorTest.java
create mode 100644
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtDiskOnlyVMSnapshotCommandWrapperTest.java
create mode 100644
server/src/test/java/org/apache/cloudstack/acl/ProjectRoleManagerImplTest.java
create mode 100644
test/integration/plugins/linstor/test_linstor_encrypted_snapshots.py
copy ui/src/utils/{permissions.js => ssvmProbe.js} (69%)
create mode 100644 ui/tests/unit/components/view/DetailsTab.spec.js
create mode 100644 ui/tests/unit/components/view/InfoCard.spec.js
create mode 100644 ui/tests/unit/components/view/VolumesTab.spec.js
create mode 100644
ui/tests/unit/views/compute/DeployVMTemplateHypervisor.spec.js
create mode 100644 ui/tests/unit/views/infra/UsageRecords.spec.js
