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

pearl11594 pushed a change to branch fix-create-counters-dup
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


    from 11f12179ba1 prevent addition of counters with same name, provider and 
source as a non-deleted counter
     add 4e321d43565 Updating pom.xml version numbers for release 4.19.2.0
     add 4a3686297dc Updating pom.xml version numbers for release 
4.19.3.0-SNAPSHOT
     add 5526ef0168c spurious versions
     add 91db905659d Merge commit '5526ef0168c' into 4.20
     add 1f092667641 UI: Fix filtering of templates by account (#10425)
     add a09c579b5b2 UI: Fixes and minor enhacements to the Public IP Addresses 
section (#10351)
     add f992ebb52a5 fix volume migration across cluster-scope pools (#10266)
     add 88916dcf2bb Merge branch '4.19' into 4.20
     add 2d00933d65e systemvmtemplate: bump version Debian 12.9.0 and ACS 
4.20.1 (#10462)
     add bdae23ed536 Fix listing disk offerings for newly created VMs that 
haven't yet been started (#10476)
     add 9b8c862f9f6 removing the usage of volumeFreeze StorPool API call 
(#8575)
     add b92fd17ef15 UI: Add change host password (#10337)
     add 3aabedd4473 UI: Proper explanation for the global setting to avoid 
ambiguity (#10042)
     add f0179855f54 add use of virsh domifaddr to get VM external DHCP IP 
(#10376)
     add f50de8981af cloudstack-setup-databases: fix mode and group of key file 
(#10466)
     add 217e5344461 linstor: improve integration-tests (#10439)
     add a9fbc6b0563 UI: Filter accounts by domain while creating templates - 
from Volume / Snapshot (#10455)
     add a89607da659 UI: List host OOBM details when enabled and configured 
(#10472)
     add b41acf28d4c UI: Show Host OOBM parameter in form if configured (#10484)
     add 48ed5e24175 Merge branch '4.19' into 4.20
     add 5cbe3da703c Remove isMirrored hardcoded parameter value from execution 
of createDiskOffering API through UI (#10474)
     add a6b1403ca6c Merge branch '4.20' of 
https://github.com/apache/cloudstack into 4.20
     add 7f4e6a9d51d NAS B&R Plugin enhancements (#9666)
     add 80b5d5c0298 ui: do not cache config.json and locale files (#10497)
     add a841ed949fc Refactor alert email generation method (#8831)
     add cdf19b552ca lint: fix test_linstor_volumes.py (#10502)
     add 35a7438033a test: fix failure in 
test_06_purge_expunged_vm_background_task (#10501)
     add 8b092951cbd prometheus: don't poll the same tag multiple times (#10450)
     add b8359e8f62e UI: Allow custom footer in password reset page (#10461)
     add 1f0ffee8583 VPC: fix private mtu of vpc tier (#10257)
     add cd6d1a23a2b KVM: return null state instead of Disconnected when 
investigate a host without NFS (#10515)
     add 8ce34ad791e kvm: find cluster-wide pools only in Up state when 
investigate a host (#10516)
     add 0427abf855f Merge branch '4.19' of 
https://github.com/apache/cloudstack into 4.20
     add 54c1f92efd2 Fix Stats Collector to not divide by zero (#10492)
     add 95c24810ab4 linstor: try to delete -rst resource before snapshot 
backup (#10443)
     add f8adedc2802 Merge release branch 4.19 to 4.20
     add 35e809e7ce4 Set external Id to null after 
backupProvider.removeVMFromBackup (#10562)
     add e091aad792b Merge branch '4.19' of 
https://github.com/apache/cloudstack into 4.20
     add 02d0dca24b2 List only VMs associated to a userdata (#10569)
     add 704d7a97879 Merge branch '4.19' of 
https://github.com/apache/cloudstack into 4.20
     add 33cdddfcd1b Fix to propagate updated management servers list and lb 
algorithm in host and indirect.agent.lb.algorithm settings resp, to systemvm 
agents (#10524)
     add 653b9738400 Update ubuntu image link for template download (#10559)
     add 8df1161f14e framework-config: improve configkey caching (#10513)
     add 16b7b71e36e Fix secondary storage selectors feature (#10546)
     add 6b4adbb20a3 Preview-Experimental Support EL10 as Management Server and 
KVM host (#10496)
     add 0b7aef7a0f7 enhancement: iterate directly on HostJoinVO (#10613)
     add 89e6b1f8ea0 server: fix npe during start vr edge case (#10366)
     add 7978141464c api: fix EntityReference in NetworkResponse.java (#10563)
     add f4a7c8ab89a linstor: implement missing deleteDatastore (#10561)
     add 6c40a7bebbc deal with null return for create deployment plan for 
maintenance (#10518)
     add c1ff799df23 ui: fix considerlasthost for start vm (#10602)
     add c9c02d030e5 UI: fix list of vpc network offerings (#10595)
     add fc1f260d529 Host status auto refresh (#10606)
     add 6f334eb1874 Update test_linstor_volumes.py for spello
     add 3afab9a7032 Updated setup-sysvm-tmplt script, to run cmds accessing 
destdir with sudo (#10263)
     add 5f93ce71bb9 Merge branch '4.19' into 4.20
     add bc5728a7ff0 systemvm: Bump systemvm template version to debian 12.10 
(#10628)
     add ee94ae575b7 Enhance VPC Network Tier form to auto-populate  Gateway, 
and Netmask (#10617)
     add d5ba39387b6 fix projects metrics on dashboard (#10651)
     add e08f88f0ae6 define the limit of projects through the UI (#10652)
     add 5d5ac17c685 xenserver: do not destroy halted hypervisor vm (#9175)
     add 6850147c9e8 Merge branch '4.19' into 4.20
     add d1df418c3c9 UI: Restore AS Numbers and IPv4 Subnets menus (#10580)
     add d32065fd38a backport #10500 framework/cluster: fix NPE for ms-host 
status when mgr stops (#10653)
     add 4ac8861f5ee Merge branch '4.19' of 
https://github.com/apache/cloudstack into 4.20
     add 53700809ed3 fix conflict - logger
     add dd1c32cd262 undo removal of accessLogger and deal with some warnings 
(#10567)
     add 53001417a04 UI: Fix column name in Usage view (#10700)
     add 6de084ca976 Add download link of volumes, templates and ISOs to the 
download event details (#10564)
     add ac6b1b382cf Migrate public templates that have URLs on data migration 
across secondary storages (#10364)
     add 40d549b0752 backport 10273 (#10702)
     add a09354ddf5f Fix volume migration failure response (#10707)
     add 207a2c1da35 Support ConfigDrive with VPC (#10495)
     add 99ea77dc839 Usage server: remove logging of prameters including secret 
keys (#10649)
     add f13cf597a2e 4.19 fix saml account selector (#10311)
     add 53d3d19606b server: check startip and endip of shared network (#10704)
     add 8db248e4b40 UI: Move templates creation date to the Zones tab (#10709)
     add 7b68615bd97 HA: set correct hostId of HA work for vm migration (#10591)
     add 8c9216d11b6 only clean details and annotations when this tamplate no 
longer exists on any zone (#10728)
     add d7765343efe Merge branch '4.19' into 4.20
     add 199170be433 utils: fix extra slash in Redfish default systems url path 
(#10630)
     add 29e58e906f9 plugin/shutdown: use mgmt server uuid in the shutdown 
response (#10717)
     add 2771586b87f Merge release branch 4.19 to 4.20
     add f2e688af260 VR: add bind-interfaces to /etc/dnsmasq.d/cloud.conf 
(#10739)
     add f055268fe2c .github: fix simulator CI caused by imcompatibility 
between python3.10 and nosetests (#10753)
     add a95e9d7f77d Merge branch '4.19' of 
https://github.com/apache/cloudstack into 4.20
     add 0af887bce12 UI: Update message of load balancer for autoscaling group 
(#10750)
     add 0da243d6604 Fix issue with allocator not considering subsequent 
clusters (#10603)
     add 45bac89b831 Fix NPE on updating security groups for an instance 
(#10493)
     add 4a1d80ddc8e Remove the validation of the amount of acquired public IPs 
when enabling static NAT, adding PF and LB rules on VPC public IPs (#10568)
     add 255a45c4a62 Merge branch '4.19' of 
https://github.com/apache/cloudstack into 4.20
     add f6f33c6add3 Fix the size of a template downloaded from secondary 
storage (#10662)
     add 431e4f9e1dd ui: confirm on reset configurations (#10745)
     add 992c4b3d4a0 Merge branch '4.19' of 
https://github.com/apache/cloudstack into 4.20
     add 603cd84b494 server: fix available hypervisors listing for a zone 
(#10738)
     add 1adfaf90ade Smoke tests: Xenserver - Fix consistent failure noticed on 
scale VM test (#10741)
     add 12c077d7045 api,ui: multi arch improvements (#10289)
     add 5d28e66b521 vTPM: support KVM and VMware (#10543)
     add 5a5c8651332 Revert "Add the option to filter by host when retrieving 
of unregistered VMs (#9925)" (#10647)
     add 422264f0055 server: Don't specify ipv6 ranges for shared network 
(#10746)
     add 55c8138a1a7 test: fix test_certauthority_root.py (#10762)
     add 07f4fc2e51d Fix smoke tests due to change in behavior of restore VM 
(#10583)
     add 9d263cd71b5 Network Usage event model adjustments (#10755)
     add 9d9737ae040 smoke tests: Fix cluster DRS & non-strict host affinity 
smoke test failures on XenServer / XCP-ng (#10761)
     add 0785ba046e9 Merge branch '4.19' of 
https://github.com/apache/cloudstack into 4.20
     add 9f229600e6a Add new config (non-dynamic) for  agent connections 
monitor thread, and keep timeunit to secs (in sync with the earlier Wait 
config) (#10525)
     add 0e0ae226bd2 Xenserver smoke-test: Allow emojis to be accepted in 
volume name during volume creation (#10774)
     add 030ed55f36c server/test: ResourceCleanupService test fix for daylight 
saving time (#10749)
     add 02d1c61cf77 add amount of system VMs that are allocated to each host 
in the hosts ListView (#10791)
     add dfd64b1a672 Ceph object store: Fix LocationConstraint error  (#10772)
     add fe77f5f2856 server: apply network ACL even if there is no network ACLs 
in the ACL list (#9374) (#10241)
     add 7f16a207e0a cloudutils: use ip command instead of route in 
networkConfig.py (#10726)
     add 0c4ed1e5b72 UI: Allow editing VM name of a Running VM in an Advanced 
zone with security groups (#10714)
     add 4c072b5bf97 UI: show checksum field when register or upload 
template/isos (#10725)
     add 01d87b77479 Merge branch '4.19' into 4.20
     add 32cc45e8405 [UI] Allow quiescevm and asyncbackup flags while taking 
volume snapshot from UI when these are supported for the volume (#10265)
     add 91c11688618 Merge branch '4.19' of 
https://github.com/apache/cloudstack into 4.20
     add 83c3ea2e67f smoke tests / CI : Fix test_vm_stric_host_tags (#10806)
     add 74e9146cfb4 check for custom offering and trim size (#10629)
     add d697cff8987 Update dependency required for test_outofbandmanagement.py 
(#10805)
     add 1f8442eb69a Extra checks in UI when deleting accounts (#10760)
     add f6d05904243 Merge branch '4.19' of 
https://github.com/apache/cloudstack into 4.20
     add c1923a2dcb3 test: cleanup test_guest_os.py for multiple execution 
(#10818)
     add c45ed060982 test: fix test_hostha_simulator.py and 
test_outofbandmanagement.py (#10815)
     add 2674da2ee9e Nas BnR: Fix for restore not working correctly  (#10785)
     add f4ca7064b70 Add search bar on rules of roles (#10822)
     add 7e2aa0efe42 engine/schema: create default network offering for vpc 
tier with conserve_mode=1 for fresh installation (#10744)
     add c453aaea2cf ui: improve metrics api use in list views (#9825)
     add 17e062a3813 StorPool notify libvirt when volume is resized (#10775)
     add 919c9797cc8 server: prevent duplicate HA works and alerts (#10624)
     add f0838cdd309 [VMware] Update vlans with proper range before creating 
port group for dvSwitch (#10708)
     add 696bc50f3ba Backport #9888 to 4.19: Fix Usage inconsistencies (#10712)
     add 751a0ad5598 UI workaround for the inconsistent formatting of 
listVirtualMachinesUsageHistory (#10824)
     add ea32a1a71aa server: fetch IP of VMs on L2 networks (#10431)
     add 0a090f48533 cleanup call on super (#10807)
     add e68abcd85de xenserver: destroy halted vm on expunge (#10833)
     add a21f912be3d Merge branch '4.19' of 
https://github.com/apache/cloudstack into 4.20
     add 04731b06182 fix logger
     add 265f4cdc288 core: support chunked transfer for image files (#10820)
     add 011fced91ed ehancement: add password to configdrive vendor_data.json 
(#10061)
     add bcd23ebb8ac server: check if redundant router is supported when 
restart network with makeredundant = true (#10612)
     add 3959dbdbe63 refactor create duplicate alert check (#10544)
     add 47a268202bc [VMware] Sync the disk path or datastore changes for IDE 
disks, and before any volume resize during start vm (for the volumes on 
datastore cluster) (#10748)
     add 88ce639255d Linstor:  implement volume and storage stats (#10850)
     add dd84c74e822 Merge branch '4.19' into 4.20
     add 0648d000b24 Support XenServer 8.4 / XCP 8.3 - make scripts python3 
compatible (#10684)
     add 95489b8bddf Direct agents rebalance improvements with multiple 
management server nodes (#10674)
     add 52d986081b3 Updated Endpoint Selector to pick the Cluster in Enabled 
state (in addition to Host state) (#10757)
     add d55aa70f7ef Restore single backed-up volume on a live instance 
attaches the volume as a Raw image making it unreadable (#10844)
     add 3df83da86c7 Get backup offering details from 
listVirtualMachinesMetrics in UI (#10867)
     add 4259e0b51bf linstor: fix host connect recursion regression (#10878)
     add 8d3ae3e0574 [Vmware] Improve listing of Vmware Datacenter VMs for 
migration to KVM (#10770)
     add a4cce70e284 List usage records for network offering (usage type 13) 
when offering id is specified in usage id (#10852)
     add 005afde24ec ssvm: reset fields on destroy (#10253)
     add f199783c751 VMware import - logs sanitation (#10433)
     add 1507a5633e7 Correct typo in exception (#10876)
     add 13ab8a04d13 Fix for Vlan doesn't match issue while adding IP range for 
the shared network without any IP range (#10837)
     add c183fc9859e Prevent data corruption for StorPool volumes (#10799)
     add 112dfddd40b Reset the pool id when create volume fails on the 
allocated pool, and update the resize error when no endpoint exists (#10777)
     add 951863c3fe9 ui: add an infinite scroll select component (#10840)
     add 39a0ba96704 Fix issue with security group selection box display 
(#10849)
     add 8f8c685d178 Merge branch '4.19' into 4.20
     add 90316b2e90f VMware 80u2 and 80u3 updates/fixes (#10586)
     add badf3e18dae test: Update test ubuntu template for VMware to 
deployasis=False (#10881)
     add 538e35f8adb test: fix test_restore_vm failure on vmware (#10885)
     add 5444261902a test: fix several simulator CI failures (#10890)
     add 34896a1ada1 Address `assignVm` regression (#10875)
     add d0dc6d8093a mgmt: add back serviceip in ManagementServerResponse 
(#10891)
     add 4748c3fd4d2 test: cleanup acl in test_global_acls.py (#10893)
     add 6e19c07da10 Fixed typos (#10882)
     add f99fb3ecde3 Merge remote-tracking branch 'origin/4.19' into 4.20
     add f2a6a2ff131 .github: fix sonar checks (#10894)
     add 7e565d2524f Routed: support vxlan networks (#10861)
     add bb79f0b727e engine/schema: create default network offering for vpc 
tier with conserve_mode=1 for fresh installation (#10744) (#10843)
     add b760b0262f2 Fix issue with configdrive on XenServer (#10912)
     add 857ccb0a3b8 server: fix list diskoffering by domainid returns Inactive 
offerings (#10916)
     add 16fc2cd1f06 Merge branch '4.19' of 
https://github.com/apache/cloudstack into 4.20
     add 64d83ce9d12 Fix access to template/ISO list for domain/resource admins
     add c3c6d345893 Add access validation to Quota email APIs
     add 9cf9966dfea Keep same/consistent auth time for valid & invalid users
     add 19d6b979af6 cks: create separate service account in project
     add d5fbd07b9fb Adding privilege checks on user and account operations
     add 38f3107211b Fix aaccess to template/ISO list for domain/resource admins
     add ad9d9cd3f68 Keep same/consistent auth time for valid & invalid users
     add e2f187912cd cks: create separate service account in project
     add a0080a04fe6 Adding privilege checks on user and account operations
     add 6bb6fe7b41f Merge branch '4.19' into 4.20
     add 62363c1f4b7 remove duplicate definitions
     add bef86aff82f Skip verification of privileges on project accounts
     add 864327b8365 Skip verification of privileges on project accounts
     add 5be6b7980df Skip verification of privileges on project accounts
     add dd066e0e0e0 Merge branch '4.19' of 
https://github.com/apache/cloudstack into 4.19
     add 3c949365be3 Merge branch '4.19' into 4.20
     add 823080cc9c3 systemvmtemplate: fix Debian 12.11.0 ISO url (#10927)
     add c61a5eb430a Updating pom.xml version numbers for release 4.20.1.0
     add b5e2c181f9c Updating pom.xml version numbers for release 
4.20.2.0-SNAPSHOT
     add c86b2f1da24 update 4.20.2.0-SNAPSHOT version
     add 10fc1f3a1c5 update version
     add 0b841fefcb6 ui: show deploy/create button on right info pane (#10814)
     add 0c7d47138d4 Updating pom.xml version numbers for release 4.19.3.0
     add c4ba601a636 Merge branch '4.19.3.0-RC20250530T0908' into 4.19
     add 379ee07d88b Updating pom.xml version numbers for release 
4.19.4.0-SNAPSHOT
     add 0d5a0ea6815 update 4.19.4.0-SNAPSHOT version
     add 41de0b9dffd Merge branch '4.19' of 
https://github.com/apache/cloudstack into 4.20
     add 8f2735ab462 Accept case insensitive values in boolean settings (#10663)
     add 5790091b25d [Vmware to KVM Migration] Improve the Force MS option text 
(#11035)
     add 75147b78116 [Vmware to KVM Migration] Display virt-v2v and ovftool 
versions for supported hosts for migration (#11019)
     add ba0204f8edd Block volume shrink on Xen (#11004)
     add 544028ca8e6 Do not rely on Memory engine even transiently in DB setup 
scripts (#11106)
     add 3b54194aef1 Correct quota type indexes (#11085)
     add c24e4eea855 server: fix orphan db transaction issue (#11095)
     add cbd2b5a0224 Add check for ldap truststore password (#11055)
     add 7cad65d310d Merge release branch 4.19 to 4.20
     add 1a251c8b789 merge forward fix
     add ed7bd5e5804 ui: fix handler for deploy button menu (#11116)
     add 80f46ad55d6 [VMware to KVM Migration] Fix for converted instance npe 
issue when source vmware instance ovf is exported from management server 
(#11003)
     add 1cbf1cd2cd8 fix volumes search filter (#11168)
     add 49c6fbdfaf3 schema: fix missing columns index (#11171)
     add 39c8c4dbae9 Normalize naming of Kubernetes clusters (#10778)
     add e47b78b2bbb directdownload: fix keytool importcert (#11113)
     add c782835f012 [Vmware to KVM Migration] Fix issue with vCenter 
Standalone hosts for VM listing (#11091)
     add 67a1ea35f4e .github: restrict codecov in UI build to apache/cloudstack 
repo (#11158)
     add 7715b3dc298 Improve the error throws when a template to owned by a non 
root-admin is registered for all zones. (#11170)
     add 61e74e086b5 Merge branch '4.19' into 4.20
     add d106b8bcf21 Merge branch '4.20' of 
https://github.com/apache/cloudstack into fix-create-counters-dup
     add cb0f178914b prevent counters with same value for the same provider

No new revisions were added by this update.

Summary of changes:
 .github/workflows/ci.yml                           |    2 +-
 .github/workflows/main-sonar-check.yml             |    2 +-
 .github/workflows/sonar-check.yml                  |    2 +-
 .github/workflows/ui.yml                           |    1 +
 agent/bindir/cloud-setup-agent.in                  |   13 +
 agent/bindir/libvirtqemuhook.in                    |   13 +
 agent/pom.xml                                      |    2 +-
 api/pom.xml                                        |    2 +-
 api/src/main/java/com/cloud/cpu/CPU.java           |   57 +-
 api/src/main/java/com/cloud/host/Host.java         |    9 +-
 .../cluster/KubernetesServiceHelper.java           |    2 +
 .../java/com/cloud/storage/MigrationOptions.java   |   11 +-
 .../storage/VMTemplateStorageResourceAssoc.java    |    3 +
 .../java/com/cloud/storage/VolumeApiService.java   |    7 +
 api/src/main/java/com/cloud/user/Account.java      |    1 +
 .../main/java/com/cloud/vm/VmDetailConstants.java  |    9 +
 .../org/apache/cloudstack/api/ApiConstants.java    |    8 +-
 .../api/command/admin/cluster/ListClustersCmd.java |   12 +-
 .../api/command/admin/host/ListHostsCmd.java       |   10 +-
 .../api/command/admin/router/ListRoutersCmd.java   |   14 +-
 .../command/admin/systemvm/ListSystemVMsCmd.java   |   12 +-
 .../user/backup/DeleteBackupScheduleCmd.java       |   14 +-
 .../api/command/user/iso/ExtractIsoCmd.java        |   11 +-
 .../command/user/template/ExtractTemplateCmd.java  |   10 +-
 .../cloudstack/api/command/user/vm/ListVMsCmd.java |   21 +-
 .../api/command/user/volume/ExtractVolumeCmd.java  |    8 +-
 .../api/response/BackupRepositoryResponse.java     |   12 -
 .../api/response/DomainRouterResponse.java         |    8 +
 .../cloudstack/api/response/HostResponse.java      |    8 +-
 .../api/response/ManagementServerResponse.java     |   13 +
 .../cloudstack/api/response/NetworkResponse.java   |    3 +-
 .../cloudstack/api/response/SystemVmResponse.java  |    8 +
 .../api/response/UnmanagedInstanceResponse.java    |   24 +
 .../cloudstack/api/response/UserVmResponse.java    |   14 +-
 .../apache/cloudstack/backup/BackupManager.java    |    5 +-
 .../org/apache/cloudstack/query/QueryService.java  |    4 +
 .../apache/cloudstack/vm/UnmanagedInstanceTO.java  |   19 +
 api/src/test/java/com/cloud/cpu/CPUTest.java       |   67 +
 client/bindir/cloud-setup-management.in            |   14 +
 client/pom.xml                                     |    2 +-
 core/pom.xml                                       |    2 +-
 .../com/cloud/agent/api/ConvertInstanceAnswer.java |   16 -
 .../cloud/agent/api/ConvertInstanceCommand.java    |   11 +-
 .../com/cloud/agent/api/GetVmIpAddressCommand.java |    8 +-
 .../storage/template/HttpTemplateDownloader.java   |   99 +-
 .../download/HttpsDirectTemplateDownloader.java    |   11 +-
 .../direct/download/HttpsMultiTrustManager.java    |  102 --
 debian/changelog                                   |   12 +
 debian/cloudstack-management.postinst              |    2 +
 developer/pom.xml                                  |    2 +-
 engine/api/pom.xml                                 |    2 +-
 .../java/com/cloud/vm/VirtualMachineManager.java   |    4 +
 engine/components-api/pom.xml                      |    2 +-
 .../main/java/com/cloud/agent/AgentManager.java    |    4 +-
 .../main/java/com/cloud/event/UsageEventUtils.java |   24 +-
 .../java/com/cloud/resource/ResourceManager.java   |   12 +
 engine/orchestration/pom.xml                       |    2 +-
 .../com/cloud/agent/manager/AgentManagerImpl.java  |   79 +-
 .../agent/manager/ClusteredAgentManagerImpl.java   |   56 +-
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |   35 +-
 .../engine/orchestration/DataMigrationUtility.java |   32 +-
 .../engine/orchestration/NetworkOrchestrator.java  |   24 +-
 .../manager/ClusteredAgentManagerImplTest.java     |  150 ++
 .../orchestration/DataMigrationUtilityTest.java    |   88 ++
 .../orchestration/NetworkOrchestratorTest.java     |    2 +-
 engine/pom.xml                                     |    2 +-
 engine/schema/pom.xml                              |   11 +-
 .../src/main/java/com/cloud/dc/dao/ClusterDao.java |    6 +-
 .../main/java/com/cloud/dc/dao/ClusterDaoImpl.java |   26 +-
 .../src/main/java/com/cloud/host/dao/HostDao.java  |    5 +
 .../main/java/com/cloud/host/dao/HostDaoImpl.java  |   42 +-
 .../java/com/cloud/network/as/dao/CounterDao.java  |    2 +-
 .../com/cloud/network/as/dao/CounterDaoImpl.java   |    4 +-
 .../java/com/cloud/storage/dao/VMTemplateDao.java  |    9 +-
 .../com/cloud/storage/dao/VMTemplateDaoImpl.java   |  108 +-
 .../com/cloud/upgrade/DatabaseUpgradeChecker.java  |    2 +
 .../upgrade/SystemVmTemplateRegistration.java      |  659 +++++---
 .../com/cloud/upgrade/dao/Upgrade42000to42010.java |    4 +-
 ...e41910to41920.java => Upgrade42010to42020.java} |   27 +-
 .../java/com/cloud/usage/dao/UsageNetworksDao.java |    2 +
 .../com/cloud/usage/dao/UsageNetworksDaoImpl.java  |   17 +
 .../main/java/com/cloud/usage/dao/UsageVpcDao.java |    4 +
 .../java/com/cloud/usage/dao/UsageVpcDaoImpl.java  |   18 +
 .../main/java/com/cloud/user/dao/AccountDao.java   |    8 +-
 .../java/com/cloud/user/dao/AccountDaoImpl.java    |   25 +-
 .../src/main/java/com/cloud/vm/VMInstanceVO.java   |    2 +-
 .../storage/datastore/db/ImageStoreDao.java        |    2 +-
 .../storage/datastore/db/ImageStoreDaoImpl.java    |   18 +-
 .../apache/cloudstack/util/CPUArchConverter.java   |    2 +-
 .../resources/META-INF/db/schema-42000to42010.sql  |   85 +-
 ...cleanup.sql => schema-42010to42020-cleanup.sql} |    4 +-
 ...302to40-cleanup.sql => schema-42010to42020.sql} |    5 +-
 .../META-INF/db/views/cloud.domain_router_view.sql |    1 +
 .../META-INF/db/views/cloud.user_vm_view.sql       |    1 +
 .../java/com/cloud/dc/dao/ClusterDaoImplTest.java  |   40 +
 .../java/com/cloud/host/dao/HostDaoImplTest.java   |  162 +-
 .../cloud/storage/dao/VMTemplateDaoImplTest.java   |  189 +++
 .../upgrade/SystemVmTemplateRegistrationTest.java  |  427 ++++++
 engine/schema/templateConfig.sh                    |    8 +-
 engine/service/pom.xml                             |    2 +-
 engine/storage/cache/pom.xml                       |    2 +-
 engine/storage/configdrive/pom.xml                 |    2 +-
 .../storage/configdrive/ConfigDriveBuilder.java    |   43 +-
 .../configdrive/ConfigDriveBuilderTest.java        |   20 +-
 engine/storage/datamotion/pom.xml                  |    2 +-
 .../KvmNonManagedStorageDataMotionStrategy.java    |    2 +-
 .../motion/StorageSystemDataMotionStrategy.java    |   20 +-
 engine/storage/image/pom.xml                       |    2 +-
 .../storage/image/SecondaryStorageServiceImpl.java |   91 +-
 .../image/SecondaryStorageServiceImplTest.java     |  138 ++
 engine/storage/integration-test/pom.xml            |    2 +-
 engine/storage/object/pom.xml                      |    2 +-
 engine/storage/pom.xml                             |    2 +-
 engine/storage/snapshot/pom.xml                    |    2 +-
 .../vmsnapshot/StorageVMSnapshotStrategy.java      |   13 +-
 .../vmsnapshot/VMSnapshotStrategyKVMTest.java      |    4 +-
 .../storage/endpoint/DefaultEndPointSelector.java  |    2 +-
 engine/storage/volume/pom.xml                      |    2 +-
 .../BasePrimaryDataStoreLifeCycleImpl.java         |   54 +-
 .../storage/volume/VolumeServiceImpl.java          |   24 +-
 engine/userdata/cloud-init/pom.xml                 |    2 +-
 engine/userdata/pom.xml                            |    2 +-
 framework/agent-lb/pom.xml                         |    2 +-
 framework/ca/pom.xml                               |    2 +-
 framework/cluster/pom.xml                          |    2 +-
 .../java/com/cloud/cluster/ClusterManagerImpl.java |   24 +-
 framework/config/pom.xml                           |    2 +-
 .../framework/config/impl/ConfigDepotImpl.java     |   19 +-
 .../framework/config/impl/ConfigDepotImplTest.java |    6 +
 framework/db/pom.xml                               |    2 +-
 .../java/com/cloud/utils/db/GenericDaoBase.java    |    8 +-
 .../main/java/com/cloud/utils/db/SearchBase.java   |   16 +-
 .../java/com/cloud/utils/db/SearchCriteria.java    |    9 +-
 framework/direct-download/pom.xml                  |    2 +-
 framework/events/pom.xml                           |    2 +-
 framework/ipc/pom.xml                              |    2 +-
 framework/jobs/pom.xml                             |    2 +-
 framework/managed-context/pom.xml                  |    2 +-
 framework/pom.xml                                  |    2 +-
 framework/quota/pom.xml                            |    2 +-
 .../presetvariables/GenericPresetVariable.java     |    6 +-
 .../activationrule/presetvariables/Resource.java   |    6 +-
 framework/rest/pom.xml                             |    2 +-
 framework/security/pom.xml                         |    2 +-
 framework/spring/lifecycle/pom.xml                 |    2 +-
 framework/spring/module/pom.xml                    |    2 +-
 packaging/el8/cloud.spec                           |    6 +
 plugins/acl/dynamic-role-based/pom.xml             |    2 +-
 .../acl/DynamicRoleBasedAPIAccessChecker.java      |    4 +-
 plugins/acl/project-role-based/pom.xml             |    2 +-
 plugins/acl/static-role-based/pom.xml              |    2 +-
 .../explicit-dedication/pom.xml                    |    2 +-
 .../host-affinity/pom.xml                          |    2 +-
 .../host-anti-affinity/pom.xml                     |    2 +-
 .../non-strict-host-affinity/pom.xml               |    2 +-
 .../non-strict-host-anti-affinity/pom.xml          |    2 +-
 plugins/alert-handlers/snmp-alerts/pom.xml         |    2 +-
 plugins/alert-handlers/syslog-alerts/pom.xml       |    2 +-
 plugins/api/discovery/pom.xml                      |    2 +-
 plugins/api/rate-limit/pom.xml                     |    2 +-
 plugins/api/solidfire-intg-test/pom.xml            |    2 +-
 plugins/api/vmware-sioc/pom.xml                    |    2 +-
 plugins/backup/dummy/pom.xml                       |    2 +-
 plugins/backup/nas/pom.xml                         |    2 +-
 .../cloudstack/backup/NASBackupProvider.java       |   12 +-
 plugins/backup/networker/pom.xml                   |    2 +-
 plugins/backup/veeam/pom.xml                       |    2 +-
 .../cloudstack/backup/VeeamBackupProvider.java     |    3 +
 plugins/ca/root-ca/pom.xml                         |    2 +-
 plugins/database/mysql-ha/pom.xml                  |    2 +-
 plugins/database/quota/pom.xml                     |    2 +-
 .../api/command/QuotaConfigureEmailCmd.java        |    2 +
 .../command/QuotaListEmailConfigurationCmd.java    |    5 +-
 plugins/dedicated-resources/pom.xml                |    2 +-
 .../implicit-dedication/pom.xml                    |    2 +-
 .../user-concentrated-pod/pom.xml                  |    2 +-
 .../deployment-planners/user-dispersing/pom.xml    |    2 +-
 plugins/drs/cluster/balanced/pom.xml               |    2 +-
 plugins/drs/cluster/condensed/pom.xml              |    2 +-
 plugins/event-bus/inmemory/pom.xml                 |    2 +-
 plugins/event-bus/kafka/pom.xml                    |    2 +-
 plugins/event-bus/rabbitmq/pom.xml                 |    2 +-
 plugins/event-bus/webhook/pom.xml                  |    2 +-
 plugins/ha-planners/skip-heurestics/pom.xml        |    2 +-
 plugins/host-allocators/random/pom.xml             |    2 +-
 .../manager/allocator/impl/RandomAllocator.java    |   12 +-
 plugins/hypervisors/baremetal/pom.xml              |    2 +-
 plugins/hypervisors/hyperv/pom.xml                 |    2 +-
 plugins/hypervisors/kvm/pom.xml                    |    2 +-
 .../main/java/com/cloud/ha/KVMInvestigator.java    |    5 +-
 .../kvm/resource/LibvirtComputingResource.java     |   59 +-
 .../hypervisor/kvm/resource/LibvirtVMDef.java      |   77 +
 .../LibvirtConvertInstanceCommandWrapper.java      |  205 +--
 .../LibvirtGetVmIpAddressCommandWrapper.java       |  198 ++-
 .../wrapper/LibvirtReadyCommandWrapper.java        |    8 +
 .../LibvirtRestoreBackupCommandWrapper.java        |   24 +-
 ...tupDirectDownloadCertificateCommandWrapper.java |    2 +-
 .../kvm/storage/KVMStorageProcessor.java           |    6 +
 .../kvm/resource/LibvirtComputingResourceTest.java |   24 +
 .../hypervisor/kvm/resource/LibvirtVMDefTest.java  |   11 +
 .../LibvirtConvertInstanceCommandWrapperTest.java  |   70 -
 .../LibvirtGetVmIpAddressCommandWrapperTest.java   |  323 ++++
 plugins/hypervisors/ovm/pom.xml                    |    4 +-
 plugins/hypervisors/ovm3/pom.xml                   |    2 +-
 plugins/hypervisors/simulator/pom.xml              |    2 +-
 .../com/cloud/agent/manager/MockAgentManager.java  |    1 +
 .../cloud/agent/manager/MockAgentManagerImpl.java  |    2 +
 .../com/cloud/resource/AgentRoutingResource.java   |    3 +
 .../com/cloud/resource/SimulatorDiscoverer.java    |    4 +
 .../main/java/com/cloud/simulator/MockHost.java    |    2 +
 .../main/java/com/cloud/simulator/MockHostVO.java  |   11 +
 plugins/hypervisors/ucs/pom.xml                    |    2 +-
 plugins/hypervisors/vmware/pom.xml                 |    2 +-
 .../hypervisor/vmware/VmwareDatacenterService.java |    7 +-
 .../vmware/manager/VmwareManagerImpl.java          |  281 ++--
 .../hypervisor/vmware/resource/VmwareResource.java |  579 ++++---
 .../resource/VmwareStorageLayoutHelper.java        |   40 +-
 .../storage/resource/VmwareStorageProcessor.java   |   30 +-
 .../api/command/admin/zone/AddVmwareDcCmd.java     |   12 +-
 .../zone/ImportVsphereStoragePoliciesCmd.java      |   11 +-
 .../command/admin/zone/ListVmwareDcHostsCmd.java   |  144 --
 .../api/command/admin/zone/ListVmwareDcItems.java  |   29 -
 .../api/command/admin/zone/ListVmwareDcVmsCmd.java |   67 +-
 .../api/command/admin/zone/ListVmwareDcsCmd.java   |   26 +-
 .../admin/zone/ListVsphereStoragePoliciesCmd.java  |   13 +-
 ...ListVsphereStoragePolicyCompatiblePoolsCmd.java |    2 +-
 .../api/command/admin/zone/RemoveVmwareDcCmd.java  |    6 +-
 .../api/command/admin/zone/UpdateVmwareDcCmd.java  |    8 +-
 .../command/admin/zone/VmwareRequestResponse.java  |   38 -
 .../motion/VmwareStorageMotionStrategy.java        |   29 +-
 .../vmware/resource/VmwareResourceTest.java        |   39 +
 plugins/hypervisors/xenserver/pom.xml              |    4 +-
 .../java/com/cloud/hypervisor/XenServerGuru.java   |    9 +
 .../xenserver/discoverer/XcpServerDiscoverer.java  |    7 +-
 .../xenserver/resource/CitrixResourceBase.java     |  650 ++++----
 ...er600Resource.java => XcpServer83Resource.java} |    4 +-
 .../resource/XenServerConnectionPool.java          |   10 +-
 .../resource/XenServerStorageProcessor.java        |   23 +-
 ...er600Resource.java => Xenserver84Resource.java} |    5 +-
 .../xen56/XenServer56FenceCommandWrapper.java      |    2 +-
 .../xen56p1/XenServer56FP1FenceCommandWrapper.java |    2 +-
 .../xenbase/CitrixCleanupVMCommandWrapper.java     |   78 +
 .../CitrixCreateVMSnapshotCommandWrapper.java      |   23 +-
 .../CitrixDeleteVMSnapshotCommandWrapper.java      |    2 +-
 .../xenbase/CitrixResizeVolumeCommandWrapper.java  |    7 +-
 .../CitrixRevertToVMSnapshotCommandWrapper.java    |   13 +-
 .../wrapper/xenbase/CitrixStartCommandWrapper.java |   30 +-
 .../wrapper/xenbase/CitrixStopCommandWrapper.java  |    2 +-
 .../java/com/xensource/xenapi/ConnectionNew.java   |  335 ++++
 .../wrapper/xenbase/CitrixRequestWrapperTest.java  |    2 +-
 plugins/integrations/cloudian/pom.xml              |    2 +-
 plugins/integrations/kubernetes-service/pom.xml    |    2 +-
 .../cluster/KubernetesClusterManagerImpl.java      |  270 +++-
 .../cluster/KubernetesClusterService.java          |    8 +-
 .../cluster/KubernetesServiceHelperImpl.java       |    8 +
 .../KubernetesClusterDestroyWorker.java            |    4 +
 ...ernetesClusterResourceModifierActionWorker.java |   38 +-
 .../cluster/dao/KubernetesClusterDao.java          |    4 +-
 .../cluster/dao/KubernetesClusterDaoImpl.java      |   33 +-
 .../version/KubernetesVersionManagerImpl.java      |   15 +-
 .../ListKubernetesSupportedVersionsCmd.java        |    9 +
 .../KubernetesSupportedVersionResponse.java        |   12 +
 ...tesClusterResourceModifierActionWorkerTest.java |  138 ++
 .../version/KubernetesVersionManagerImplTest.java  |    2 +
 .../version/KubernetesVersionServiceTest.java      |    1 +
 plugins/integrations/prometheus/pom.xml            |    2 +-
 .../cloudstack/metrics/PrometheusExporterImpl.java |    3 +-
 plugins/metrics/pom.xml                            |    2 +-
 .../cloudstack/metrics/MetricsServiceImpl.java     |   26 +-
 plugins/network-elements/bigswitch/pom.xml         |    2 +-
 plugins/network-elements/brocade-vcs/pom.xml       |    2 +-
 plugins/network-elements/cisco-vnmc/pom.xml        |    2 +-
 plugins/network-elements/dns-notifier/pom.xml      |    2 +-
 .../network-elements/elastic-loadbalancer/pom.xml  |    2 +-
 plugins/network-elements/globodns/pom.xml          |    2 +-
 .../network-elements/internal-loadbalancer/pom.xml |    2 +-
 .../lb/InternalLoadBalancerVMManagerImpl.java      |  134 +-
 .../lb/InternalLoadBalancerVMManagerImplTest.java  |  172 +++
 plugins/network-elements/juniper-contrail/pom.xml  |    2 +-
 .../contrail/management/MockAccountManager.java    |    4 +
 plugins/network-elements/netscaler/pom.xml         |    2 +-
 plugins/network-elements/nicira-nvp/pom.xml        |    2 +-
 plugins/network-elements/nsx/pom.xml               |    2 +-
 plugins/network-elements/opendaylight/pom.xml      |    2 +-
 plugins/network-elements/ovs/pom.xml               |    2 +-
 plugins/network-elements/palo-alto/pom.xml         |    2 +-
 plugins/network-elements/stratosphere-ssp/pom.xml  |    2 +-
 plugins/network-elements/tungsten/pom.xml          |    2 +-
 plugins/network-elements/vxlan/pom.xml             |    2 +-
 .../cloud/network/guru/VxlanGuestNetworkGuru.java  |    3 +
 .../outofbandmanagement-drivers/ipmitool/pom.xml   |    2 +-
 .../nested-cloudstack/pom.xml                      |    2 +-
 .../outofbandmanagement-drivers/redfish/pom.xml    |    2 +-
 plugins/pom.xml                                    |    2 +-
 plugins/shutdown/pom.xml                           |    2 +-
 .../api/response/ReadyForShutdownResponse.java     |   14 +-
 .../cloudstack/shutdown/ShutdownManagerImpl.java   |    4 +-
 plugins/storage-allocators/random/pom.xml          |    2 +-
 plugins/storage/image/default/pom.xml              |    2 +-
 plugins/storage/image/s3/pom.xml                   |    2 +-
 plugins/storage/image/sample/pom.xml               |    2 +-
 plugins/storage/image/swift/pom.xml                |    2 +-
 plugins/storage/object/ceph/pom.xml                |    2 +-
 .../driver/CephObjectStoreDriverImpl.java          |   10 +-
 .../driver/CephObjectStoreDriverImplTest.java      |    2 +-
 plugins/storage/object/minio/pom.xml               |    2 +-
 plugins/storage/object/simulator/pom.xml           |    2 +-
 plugins/storage/sharedfs/storagevm/pom.xml         |    2 +-
 plugins/storage/volume/adaptive/pom.xml            |    2 +-
 plugins/storage/volume/cloudbyte/pom.xml           |    2 +-
 plugins/storage/volume/datera/pom.xml              |    2 +-
 plugins/storage/volume/default/pom.xml             |    2 +-
 .../CloudStackPrimaryDataStoreDriverImpl.java      |   11 +-
 plugins/storage/volume/flasharray/pom.xml          |    2 +-
 plugins/storage/volume/linstor/CHANGELOG.md        |   17 +
 plugins/storage/volume/linstor/pom.xml             |    2 +-
 .../driver/LinstorPrimaryDataStoreDriverImpl.java  |  107 +-
 .../LinstorPrimaryDataStoreLifeCycleImpl.java      |    5 +-
 .../datastore/provider/LinstorHostListener.java    |    4 +-
 .../util/LinstorConfigurationManager.java          |    9 +-
 .../storage/datastore/util/LinstorUtil.java        |   32 +-
 plugins/storage/volume/nexenta/pom.xml             |    2 +-
 plugins/storage/volume/primera/pom.xml             |    2 +-
 plugins/storage/volume/sample/pom.xml              |    2 +-
 plugins/storage/volume/scaleio/pom.xml             |    2 +-
 .../ScaleIOPrimaryDataStoreLifeCycle.java          |   55 +-
 plugins/storage/volume/solidfire/pom.xml           |    2 +-
 plugins/storage/volume/storpool/pom.xml            |    2 +-
 .../driver/StorPoolPrimaryDataStoreDriver.java     |  176 +--
 .../storage/datastore/util/StorPoolUtil.java       |    6 +
 .../storage/motion/StorPoolDataMotionStrategy.java |   15 +-
 plugins/user-authenticators/ldap/pom.xml           |    2 +-
 .../apache/cloudstack/ldap/LdapContextFactory.java |   40 +-
 .../apache/cloudstack/ldap/LdapManagerImpl.java    |    5 +
 plugins/user-authenticators/md5/pom.xml            |    2 +-
 plugins/user-authenticators/oauth2/pom.xml         |    2 +-
 plugins/user-authenticators/pbkdf2/pom.xml         |    2 +-
 plugins/user-authenticators/plain-text/pom.xml     |    2 +-
 plugins/user-authenticators/saml2/pom.xml          |    2 +-
 .../api/command/ListAndSwitchSAMLAccountCmd.java   |   25 +-
 .../api/command/SAML2LoginAPIAuthenticatorCmd.java |   14 +-
 .../apache/cloudstack/saml/SAML2AuthManager.java   |    4 +
 .../cloudstack/saml/SAML2AuthManagerImpl.java      |    2 +-
 .../java/org/apache/cloudstack/saml/SAMLUtils.java |   88 +-
 .../java/org/apache/cloudstack/SAMLUtilsTest.java  |    6 +-
 .../command/ListAndSwitchSAMLAccountCmdTest.java   |    2 -
 plugins/user-authenticators/sha256salted/pom.xml   |    2 +-
 .../static-pin/pom.xml                             |    2 +-
 .../user-two-factor-authenticators/totp/pom.xml    |    2 +-
 pom.xml                                            |    8 +-
 python/lib/cloudutils/networkConfig.py             |    2 +-
 python/lib/cloudutils/syscfg.py                    |    7 +-
 python/lib/cloudutils/utilities.py                 |    4 +
 quickcloud/pom.xml                                 |    2 +-
 scripts/storage/secondary/setup-sysvm-tmplt        |   10 +-
 scripts/vm/hypervisor/kvm/nasbackup.sh             |   68 +-
 .../xenserver/{xcposs => xcpserver83}/NFSSR.py     |   40 +-
 .../xenserver/{xcpserver => xcpserver83}/patch     |    9 +-
 .../{ => xenserver84}/cloud-plugin-storage         |   17 +-
 .../{ => xenserver84}/cloudstack_pluginlib.py      |   77 +-
 .../xenserver/{ => xenserver84}/ovs-vif-flows.py   |   34 +-
 .../xenserver/{xenserver65 => xenserver84}/patch   |   16 +-
 .../hypervisor/xenserver/{ => xenserver84}/swift   |   52 +-
 .../hypervisor/xenserver/{ => xenserver84}/vmops   |  598 ++++----
 .../xenserver/{ => xenserver84}/vmopsSnapshot      |   89 +-
 .../xenserver/{ => xenserver84}/vmopspremium       |   18 +-
 server/conf/cloudstack-sudoers.in                  |    2 +-
 server/pom.xml                                     |    2 +-
 .../manager/allocator/impl/FirstFitAllocator.java  |    9 +-
 .../java/com/cloud/alert/AlertManagerImpl.java     |  288 ++--
 server/src/main/java/com/cloud/api/ApiDBUtils.java |    2 +-
 .../main/java/com/cloud/api/ApiResponseHelper.java |    4 +-
 server/src/main/java/com/cloud/api/ApiServer.java  |  144 +-
 server/src/main/java/com/cloud/api/ApiServlet.java |    7 +-
 .../java/com/cloud/api/query/QueryManagerImpl.java |   36 +-
 .../api/query/dao/DomainRouterJoinDaoImpl.java     |    1 +
 .../cloud/api/query/dao/TemplateJoinDaoImpl.java   |    7 -
 .../com/cloud/api/query/dao/UserVmJoinDaoImpl.java |    1 +
 .../com/cloud/api/query/vo/DomainRouterJoinVO.java |   11 +
 .../java/com/cloud/api/query/vo/UserVmJoinVO.java  |    7 +
 .../configuration/ConfigurationManagerImpl.java    |  219 ++-
 .../consoleproxy/ConsoleProxyManagerImpl.java      |  118 +-
 .../com/cloud/ha/HighAvailabilityManagerImpl.java  |   60 +-
 .../java/com/cloud/ha/dao/HighAvailabilityDao.java |    3 +
 .../com/cloud/ha/dao/HighAvailabilityDaoImpl.java  |   13 +
 .../com/cloud/network/IpAddressManagerImpl.java    |   94 +-
 .../java/com/cloud/network/NetworkServiceImpl.java |   37 +-
 .../com/cloud/network/as/AutoScaleManagerImpl.java |    7 +-
 .../network/element/ConfigDriveNetworkElement.java |    6 +-
 .../network/guru/ExternalGuestNetworkGuru.java     |   25 +-
 .../com/cloud/network/guru/GuestNetworkGuru.java   |   24 +
 .../cloud/network/router/NetworkHelperImpl.java    |  112 +-
 .../java/com/cloud/network/vpc/VpcManagerImpl.java |   28 +-
 .../com/cloud/resource/ResourceManagerImpl.java    |  219 ++-
 .../resourcelimit/ResourceLimitManagerImpl.java    |    6 +
 .../com/cloud/server/ManagementServerImpl.java     |   20 +-
 .../main/java/com/cloud/server/StatsCollector.java |    4 +-
 .../java/com/cloud/storage/StorageManagerImpl.java |  118 +-
 .../com/cloud/storage/VolumeApiServiceImpl.java    |   21 +-
 .../storage/download/DownloadActiveState.java      |    2 +-
 .../cloud/storage/download/DownloadListener.java   |    1 +
 .../storage/snapshot/SnapshotManagerImpl.java      |    2 +-
 .../cloud/template/HypervisorTemplateAdapter.java  |   35 +-
 .../com/cloud/template/TemplateAdapterBase.java    |   10 +-
 .../com/cloud/template/TemplateManagerImpl.java    |    8 +-
 .../java/com/cloud/usage/UsageServiceImpl.java     |   17 +-
 .../main/java/com/cloud/user/AccountManager.java   |    1 +
 .../java/com/cloud/user/AccountManagerImpl.java    |  418 +++--
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  |  255 ++--
 .../agent/lb/IndirectAgentLBServiceImpl.java       |   38 +-
 .../cloudstack/backup/BackupManagerImpl.java       |   48 +-
 .../network/topology/AdvancedNetworkTopology.java  |    5 -
 .../storage/heuristics/presetvariables/Domain.java |    2 +-
 .../GenericHeuristicPresetVariable.java            |   10 +-
 .../cloudstack/vm/UnmanagedVMsManagerImpl.java     |   59 +-
 .../ConfigurationManagerImplTest.java              |  158 ++
 .../configuration/ConfigurationManagerTest.java    |    6 +
 .../consoleproxy/ConsoleProxyManagerImplTest.java  |  107 ++
 .../cloud/ha/HighAvailabilityManagerImplTest.java  |    2 -
 .../com/cloud/network/NetworkServiceImplTest.java  |    2 +-
 .../network/router/NetworkHelperImplTest.java      |  119 +-
 .../com/cloud/user/AccountManagerImplTest.java     |  175 ++-
 .../AccountManagerImplVolumeDeleteEventTest.java   |    1 +
 .../com/cloud/user/AccountManagetImplTestBase.java |    3 +
 .../com/cloud/user/MockAccountManagerImpl.java     |    4 +
 .../java/com/cloud/vm/UserVmManagerImplTest.java   |  113 +-
 .../resource/ResourceCleanupServiceImplTest.java   |   25 +-
 .../heuristics/presetvariables/AccountTest.java    |   20 +-
 .../heuristics/presetvariables/DomainTest.java     |   15 +-
 .../GenericHeuristicPresetVariableTest.java        |   14 +-
 .../presetvariables/SecondaryStorageTest.java      |   19 +-
 .../heuristics/presetvariables/SnapshotTest.java   |   18 +-
 .../heuristics/presetvariables/TemplateTest.java   |   20 +-
 .../heuristics/presetvariables/VolumeTest.java     |   18 +-
 .../cloudstack/vm/UnmanagedVMsManagerImplTest.java |    2 -
 services/console-proxy/pom.xml                     |    2 +-
 services/console-proxy/rdpconsole/pom.xml          |    2 +-
 services/console-proxy/server/pom.xml              |    2 +-
 services/pom.xml                                   |    2 +-
 services/secondary-storage/controller/pom.xml      |    2 +-
 .../SecondaryStorageManagerImpl.java               |   77 +-
 .../SecondaryStorageManagerImplTest.java           |   89 +-
 services/secondary-storage/pom.xml                 |    2 +-
 services/secondary-storage/server/pom.xml          |    2 +-
 .../storage/template/UploadManagerImpl.java        |   14 +-
 setup/bindir/cloud-setup-databases.in              |    2 +
 setup/db/create-schema-simulator.sql               |    1 +
 setup/db/create-schema.sql                         |    4 +-
 systemvm/debian/opt/cloud/bin/cs/CsDhcp.py         |    2 +-
 systemvm/pom.xml                                   |    2 +-
 .../component/test_affinity_groups_projects.py     |   17 +-
 .../plugins/linstor/test_linstor_volumes.py        |  252 ++-
 test/integration/smoke/test_certauthority_root.py  |   36 +-
 test/integration/smoke/test_cluster_drs.py         |   13 +-
 .../smoke/test_deploy_vm_extra_config_data.py      |    4 +-
 test/integration/smoke/test_dynamicroles.py        |    1 -
 test/integration/smoke/test_events_resource.py     |    5 +-
 test/integration/smoke/test_global_acls.py         |    1 +
 test/integration/smoke/test_guest_os.py            |   26 +-
 test/integration/smoke/test_hostha_simulator.py    |    2 +-
 test/integration/smoke/test_network_permissions.py |   15 +-
 .../smoke/test_nonstrict_affinity_group.py         |   10 +-
 test/integration/smoke/test_outofbandmanagement.py |    2 +-
 test/integration/smoke/test_purge_expunged_vms.py  |    4 +-
 test/integration/smoke/test_restore_vm.py          |   10 +-
 test/integration/smoke/test_scale_vm.py            |  102 +-
 test/integration/smoke/test_ssvm.py                |    6 +
 test/integration/smoke/test_vm_strict_host_tags.py |    6 +-
 test/pom.xml                                       |    2 +-
 tools/apidoc/pom.xml                               |    2 +-
 .../scripts/configure_systemvm_services.sh         |    2 +-
 .../template-base_aarch64-target_aarch64.json      |    4 +-
 .../template-base_x86_64-target_aarch64.json       |    4 +-
 .../template-base_x86_64-target_x86_64.json        |    4 +-
 tools/checkstyle/pom.xml                           |    2 +-
 tools/devcloud-kvm/pom.xml                         |    2 +-
 tools/devcloud4/pom.xml                            |    2 +-
 tools/docker/Dockerfile                            |    2 +-
 tools/docker/Dockerfile.marvin                     |    4 +-
 tools/marvin/marvin/config/test_data.py            |    8 +-
 tools/marvin/marvin/lib/base.py                    |   15 +-
 tools/marvin/pom.xml                               |    2 +-
 tools/marvin/setup.py                              |    2 +-
 tools/pom.xml                                      |    2 +-
 ui/.env.qa                                         |    1 +
 ui/public/config.json                              |    1 +
 ui/public/index.html                               |    2 +-
 ui/public/locales/en.json                          |   29 +-
 ui/public/locales/pt_BR.json                       |    2 +
 ui/src/components/header/ProjectMenu.vue           |  117 +-
 ui/src/components/header/SamlDomainSwitcher.vue    |    3 +
 ui/src/components/view/InfoCard.vue                | 1601 ++++++++++----------
 ui/src/components/view/ListView.vue                |   10 +-
 ui/src/components/view/ResourceLimitTab.vue        |    2 +-
 ui/src/components/view/SearchView.vue              |   13 +-
 ui/src/components/view/SettingsTab.vue             |    2 +-
 ui/src/components/view/StatsTab.vue                |    2 +-
 ui/src/components/widgets/InfiniteScrollSelect.vue |  298 ++++
 ui/src/config/router.js                            |    1 -
 ui/src/config/section/account.js                   |    5 +-
 ui/src/config/section/compute.js                   |   20 +-
 ui/src/config/section/config.js                    |    2 +-
 ui/src/config/section/image.js                     |   14 +-
 ui/src/config/section/infra/clusters.js            |    6 +-
 ui/src/config/section/infra/hosts.js               |   47 +-
 ui/src/config/section/infra/routers.js             |    6 +-
 ui/src/config/section/infra/systemVms.js           |    6 +-
 ui/src/config/section/infra/zones.js               |    4 +-
 ui/src/config/section/network.js                   |  121 +-
 ui/src/config/section/storage.js                   |   21 +-
 ui/src/layouts/UserLayout.vue                      |    5 +-
 ui/src/locales/index.js                            |    2 +-
 ui/src/main.js                                     |    8 +-
 ui/src/store/modules/user.js                       |    4 +-
 ui/src/utils/network.js                            |   51 +
 ui/src/utils/plugins.js                            |   29 +-
 ui/src/utils/quota.js                              |    4 +-
 ui/src/views/AutogenView.vue                       |    9 +-
 ui/src/views/compute/CreateAutoScaleVmGroup.vue    |   32 +-
 ui/src/views/compute/CreateSnapshotWizard.vue      |   13 +-
 ui/src/views/compute/DeployVM.vue                  |   84 +-
 ui/src/views/compute/DeployVnfAppliance.vue        |   62 +-
 ui/src/views/compute/EditVM.vue                    |   11 +-
 ui/src/views/compute/InstanceTab.vue               |    1 +
 ui/src/views/compute/StartVirtualMachine.vue       |    2 +-
 ui/src/views/compute/wizard/DeployButtons.vue      |  129 ++
 ui/src/views/dashboard/UsageDashboard.vue          |    8 +-
 ui/src/views/iam/DeleteAccount.vue                 |  176 +++
 ui/src/views/iam/DeleteAccountWrapper.vue          |   74 +
 ui/src/views/iam/RolePermissionTab.vue             |   28 +-
 .../views/image/AddKubernetesSupportedVersion.vue  |   15 +-
 ui/src/views/image/IsoZones.vue                    |    8 +
 ui/src/views/image/RegisterOrUploadIso.vue         |   24 +-
 ui/src/views/image/RegisterOrUploadTemplate.vue    |   21 +-
 ui/src/views/image/TemplateZones.vue               |    8 +
 ui/src/views/image/UpdateISO.vue                   |   15 +-
 ui/src/views/image/UpdateTemplate.vue              |   15 +-
 .../ChangeHostPassword.vue}                        |   60 +-
 ui/src/views/infra/ClusterAdd.vue                  |   17 +-
 ui/src/views/infra/ConfigureHostOOBM.vue           |  172 +++
 ui/src/views/infra/HostEnableDisable.vue           |   42 +-
 ui/src/views/infra/HostInfo.vue                    |   62 +-
 ui/src/views/infra/UsageRecords.vue                |    1 +
 ui/src/views/infra/zone/StaticInputsForm.vue       |    1 +
 ui/src/views/infra/zone/ZoneWizardAddResources.vue |   16 +-
 ui/src/views/infra/zone/ZoneWizardLaunchZone.vue   |    2 +-
 ui/src/views/network/CreateNetworkPermission.vue   |  124 +-
 ui/src/views/network/VpcTiersTab.vue               |   22 +-
 ui/src/views/offering/AddDiskOffering.vue          |    1 -
 ui/src/views/offering/AddVpcOffering.vue           |    8 +-
 ui/src/views/setting/ConfigurationValue.vue        |    2 +-
 ui/src/views/storage/ChangeOfferingForVolume.vue   |    2 +-
 ui/src/views/storage/CreateTemplate.vue            |  113 +-
 ui/src/views/storage/CreateVolume.vue              |    3 +
 ui/src/views/storage/TakeSnapshot.vue              |    9 +-
 ui/src/views/tools/ImportUnmanagedInstance.vue     |    6 +
 ui/src/views/tools/ManageInstances.vue             |   29 +-
 ui/src/views/tools/SelectVmwareVcenter.vue         |   69 +-
 ui/tests/common/index.js                           |    4 +-
 ui/vue.config.js                                   |    2 +-
 usage/pom.xml                                      |    2 +-
 .../java/com/cloud/usage/UsageManagerImpl.java     |   95 +-
 utils/pom.xml                                      |    2 +-
 utils/src/main/java/com/cloud/utils/HttpUtils.java |   51 +
 .../src/main/java/com/cloud/utils/StringUtils.java |   92 +-
 .../main/java/com/cloud/utils/net/NetUtils.java    |   24 +-
 .../java/com/cloud/utils/nio/NioConnection.java    |    1 -
 .../main/java/com/cloud/utils/script/Script.java   |   27 +-
 .../cloudstack/utils/redfish/RedfishClient.java    |   36 +-
 .../test/java/com/cloud/utils/HttpUtilsTest.java   |  142 +-
 .../java/com/cloud/utils/net/NetUtilsTest.java     |    4 +-
 .../utils/redfish/RedfishClientTest.java           |   12 +-
 vmware-base/pom.xml                                |    2 +-
 .../com/cloud/hypervisor/vmware/mo/BaseMO.java     |  148 +-
 .../vmware/mo/CustomFieldsManagerMO.java           |    7 +-
 .../cloud/hypervisor/vmware/mo/DatacenterMO.java   |  123 +-
 .../com/cloud/hypervisor/vmware/mo/HostMO.java     |   98 +-
 .../hypervisor/vmware/mo/HypervisorHostHelper.java |   22 +-
 .../hypervisor/vmware/mo/VirtualMachineMO.java     |  655 ++++++--
 .../cloud/hypervisor/vmware/util/VmwareClient.java |   22 +-
 .../vmware/util/VmwareClientException.java         |   33 -
 .../cloud/hypervisor/vmware/util/VmwareHelper.java |   13 +
 .../vmware/mo/HypervisorHostHelperTest.java        |   56 +-
 583 files changed, 13505 insertions(+), 6444 deletions(-)
 create mode 100644 api/src/test/java/com/cloud/cpu/CPUTest.java
 delete mode 100644 
core/src/main/java/org/apache/cloudstack/direct/download/HttpsMultiTrustManager.java
 create mode 100644 
engine/orchestration/src/test/java/com/cloud/agent/manager/ClusteredAgentManagerImplTest.java
 create mode 100644 
engine/orchestration/src/test/java/org/apache/cloudstack/engine/orchestration/DataMigrationUtilityTest.java
 copy 
engine/schema/src/main/java/com/cloud/upgrade/dao/{Upgrade41910to41920.java => 
Upgrade42010to42020.java} (52%)
 copy 
engine/schema/src/main/resources/META-INF/db/{schema-41110to41120-cleanup.sql 
=> schema-42010to42020-cleanup.sql} (94%)
 copy engine/schema/src/main/resources/META-INF/db/{schema-302to40-cleanup.sql 
=> schema-42010to42020.sql} (74%)
 create mode 100644 
engine/schema/src/test/java/com/cloud/storage/dao/VMTemplateDaoImplTest.java
 create mode 100644 
engine/schema/src/test/java/com/cloud/upgrade/SystemVmTemplateRegistrationTest.java
 create mode 100644 
engine/storage/image/src/test/java/org/apache/cloudstack/storage/image/SecondaryStorageServiceImplTest.java
 create mode 100644 
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVmIpAddressCommandWrapperTest.java
 delete mode 100644 
plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcHostsCmd.java
 delete mode 100644 
plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVmwareDcItems.java
 delete mode 100644 
plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/VmwareRequestResponse.java
 copy 
plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/{XenServer600Resource.java
 => XcpServer83Resource.java} (87%)
 copy 
plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/{XenServer600Resource.java
 => Xenserver84Resource.java} (87%)
 create mode 100644 
plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCleanupVMCommandWrapper.java
 create mode 100644 
plugins/hypervisors/xenserver/src/main/java/com/xensource/xenapi/ConnectionNew.java
 create mode 100644 
plugins/integrations/kubernetes-service/src/test/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorkerTest.java
 create mode 100644 
plugins/network-elements/internal-loadbalancer/src/test/java/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImplTest.java
 copy scripts/vm/hypervisor/xenserver/{xcposs => xcpserver83}/NFSSR.py (90%)
 mode change 100644 => 100755
 copy scripts/vm/hypervisor/xenserver/{xcpserver => xcpserver83}/patch (90%)
 copy scripts/vm/hypervisor/xenserver/{ => xenserver84}/cloud-plugin-storage 
(97%)
 copy scripts/vm/hypervisor/xenserver/{ => xenserver84}/cloudstack_pluginlib.py 
(95%)
 copy scripts/vm/hypervisor/xenserver/{ => xenserver84}/ovs-vif-flows.py (84%)
 copy scripts/vm/hypervisor/xenserver/{xenserver65 => xenserver84}/patch (89%)
 copy scripts/vm/hypervisor/xenserver/{ => xenserver84}/swift (98%)
 mode change 100755 => 100644
 copy scripts/vm/hypervisor/xenserver/{ => xenserver84}/vmops (76%)
 copy scripts/vm/hypervisor/xenserver/{ => xenserver84}/vmopsSnapshot (94%)
 mode change 100755 => 100644
 copy scripts/vm/hypervisor/xenserver/{ => xenserver84}/vmopspremium (95%)
 create mode 100644 
server/src/test/java/com/cloud/consoleproxy/ConsoleProxyManagerImplTest.java
 copy 
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/ResourceTest.java
 => 
server/src/test/java/org/apache/cloudstack/storage/heuristics/presetvariables/AccountTest.java
 (62%)
 copy 
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/ResourceTest.java
 => 
server/src/test/java/org/apache/cloudstack/storage/heuristics/presetvariables/DomainTest.java
 (70%)
 copy 
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/ComputingResourcesTest.java
 => 
server/src/test/java/org/apache/cloudstack/storage/heuristics/presetvariables/GenericHeuristicPresetVariableTest.java
 (68%)
 copy 
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/ComputingResourcesTest.java
 => 
server/src/test/java/org/apache/cloudstack/storage/heuristics/presetvariables/SecondaryStorageTest.java
 (61%)
 copy 
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/ComputingResourcesTest.java
 => 
server/src/test/java/org/apache/cloudstack/storage/heuristics/presetvariables/SnapshotTest.java
 (64%)
 copy 
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/ComputingResourcesTest.java
 => 
server/src/test/java/org/apache/cloudstack/storage/heuristics/presetvariables/TemplateTest.java
 (59%)
 copy 
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/ComputingResourcesTest.java
 => 
server/src/test/java/org/apache/cloudstack/storage/heuristics/presetvariables/VolumeTest.java
 (65%)
 create mode 100644 ui/.env.qa
 create mode 100644 ui/src/components/widgets/InfiniteScrollSelect.vue
 create mode 100644 ui/src/utils/network.js
 create mode 100644 ui/src/views/compute/wizard/DeployButtons.vue
 create mode 100644 ui/src/views/iam/DeleteAccount.vue
 create mode 100644 ui/src/views/iam/DeleteAccountWrapper.vue
 copy ui/src/views/{iam/ChangeUserPassword.vue => infra/ChangeHostPassword.vue} 
(69%)
 create mode 100644 ui/src/views/infra/ConfigureHostOOBM.vue
 delete mode 100644 
vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareClientException.java

Reply via email to