This is an automated email from the ASF dual-hosted git repository.

DaanHoogland pushed a change to branch DaanHoogland-patch-6
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


    from e4866293e90 Update RAT plugin version from 0.12 to 0.18
     add 7ba5240b311 Block backup deletion while create-VM-from-backup or 
restore jobs are in progress (#12792)
     add 1ff9eec9977 Load arch data for backup from template during create 
instance from backup (#12801)
     add b5858029bb5 Fix listing service offerings with different host tags 
(#12919)
     add b0b3dc91f53 fix: support SharedMountPoint volume checks for importVm 
(#12946)
     add b1bc5380a28 fix: support SharedMountPoint for KVM volume import and 
unmanage (#12956)
     add 416679fae13 Fix domain parsing for GPU & add Display controller in the 
supported PCI class (#12981)
     add 4ba4bd33c3c replace GROUP_CONCAT with JSON_ARRAYAGG to avoid errors 
like Row 19 was cut by GROUP_CONCAT (#12777)
     add 68bd0563061 Support timeout configuration for Create and Restore NAS 
backup (#12964)
     add 7b467496cb9 Do not include snapshots with Group type in snapshots 
resource count (#12945)
     add 2a60305792c Fix snapshot chaining on Xen (#12597)
     add 11538df7102 Merge branch '4.22'
     add 9f57a4dd19f Unhide setting `js.interpretation.enabled` (#12605)
     add 5b696c0ec7a Create, Delete, Enable, Disable, Enter, Cancel maintenance 
of Primary StoragePool with ONTAP storage (#12563)
     add ed575cc0a10 New config.json variable to set the ACS default language 
(#12863)
     add e297644ce1e KVM: Enable HA heartbeat on ShareMountPoint (#12773)
     add 80ee7f183f7 Fix six package incompatiblity with EL10 (#12799)
     add 27e4d979f12 Clean up backup references to their schedules when the 
schedules are deleted (#12401)
     add 8f3c6fad7a9 set snapcpg config on copy (#12955)
     add 273699cf566 kvm: fix wrong CheckVirtualMachineAnswer when vm does not 
exist (#12928)
     add df7ff972719 Create volume on a specified storage pool (#12966)
     add b196e97cc36 Prevent deletion of account and domain if either of them 
has deleted protected instance (#12901)
     add 7c7b2ae75d1 Fix KVM incremental volume snapshot creation (#12666)
     add 47c5bb8ee7a Support list/query async jobs by resource (#12983)
     add ae455ee193e VPC restart cleanup for Public networks with multi-CIDR 
data (#12622)
     add 161b4177c2d Add logs for storage pools reordering (#10419)
     add feb60769305 Remove unused config consoleproxy.cmd.port (#12807)
     add 38abe2df0bb Allow list async jobs by resource type alone (#13011)
     add d75acb6efcc Fix rollback disk snapshots on instance snapshot failure 
(#12949)
     add 37e36577707 [22.0] resource allocation
     add 003c8408179 [22.0] resource instance limits
     add 8d269cf5bef [22.0] Implement/fix limit validation for projects
     add 831ef82ff9b [22.0] resource allocation vpc
     add 1f849caa0be [22.0] resource reservation on volume creation
     add 46a6bbad270 Fix: KVM Direct Download URL injection (#60)
     add 7703fdacab4 [minio] Handle user's canned policy when a bucket is 
deleted
     add 3d678e726ad [22.0] resource reservation on volume snapshot creation
     add d11d182c715 [22.0] Fix resource limit reservation and check during 
StartVirtualMachine
     add 95816b44e93 extensions: allow reserved resource details
     add 4855d40e6e3 [22.0] secondary storage resource limit for download
     add 5d5ee7b6893 volume download fix
     add d7224151053 [22.0] secondary storage resource limit for upload
     add 07c3dc86b2d [22.0] Consider infinite resources when calculating 
secondary storage limit for upload operations
     add f7f0e751225 Fixed a merge issue in ImageStoreUploadMonitorImpl
     add 9c0c8da706e [22.0] Address limit checks for VM, CPU, memory, volume, 
and primary storage
     add 88a12a801f8 Cleanup imported VM from disk on failure due to volume 
allocation + prevent duplicate volume and primary storage increment on import
     add c6b20b8cc7f Fix failing tests
     add 9db630932e0 Address public IP limit validations
     add 8ce1c9876ee fix restore volume from backup and attach
     add 24fd440ee72 Fix create VM from backup
     add 86c9f7bd941 Fix backup list
     add e8d57d1b0dc Implement/fix limit validation for secondary storage
     add f3331344566 Address merge issues
     add 8608b4edd02 Fix snapshot copy resource limit concurrency
     add 19b4ef10693 server: reserve backup, bucket resource limits during 
operations
     add 1085da4ef8b Merge commit '19b4ef106931aa1d6a8fed06984009d86760e4de' 
into 4.22
     add d6f4fc3ac40 Updating pom.xml version numbers for release 22.0.1
     add 23f633ae835 Merge tag '4.22.0.1' into 4.22
     add 82bfa9fb3f4 Merge branch '4.22'
     add 0c86899cc19 Added VDDK support in VMware to KVM migrations (#12970)
     add 5013cf2af64 Fix user password reset mail template value  (#12882)
     add 160876c6d7d Fix: API Thread held forever during force deleting across 
MS (#12968)
     add 13842a626d7 Address reviews
     add 2511fdffaad Implement limit validations on updateBucket
     add c298f8f3608 Merge release branch 4.22.0.1 to 4.22
     add f5e75771bcb merge forwards fix
     add 05c59630e0a fix: LB Creation avoid 404 API errors due to non-needed 
patches (#12835)
     add e0fe953791b fix: NSX SDK list operations are pageable: the API returns 
a non-null and non-empty (#12834)
     add 6e810989b63 HAProxy Configuration: 
network.loadbalancer.haproxy.idle.timeout (#12586)
     add 83f705ddc58 Static Routes with nexthop non-functional for private 
gateways (#12859)
     add 89df3181648 [20.3] resource allocation
     add 4dd91feb277 [20.3] resource instance limits
     add 1593944553f [20.3] Implement/fix limit validation for projects
     add 7faa1b650b9 [20.3] resource allocation vpc
     add b025e85fc57 Check resource reservation on volume creation
     add 0edd577f4bb Fix: KVM Direct Download URL injection
     add 3b987f21afb [20.3] handle user's canned policy when a bucket is deleted
     add e0ef3a69472 Check resource reservation on volume snapshot creation
     add 06ee2fea76d Implement/fix limit validation for secondary storage
     add 4bcd509193f Fix resource limit reservation and check during 
StartVirtualMachine
     add 03dfe4d1f3e secondary storage resource limit for download
     add d0f67301579 volume download fix
     add 81a8ac8e1ff secondary storage resource limit for upload
     add 360b64ce1e3 Consider infinite resources when calculating secondary 
storage limit for upload operations
     add 0a4b4c6af05 [20.3] Address limit checks for VM, CPU, memory, volume, 
and primary storage
     add 497266270b9 Cleanup imported VM from disk on failure due to volume 
allocation + prevent duplicate volume and primary storage increment on import
     add e8f8aca694f Fix failing tests
     add dc7068a1351 Address public IP limit validations
     add 23b19a9776d review comments
     add 61afb4cb782 fix identation
     add 7cdcf571fac Fix xcpng test failures (#12812)
     add b497f58022c Fix K8s scaling and deletion issue if firewall rule is for 
ALL ports (#12806)
     add c19630f0a4f Fix snapshot copy resource limit concurrency
     add 4b7370a6017 upgrade: skip the upgrade paths which are not needed 
(#12881)
     add b22dbbe2d7a Fix Revert Instance to Snapshot with custom service 
offering (#12885)
     add 2416db2a443 Fix NPE on external/unmanaged instance import using custom 
offerings (#12884)
     add d38c1f8d125 Fix error message while creating local storage pool 
(#12767)
     add e2497cfc4df backport: default system vm template update implementation 
(#12935)
     add 6f1aa96b4cd engine/schema: fix new systemvm template is not registered 
during upgrade if hypervisor is not KVM (#12952)
     add c8599040b47 Updating pom.xml version numbers for release 4.20.3.0
     add 8eb162cb996 Updating pom.xml version numbers for release 
4.20.4.0-SNAPSHOT
     add c6936889f5c server: prevent adding vm compute details when not 
applicable (#12637)
     add 1fc4cb90bff Routed VR: accept packets from related and established 
connections (#12986)
     add 13a2c7793c2 Merge branch '4.20' into 4.22
     add 2d6280b9daa Merge branch '4.22'
     add f820d0125de fix end of files and codespell errors
     add 3166e64891f Add support for new variables to the GUI whitelabel 
runtime system (#12760)
     add 4df32ae79fb fix: NsxResource.executeRequest DeleteNsxNatRuleCommand 
comparison bug (#12833)
     add 6c1437b7ddd fix end of file schema-42200to42210.sql
     add be89e6f7c37 [KVM] Reorder migration logs to prevent populating agent 
logs on migrations (#12883)
     add 64ac0822b43 merge conflict fixes (#13046)
     add 856d83a15ee Merge branch '4.22'
     add 6f4445c5c1b Add offering preset variables for `Network` and `VPC` 
Quota tariffs (#11810)
     add e2c13da4197 Remove UUID parse from param processing workflow (#13065)
     add 089eb36e471 Linstor: fix create volume from snapshot on primary 
storage (#13043)
     add a73cc9a22c0 Improve Quota Statement (#10506)
     add c45596cca3e Refactor of Allocator classes (#9074)
     add c07f1fd5d29 Number of running and stopped VMs as preset variables for 
`Network` type Quota tariffs (#11689)
     add 0b169920f34 make dh group 31 default, support 22-24+31 (#12764)
     add ffebe8eaa64 Fix bulk power state query missing VM lifecycle state 
field (#13027)
     add 92d82989e32 Correction of the user responsible for the  event (#13066)
     add 1f5dba9bd2d Release reserved storage resources on VM deployment 
failure (#13048)
     add 8906aa1d460 Merge branch '4.22'
     add a17bff9ba87 ui: fix webhook filters listing (#13068)
     add 1e512ab9c65 Skip QemuImgTest when libvirt native library cannot load 
(#13086)
     add 96ca1b2a7c1 Add option to control MAC address reuse for VR public NICs 
(#13001)
     add cbc1ae73880 Bump the github-actions-dependencies group across 1 
directory with 9 updates (#13042)
     add f6efda50d2f Update .asf.yaml: Add ingox as collaborator(#12058)
     add 4425ee42348 Remove unnecessary if-else branch in template permission 
validation (#12683)
     add 72b99a3f8ce Make resource deletion safer with name confirmation 
(#13104)
     add 519715e81a6 Fix id in listguestosmapping search (#13082)
     add 5b9a3d7d320 linstor: Fix a file handle resource leak opening 
template.properties (#13091)
     add 89d915493fb Fix NPE on external/unmanaged instance import using custom 
offerings (#12884)
     add a127a26ebd3 Fix Revert Instance to Snapshot with custom service 
offering (#12885)
     add 2eef7aa9a27 adding default deny keys also when there are no other keys
     add 3e688b01978 Merge tag '4.22.0.1' into 4.22
     add ddcc0c889d7 Don't delete volume on store if it is not created or 
doesn't exist on it (#13111)
     add 4359198904c KVM Host HA improvements - Fix to not cancel VM HA items 
when Host HA inspection in progress, and some code improvements (#13088)
     add a4a52c96659 Merge branch '4.22'
     add e1521f139b0 systemvmtemplate-register: correctly update existing 
template name in config (#12703)
     add 5893ba5a8c0 server: Fix NPE when on findHostsForMigration when no 
suitable hosts are found (#13138)
     add 94d911be9ae Translation of missing labels to Portuguese (#12947)
     add 522283bdeca Refactor merge conflict checker workflow (#13183)
     add 68221cf1018 fix(linstor): pre-flight check destination is a LINSTOR 
satellite before live migration (#13077)
     add 38c001296a2 Rename gpordeus collaborator to gp-santos (#13195)
     add 3c1f03144fe Add null check for ApiKeyPair in getUserByApiKey (#12938)
     add a47091431a9 Fix select search icon orientation in dropdown menu 
(#13170)
     add 1fe486f493b Add ROOT CAs to the trust store and allow force 
provisioning of certs hosts & systemVMs via ssh (#12911)
     add 850b44317a4 fix(linstor): verify resource deletion completes; warn if 
stuck in DELETING (#13076)
     add 6b831f5196c Live scaling for VMs with fixed service offerings on KVM 
(#12975)
     add 470e95964bc Change disk-only VM snapshot removal message (#11182)
     add a289bb0e6c0 Update suse15 packaging spec, use qemu-ovmf-x86_64 package 
instead of edk2-ovmf for agent (#13133)
     add 348ce953a99 Updating pom.xml version numbers for release 4.22.1.0
     add 79bb8ef1cc3 Updating pom.xml version numbers for release 
4.22.2.0-SNAPSHOT
     add 4a49ffa9aa2 update debian change log
     add 3285e2fad87 systemvm: accept ipv6 established/related return traffic 
(#13173)
     add ca4645320e2 Move checkRoleEscalation outside DB transaction in 
createAccount (#13044)
     add 35ac91e58b8 Change exception treatment on incremental snapshot wait 
(#12665)
     add d1e1aa5d203 VM Deployment using snapshot in new zone (#13178)
     add 9f96c9d5eb9 Flexibilize public IP selection (#11076)
     add 08b1d387557 adaptive: honor user-provided capacityBytes when provider 
stats are unavailable (#13059)
     add a7c2a059f5d Update mysql java connector version to 8.4.0 (matching 
version for MySQL 8.4) (#12640)
     add c165806d3b8 Fix VPC network offerings listing in isolated network 
creation form (#12645)
     add c267ad39bcd Fix/flasharray delete rename destroy patch conflict 
(#13049)
     add 21b2025c505 Merge release branch 4.20 to 4.22
     add 67b849f3efd Merge release branch 4.22 to main
     add a0aafe2fa73 Update bouncy castle (#12794)
     add ea771a70131 Fix Instance Backup related events (#13180)
     add 2ae1015073b Add jmsperu to the list of contributors
     add 583a1e0dfb0 Refactor github actions (#12774)
     add b16340399ba fix: show re-enable 2FA button when is2faenabled is 
null/undefined
     add 7f849e9362f add GaOrtiga to colaborators (#13246)
     add 3f6866d70a6 Refactor Quota balance (#12961)
     add 923becea47e Merge branch 'main' into DaanHoogland-patch-6

No new revisions were added by this update.

Summary of changes:
 .asf.yaml                                          |    5 +-
 .github/CODEOWNERS                                 |    1 +
 .../install-nonoss/action.yml}                     |   19 +-
 .github/actions/setup-env/action.yml               |   58 +
 .github/workflows/build.yml                        |   40 +-
 .github/workflows/ci.yml                           |  111 +-
 .github/workflows/codecov.yml                      |   59 -
 .github/workflows/codeql-analysis.yml              |   10 +-
 .github/workflows/daily-repo-status.lock.yml       |   64 +-
 .github/workflows/docker-cloudstack-simulator.yml  |    8 +-
 .github/workflows/issue-triage-agent.lock.yml      |   62 +-
 .github/workflows/main-sonar-check.yml             |   61 +-
 .github/workflows/merge-conflict-checker.yml       |   32 +-
 .github/workflows/pre-commit.yml                   |   18 +-
 .github/workflows/rat.yml                          |   27 +-
 .github/workflows/sonar-check.yml                  |   60 +-
 .github/workflows/stale.yml                        |    4 +-
 .github/workflows/ui.yml                           |   12 +-
 agent/conf/agent.properties                        |   15 +
 .../cloud/agent/properties/AgentProperties.java    |   29 +
 .../main/java/com/cloud/agent/api/to/BucketTO.java |    7 +
 .../com/cloud/agent/api/to/RemoteInstanceTO.java   |   20 +-
 .../com/cloud/agent/api/to/VirtualMachineTO.java   |    8 +-
 .../agent/manager/allocator/HostAllocator.java     |   33 -
 .../java/com/cloud/deploy/DeploymentPlanner.java   |    2 +-
 api/src/main/java/com/cloud/ha/Investigator.java   |   16 +-
 api/src/main/java/com/cloud/host/Host.java         |    3 +
 api/src/main/java/com/cloud/network/Network.java   |    2 +
 .../java/com/cloud/network/NetworkProfile.java     |    5 +
 api/src/main/java/com/cloud/network/vpc/Vpc.java   |    2 +
 .../java/com/cloud/network/vpc/VpcService.java     |    4 +-
 .../java/com/cloud/projects/ProjectService.java    |    4 +-
 .../java/com/cloud/server/ManagementService.java   |   11 -
 .../storage/VMTemplateStorageResourceAssoc.java    |    3 +-
 .../java/com/cloud/user/ResourceLimitService.java  |   20 +-
 .../cloudstack/api/ApiCommandResourceType.java     |    4 +-
 .../org/apache/cloudstack/api/ApiConstants.java    |   20 +-
 .../java/org/apache/cloudstack/api/BaseCmd.java    |    9 +-
 .../command/admin/ca/ProvisionCertificateCmd.java  |   12 +-
 .../command/admin/ha/ConfigureHAForHostCmd.java    |    1 +
 .../admin/host/FindHostsForMigrationCmd.java       |    2 +-
 .../api/command/admin/host/ListHostsCmd.java       |    2 +-
 .../api/command/admin/user/GetUserCmd.java         |    4 +-
 .../api/command/admin/vm/ImportVmCmd.java          |   12 +
 .../user/account/AddAccountToProjectCmd.java       |    3 +-
 .../command/user/account/AddUserToProjectCmd.java  |    3 +-
 .../AssignVirtualMachineToBackupOfferingCmd.java   |   11 +
 .../api/command/user/backup/CreateBackupCmd.java   |    7 +-
 .../user/backup/CreateBackupScheduleCmd.java       |   13 +-
 .../RemoveVirtualMachineFromBackupOfferingCmd.java |   11 +
 .../RestoreVolumeFromBackupAndAttachToVMCmd.java   |   15 +
 .../api/command/user/bucket/DeleteBucketCmd.java   |    3 +-
 .../api/command/user/job/ListAsyncJobsCmd.java     |   15 +
 .../command/user/job/QueryAsyncJobResultCmd.java   |   18 +-
 .../api/command/user/network/CreateNetworkCmd.java |    9 +
 .../api/command/user/network/UpdateNetworkCmd.java |    9 +
 .../api/command/user/vm/CreateVMFromBackupCmd.java |    1 +
 .../api/command/user/volume/CreateVolumeCmd.java   |   15 +
 .../api/command/user/vpc/CreateVPCCmd.java         |    9 +
 .../api/command/user/vpc/UpdateVPCCmd.java         |    9 +
 .../cloudstack/api/response/ExtensionResponse.java |   10 +
 .../cloudstack/api/response/NetworkResponse.java   |    8 +
 .../cloudstack/api/response/VpcResponse.java       |    8 +
 .../apache/cloudstack/backup/BackupManager.java    |    2 +-
 .../java/org/apache/cloudstack/ca/CAManager.java   |   31 +-
 .../org/apache/cloudstack/context/CallContext.java |    6 +-
 .../cloudstack/extension/ExtensionHelper.java      |    3 +
 .../apache/cloudstack/resourcelimit/Reserver.java  |   15 +-
 .../storage/object/BucketApiService.java           |    2 +-
 .../volume/VolumeImportUnmanageService.java        |    2 +-
 .../CreateIpv4SubnetForGuestNetworkCmdTest.java    |    2 +-
 .../network/CreateIpv4SubnetForZoneCmdTest.java    |    2 +-
 .../network/DedicateIpv4SubnetForZoneCmdTest.java  |    2 +-
 .../DeleteIpv4SubnetForGuestNetworkCmdTest.java    |    2 +-
 .../network/DeleteIpv4SubnetForZoneCmdTest.java    |    2 +-
 .../ReleaseDedicatedIpv4SubnetForZoneCmdTest.java  |    2 +-
 .../network/UpdateIpv4SubnetForZoneCmdTest.java    |    2 +-
 .../bgp/ChangeBgpPeersForNetworkCmdTest.java       |    2 +-
 .../network/bgp/ChangeBgpPeersForVpcCmdTest.java   |    2 +-
 .../admin/network/bgp/CreateBgpPeerCmdTest.java    |    2 +-
 .../admin/network/bgp/DedicateBgpPeerCmdTest.java  |    2 +-
 .../admin/network/bgp/DeleteBgpPeerCmdTest.java    |    2 +-
 .../bgp/ReleaseDedicatedBgpPeerCmdTest.java        |    2 +-
 .../admin/network/bgp/UpdateBgpPeerCmdTest.java    |    2 +-
 .../storage/DownloadImageStoreObjectCmdTest.java   |    2 +-
 .../admin/volume/UnmanageVolumeCmdTest.java        |    2 +-
 .../command/test/AddAccountToProjectCmdTest.java   |    3 +
 .../api/command/test/CreateSnapshotCmdTest.java    |    2 +-
 .../api/command/test/UpdateConditionCmdTest.java   |    2 +-
 .../routing/DeleteRoutingFirewallRuleCmdTest.java  |    2 +-
 .../api/command/user/vpc/UpdateVPCCmdTest.java     |    2 +-
 client/pom.xml                                     |   28 +-
 .../agent/api/CheckConvertInstanceCommand.java     |   23 +
 .../com/cloud/agent/api/CheckOnHostAnswer.java     |    3 +-
 .../com/cloud/agent/api/CheckOnHostCommand.java    |   10 +-
 .../cloud/agent/api/ConvertInstanceCommand.java    |   36 +
 .../agent/api/PropagateResourceEventCommand.java   |   17 +
 .../java/com/cloud/agent/api/ScaleVmCommand.java   |    9 +-
 .../api/routing/LoadBalancerConfigCommand.java     |    4 +-
 .../cloud/agent/api/storage/DownloadAnswer.java    |    2 +-
 .../com/cloud/network/HAProxyConfigurator.java     |   13 +
 .../download/DirectTemplateDownloaderImpl.java     |   11 +-
 .../download/MetalinkDirectTemplateDownloader.java |    2 +-
 .../download/NfsDirectTemplateDownloader.java      |    2 +-
 .../command/TemplateOrVolumePostUploadCommand.java |    8 +
 .../storage/command/UploadStatusCommand.java       |   10 +
 .../resource/virtualnetwork/ConfigHelperTest.java  |    2 +-
 .../virtualnetwork/VirtualRoutingResourceTest.java |    4 +-
 .../com/cloud/network/HAProxyConfiguratorTest.java |   32 +-
 debian/changelog                                   |   14 +-
 .../java/com/cloud/vm/VirtualMachineManager.java   |    9 -
 .../service/NetworkOrchestrationService.java       |   15 +-
 .../service/VolumeOrchestrationService.java        |    2 +-
 .../java/com/cloud/capacity/CapacityManager.java   |   14 +
 .../java/com/cloud/ha/HighAvailabilityManager.java |    7 +-
 .../java/com/cloud/resource/ResourceManager.java   |    2 +
 .../com/cloud/agent/manager/AgentManagerImpl.java  |   25 +-
 .../agent/manager/ClusteredAgentManagerImpl.java   |   11 +-
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |   84 +-
 .../engine/orchestration/NetworkOrchestrator.java  |  534 +++++----
 .../engine/orchestration/VolumeOrchestrator.java   |   24 +-
 .../java/com/cloud/dc/dao/AccountVlanMapDao.java   |    2 +-
 .../com/cloud/dc/dao/AccountVlanMapDaoImpl.java    |    4 +-
 .../java/com/cloud/dc/dao/DomainVlanMapDao.java    |    2 +-
 .../com/cloud/dc/dao/DomainVlanMapDaoImpl.java     |    4 +-
 .../src/main/java/com/cloud/host/dao/HostDao.java  |    2 +-
 .../main/java/com/cloud/host/dao/HostDaoImpl.java  |    4 +-
 .../main/java/com/cloud/host/dao/HostTagsDao.java  |    5 +
 .../java/com/cloud/host/dao/HostTagsDaoImpl.java   |   20 +
 .../main/java/com/cloud/network/dao/NetworkVO.java |   13 +
 .../cloud/network/dao/PublicIpQuarantineDao.java   |   12 +
 .../network/dao/PublicIpQuarantineDaoImpl.java     |   22 +
 .../src/main/java/com/cloud/network/vpc/VpcVO.java |   12 +
 .../com/cloud/storage/dao/SnapshotDaoImpl.java     |    2 +
 .../cloud/upgrade/DatabaseVersionHierarchy.java    |    5 +-
 .../upgrade/SystemVmTemplateRegistration.java      |    2 +-
 .../com/cloud/upgrade/dao/Upgrade42020to42030.java |    4 -
 .../com/cloud/upgrade/dao/Upgrade42210to42300.java |   47 +
 .../main/java/com/cloud/vm/dao/VMInstanceDao.java  |    5 +
 .../java/com/cloud/vm/dao/VMInstanceDaoImpl.java   |   44 +-
 .../cloudstack/backup/dao/BackupScheduleDao.java   |    6 -
 .../backup/dao/BackupScheduleDaoImpl.java          |   46 +-
 .../storage/datastore/db/SnapshotDataStoreDao.java |    2 +
 .../datastore/db/SnapshotDataStoreDaoImpl.java     |   15 +
 ...n-daos-between-management-and-usage-context.xml |    2 +
 .../spring-engine-schema-core-daos-context.xml     |    2 -
 .../resources/META-INF/db/schema-42000to42010.sql  |    2 +-
 .../resources/META-INF/db/schema-42010to42100.sql  |   62 +-
 .../META-INF/db/schema-42200to42210-cleanup.sql    |    6 +
 .../resources/META-INF/db/schema-42200to42210.sql  |   21 +
 .../resources/META-INF/db/schema-42210to42300.sql  |   32 +
 .../META-INF/db/views/cloud.user_vm_view.sql       |    1 +
 .../cloud_usage.quota_usage_view.sql}              |   21 +-
 .../cloud/upgrade/DatabaseUpgradeCheckerTest.java  |   20 +
 .../upgrade/SystemVmTemplateRegistrationTest.java  |   14 +-
 .../storage/snapshot/DefaultSnapshotStrategy.java  |    2 +-
 .../vmsnapshot/StorageVMSnapshotStrategy.java      |   19 +-
 .../snapshot/DefaultSnapshotStrategyTest.java      |    7 +-
 .../vmsnapshot/VMSnapshotStrategyKVMTest.java      |    4 +-
 .../allocator/AbstractStoragePoolAllocator.java    |   76 +-
 .../storage/image/BaseImageStoreDriverImpl.java    |   26 +-
 .../storage/volume/VolumeServiceImpl.java          |   25 +-
 .../java/com/cloud/utils/db/SearchCriteria.java    |    6 +
 .../extensions/api/CreateExtensionCmd.java         |   10 +
 .../extensions/api/UpdateExtensionCmd.java         |   10 +
 .../extensions/manager/ExtensionsManagerImpl.java  |   98 +-
 .../extensions/api/CreateExtensionCmdTest.java     |   14 +
 .../extensions/api/UpdateExtensionCmdTest.java     |   15 +
 .../manager/ExtensionsManagerImplTest.java         |  167 ++-
 .../cloudstack/framework/jobs/dao/AsyncJobDao.java |   18 +
 .../framework/jobs/dao/AsyncJobDaoImpl.java        |   33 +
 .../apache/cloudstack/quota/QuotaManagerImpl.java  |    9 +-
 .../presetvariables/PresetVariableHelper.java      |   44 +-
 .../presetvariables/ResourceCounting.java          |   52 +
 .../activationrule/presetvariables/Value.java      |   33 +
 .../cloudstack/quota/dao/QuotaBalanceDao.java      |   10 +-
 .../cloudstack/quota/dao/QuotaBalanceDaoImpl.java  |  187 ++-
 ...otaBalanceDao.java => QuotaTariffUsageDao.java} |   24 +-
 .../quota/dao/QuotaTariffUsageDaoImpl.java         |   56 +
 .../cloudstack/quota/dao/QuotaUsageJoinDao.java    |   15 +-
 .../quota/dao/QuotaUsageJoinDaoImpl.java           |   94 ++
 .../cloudstack/quota/vo/QuotaTariffUsageVO.java    |   86 ++
 .../cloudstack/quota/vo/QuotaUsageJoinVO.java      |  179 +++
 .../cloudstack/quota/vo/QuotaUsageResourceVO.java  |   44 +-
 .../quota/spring-framework-quota-context.xml       |    4 +-
 .../presetvariables/PresetVariableHelperTest.java  |  158 +++
 .../quota/dao/QuotaBalanceDaoImplTest.java         |   91 ++
 packaging/el8/cloud.spec                           |   21 +-
 packaging/suse15                                   |    1 -
 packaging/suse15/cloud-ipallocator.rc              |    1 +
 packaging/suse15/cloud.limits                      |    1 +
 packaging/{el8 => suse15}/cloud.spec               |   31 +-
 packaging/suse15/cloudstack-agent.te               |    1 +
 packaging/suse15/cloudstack-sccs                   |    1 +
 packaging/suse15/filelimit.conf                    |    1 +
 packaging/suse15/replace.properties                |   65 +
 packaging/systemd/cloudstack-management.default    |    2 +-
 packaging/systemd/cloudstack-usage.default         |    2 +-
 .../cloudstack/backup/NASBackupProvider.java       |    8 +-
 .../ca/provider/RootCACustomTrustManager.java      |    8 +-
 .../cloudstack/ca/provider/RootCAProvider.java     |  172 ++-
 .../ca/provider/RootCACustomTrustManagerTest.java  |   37 +-
 .../cloudstack/ca/provider/RootCAProviderTest.java |  107 +-
 .../cloudstack/api/command/QuotaBalanceCmd.java    |   62 +-
 .../cloudstack/api/command/QuotaStatementCmd.java  |   74 +-
 .../api/response/QuotaBalanceResponse.java         |  132 +-
 .../api/response/QuotaResponseBuilder.java         |   12 +-
 .../api/response/QuotaResponseBuilderImpl.java     |  465 ++++----
 .../QuotaStatementItemResourceResponse.java        |   61 +
 .../api/response/QuotaStatementItemResponse.java   |   69 +-
 .../api/response/QuotaStatementResponse.java       |   65 +-
 .../org/apache/cloudstack/quota/QuotaService.java  |    8 +-
 .../apache/cloudstack/quota/QuotaServiceImpl.java  |  138 +--
 .../api/command/QuotaBalanceCmdTest.java           |   42 +-
 .../api/command/QuotaStatementCmdTest.java         |   23 +-
 .../api/response/QuotaResponseBuilderImplTest.java |  269 ++++-
 .../cloudstack/quota/QuotaServiceImplTest.java     |  105 +-
 .../mom/webhook/WebhookDeliveryThread.java         |    6 +-
 plugins/host-allocators/random/pom.xml             |   30 -
 .../manager/allocator/impl/RandomAllocator.java    |  196 ---
 .../allocator/impl/RandomAllocatorTest.java        |   80 --
 .../manager/BareMetalTemplateAdapter.java          |    1 -
 .../main/java/com/cloud/ha/HypervInvestigator.java |    6 +-
 .../main/java/com/cloud/ha/KVMInvestigator.java    |   87 +-
 .../cloud/hypervisor/kvm/resource/KVMHABase.java   |   12 +-
 .../hypervisor/kvm/resource/KVMHAChecker.java      |   33 +-
 .../hypervisor/kvm/resource/KVMHAMonitor.java      |   78 +-
 .../kvm/resource/KVMHAVMActivityChecker.java       |    6 +-
 .../kvm/resource/LibvirtComputingResource.java     |  330 ++++-
 .../kvm/resource/LibvirtDomainXMLParser.java       |    2 +-
 .../hypervisor/kvm/resource/LibvirtGpuDef.java     |   47 +-
 .../hypervisor/kvm/resource/LibvirtVMDef.java      |   17 +-
 .../LibvirtCheckConvertInstanceCommandWrapper.java |   10 +-
 .../wrapper/LibvirtCheckOnHostCommandWrapper.java  |   16 +-
 ...CheckVMActivityOnStoragePoolCommandWrapper.java |    6 +-
 .../LibvirtCheckVirtualMachineCommandWrapper.java  |    9 +-
 .../wrapper/LibvirtCheckVolumeCommandWrapper.java  |    5 +-
 .../LibvirtConvertInstanceCommandWrapper.java      |  307 ++++-
 .../LibvirtGetVolumesOnStorageCommandWrapper.java  |    2 +-
 .../wrapper/LibvirtMigrateCommandWrapper.java      |   10 +-
 .../wrapper/LibvirtReadyCommandWrapper.java        |    4 +
 .../LibvirtRestoreBackupCommandWrapper.java        |    6 +-
 .../wrapper/LibvirtScaleVmCommandWrapper.java      |    5 +-
 .../wrapper/LibvirtTakeBackupCommandWrapper.java   |    3 +-
 .../kvm/storage/IscsiAdmStoragePool.java           |    4 +-
 .../hypervisor/kvm/storage/KVMStoragePool.java     |   70 +-
 .../kvm/storage/KVMStoragePoolManager.java         |    4 +
 .../kvm/storage/KVMStorageProcessor.java           |   26 +-
 .../hypervisor/kvm/storage/LibvirtStoragePool.java |   58 +-
 .../hypervisor/kvm/storage/MultipathSCSIPool.java  |    6 +-
 .../hypervisor/kvm/storage/ScaleIOStoragePool.java |    4 +-
 .../org/apache/cloudstack/kvm/ha/KVMHAConfig.java  |   23 +-
 .../apache/cloudstack/kvm/ha/KVMHAProvider.java    |    7 +-
 .../cloudstack/kvm/ha/KVMHostActivityChecker.java  |  198 +--
 .../kvm/resource/LibvirtComputingResourceTest.java |  118 +-
 .../hypervisor/kvm/resource/LibvirtGpuDefTest.java |  139 +++
 ...virtCheckConvertInstanceCommandWrapperTest.java |   25 +
 ...bvirtCheckVirtualMachineCommandWrapperTest.java |  191 +++
 .../LibvirtConvertInstanceCommandWrapperTest.java  |  124 ++
 .../LibvirtRestoreBackupCommandWrapperTest.java    |   30 +-
 .../apache/cloudstack/utils/qemu/QemuImgTest.java  |    2 +-
 .../java/com/cloud/ha/SimulatorInvestigator.java   |    4 +-
 .../main/java/com/cloud/ha/VmwareInvestigator.java |    2 +-
 plugins/integrations/kubernetes-service/pom.xml    |   10 -
 ...ernetesClusterResourceModifierActionWorker.java |    2 +-
 .../KubernetesClusterScaleWorker.java              |    8 +-
 .../network/lb/ElasticLoadBalancerManagerImpl.java |    3 +-
 .../lb/InternalLoadBalancerVMManagerImpl.java      |    3 +-
 .../apache/cloudstack/service/NsxApiClient.java    |  218 +++-
 .../apache/cloudstack/service/PagedFetcher.java    |   82 ++
 .../cloudstack/service/NsxApiClientTest.java       |  311 +++++
 .../cloudstack/service/PagedFetcherTest.java       |  156 +++
 plugins/pom.xml                                    |    7 +-
 plugins/storage/object/minio/pom.xml               |   16 +-
 .../driver/MinIOObjectStoreDriverImpl.java         |   81 +-
 .../driver/MinIOObjectStoreDriverImplTest.java     |    7 +-
 plugins/storage/object/simulator/pom.xml           |    4 +-
 .../lifecycle/AdaptiveDataStoreLifeCycleImpl.java  |   13 +-
 .../CloudStackPrimaryDataStoreDriverImpl.java      |    3 +-
 .../adapter/flasharray/FlashArrayAdapter.java      |   67 +-
 .../kvm/storage/LinstorStorageAdaptor.java         |   15 +-
 .../hypervisor/kvm/storage/LinstorStoragePool.java |   14 +-
 .../driver/LinstorPrimaryDataStoreDriverImpl.java  |   44 +-
 .../storage/datastore/util/LinstorUtil.java        |   52 +
 .../storage/motion/LinstorDataMotionStrategy.java  |   61 +
 .../LinstorPrimaryDataStoreDriverImplTest.java     |  109 ++
 plugins/storage/volume/ontap/README.md             |  123 ++
 plugins/storage/volume/ontap/pom.xml               |  169 +++
 .../driver/OntapPrimaryDatastoreDriver.java        |  188 +++
 .../storage/feign/FeignClientFactory.java          |   45 +
 .../storage/feign/FeignConfiguration.java          |  158 +++
 .../storage/feign/client/AggregateFeignClient.java |   37 +
 .../storage/feign/client/ClusterFeignClient.java   |   32 +
 .../storage/feign/client/JobFeignClient.java       |   31 +
 .../storage/feign/client/NASFeignClient.java       |   86 ++
 .../storage/feign/client/NetworkFeignClient.java   |   34 +
 .../storage/feign/client/SANFeignClient.java       |   91 ++
 .../storage/feign/client/SvmFeignClient.java       |   40 +
 .../storage/feign/client/VolumeFeignClient.java    |   56 +
 .../cloudstack/storage/feign/model/Aggregate.java  |  165 +++
 .../storage/feign/model/AntiRansomware.java        |   34 +
 .../cloudstack/storage/feign/model/Cluster.java    |  134 +++
 .../storage/feign/model/ExportPolicy.java          |  122 ++
 .../cloudstack/storage/feign/model/ExportRule.java |  195 +++
 .../cloudstack/storage/feign/model/FileInfo.java   |  297 +++++
 .../cloudstack/storage/feign/model/Igroup.java     |  257 ++++
 .../cloudstack/storage/feign/model/Initiator.java  |   38 +
 .../storage/feign/model/IpInterface.java           |  155 +++
 .../storage/feign/model/IscsiService.java          |  111 ++
 .../apache/cloudstack/storage/feign/model/Job.java |  121 ++
 .../apache/cloudstack/storage/feign/model/Lun.java |  341 ++++++
 .../cloudstack/storage/feign/model/LunMap.java     |  111 ++
 .../cloudstack/storage/feign/model/LunSpace.java   |   97 ++
 .../apache/cloudstack/storage/feign/model/Nas.java |   50 +
 .../storage/feign/model/OntapStorage.java          |   70 ++
 .../cloudstack/storage/feign/model/Policy.java     |   60 +
 .../apache/cloudstack/storage/feign/model/Qos.java |   38 +
 .../apache/cloudstack/storage/feign/model/Svm.java |  146 +++
 .../cloudstack/storage/feign/model/Version.java    |  108 ++
 .../cloudstack/storage/feign/model/Volume.java     |  142 +++
 .../storage/feign/model/VolumeQosPolicy.java       |   83 ++
 .../storage/feign/model/VolumeSpace.java           |   61 +
 .../feign/model/VolumeSpaceLogicalSpace.java       |   51 +
 .../storage/feign/model/response/JobResponse.java  |   30 +
 .../feign/model/response/OntapResponse.java        |   64 +
 .../lifecycle/OntapPrimaryDatastoreLifecycle.java  |  536 +++++++++
 .../storage/listener/OntapHostListener.java        |  186 +++
 .../provider/OntapPrimaryDatastoreProvider.java    |   88 ++
 .../storage/provider/StorageProviderFactory.java   |   60 +
 .../cloudstack/storage/service/NASStrategy.java    |   29 +
 .../cloudstack/storage/service/SANStrategy.java    |   29 +
 .../storage/service/StorageStrategy.java           |  456 +++++++
 .../storage/service/UnifiedNASStrategy.java        |  303 +++++
 .../storage/service/UnifiedSANStrategy.java        |  309 +++++
 .../storage/service/model/AccessGroup.java         |   73 ++
 .../storage/service/model/CloudStackVolume.java    |   59 +
 .../storage/service/model/ProtocolType.java        |   25 +
 .../storage/utils/OntapStorageConstants.java       |   93 ++
 .../storage/utils/OntapStorageUtils.java           |   76 ++
 .../storage-volume-ontap/logback-spring.xml        |   44 +
 .../storage-volume-ontap}/module.properties        |    4 +-
 .../spring-storage-volume-ontap-context.xml}       |    5 +-
 .../OntapPrimaryDatastoreLifecycleTest.java        |  324 +++++
 .../OntapPrimaryDatastoreProviderTest.java         |  215 ++++
 .../datastore/adapter/primera/PrimeraAdapter.java  |    1 +
 .../kvm/storage/StorPoolStoragePool.java           |   10 +-
 plugins/user-authenticators/ldap/pom.xml           |   40 +
 pom.xml                                            |   23 +-
 scripts/util/keystore-cert-import                  |   20 +-
 scripts/vm/hypervisor/kvm/gpudiscovery.sh          |  204 +++-
 scripts/vm/hypervisor/kvm/kvmheartbeat.sh          |    4 +-
 scripts/vm/hypervisor/kvm/kvmsmpheartbeat.sh       |  218 ++++
 .../manager/allocator/impl/BaseAllocator.java      |   90 ++
 .../manager/allocator/impl/FirstFitAllocator.java  |  546 ++++-----
 .../manager/allocator/impl/RandomAllocator.java    |  132 ++
 .../manager/allocator/impl/TestingAllocator.java   |   21 +-
 server/src/main/java/com/cloud/api/ApiDBUtils.java |   10 +-
 .../main/java/com/cloud/api/ApiResponseHelper.java |   74 +-
 .../com/cloud/api/dispatch/ParamProcessWorker.java |    5 +-
 .../java/com/cloud/api/query/QueryManagerImpl.java |   82 +-
 .../com/cloud/api/query/ResourceIdSupport.java     |  123 ++
 .../com/cloud/api/query/dao/UserVmJoinDaoImpl.java |   27 +-
 .../java/com/cloud/api/query/vo/UserVmJoinVO.java  |    7 +
 .../com/cloud/capacity/CapacityManagerImpl.java    |    2 +-
 .../configuration/ConfigurationManagerImpl.java    |  141 ++-
 .../cloud/consoleproxy/ConsoleProxyManager.java    |    3 -
 .../consoleproxy/ConsoleProxyManagerImpl.java      |    2 +-
 .../deploy/DeploymentPlanningManagerImpl.java      |   22 +-
 .../com/cloud/ha/CheckOnAgentInvestigator.java     |    2 +-
 .../com/cloud/ha/HighAvailabilityManagerImpl.java  |  136 ++-
 server/src/main/java/com/cloud/ha/KVMFencer.java   |   11 +-
 .../cloud/ha/ManagementIPSystemVMInvestigator.java |    2 +-
 .../java/com/cloud/ha/UserVmDomRInvestigator.java  |    2 +-
 .../java/com/cloud/ha/XenServerInvestigator.java   |    4 +-
 .../main/java/com/cloud/hypervisor/KVMGuru.java    |  148 +--
 .../kvm/discoverer/LibvirtServerDiscoverer.java    |   55 +-
 .../com/cloud/network/IpAddressManagerImpl.java    |   91 +-
 .../cloud/network/NetworkMigrationManagerImpl.java |    2 +-
 .../java/com/cloud/network/NetworkServiceImpl.java |   75 +-
 .../cloud/network/router/CommandSetupHelper.java   |    3 +-
 .../cloud/network/router/NetworkHelperImpl.java    |  122 +-
 .../router/VirtualNetworkApplianceManagerImpl.java |    2 +-
 .../java/com/cloud/network/vpc/VpcManagerImpl.java |  103 +-
 .../com/cloud/projects/ProjectManagerImpl.java     |  141 ++-
 .../com/cloud/resource/ResourceManagerImpl.java    |   32 +-
 .../cloud/resourcelimit/CheckedReservation.java    |  117 +-
 .../com/cloud/resourcelimit/ReservationHelper.java |   21 +-
 .../resourcelimit/ResourceLimitManagerImpl.java    |  215 ++--
 .../com/cloud/server/ManagementServerImpl.java     |   48 +-
 .../cloud/storage/ImageStoreUploadMonitorImpl.java |  180 ++-
 .../java/com/cloud/storage/StorageManagerImpl.java |   33 +-
 .../com/cloud/storage/VolumeApiServiceImpl.java    |  774 +++++++-----
 .../storage/download/DownloadActiveState.java      |    5 +
 .../cloud/storage/download/DownloadErrorState.java |    5 +
 .../storage/download/DownloadInactiveState.java    |    6 +
 .../download/DownloadLimitReachedState.java        |   54 +
 .../cloud/storage/download/DownloadListener.java   |   89 +-
 .../com/cloud/storage/download/DownloadState.java  |    6 +-
 .../storage/snapshot/SnapshotManagerImpl.java      |  258 ++--
 .../cloud/template/HypervisorTemplateAdapter.java  |   39 +-
 .../com/cloud/template/TemplateAdapterBase.java    |    4 +-
 .../com/cloud/template/TemplateManagerImpl.java    |  310 ++---
 .../java/com/cloud/user/AccountManagerImpl.java    |   48 +-
 .../java/com/cloud/user/DomainManagerImpl.java     |   20 +
 .../src/main/java/com/cloud/vm/UserVmManager.java  |    7 +
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  |  576 ++++-----
 .../cloud/vm/snapshot/VMSnapshotManagerImpl.java   |   76 +-
 .../cloudstack/backup/BackupManagerImpl.java       |  225 ++--
 .../org/apache/cloudstack/ca/CAManagerImpl.java    |  223 +++-
 .../cloudstack/gui/theme/GuiThemeServiceImpl.java  |  110 +-
 .../validator/JsonConfigAttributeValidator.java    |   15 +-
 .../json/config/validator/JsonConfigValidator.java |   76 ++
 .../config/validator/attributes/AttributeBase.java |   72 ++
 .../validator/attributes/ErrorAttribute.java       |   43 +-
 .../validator/attributes/PluginsAttribute.java     |   68 ++
 .../validator/attributes/ThemeAttribute.java       |   43 +
 .../validator/attributes/UserCardAttribute.java    |   88 ++
 .../java/org/apache/cloudstack/ha/HAManager.java   |    7 +-
 .../org/apache/cloudstack/ha/HAManagerImpl.java    |   72 +-
 .../apache/cloudstack/ha/HAResourceCounter.java    |    6 +-
 .../cloudstack/ha/task/ActivityCheckTask.java      |    6 +-
 .../org/apache/cloudstack/ha/task/BaseHATask.java  |    2 +-
 .../jsinterpreter/JsInterpreterHelper.java         |   27 +-
 .../deployment/RouterDeploymentDefinition.java     |    6 +-
 .../deployment/VpcRouterDeploymentDefinition.java  |    7 +-
 .../storage/object/BucketApiServiceImpl.java       |  151 ++-
 .../volume/VolumeImportUnmanageManagerImpl.java    |   37 +-
 .../cloudstack/vm/UnmanagedVMsManagerImpl.java     |  841 ++++++++-----
 .../core/spring-server-core-misc-context.xml       |    5 +
 .../spring-server-allocator-context.xml            |    3 +
 .../manager/allocator/impl/BaseAllocatorTest.java  |  219 ++++
 .../allocator/impl/FirstFitAllocatorTest.java      |  760 +++++++++---
 .../allocator/impl/RandomAllocatorTest.java        |  332 ++++++
 .../com/cloud/api/query/QueryManagerImplTest.java  |   42 +-
 .../cloud/api/query/dao/UserVmJoinDaoImplTest.java |    4 +
 .../cloud/ha/HighAvailabilityManagerImplTest.java  |    5 +-
 .../java/com/cloud/hypervisor/KVMGuruTest.java     |  171 +--
 .../com/cloud/network/IpAddressManagerTest.java    |    1 +
 .../com/cloud/network/NetworkServiceImplTest.java  |   50 +-
 .../network/router/NetworkHelperImplTest.java      |  288 ++++-
 .../com/cloud/network/vpc/VpcManagerImplTest.java  |   25 +-
 .../cloud/resource/MockResourceManagerImpl.java    |    5 +
 .../cloud/resource/ResourceManagerImplTest.java    |   27 +
 .../resourcelimit/CheckedReservationTest.java      |   17 +-
 .../ResourceLimitManagerImplTest.java              |  112 +-
 .../com/cloud/server/ManagementServerImplTest.java |   39 +-
 .../cloud/storage/VolumeApiServiceImplTest.java    |   52 +-
 .../storage/snapshot/SnapshotManagerImplTest.java  |    4 +-
 .../storage/snapshot/SnapshotManagerTest.java      |   55 +-
 .../cloud/template/TemplateManagerImplTest.java    |  137 +--
 .../java/com/cloud/user/DomainManagerImplTest.java |    7 +-
 .../java/com/cloud/vm/UserVmManagerImplTest.java   |  734 +++++++-----
 .../cloud/vm/snapshot/VMSnapshotManagerTest.java   |   58 +-
 .../java/com/cloud/vpc/MockNetworkManagerImpl.java |   12 +-
 .../cloud/vpc/MockResourceLimitManagerImpl.java    |   41 +-
 .../cloudstack/backup/BackupManagerTest.java       |  240 ++--
 .../apache/cloudstack/ca/CABackgroundTaskTest.java |   10 +-
 .../apache/cloudstack/ca/CAManagerImplTest.java    |  223 +++-
 .../storage/object/BucketApiServiceImplTest.java   |  139 ++-
 .../VolumeImportUnmanageManagerImplTest.java       |    3 -
 .../cloudstack/vm/UnmanagedVMsManagerImplTest.java |  343 ++++--
 services/console-proxy/rdpconsole/pom.xml          |    4 +-
 .../storage/resource/HttpUploadServerHandler.java  |    2 +
 .../resource/NfsSecondaryStorageResource.java      |   33 +-
 .../storage/template/DownloadManagerImpl.java      |    2 +-
 setup/db/deploy-db-dev.sh                          |    5 +-
 systemvm/debian/opt/cloud/bin/cs/CsAddress.py      |   47 +-
 systemvm/debian/opt/cloud/bin/cs/CsHelper.py       |   30 +
 systemvm/debian/opt/cloud/bin/cs/CsNetfilter.py    |    4 +-
 systemvm/debian/opt/cloud/bin/cs/CsStaticRoutes.py |   40 +-
 .../debian/root/health_checks/haproxy_check.py     |   43 +-
 systemvm/patch-sysvms.sh                           |   23 +-
 .../test_redundant_router_deployment_planning.py   |  770 ++++++------
 .../component/test_escalations_instances.py        |    3 -
 .../component/test_escalations_ipaddresses.py      |    9 +-
 .../plugins/quota/test_quota_balance.py            |   49 +-
 test/integration/smoke/test_certauthority_root.py  |  177 ++-
 test/integration/smoke/test_public_ip_range.py     |   68 +-
 test/integration/smoke/test_quarantined_ips.py     |    8 +-
 test/integration/smoke/test_vm_strict_host_tags.py |    2 +-
 tools/docker/Dockerfile                            |    2 +-
 tools/marvin/setup.py                              |    2 +-
 ui/public/config.json                              |    3 +-
 ui/public/locales/el_GR.json                       |    2 -
 ui/public/locales/en.json                          |   12 +-
 ui/public/locales/ja_JP.json                       |    1 -
 ui/public/locales/pt_BR.json                       | 1258 +++++++++++++++++++-
 ui/public/locales/te.json                          |    1 -
 ui/public/locales/zh_CN.json                       |    1 -
 ui/src/components/header/TranslationMenu.vue       |    3 +-
 ui/src/components/view/DeployVMFromBackup.vue      |   46 +-
 ui/src/components/view/ListView.vue                |    2 +-
 ui/src/components/view/Setting.vue                 |    2 +-
 ui/src/components/view/WebhookFiltersTab.vue       |    3 +-
 ui/src/config/section/compute.js                   |    7 +-
 ui/src/config/section/extension.js                 |    2 +-
 ui/src/config/section/infra/hosts.js               |    2 +-
 ui/src/config/section/network.js                   |   30 +-
 ui/src/config/section/project.js                   |    1 +
 ui/src/config/section/user.js                      |    2 +-
 ui/src/style/ant-overwrite/ant-form.less           |    2 +-
 ui/src/utils/guiTheme.js                           |   34 +-
 ui/src/views/AutogenView.vue                       |   64 +-
 ui/src/views/compute/ScaleVM.vue                   |   37 +-
 .../compute/wizard/ComputeOfferingSelection.vue    |   23 +-
 ui/src/views/compute/wizard/ComputeSelection.vue   |   12 +-
 ui/src/views/extension/CreateExtension.vue         |   11 +
 ui/src/views/extension/UpdateExtension.vue         |   17 +-
 ui/src/views/infra/HostInfo.vue                    |   16 +
 ui/src/views/network/CreateIsolatedNetworkForm.vue |   44 +-
 ui/src/views/network/CreateVpc.vue                 |   20 +-
 ui/src/views/network/UpdateNetwork.vue             |   28 +-
 ui/src/views/network/VpnCustomerGateway.vue        |   20 +-
 ui/src/views/storage/CreateVMFromBackup.vue        |   25 +-
 ui/src/views/storage/CreateVolume.vue              |   74 ++
 ui/src/views/tools/ImportUnmanagedInstance.vue     |  100 +-
 .../java/com/cloud/usage/UsageSanityChecker.java   |    2 +-
 utils/pom.xml                                      |    6 +-
 .../main/java/com/cloud/utils/net/NetUtils.java    |    2 +-
 utils/src/main/java/com/cloud/utils/nio/Link.java  |    2 +-
 .../cloudstack/utils/redfish/RedfishClient.java    |   14 +-
 .../cloudstack/utils/security/CertUtils.java       |   15 +-
 .../cloudstack/utils/security/KeyStoreUtils.java   |    1 -
 .../java/com/cloud/utils/net/NetUtilsTest.java     |    4 +
 .../cloudstack/utils/security/CertUtilsTest.java   |   17 +-
 525 files changed, 24795 insertions(+), 7335 deletions(-)
 copy .github/{CODEOWNERS => actions/install-nonoss/action.yml} (66%)
 create mode 100644 .github/actions/setup-env/action.yml
 delete mode 100644 .github/workflows/codecov.yml
 copy 
engine/schema/src/main/java/com/cloud/network/dao/PublicIpQuarantineDao.java => 
api/src/main/java/org/apache/cloudstack/resourcelimit/Reserver.java (67%)
 copy 
engine/schema/src/main/resources/META-INF/db/{schema-42200to42210-cleanup.sql 
=> views/cloud_usage.quota_usage_view.sql} (58%)
 create mode 100644 
framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/ResourceCounting.java
 copy 
framework/quota/src/main/java/org/apache/cloudstack/quota/dao/{QuotaBalanceDao.java
 => QuotaTariffUsageDao.java} (52%)
 create mode 100644 
framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaTariffUsageDaoImpl.java
 copy engine/schema/src/main/java/com/cloud/dc/dao/AccountVlanMapDao.java => 
framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaUsageJoinDao.java
 (68%)
 create mode 100644 
framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaUsageJoinDaoImpl.java
 create mode 100644 
framework/quota/src/main/java/org/apache/cloudstack/quota/vo/QuotaTariffUsageVO.java
 create mode 100644 
framework/quota/src/main/java/org/apache/cloudstack/quota/vo/QuotaUsageJoinVO.java
 copy api/src/main/java/com/cloud/agent/api/to/BucketTO.java => 
framework/quota/src/main/java/org/apache/cloudstack/quota/vo/QuotaUsageResourceVO.java
 (56%)
 create mode 100644 
framework/quota/src/test/java/org/apache/cloudstack/quota/dao/QuotaBalanceDaoImplTest.java
 delete mode 120000 packaging/suse15
 create mode 120000 packaging/suse15/cloud-ipallocator.rc
 create mode 120000 packaging/suse15/cloud.limits
 copy packaging/{el8 => suse15}/cloud.spec (96%)
 create mode 120000 packaging/suse15/cloudstack-agent.te
 create mode 120000 packaging/suse15/cloudstack-sccs
 create mode 120000 packaging/suse15/filelimit.conf
 create mode 100644 packaging/suse15/replace.properties
 create mode 100644 
plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaStatementItemResourceResponse.java
 delete mode 100644 plugins/host-allocators/random/pom.xml
 delete mode 100644 
plugins/host-allocators/random/src/main/java/com/cloud/agent/manager/allocator/impl/RandomAllocator.java
 delete mode 100644 
plugins/host-allocators/random/src/test/java/com/cloud/agent/manager/allocator/impl/RandomAllocatorTest.java
 create mode 100644 
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckVirtualMachineCommandWrapperTest.java
 create mode 100644 
plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/PagedFetcher.java
 create mode 100644 
plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/PagedFetcherTest.java
 create mode 100644 plugins/storage/volume/ontap/README.md
 create mode 100644 plugins/storage/volume/ontap/pom.xml
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/driver/OntapPrimaryDatastoreDriver.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/FeignClientFactory.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/FeignConfiguration.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/client/AggregateFeignClient.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/client/ClusterFeignClient.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/client/JobFeignClient.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/client/NASFeignClient.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/client/NetworkFeignClient.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/client/SANFeignClient.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/client/SvmFeignClient.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/client/VolumeFeignClient.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Aggregate.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/AntiRansomware.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Cluster.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/ExportPolicy.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/ExportRule.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/FileInfo.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Igroup.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Initiator.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/IpInterface.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/IscsiService.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Job.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Lun.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/LunMap.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/LunSpace.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Nas.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/OntapStorage.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Policy.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Qos.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Svm.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Version.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Volume.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/VolumeQosPolicy.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/VolumeSpace.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/VolumeSpaceLogicalSpace.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/response/JobResponse.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/response/OntapResponse.java
 create mode 100755 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/lifecycle/OntapPrimaryDatastoreLifecycle.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/listener/OntapHostListener.java
 create mode 100755 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/provider/OntapPrimaryDatastoreProvider.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/provider/StorageProviderFactory.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/NASStrategy.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/SANStrategy.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/StorageStrategy.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/UnifiedNASStrategy.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/UnifiedSANStrategy.java
 create mode 100755 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/model/AccessGroup.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/model/CloudStackVolume.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/model/ProtocolType.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/utils/OntapStorageConstants.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/utils/OntapStorageUtils.java
 create mode 100644 
plugins/storage/volume/ontap/src/main/resources/META-INF/cloudstack/storage-volume-ontap/logback-spring.xml
 rename 
plugins/{host-allocators/random/src/main/resources/META-INF/cloudstack/host-allocator-random
 => 
storage/volume/ontap/src/main/resources/META-INF/cloudstack/storage-volume-ontap}/module.properties
 (94%)
 rename 
plugins/{host-allocators/random/src/main/resources/META-INF/cloudstack/host-allocator-random/spring-host-allocator-random-context.xml
 => 
storage/volume/ontap/src/main/resources/META-INF/cloudstack/storage-volume-ontap/spring-storage-volume-ontap-context.xml}
 (91%)
 create mode 100644 
plugins/storage/volume/ontap/src/test/java/org/apache/cloudstack/storage/lifecycle/OntapPrimaryDatastoreLifecycleTest.java
 create mode 100644 
plugins/storage/volume/ontap/src/test/java/org/apache/cloudstack/storage/provider/OntapPrimaryDatastoreProviderTest.java
 create mode 100755 scripts/vm/hypervisor/kvm/kvmsmpheartbeat.sh
 create mode 100644 
server/src/main/java/com/cloud/agent/manager/allocator/impl/BaseAllocator.java
 create mode 100644 
server/src/main/java/com/cloud/agent/manager/allocator/impl/RandomAllocator.java
 create mode 100644 
server/src/main/java/com/cloud/api/query/ResourceIdSupport.java
 copy engine/schema/src/main/java/com/cloud/dc/dao/DomainVlanMapDao.java => 
server/src/main/java/com/cloud/resourcelimit/ReservationHelper.java (67%)
 create mode 100644 
server/src/main/java/com/cloud/storage/download/DownloadLimitReachedState.java
 copy ui/src/style/ant-overwrite/ant-form.less => 
server/src/main/java/org/apache/cloudstack/gui/theme/json/config/validator/JsonConfigAttributeValidator.java
 (73%)
 create mode 100644 
server/src/main/java/org/apache/cloudstack/gui/theme/json/config/validator/JsonConfigValidator.java
 create mode 100644 
server/src/main/java/org/apache/cloudstack/gui/theme/json/config/validator/attributes/AttributeBase.java
 copy core/src/main/java/com/cloud/agent/api/PropagateResourceEventCommand.java 
=> 
server/src/main/java/org/apache/cloudstack/gui/theme/json/config/validator/attributes/ErrorAttribute.java
 (56%)
 create mode 100644 
server/src/main/java/org/apache/cloudstack/gui/theme/json/config/validator/attributes/PluginsAttribute.java
 create mode 100644 
server/src/main/java/org/apache/cloudstack/gui/theme/json/config/validator/attributes/ThemeAttribute.java
 create mode 100644 
server/src/main/java/org/apache/cloudstack/gui/theme/json/config/validator/attributes/UserCardAttribute.java
 create mode 100644 
server/src/test/java/com/cloud/agent/manager/allocator/impl/BaseAllocatorTest.java
 create mode 100644 
server/src/test/java/com/cloud/agent/manager/allocator/impl/RandomAllocatorTest.java

Reply via email to