You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2025/10/21 09:26:36 UTC

(cloudstack) branch DaanHoogland-patch-7 updated (4027aae2ceb -> 103629bcf2e)

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

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


 discard 4027aae2ceb improve package path
 discard 2683df427ac Change Python version from 3.12 to 3.10
 discard 5cbe343fa8c Downgrade Python setup action to version 5
 discard 574c94eb702 Update Python version to 3.12 in CI workflow
 discard b6af1404d48 Update CI dependencies to use netcat-openbsd
 discard c4170a6bcfe Update CI workflow to use Ubuntu 24.04
    omit f63118c011e Add erikbocks as a collaborator (#11863)
    omit 4cdcde2fe7a server: do not return extension path to non root admins (#11856)
    omit d8766418e01 extensions: custom action entity access
    omit e7a55a766c5 Fixes for Import VM Tasks listing (#11841)
    omit 8b9f5fd8f96 Merge branch '4.20'
    omit 0e8b0b8e406 Allow counters to be created with same name, provider and source as a deleted one (#10223)
    omit f4b6a74a94a Add support for CSI driver in CKS (#11419)
    omit 046014b4c55 NAS BnR: Create Instance from Backup issues (#11754)
    omit c0a4392b053 Fix volume copy from primary to primary in simulator (#11836)
    omit f71d3a8e9fe update the developers guide link on the API page (#11832)
    omit 9e535e35d27 Support xz format for template registration (#11786)
    omit dfcbd2e9772 server: consistent behaviour for list apis with project=-1 (#11767)
    omit a574f7ac99c Add logs for host removal (#10423)
    omit c9ce6e305c1 ui: Allow edit source CIDR on load balancer rule (#11766)
    omit 5e7ae227d3a UI: Prevent exceptions when network service provider that's disabled is viewed (#11413)
    omit 0ca63f36a52 api,server,ui: allow cleaning up external details for host and serviceoffering (#11548)
    omit 349feebd151 Standardize Markdown headings; enforce MD003 with markdownlint (#11688)
    omit cdb0604e7b6 pre-commit: enforce mixed-line-ending for all files (#11667)
    omit e27528f8b2a Update GitHub Actions (#11664)
    omit 22ba8dd504d Remove misspelled file not found from rat excludes (#11665)
    omit 0ca267f5166  Allow uploading of ISO for creating kubernetes supported versions  (#9561)
    omit 8464e46b53f PR #11778 with changes for main branch (#11781)
    omit 0e93ae3bdf5 UI: Add validator for CIDR being passed (#11465)
    omit a5a934dac14 pre-commit: add hooks `check-illegal-windows-names` and `file-contents-sorter` (#11662)
    omit 136ea3eafac UI: Removal of UI blockage to access the `changeOfferingForVolume` API (#10135)
    omit 1e23d6bc205 server: enable KVM volume and VM snapshot by default (#11446)
    omit 162c45f8fa9 api/server: list networks by name (#11470)
    omit 0b9afe77cac Enforce distinct hostnames network (#10212)
    omit cc6ee906d51 Markdown: add documentation on pre-commit usage (#11680)
    omit b106d6e190b VMware to KVM Migrations improvements (#11594)
    omit b99a03092f2 Added Extension for MaaS integration in CloudStack (#11613)
    omit df49c4f14bf UI: Move Backup Repository to Infrastructure (from Configuration) (#11738)
    omit 67250d99d44 ui: fix add host form state on submit (#11815)
    omit 2b1f0bbbdbd UI: Fix for cluster addition in VMware (#11812)
    omit 973819dad61 API: Add support to list all snapshot policies & backup schedules (#11587)
    omit f67b738eb3d Migrate volume improvements, to bypass secondary storage when copy volume between pools is allowed directly (#11625)
    omit a6ef24d1679 server: consistent domainpath in api responses (#11589)
    omit 6089c161a6c Merge remote-tracking branch 'apache/4.20'
    omit cc3170577c1 Add `Hypervisor default` as cache mode for disk offerings (#10282)
    omit a15fbd9bcc8 refactor: remove use of term entry-point from extensions code base (#11488)
    omit 09b63bc2e82 Storage pool response improvements (#10740)
    omit d2615bb142c Add support for providing userdata to system VMs (#11654)
    omit 858663fcf7c UI: fix missing comma at end of line
    omit 5f63e8493c5 Merge branch '4.20'
    omit 9bcd98876d6 Make kvm domain persistent when unmanaged from CS (#11541)
    omit b7a11cb203a NAS backup provider: Support restore from backup to volumes on Ceph storage pool(s), and take backup for stopped instances with volumes on Ceph storage pool(s) (#11684)
    omit 5a8a1e27e10 Fixed and enhanced vlan field validation in the UI (#10983)
    omit b09f3e8ff7e ui: fix overflow for value in DetailInput (#11771)
    omit 1efa46cb4d1 fix removeUsage for backups (#11522)
    omit cd12fa58482 Add UUID field for LDAP configuration (#11462)
    omit 7dd0d6e9377 add ConfigDrive to datasource_list in SharedfsVM (#11726)
    omit 2a802a31435 Extensions: use home directory of cloud user instead of /var/lib/cloudstack/management/ (#11732)
    omit d60f455b00e Fix detection of Mi3xx GPUs (#11715)
    omit 3159fa7d84e noVNC: make show dot configurable (#11741)
    omit 9cc88b8dccc CKS: fix control plane endpoint IP (#11720)
    omit 2c1aad4db8c Merge remote-tracking branch 'apache/4.20'
    omit 928972f7676 extension/proxmox: add console access for instances (#11601)
    omit ec533cd24d9 Add support EL10 (#11546)
    omit 23c9e830473 Create Instance from backup on another Zone (DRaaS use case) (#11560)
    omit b0c77190066 ui: do not show admin only options to users while registering template (#11702)
    omit e78b5cc3cc9 Merge remote-tracking branch 'apache/4.20'
    omit 4884f52c908 ui: allow provisioning backups during instance deploy (#11612)
    omit d9abc078cfd ui: fix build on latest Ubuntu and macOS (#11259)
    omit 22bf8fd5d14 Merge remote-tracking branch 'apache/4.20'
    omit 69998f7c40f api,server: support templatetype when upload template from local (#11682)
    omit aca8732102f [router] make a distinction between fatal errors, warnings and unknown as healthcheck result (#10710)
    omit 3ef25569000 Fix scaleKubernetesCluster API (#11652)
    omit e6c7a71d40e Add yamllint pre-commit hook for YAML file standardization (#11017)
    omit a466750d3b4 Add cleanup for tiers dropdown on assignVIrtualMachine API form (#11464)
    omit a452dc6543f chore(markdown): use https on links (#11676)
    omit 8eb6ddd9203 Fix inactive VPCs deletion (#11618)
    omit 0526ec0d82a PULL_REQUEST_TEMPLATE standardize case of types of changes (#11663)
    omit 0108ffd1b00 java: fix one typo in many files (#11284)
    omit 6eb27da5e4d Fix spelling in Java and Python files; update the ignored words list `codespell.txt` (#11285)
    omit 33cfedee46d pre-commit add hook `check-shebang-scripts-are-executable` for Shell (#10150)
    omit f9a72de5004 misc: pre-commit auto remove unneeded trailing whitespace (#11289)
    omit e7015cbc4c7 Move console proxy related global settings to Zone level (#11415)
    omit 273ae032743 Allow updating of Load Balancer source CIDR list (#11568)
    omit 57309314a1a pre-commit: clean up Python flake8 excludes with black (#9793)
    omit 0d9c5065de6 Add CodeQL Analysis for GitHub Actions (#11300)
    omit ada750e391b Merge branch '4.20'
    omit 96ccd7e6c5b Filter netris vNets only by VPC ID as filter by site isn't working as expected on netris end (#11617)
    omit 96cabf7e436 [KVM] Allow passing the OS type machine for KVM XML domains through VM setting (#11569)
    omit 23a53e213eb Add LB service to Custom Netris VPC/Network offerings (#11410)
    omit 9317a465134 Add all workflow buttons to README (#11406)
    omit 70a4503ea16 Merge remote-tracking branch 'apache/4.20'
    omit b46e29dc677 Improvement: SSL offloading with Virtual Router (#11468)
    omit 8089d327403 Merge remote-tracking branch 'apache/4.20'
    omit 3d6ec29c9bb Don't show backup in list_capacity for dummy plugin or if backup_framework is disabled (#11485)
    omit 66a584624f7 Update md5sum to sha512sum (#11134)
    omit 3ddd8023d0a ui: fix extension path with name having special characters (#11489)
    omit 76ef8d31f8a make server threads configurable with server.properties file (#11540)
    omit abe41add86d Merge remote-tracking branch 'apache/4.20'
    omit 574ed7857b3 .github: Update to JDK 17 in ci.yml and build.yml (#11030)
    omit ca0c3530ad0 utils: add UuidUtils.nameUUIDFromBytes (#11136)
    omit ba42d251624 packaging: add pre-check.sh (#11135)
    omit 9184170b01d Remove Domain/IP from Password Reset Link to custom Global Setting (#11379)
    omit 3c4f4588192 Merge remote-tracking branch 'apache/4.20'
    omit 889fc62b605 schema: Add upgrade path from 4.21.0.0 to 4.22.0.0 (#11469)
    omit 2eb80e0361f Merge branch '4.20'
    omit 2105794f61d UI: Hide User Card from config.userCard.enabled option (#10545)
    omit cbc614d8e33 Add logs to keystore-setup and fix password regex (#10723)
    omit 5da7d2d01ef scripts: fix external provision to use correct power state & hyperv powersync (#11504)
    omit e5e902a3208 tools: fix 4.22.0.0-SNAPSHOT
    omit 1033be4b31f Updating pom.xml version numbers for release 4.22.0.0-SNAPSHOT
    omit f9513b47bf8 Updating pom.xml version numbers for release 4.21.0.0
    omit 1272b130878 Fix of create a template from a StorPool snapshot on another zone (#11490)
    omit e0bc8c3b1a5 Merge branch '4.20'
    omit f2d635683bf Update error message when no snapshot strategy is found while creating snapshot (#11455)
    omit 5a90da32760 Fix for PowerFlex MDM configuration on host while preparing the SDC connection (#11458)
    omit f671461d4c9 Fix for create template from snapshot (for snapshots on primary storage and storage doesn't support create snapshot to template directly) (#11452)
    omit ba2d70ab214 [KVM] CPU Features for System VMs (#10964)
    omit 2c34f5e4954 Merge branch '4.20'
    omit 93d6ff3a7d0 Proxmox: fix restore snapshot with memory (#11450)
    omit 03da8cbd3e0 server: fix conserve_mode of DefaultIsolatedNetworkOfferingForVpcNetworks (#11133)
    omit 0b381d4270e Exclude External hypervisor type during upgrade for System VM template checks (#11435)
    omit 2c493d19336 Add support for nvidia vGPU support with vendor specific framework (#11432)
    omit 9fd2b90b80d Fix ConfigurationVO load exception after schema change (#10485)
    omit 96728c5a17d Merge branch '4.20'
    omit e57e8cf4189 Network rate must be multiplied by 125 not 128 (#10645)
    omit 1994511f0c9 noVNC: Show a dot cursor when the cursor is not visible (#11418)
    omit 99919fda7f0 Merge branch '4.20'
    omit 53b026487fb UI: Fix duplicate edit zone button on Basic zones (#11427)
    omit 26218b093ea Fix edit of compute offering in UI (#11417)
    omit 7d59bfe2b59 [UI] Fix zone creation wizard stuck on configuring public traffic (#11404)
    omit dc5e475bd2d Fix of deployment VM from a copied snapshot in another zone (#11351)
    omit ae95be3702f Merge branch '4.20'
    omit fe8f3c8eeb5 get forward header for proxies and apply it in Jetty (#11386)
    omit f020b5b5df9 cleanup: remove com.cloud.user.MockAccountManagerImpl (#11392)
    omit 4c3f29de1e1 Agent manager connection handling improvements (#11376)
    omit d7b7bd53adf Fix infrastructure leak on exception while attaching/detaching volumes in VMware (#10860)
    omit 15740136dc0 Merge branch '4.20'
    omit 80f837b5e71 remove volume size check in restoreBackupToVM (#11384)
    omit d601c176f16 Merge branch '4.20'
    omit ca8ce8c8853 Merge branch '4.20'
    omit 9712b4d322a custom AccessLogger (#9733)
    omit e5f61164b34 Support of snapshot copy to primary storage in different zones. (#9478)
    omit 5cac4f6c448 added online/offline copy method for Primera storage adapter (#11298)
    omit 4a4b5a5e5fb Improve volume backup restoration log (#11181)
    omit ccd86d96d90 ceph: fix SignatureDoesNotMatch by using correct secret key (#11115)
    omit a84c4cb3512 Merge branch '4.20'
    omit db63d2428bd Netris: Fix Netris provider parameter name and response (#11377)
    omit 9de77e1cc13 API to list console sessions (#11016)
    omit 5c1bf4a4ce8 Merge branch '4.20'
    omit d4229d3105c Fix failing simulator vgpu test (#11374)
    omit b2ce1fb9c3c ui: fix initial pagination for images in deploy forms (#11349)
    omit 44f80648a9e agent: increase timeout for host arch retrieval (#11254)
    omit b479d37b870 ui: fix api type in InfiniteScrollSelect (#11370)
    omit a60c8cab144 api,server,ui: allow listing events by state (#11355)
    omit adccdf2c7be UI support for deploy a VM from volume/snapshot (#11164)
    omit 5aa15187b66 Refactoring StorPool tests (#11107)
    omit bcd738caa60 Fix GPU discovery script to make it run with mdev for SR-IOV enabled devices (#11340)
    omit e805e45342a Show chain size in snapshot response for incremental snapshots (#11313)
    omit 9f5828a0270 UI: Fix cpu & memory details on list view for unmanaged k8s clusters (CAPC) (#11353)
    omit 8ac8a221630 Merge branch '4.20'
    omit 5ea1ada59a4 Allow full clone volumes with thin provisioning in KVM (#11177)
    omit f62b85dffee fix fsvm-init.yml to detect virtio-scsi in kvm (#11070)
    omit a87c5c2b3a5 Create new Instance from VM backup (#10140)
    omit b9febe4b4fc Merge branch '4.20'
    omit 6b9615b2f9e Selected type on update traffic type is based on chosen type in traffic types tab (#10902)
    omit f58372e97b5 [UI] Use GET request method for list API calls (#11354)
    omit 1f1e38f3a85 Support to list templates in ready state (new API parameter 'isready', similar to list ISOs) (#11343)
    omit 712492230ae Shutdown MS maintenance jobs when finished (#11330)
    omit 70468a62584 Merge branch '4.20'
    omit f73cb5621df Refactoring retention of backup schedules (#11223)
    omit 76cfcb48fbf Merge branch '4.20'
    omit 8497f70b46c ui: make events tab selected columns persistent using cache (#11317)
    omit da3ba17884e Fix build and ui build errors in main (#11332)
    omit 2bffabba7b1 Fix unit tests after merge forward
    omit 8429223782d missing imports from merge forward
    omit 0b3959221b5 Merge branch '4.20'
    omit f2bda464193 Upgrade noVNC from 1.4.0 to 1.6.0 (#11119)
    omit 86827f871d2 Update CIDR/Gateway of the Shared Networks from Guest IP ranges (#11249)
    omit f6ad184ea2d Feature: Add support for GPU with KVM hosts (#11143)
    omit b92c1965b97 README: add `Contributors Avatars` and `Star History` (#11311)
    omit 4aed972e78c api,server,extensions: allow updating extension resource map details (#11303)
    omit 9fee6dae34c Fix local storage pool disconnect issue (#11200)
    omit d693736ee82 ui: fix NAN% used memory for vm (#11307)
    omit 524f0d80db0 server: fix NaN values for external resource metrics (#11302)
    omit 45edf82efaf [UI] Fix for local storage enable/disable toggle in edit zone (#11309)
    omit 1a9efe8de3c Add unit tests for getConfigResources in ModuleDefinitionSet and improve context readability (#11042)
    omit 21dde2b9a28 [DB] Add force recreate parameter to cloudstack-setup-databases script (#11239)
    omit cca8b2fef90  Extensions Framework & Orchestrate Anything (#9752)
    omit 217ff27650f ui: fix compute offering edit (#11232)
    omit 407072ffd43 schema,framework/db,server: fix user_vm_details usage (#11292)
    omit 13892e2ff06 [CKS] Create Kubernetes ISO support for ARCH optional parameter (#10986)
    omit 0d4147f3f63 Netris Network Plugin Integration with CloudStack (#10458)
    omit ae501037047 Config 'vm.network.nic.max.secondary.ipaddresses' - Sync default value (and value if not set) to 10 as per the config description and default value in parseInt of the config (#11256)
    omit 074f75838e4 Fix pre-commit warnings for deprecated stage names (#11276)
    omit 935c568082c Merge fix for UI
    omit 11455f6d49c UI: Add option to Login to a specific Project view via setting on config.json (#10935)
    omit 22b753e9302 [UI] Deploy VM: Preselect first available template (#11207)
    omit 83bccead3db schema, refactor: rename cloud.user_vm_details to cloud.vm_instance_details (#10736)
    omit 7da5f9002b2 misc: fix typo `sercurity` -> `security` (#10966)
    omit 071e612f404 UI: Fix OS Type displayed for a VM (#11075)
    omit 1fbe1d76827 pre-commit: add gitleaks to detect hardcoded secrets (#11064)
    omit 165ab0aabe2 Fix HTML license; standardize HTML code (#11067)
    omit fb3bb3fd568 pre-commit: upgrade markdownlint to the latest version (#11066)
    omit 6d5cefdfe94 add since parameter to BackupScheduleResponse (#11265)
    omit d63899fc8a4 Set Content-Type from the file type (#11093)
    omit 666784f4e57 ovm deprecation (#11196)
    omit a710ff8c6db UI: Fix ISO Hypervisor selection (#11261)
    omit 9d049707d5e Fix deletion of backup schedules (#11222)
    omit e7172161dd2 Guard OS type update for iso/template with existing vms (#11215)
    omit 6ad92964120 Fix KVM incremental snapshot removal when using multiple secondary storages (#11180)
    omit c5da9e6188c Update .asf.yaml re-add sudo87
    omit 1003c8034c1 Update .asf.yaml remove sudo87
    omit 3687032ed68 Update .asf.yaml re-add rosi
    omit a849b822c21 Update .asf.yaml: remove new committer Bernardo (#11231)
    omit 15c09af5cc7 UI: Fix traffic Label on Zone creation wizard for VMware (#11101)
    omit b57994eeb0d Merge branch '4.20'
    omit 65d359228dc Allow populating generic templates during Zone Deployment (#10947)
    omit 53eb2c5b9b7 File-based disk-only VM snapshot with KVM as hypervisor (#10632)
    omit bb75abcffa2 Usage parsers refactoring (#11097)
    omit 3220eb442a5 PowerFlex/ScaleIO - MDM and host SDC connection enhancements (#11047)
    omit 84b807eeee1 [CKS] Simplify logic for scaling CKS cluster service offerings (#11063)
    omit f52e05863e6 UI fix api in project view (#11191)
    omit e8ab0ae70a7 CPU to Memory weight based algorithm to order cluster  (#10997)
    omit fb6adacc512 GUI whitelabel runtime system (#8942)
    omit 60597241897 Hide CloudStack version from XML response when unauthenticated (#10575)
    omit 54b44cc316e KVM: Option to deploy a VM with existing volume/snapshot (#10503)
    omit 0dbd761fbbd Merge branch '4.20'
    omit 4d46bece4a7 fix priority for volume copy operation (#11109)
    omit f9588960d43 Refactor: Replace sleep() with wait() (#10504)
    omit 51126a7c105 iteration optimized (#10576)
    omit 8e4fe1c370e Allow configuring Announcement banner by admin (#10951)
    omit 749ddb975f1 Support ApiServer to enforce POST requests for state changing APIs and requests with timestamps (#10899)
    omit d5fd3ec36ea Add API command remove management server (#10325)
    omit 3e3a0c06781 Merge branch '4.20'
    omit be22bfe2c9d Management Server - Prepare for Maintenance and Cancel Maintenance improvements (#10995)
    omit 16c60c7528a Support Direct Download on Ceph (#11069)
    omit 0bd35a54031 ui: fix missing changes from #10814 (#11060)
    omit 5b7c3b475e3 docs: Update INSTALL.md for frontend build instructions (#11057)
    omit 6adfda2818e CKS Enhancements (#9102)
    omit 4662ffc4243 Changes baseurl for downloading kubectl (#11040)
    omit f8c4121ea34 Add access modifiers to `VirtualMachineTO` (#9277)
    omit 6aaaa838b25 docs: revise INSTALL.md with updated Maven setup (#11025)
    omit ea7919b0c1c Remove test/selenium/ test/src-not-used/ (#11013)
    omit e83a347ace0 Improves StoragePoolAllocators' logs (#10475)
    omit 28ff19b7516 enabled discard option (#10077)
    omit 685ee9e78f6 StorPool: support for direct download (#9833)
    omit 7f13beb36a7 Check Qcow2 version before using --bitmaps (#10896)
    omit 380884ed500 Fix data being replicated on VM's metadata file in the VR (#10987)
    omit 675ee2ab398 Add parameter to not create additional users on `cloudstack-setup-databases` (#9969)
    omit 28e24111100 engine-schema: fix naming for AlmaLinux (#11011)
    omit 4a672fd9b35 docs: fix outdated Maven subtitle in INSTALL.md (#11012)
    omit 2d669dbe548 engine-schema: fix duplicate statements in upgrade path (#11001)
    omit 40b0e7cd63c ui: fix build after forward merge (#11010)
    omit 5c0346ea866 Adding device ID to a StorPool volume (#10587)
    omit a13728360bc Fix issue with forward merge
    omit 875223c5b4f Merge branch '4.20' of https://github.com/apache/cloudstack
    omit bce17b627d1 ui,api,server: template categorization based on os (#10773)
    omit 41b4f0afd53 ui: missing changes from #10115 (#10949)
    omit fa85a75bc88 Log previous and new value of configuration when reset/update API is called (#10769)
    omit 7632814cd20 Instance lease: Allow deployment of instances with lease duration and leaseexpiry action (#10560)
    omit 650b5ec3dab Merge branch '4.20'
    omit 99863c2fa5a Imporve socketChannel closing in NioConnection (#10895)
    omit f496ed6eaf1 Merge branch '4.20' of https://github.com/apache/cloudstack
    omit 97c96a55ba9 .github: fix sonar checks (#10894)
    omit 96b8e23767e kvm: fix vm deployment from RAW template (#10880)
    omit 842b2f8c243 Merge remote-tracking branch 'apache/4.20'
    omit b17808bfba1 Introducing Storage Access Groups for better management for host and storage connections (#10381)
    omit d5ba23c8482 Introduce volume allocation algorithm global configuration (#10696)
    omit 7bab40db6f5 disabled create and add volume button for VMs in Error state (#10859)
    omit 572fc11a64a [PowerFlex] Add & Remove PowerFlex/ScaleIO MDMs for the storage SDC connections (#9903)
    omit 64828f66e81 Merge branch '4.20'
    omit 6fdaf51ddc0 KVM incremental snapshot feature (#9270)
    omit 1e5d1330336 Merge branch '4.20' of https://github.com/apache/cloudstack
    omit 39c5641cbe6 Merge branch '4.20' of https://github.com/apache/cloudstack
    omit fd74895ad05 New feature: Reconcile commands (CopyCommand, MigrateCommand, MigrateVolumeCommand) (#10514)
    omit d7d9d131b2d Merge branch '4.20'
    omit c2259cef5d2 docs: correct outdated Maven link in install.md (#10800)
    omit 2df1ac51068 Merge branch '4.20' of https://github.com/apache/cloudstack
    omit 576b97ba221 Merge branch '4.20' of https://github.com/apache/cloudstack
    omit ffc0d516161 Merge branch '4.20' of https://github.com/apache/cloudstack
    omit 193d6ef52f5 Merge branch '4.20' of https://github.com/apache/cloudstack
    omit 55ca1145251 Merge branch '4.20'
    omit 190f8b8ab57 Merge release branch 4.20 to main
    omit aa4718a3010 Fix merge error: use new method of getting scoped vars (#10751)
    omit 3c75d9363b7 Merge branch '4.20'
    omit 55c811547a8 Update Mockito to 5.16.1 (#10686)
    omit 41e881ea01c added: rosi as a contributor (#10724)
    omit b2b2218a8ab Launch RESIZE event on volume snapshot revert (#10482)
    omit 4d572fa6d38 Merge branch '4.20' of https://github.com/apache/cloudstack
    omit 4c31f9d533e Merge release branch 4.20 to main
    omit f275c28838d test(python): fix code comment typo; Valiate -> Validate (#10536)
    omit f206137f833 docs: fixes grammar and spelling in Markdown files only (#10656)
    omit fd3d605dd1b Add sudo87 as collaborator (#10654)
    omit 0934fb1b53e docs: fix grammar and spelling in CONTRIBUTING.md (#10642)
    omit 806737068bb Update .asf.yaml
    omit ba835541abe Update .asf.yaml
    omit cb4848bc1a6 Add support to RBD erasure code pools (#9808)
    omit 2dfe6a63337 Update .asf.yaml
    omit 99b6f45a87b Update .asf.yaml
    omit 5e8238c3820 noop Update of .asf.yaml
    omit 8d18c1e7887 Change resource settings tab to be type based (#10596)
    omit 8af021c6f63 Merge branch '4.20'
    omit f47bd61279c framework/cluster: fix NPE for ms-host status when mgr stops (#10500)
    omit 7f3f1042959 add UI support for filtering ISOs by account (#10488)
    omit 8a338ea12c3 In Install.md->CloudStack UI Commands(npm) (#10593)
    omit 9a3fa89e323 remove trailing white space
    omit a521985662a [Infra] reset collaborators list
    omit e6b2df2e0ff [Infra] reset collaborators
    omit 9dceae46148 MS maintenance improvements (#10417)
    omit ea36568e47b Merge branch '4.20' of https://github.com/apache/cloudstack
    omit 1732f676db8 Merge branch '4.20' of https://github.com/apache/cloudstack
    omit 9c6f2a9e14c Merge release branch 4.20 to main
    omit b387bc1664c Merge branch '4.20' of https://github.com/apache/cloudstack
    omit d94aaa8b597 Add Cloudian HyperStore Object Storage (#9748)
    omit 1c1dad977e5 Merge remote-tracking branch 'apache/4.20'
    omit eab37eca437 Change L2 network offering form to not require a compute offering (#10389)
    omit 69cf299c62a Merge remote-tracking branch 'origin/4.20'
    omit 3a28a87483e Merge branch '4.20' of https://github.com/apache/cloudstack
    omit 48f890a6931 resolve merge problems in the backup framework (#10457)
    omit 24b7c662519 Merge branch '4.20'
    omit a8b18a53942 Add nicoschmdt as a project collaborator (#10422)
    omit 864751d5f99 Fix ordering of secondary storages with the algorithm `firstfitleastconsumed` (#8557)
    omit 617fee84165 Add `offerHa` and `forceHa` preset variables to `RUNNING_VM` usage type (#9500)
    omit a093f00ab52 Add IOPS and bytes preset variables to `VOLUME` usage type (#10326)
    omit 2a4a1f73d04 Support multi-scope configuration settings (#10300)
    omit f8563b86e7d Fix NPE during kubernetes cluster creation when network has rules with ports saved as null on DB (#9223)
    omit 0dcb8da03a2 Merge branch '4.20'
    omit 0a92cc03496 UI: Add VM state to Volume list view (#10341)
    omit a7beaaf73b8 Add Resource Limits to Backups and Object Storage (#10017)
    omit 648170cf9bb Fix lint error coming up in main (#10342)
    omit 2ef16132ee9 Merge remote-tracking branch 'origin/4.20'
    omit 22c71928dd2 Change debian packages maintainer (#10321)
    omit cd81398cb71 removing inactive collaborators from .asf.yaml (#10298)
    omit 2654890e868 Merge branch '4.20'
    omit 7abda3b9639 Merge remote-tracking branch 'apache/4.20'
    omit 4cf6fc95f22 Revert Holiday season Apache logo (#10302)
    omit 5df15a7aa62 KVM/s390x Support:  Add support for KVM on s390x architecture (#10038)
    omit 398ffc3b2c7 Add preset variable account created (#10200)
    omit 3b108b968f0 Support for Management Server Maintenance Mode (#9854)
    omit 048649d3515 Merge release branch 4.20 to main
    omit 789e2699406 Add lucas-a-martins as a project collaborator (#10283)
    omit 98f56639541 Merge branch '4.20'
    omit 81e052cfebf Merge release branch 4.20 to main
    omit 1c626c884c6 Update bug.yml
    omit ecd60a4e461 Merge release branch 4.20 to main
    omit 0ed6895db4f feature and bug templates (#10186)
    omit 449d3c7cb1d Create API to list Quota credits (#9590)
    omit 0c13ded943c Merge release branch 4.20 to main
    omit baad8ddc914 network: Add BGP+EVPN+VXLAN script to main repository and Agent package (#9778)
    omit bd874eaa44e Merge release branch 4.20 to main
    omit fadb39ece73 Merge release branch 4.20 to main
    omit d1cf45365a6 Revert "pre-commit: add hook `check-yaml` (#9133)" (#10161)
    omit 30b2588c062 Merge release branch 4.20 to main
    omit 5bae1188ff6 pre-commit fix mixed line endings in XML files (#10148)
    omit 0f3ea8ceb2e Add pre-commit hook `fix-byte-order-marker` (#10147)
    omit 2b070880c10 pre-commit check `.cfg` files with the trailing whitespace hook (#10151)
    omit fd24509ba7e pre-commit: fix `.cs` files with the `trailing-whitespace` hook (#9794)
    omit 0128046429f pre-commit update markdownlint; enable rules MD009,MD019; fix license header (#10145)
    omit 0b66f5a86a7 pre-commit: remove trailing-whitespace from more file types (#10131)
    omit 57867dc6b03 pre-commit: add hook `check-yaml` (#9133)
    omit 2daffa34f22 Merge release branch 4.20 to main
    omit b48de4e0234 pre-commit: enable `markdownlint` rule `MD018` (#9134)
    omit 6a2c7b02201 pre-commit: enable markdownlint rule `MD012` (#9364)
    omit 631bba279b1 README: it's that time of the year! (#10125)
    omit 0b2952ca43f Merge release branch 4.20 to main
    omit ee893d12027 Clean up Python code; Python `2` to `3` (#8993)
    omit b1ba9bf626d text in echo change in git-pr
    omit 9295a1624df Merge release branch 4.20 to main
    omit 73c3339bf15 List users by their authentication source (#10115)
    omit 54bc1501402 fix typo in SnapshotManager.java (#10104)
    omit 91ab67c9522 Add logs to VMware instance configuration process (#9080)
    omit f75a194c095 Persist IP addresses related to VM access via CPVM (#9534)
    omit c94d0abab49 Merge remote-tracking branch 'origin/4.20'
    omit cb530c1749d Merge remote-tracking branch 'origin/4.20'
    omit 27d2de180ff Merge release branch 4.20 to main
    omit 97f9e8e8163 Merge release branch 4.20 to main
    omit 205ebfb8b5d Merge release branch 4.20 to main
    omit 4ac4d9cf29a API to validate Quota activation rule (#9605)
    omit 9b6f9b5f7d8 Merge release branch 4.20 to main
    omit da94ae2c1c5 Merge remote-tracking branch 'apache/4.20'
    omit ef6c0c443d6 Prepend VPC name to VPC network tier name (#9780)
    omit 546ef31aedb UI: Add UI support for `forvpc` and `guestiptype` parameters of the `listNetworkOfferings` API (#9947)
    omit db2e89a3a2c UI: make a newly added Network the default one (#9708)
    omit 528fca2f179 Added-cpu-core-and-memory-range-fot-type-offers-CustomConstrained (#9930)
    omit 26095e28ded Add support for telugu language (#9956)
    omit d9774a8462b Updating pom.xml version numbers for release 4.21.0.0-SNAPSHOT
     add 103629bcf2e Update CI workflow to use Ubuntu 24.04

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (4027aae2ceb)
            \
             N -- N -- N   refs/heads/DaanHoogland-patch-7 (103629bcf2e)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 .asf.yaml                                          |    18 +-
 .github/ISSUE_TEMPLATE/bug.yml                     |    46 -
 .github/ISSUE_TEMPLATE/feature_request.yaml        |    25 -
 .github/linters/.markdown-lint.yml                 |    18 +-
 .github/linters/.yamllint.yml                      |    31 -
 .github/linters/codespell.txt                      |     5 +-
 .github/workflows/build.yml                        |    15 +-
 .github/workflows/ci.yml                           |    24 +-
 .github/workflows/codecov.yml                      |     4 +-
 .github/workflows/codeql-analysis.yml              |    48 -
 .github/workflows/docker-cloudstack-simulator.yml  |     2 +-
 .github/workflows/linter.yml                       |     4 +-
 .github/workflows/main-sonar-check.yml             |     4 +-
 .github/workflows/rat.yml                          |     4 +-
 .github/workflows/sonar-check.yml                  |     4 +-
 .github/workflows/ui.yml                           |     4 +-
 .gitignore                                         |     4 +-
 .markdownlintignore                                |     1 -
 .pre-commit-config.yaml                            |    52 +-
 CHANGES.md                                         |    10 +-
 CONTRIBUTING.md                                    |    57 +-
 INSTALL.md                                         |    45 +-
 ISSUE_TEMPLATE.md                                  |     3 +
 PRE-COMMIT.md                                      |    43 -
 PULL_REQUEST_TEMPLATE.md                           |     7 +-
 README.md                                          |    30 +-
 agent/bindir/cloud-setup-agent.in                  |    55 +-
 agent/conf/agent.properties                        |    22 +-
 agent/conf/developer.properties.template           |     4 +-
 agent/pom.xml                                      |     2 +-
 agent/src/main/java/com/cloud/agent/Agent.java     |   230 +-
 .../src/main/java/com/cloud/agent/AgentShell.java  |    28 +-
 .../src/main/java/com/cloud/agent/IAgentShell.java |    11 +-
 .../cloud/agent/properties/AgentProperties.java    |    76 +-
 .../com/cloud/agent/resource/DummyResource.java    |     4 +-
 .../consoleproxy/ConsoleProxyResource.java         |     5 +-
 .../test/java/com/cloud/agent/AgentShellTest.java  |     2 +-
 api/pom.xml                                        |     2 +-
 api/src/main/java/com/cloud/agent/api/Command.java |    48 +-
 .../java/com/cloud/agent/api/VgpuTypesInfo.java    |   164 +-
 .../main/java/com/cloud/agent/api/to/DiskTO.java   |     6 +-
 .../com/cloud/agent/api/to/FirewallRuleTO.java     |     2 +-
 .../java/com/cloud/agent/api/to/GPUDeviceTO.java   |    33 +-
 .../com/cloud/agent/api/to/LoadBalancerTO.java     |     6 +-
 .../java/com/cloud/agent/api/to/NetworkTO.java     |     6 +-
 .../main/java/com/cloud/agent/api/to/NicTO.java    |     8 -
 .../cloud/agent/api/to/PortForwardingRuleTO.java   |     4 +
 .../com/cloud/agent/api/to/VirtualMachineTO.java   |   153 +-
 api/src/main/java/com/cloud/capacity/Capacity.java |     6 +-
 .../cloud/configuration/ConfigurationService.java  |    79 +-
 .../java/com/cloud/configuration/Resource.java     |    13 +-
 api/src/main/java/com/cloud/dc/Pod.java            |     2 -
 .../com/cloud/deploy/DeploymentClusterPlanner.java |     2 +-
 api/src/main/java/com/cloud/event/EventTypes.java  |   123 +-
 .../exception/OperationTimedoutException.java      |     2 +-
 api/src/main/java/com/cloud/host/Host.java         |     4 -
 api/src/main/java/com/cloud/host/Status.java       |     1 -
 .../main/java/com/cloud/hypervisor/Hypervisor.java |     1 -
 .../cluster/KubernetesServiceHelper.java           |     9 -
 api/src/main/java/com/cloud/network/IpAddress.java |     1 -
 api/src/main/java/com/cloud/network/Network.java   |     1 -
 .../main/java/com/cloud/network/NetworkModel.java  |     2 -
 .../java/com/cloud/network/NetworkService.java     |    13 +-
 api/src/main/java/com/cloud/network/Networks.java  |     3 +-
 .../com/cloud/network/RouterHealthCheckResult.java |     2 +-
 .../com/cloud/network/SDNProviderNetworkRule.java  |   358 -
 .../com/cloud/network/Site2SiteVpnConnection.java  |     2 +-
 .../network/VirtualNetworkApplianceService.java    |     4 -
 .../com/cloud/network/as/AutoScaleService.java     |     2 -
 .../com/cloud/network/element/NetworkElement.java  |     9 -
 .../element/PortForwardingServiceProvider.java     |    28 -
 .../com/cloud/network/element/VpcProvider.java     |     4 -
 .../java/com/cloud/network/guru/NetworkGuru.java   |     4 -
 .../network/lb/LoadBalancingRulesService.java      |    22 +-
 .../com/cloud/network/netris/NetrisLbBackend.java  |    41 -
 .../cloud/network/netris/NetrisNetworkRule.java    |   108 -
 .../com/cloud/network/netris/NetrisProvider.java   |    30 -
 .../com/cloud/network/netris/NetrisService.java    |   310 -
 .../java/com/cloud/network/nsx/NsxService.java     |     4 +-
 .../java/com/cloud/network/vpc/StaticRoute.java    |     5 +-
 .../com/cloud/network/vpc/StaticRouteProfile.java  |    22 +-
 api/src/main/java/com/cloud/network/vpc/Vpc.java   |     2 -
 .../java/com/cloud/network/vpc/VpcOffering.java    |     4 +-
 .../cloud/network/vpc/VpcProvisioningService.java  |     2 +-
 .../java/com/cloud/network/vpc/VpcService.java     |    10 +-
 .../main/java/com/cloud/offering/DiskOffering.java |     7 +-
 .../java/com/cloud/offering/DiskOfferingInfo.java  |     7 -
 .../java/com/cloud/offering/NetworkOffering.java   |     6 +-
 .../java/com/cloud/offering/ServiceOffering.java   |     4 -
 api/src/main/java/com/cloud/org/Cluster.java       |     2 -
 .../java/com/cloud/resource/ResourceService.java   |    15 +-
 .../java/com/cloud/resource/ResourceState.java     |     7 +-
 .../cloud/server/ManagementServerHostStats.java    |     5 -
 .../java/com/cloud/server/ManagementService.java   |    36 +-
 .../java/com/cloud/server/ResourceIconManager.java |     6 -
 .../main/java/com/cloud/server/ResourceTag.java    |     1 -
 .../java/com/cloud/storage/GuestOsCategory.java    |     5 -
 api/src/main/java/com/cloud/storage/Snapshot.java  |     2 +-
 api/src/main/java/com/cloud/storage/Storage.java   |     1 -
 .../java/com/cloud/storage/StorageService.java     |     5 +-
 .../java/com/cloud/storage/VolumeApiService.java   |    10 +-
 .../cloud/storage/snapshot/SnapshotApiService.java |     2 +-
 .../com/cloud/storage/snapshot/SnapshotPolicy.java |     3 +-
 .../com/cloud/template/TemplateApiService.java     |    19 +-
 .../com/cloud/template/VirtualMachineTemplate.java |     4 -
 .../java/com/cloud/user/ResourceLimitService.java  |    14 +-
 api/src/main/java/com/cloud/user/UserData.java     |     1 -
 api/src/main/java/com/cloud/vm/UserVmService.java  |    28 +-
 api/src/main/java/com/cloud/vm/VirtualMachine.java |     1 +
 .../java/com/cloud/vm/VirtualMachineProfile.java   |     1 -
 .../main/java/com/cloud/vm/VmDetailConstants.java  |    16 -
 api/src/main/java/com/cloud/vm/VmDiskInfo.java     |    39 -
 .../java/com/cloud/vm/snapshot/VMSnapshot.java     |     7 +-
 .../java/org/apache/cloudstack/acl/RoleType.java   |    27 -
 .../org/apache/cloudstack/alert/AlertService.java  |     3 -
 .../cloudstack/api/AbstractGetUploadParamsCmd.java |    28 -
 .../cloudstack/api/ApiCommandResourceType.java     |     7 +-
 .../org/apache/cloudstack/api/ApiConstants.java    |   191 +-
 .../org/apache/cloudstack/api/ApiErrorCode.java    |     2 -
 .../apache/cloudstack/api/ApiServerService.java    |     2 -
 .../java/org/apache/cloudstack/api/BaseCmd.java    |    14 -
 .../cloudstack/api/BaseUpdateTemplateOrIsoCmd.java |     8 -
 .../apache/cloudstack/api/ResponseGenerator.java   |    47 +-
 .../command/admin/autoscale/CreateCounterCmd.java  |     9 +-
 .../api/command/admin/cluster/AddClusterCmd.java   |    42 +-
 .../api/command/admin/cluster/ListClustersCmd.java |    50 -
 .../command/admin/cluster/UpdateClusterCmd.java    |    14 +-
 .../api/command/admin/gpu/CreateGpuCardCmd.java    |   122 -
 .../api/command/admin/gpu/CreateGpuDeviceCmd.java  |   123 -
 .../command/admin/gpu/CreateVgpuProfileCmd.java    |   131 -
 .../api/command/admin/gpu/DeleteGpuCardCmd.java    |    75 -
 .../api/command/admin/gpu/DeleteGpuDeviceCmd.java  |    78 -
 .../command/admin/gpu/DeleteVgpuProfileCmd.java    |    76 -
 .../command/admin/gpu/DiscoverGpuDevicesCmd.java   |    63 -
 .../admin/gpu/ListGpuDevicesCmdByAdmin.java        |    74 -
 .../api/command/admin/gpu/ManageGpuDeviceCmd.java  |    78 -
 .../command/admin/gpu/UnmanageGpuDeviceCmd.java    |    79 -
 .../api/command/admin/gpu/UpdateGpuCardCmd.java    |    99 -
 .../api/command/admin/gpu/UpdateGpuDeviceCmd.java  |   109 -
 .../command/admin/gpu/UpdateVgpuProfileCmd.java    |   129 -
 .../command/admin/guest/AddGuestOsCategoryCmd.java |    93 -
 .../admin/guest/DeleteGuestOsCategoryCmd.java      |    89 -
 .../admin/guest/UpdateGuestOsCategoryCmd.java      |   113 -
 .../api/command/admin/guest/UpdateGuestOsCmd.java  |    32 +-
 .../api/command/admin/host/AddHostCmd.java         |    22 +-
 ...intenanceCmd.java => CancelMaintenanceCmd.java} |     2 +-
 .../api/command/admin/host/ListHostsCmd.java       |    25 -
 ...nanceCmd.java => PrepareForMaintenanceCmd.java} |     2 +-
 .../api/command/admin/host/UpdateHostCmd.java      |    27 +-
 .../management/RemoveManagementServerCmd.java      |    61 -
 .../admin/network/CreateNetworkOfferingCmd.java    |    64 +-
 .../admin/offering/CreateDiskOfferingCmd.java      |     2 +-
 .../admin/offering/CreateServiceOfferingCmd.java   |    76 +-
 .../admin/offering/UpdateServiceOfferingCmd.java   |    23 -
 .../api/command/admin/pod/CreatePodCmd.java        |    14 +-
 .../api/command/admin/pod/ListPodsByCmd.java       |    17 -
 .../command/admin/resource/ListCapacityCmd.java    |     1 +
 .../admin/storage/AddObjectStoragePoolCmd.java     |     9 +-
 .../admin/storage/ConfigureStorageAccessCmd.java   |   135 -
 .../admin/storage/CreateStoragePoolCmd.java        |     8 -
 .../admin/storage/ListStorageAccessGroupsCmd.java  |    65 -
 .../command/admin/storage/ListStoragePoolsCmd.java |    17 +-
 .../admin/storage/UpdateObjectStoragePoolCmd.java  |     6 -
 .../command/admin/systemvm/PatchSystemVMCmd.java   |     4 +-
 .../api/command/admin/user/ListUsersCmd.java       |    24 -
 .../command/admin/vlan/CreateVlanIpRangeCmd.java   |    13 +-
 .../admin/vm/CreateVMFromBackupCmdByAdmin.java     |    55 -
 .../api/command/admin/vm/ImportVmCmd.java          |    20 -
 .../api/command/admin/vm/ListImportVMTasksCmd.java |   116 -
 .../api/command/admin/vm/MigrateVMCmd.java         |     5 -
 .../command/admin/vm/UnmanageVMInstanceCmd.java    |    37 +-
 .../command/admin/vpc/CreateVPCOfferingCmd.java    |    64 +-
 .../api/command/admin/zone/CreateZoneCmd.java      |    11 -
 .../user/address/ListPublicIpAddressesCmd.java     |     7 -
 .../api/command/user/backup/CreateBackupCmd.java   |    35 +-
 .../user/backup/CreateBackupScheduleCmd.java       |    21 -
 .../user/backup/DeleteBackupScheduleCmd.java       |    16 +-
 .../command/user/backup/ListBackupScheduleCmd.java |    30 +-
 .../api/command/user/backup/ListBackupsCmd.java    |    34 +-
 .../backup/repository/AddBackupRepositoryCmd.java  |     8 +-
 .../repository/UpdateBackupRepositoryCmd.java      |   116 -
 .../api/command/user/bucket/CreateBucketCmd.java   |     2 +-
 .../api/command/user/bucket/UpdateBucketCmd.java   |     2 +-
 .../command/user/config/ListCapabilitiesCmd.java   |     2 -
 .../consoleproxy/CreateConsoleEndpointCmd.java     |     5 -
 .../user/consoleproxy/ListConsoleSessionsCmd.java  |   182 -
 .../api/command/user/event/ListEventsCmd.java      |     7 -
 .../api/command/user/gpu/ListGpuCardsCmd.java      |    96 -
 .../api/command/user/gpu/ListGpuDevicesCmd.java    |    65 -
 .../api/command/user/gpu/ListVgpuProfilesCmd.java  |    80 -
 .../user/guest/ListGuestOsCategoriesCmd.java       |    77 +-
 .../command/user/gui/theme/CreateGuiThemeCmd.java  |   129 -
 .../command/user/gui/theme/ListGuiThemesCmd.java   |   110 -
 .../command/user/gui/theme/RemoveGuiThemeCmd.java  |    60 -
 .../command/user/gui/theme/UpdateGuiThemeCmd.java  |   136 -
 .../api/command/user/iso/DetachIsoCmd.java         |     2 +-
 .../command/user/iso/GetUploadParamsForIsoCmd.java |    23 -
 .../api/command/user/iso/ListIsosCmd.java          |    39 +-
 .../loadbalancer/AssignCertToLoadBalancerCmd.java  |    24 +-
 .../loadbalancer/CreateLoadBalancerRuleCmd.java    |     5 +-
 .../RemoveCertFromLoadBalancerCmd.java             |    11 -
 .../loadbalancer/UpdateLoadBalancerRuleCmd.java    |     7 -
 .../api/command/user/network/ListNetworksCmd.java  |     7 -
 .../user/offering/ListServiceOfferingsCmd.java     |    22 -
 .../api/command/user/snapshot/CopySnapshotCmd.java |    59 +-
 .../command/user/snapshot/CreateSnapshotCmd.java   |    33 +-
 .../snapshot/CreateSnapshotFromVMSnapshotCmd.java  |     2 +-
 .../user/snapshot/CreateSnapshotPolicyCmd.java     |    43 +-
 .../user/snapshot/ListSnapshotPoliciesCmd.java     |     7 +-
 .../template/GetUploadParamsForTemplateCmd.java    |    18 -
 .../command/user/template/ListTemplatesCmd.java    |    71 +-
 .../command/user/template/RegisterTemplateCmd.java |    32 +-
 .../command/user/template/UpdateTemplateCmd.java   |     9 -
 .../user/userdata/BaseRegisterUserDataCmd.java     |    87 -
 .../user/userdata/DeleteCniConfigurationCmd.java   |    74 -
 .../user/userdata/ListCniConfigurationCmd.java     |    59 -
 .../api/command/user/userdata/ListUserDataCmd.java |     2 +-
 .../user/userdata/RegisterCniConfigurationCmd.java |    77 -
 .../command/user/userdata/RegisterUserDataCmd.java |    80 +-
 .../api/command/user/vm/BaseDeployVMCmd.java       |   848 -
 .../api/command/user/vm/CreateVMFromBackupCmd.java |   153 -
 .../api/command/user/vm/DeployVMCmd.java           |   723 +-
 .../cloudstack/api/command/user/vm/ListVMsCmd.java |   118 +-
 .../api/command/user/vm/UpdateVMCmd.java           |    56 +-
 .../api/command/user/vpc/CreateStaticRouteCmd.java |    53 +-
 .../api/command/user/vpc/CreateVPCCmd.java         |     9 -
 .../api/command/user/vpn/AddVpnUserCmd.java        |    18 +-
 .../api/command/user/vpn/CreateVpnGatewayCmd.java  |    14 +-
 .../api/command/user/zone/ListZonesCmd.java        |    17 -
 .../api/command/utils/OfferingUtils.java           |    38 -
 .../cloudstack/api/response/AccountResponse.java   |   135 -
 .../cloudstack/api/response/AsyncJobResponse.java  |    25 +-
 .../api/response/BackupOfferingResponse.java       |    16 -
 .../api/response/BackupRepositoryResponse.java     |    12 -
 .../cloudstack/api/response/BackupResponse.java    |    69 -
 .../api/response/BackupScheduleResponse.java       |    29 +-
 .../cloudstack/api/response/BucketResponse.java    |     2 +-
 .../api/response/CapabilitiesResponse.java         |    17 -
 .../response/ClusterDrsPlanMigrationResponse.java  |    12 +-
 .../cloudstack/api/response/ClusterResponse.java   |    70 -
 .../api/response/ConsoleSessionResponse.java       |   236 -
 .../response/CreateConsoleEndpointResponse.java    |     2 +-
 .../cloudstack/api/response/DomainResponse.java    |   132 -
 .../ExtensionCustomActionParameterResponse.java    |    58 -
 .../response/ExtensionCustomActionResponse.java    |   184 -
 .../api/response/ExtensionResourceResponse.java    |    95 -
 .../cloudstack/api/response/ExtensionResponse.java |   182 -
 .../api/response/GetUploadParamsResponse.java      |     4 -
 .../cloudstack/api/response/GpuCardResponse.java   |   109 -
 .../cloudstack/api/response/GpuDeviceResponse.java |   227 -
 .../api/response/GuestOSCategoryResponse.java      |    29 +-
 .../cloudstack/api/response/GuiThemeResponse.java  |   179 -
 .../cloudstack/api/response/HostResponse.java      |   133 +-
 .../cloudstack/api/response/IPAddressResponse.java |     8 -
 .../api/response/ImportVMTaskResponse.java         |   257 -
 .../api/response/KubernetesUserVmResponse.java     |    51 -
 .../cloudstack/api/response/LoginCmdResponse.java  |    12 -
 .../api/response/ManagementServerResponse.java     |    48 -
 .../cloudstack/api/response/NetworkResponse.java   |    16 +
 .../api/response/ObjectStoreResponse.java          |    20 +-
 .../cloudstack/api/response/PodResponse.java       |    24 -
 .../cloudstack/api/response/ProjectResponse.java   |   135 -
 .../response/ResourceLimitAndCountResponse.java    |    30 -
 .../response/RouterHealthCheckResultResponse.java  |    21 +-
 .../api/response/ServiceOfferingResponse.java      |   148 +-
 .../api/response/SnapshotPolicyResponse.java       |    26 +-
 .../cloudstack/api/response/SnapshotResponse.java  |     8 -
 .../api/response/StaticRouteResponse.java          |    24 +-
 .../api/response/StorageAccessGroupResponse.java   |   108 -
 .../api/response/StoragePoolResponse.java          |    43 +-
 .../cloudstack/api/response/SystemVmResponse.java  |     8 +
 .../cloudstack/api/response/TemplateResponse.java  |    41 -
 .../api/response/UnmanageVMInstanceResponse.java   |    14 +-
 .../cloudstack/api/response/UserResponse.java      |     2 +-
 .../cloudstack/api/response/UserVmResponse.java    |   149 +-
 .../api/response/VgpuProfileResponse.java          |   135 -
 .../api/response/VlanIpRangeResponse.java          |    10 +-
 .../cloudstack/api/response/ZoneResponse.java      |    57 +-
 .../java/org/apache/cloudstack/backup/Backup.java  |    61 +-
 .../apache/cloudstack/backup/BackupManager.java    |   107 +-
 .../apache/cloudstack/backup/BackupProvider.java   |    74 +-
 .../apache/cloudstack/backup/BackupRepository.java |     5 -
 .../cloudstack/backup/BackupRepositoryService.java |     2 -
 .../apache/cloudstack/backup/BackupSchedule.java   |     6 +-
 .../command/ReconcileCommandService.java           |    65 -
 .../consoleproxy/ConsoleAccessManager.java         |     9 +-
 .../cloudstack/consoleproxy/ConsoleSession.java    |    45 -
 .../extension/CustomActionResultResponse.java      |    65 -
 .../org/apache/cloudstack/extension/Extension.java |    44 -
 .../extension/ExtensionCustomAction.java           |   386 -
 .../cloudstack/extension/ExtensionHelper.java      |    24 -
 .../cloudstack/extension/ExtensionResourceMap.java |    34 -
 .../java/org/apache/cloudstack/gpu/GpuCard.java    |    69 -
 .../java/org/apache/cloudstack/gpu/GpuDevice.java  |    42 -
 .../java/org/apache/cloudstack/gpu/GpuService.java |   157 -
 .../org/apache/cloudstack/gpu/VgpuProfile.java     |    74 -
 .../org/apache/cloudstack/gui/theme/GuiTheme.java  |    61 -
 .../cloudstack/gui/theme/GuiThemeDetails.java      |    36 -
 .../apache/cloudstack/gui/theme/GuiThemeJoin.java  |    47 -
 .../cloudstack/gui/theme/GuiThemeService.java      |    35 -
 .../management/ManagementServerHost.java           |     2 +-
 .../cloudstack/network/RoutedIpv4Manager.java      |     2 +-
 .../org/apache/cloudstack/query/QueryService.java  |     4 -
 .../storage/object/BucketApiService.java           |    51 +-
 .../cloudstack/userdata/UserDataManager.java       |    12 -
 .../org/apache/cloudstack/vm/ImportVmTask.java     |    41 -
 .../apache/cloudstack/vm/ImportVmTasksManager.java |    38 -
 .../apache/cloudstack/vm/UnmanageVMService.java    |     7 +-
 .../apache/cloudstack/vm/lease/VMLeaseManager.java |    61 -
 .../command/admin/cluster/ListClustersCmdTest.java |    83 -
 .../command/admin/gpu/CreateGpuCardCmdTest.java    |    90 -
 .../command/admin/gpu/CreateGpuDeviceCmdTest.java  |   100 -
 .../admin/gpu/CreateVgpuProfileCmdTest.java        |   108 -
 .../command/admin/gpu/DeleteGpuCardCmdTest.java    |    45 -
 .../command/admin/gpu/DeleteGpuDeviceCmdTest.java  |    47 -
 .../admin/gpu/DeleteVgpuProfileCmdTest.java        |    45 -
 .../admin/gpu/DiscoverGpuDevicesCmdTest.java       |    38 -
 .../admin/gpu/ListGpuDevicesCmdByAdminTest.java    |    65 -
 .../command/admin/gpu/ManageGpuDeviceCmdTest.java  |    47 -
 .../admin/gpu/UnmanageGpuDeviceCmdTest.java        |    47 -
 .../command/admin/gpu/UpdateGpuCardCmdTest.java    |    72 -
 .../command/admin/gpu/UpdateGpuDeviceCmdTest.java  |    91 -
 .../admin/gpu/UpdateVgpuProfileCmdTest.java        |   108 -
 .../admin/guest/AddGuestOsCategoryCmdTest.java     |    46 -
 .../admin/guest/UpdateGuestOsCategoryCmdTest.java  |    55 -
 .../command/admin/guest/UpdateGuestOsCmdTest.java  |    37 -
 .../offering/CreateServiceOfferingCmdTest.java     |    42 -
 .../resource/PurgeExpungedResourcesCmdTest.java    |     2 +-
 .../admin/storage/AddObjectStoragePoolCmdTest.java |     7 +-
 .../storage/DownloadImageStoreObjectCmdTest.java   |    15 +
 .../vm/MigrateVirtualMachineWithVolumeCmdTest.java |     6 -
 .../command/admin/vpc/CreateVPCCmdByAdminTest.java |     7 +-
 .../api/command/test/CreateSnapshotCmdTest.java    |     4 +-
 .../user/backup/ListBackupScheduleCmdTest.java     |    98 -
 .../consoleproxy/ListConsoleSessionsCmdTest.java   |   124 -
 .../api/command/user/gpu/ListGpuCardsCmdTest.java  |    82 -
 .../command/user/gpu/ListGpuDevicesCmdTest.java    |    36 -
 .../command/user/gpu/ListVgpuProfilesCmdTest.java  |    63 -
 .../user/guest/ListGuestOsCategoriesCmdTest.java   |    87 -
 .../command/user/network/UpdateNetworkCmdTest.java |    11 +-
 .../command/user/snapshot/CopySnapshotCmdTest.java |     5 -
 .../user/snapshot/ListSnapshotPoliciesCmdTest.java |    79 -
 .../command/user/userdata/ListUserDataCmdTest.java |     4 +-
 .../api/command/user/vm/DeployVMCmdTest.java       |   483 -
 .../api/command/user/vm/ListVMsCmdTest.java        |   223 -
 .../api/command/user/vpc/CreateVPCCmdTest.java     |    15 +-
 .../extension/ExtensionCustomActionTest.java       |   484 -
 build/replace.properties                           |     1 -
 client/bindir/cloud-update-xenserver-licenses.in   |   268 +-
 client/conf/server.properties.in                   |     7 -
 client/pom.xml                                     |    29 +-
 .../java/org/apache/cloudstack/ACSRequestLog.java  |    84 -
 .../java/org/apache/cloudstack/ServerDaemon.java   |    40 +-
 cloud-cli/bindir/cloud-tool                        |     7 +-
 core/pom.xml                                       |     2 +-
 .../agent/api/CheckS2SVpnConnectionsAnswer.java    |     1 +
 .../api/ConsoleAccessAuthenticationCommand.java    |    12 +-
 .../cloud/agent/api/ConvertInstanceCommand.java    |    17 +-
 .../com/cloud/agent/api/ConvertSnapshotAnswer.java |    36 -
 .../cloud/agent/api/ConvertSnapshotCommand.java    |    42 -
 .../cloud/agent/api/DeleteStoragePoolCommand.java  |     4 +-
 .../cloud/agent/api/GetExternalConsoleAnswer.java  |    68 -
 .../cloud/agent/api/GetExternalConsoleCommand.java |    53 -
 .../com/cloud/agent/api/GetGPUStatsAnswer.java     |    17 -
 .../com/cloud/agent/api/HandleCksIsoCommand.java   |    34 -
 .../agent/api/ImportConvertedInstanceCommand.java  |     9 +-
 .../agent/api/MigrateAgentConnectionAnswer.java    |    38 -
 .../agent/api/MigrateAgentConnectionCommand.java   |    61 -
 .../java/com/cloud/agent/api/MigrateCommand.java   |    25 +-
 .../cloud/agent/api/ModifyStoragePoolAnswer.java   |     4 -
 .../cloud/agent/api/ModifyStoragePoolCommand.java  |     6 +-
 .../main/java/com/cloud/agent/api/PingAnswer.java  |    25 +-
 .../main/java/com/cloud/agent/api/PingCommand.java |    11 -
 .../api/PrepareExternalProvisioningAnswer.java     |    51 -
 .../api/PrepareExternalProvisioningCommand.java    |    39 -
 .../java/com/cloud/agent/api/ReadyCommand.java     |    17 +-
 .../agent/api/RecreateCheckpointsCommand.java      |    49 -
 .../com/cloud/agent/api/RemoveBitmapCommand.java   |    46 -
 .../com/cloud/agent/api/RunCustomActionAnswer.java |    32 -
 .../cloud/agent/api/RunCustomActionCommand.java    |    61 -
 .../cloud/agent/api/SetupGuestNetworkCommand.java  |     9 -
 .../java/com/cloud/agent/api/StartupCommand.java   |     9 -
 .../com/cloud/agent/api/StartupRoutingCommand.java |    11 +-
 .../main/java/com/cloud/agent/api/StopCommand.java |    17 +-
 .../com/cloud/agent/api/TransferAgentCommand.java  |    10 -
 .../cloud/agent/api/UnmanageInstanceAnswer.java    |    27 -
 .../cloud/agent/api/UnmanageInstanceCommand.java   |    61 -
 .../agent/api/UnprepareStorageClientCommand.java   |    10 +-
 .../storage/CreateDiskOnlyVmSnapshotAnswer.java    |    39 -
 .../storage/CreateDiskOnlyVmSnapshotCommand.java   |    41 -
 .../storage/DeleteDiskOnlyVmSnapshotCommand.java   |    44 -
 .../storage/MergeDiskOnlyVmSnapshotCommand.java    |    55 -
 .../agent/api/storage/MigrateVolumeCommand.java    |     5 -
 .../storage/RevertDiskOnlyVmSnapshotAnswer.java    |    38 -
 .../storage/RevertDiskOnlyVmSnapshotCommand.java   |    50 -
 .../agent/api/storage/SnapshotMergeTreeTO.java     |    57 -
 .../agent/resource/virtualnetwork/VRScripts.java   |     3 -
 .../virtualnetwork/VirtualRoutingResource.java     |    12 -
 .../facade/LoadBalancerConfigItem.java             |     2 -
 .../facade/SetGuestNetworkConfigItem.java          |     1 -
 .../virtualnetwork/model/GuestNetwork.java         |     9 -
 .../virtualnetwork/model/LoadBalancerRule.java     |    56 -
 .../cloud/agent/transport/ArrayTypeAdaptor.java    |    12 +-
 .../com/cloud/network/HAProxyConfigurator.java     |   140 +-
 .../cloud/network/LoadBalancerConfigurator.java    |     3 -
 .../java/com/cloud/resource/ServerResource.java    |     6 -
 .../main/java/com/cloud/serializer/GsonHelper.java |     2 +-
 .../cloud/storage/resource/StorageProcessor.java   |     4 +-
 .../StorageSubsystemCommandHandlerBase.java        |     8 +-
 .../cloud/storage/template/TemplateConstants.java  |     2 +-
 .../cloudstack/agent/lb/SetupMSListCommand.java    |    15 +-
 .../org/apache/cloudstack/backup/BackupAnswer.java |    12 -
 .../backup/BackupStorageStatsAnswer.java           |    50 -
 .../backup/GetBackupStorageStatsCommand.java       |    66 -
 .../cloudstack/backup/RestoreBackupCommand.java    |    38 +-
 .../cloudstack/backup/TakeBackupCommand.java       |    19 -
 .../org/apache/cloudstack/command/CommandInfo.java |   124 -
 .../apache/cloudstack/command/ReconcileAnswer.java |    45 -
 .../cloudstack/command/ReconcileCommand.java       |    33 -
 .../cloudstack/command/ReconcileCommandUtils.java  |   192 -
 .../cloudstack/command/ReconcileCopyAnswer.java    |    56 -
 .../cloudstack/command/ReconcileCopyCommand.java   |    53 -
 .../cloudstack/command/ReconcileMigrateAnswer.java |    68 -
 .../command/ReconcileMigrateCommand.java           |    31 -
 .../command/ReconcileMigrateVolumeAnswer.java      |    50 -
 .../command/ReconcileMigrateVolumeCommand.java     |    48 -
 .../cloudstack/command/ReconcileVolumeAnswer.java  |    46 -
 .../download/HttpsDirectTemplateDownloader.java    |     4 +-
 ...ckDataStoreStoragePolicyComplainceCommand.java} |     4 +-
 .../cloudstack/storage/command/CopyCommand.java    |     5 -
 .../cloudstack/storage/to/SnapshotObjectTO.java    |    74 +-
 .../cloudstack/storage/to/VolumeObjectTO.java      |    29 +-
 .../resource/virtualnetwork/ConfigHelperTest.java  |     6 +-
 .../virtualnetwork/model/LoadBalancerRuleTest.java |    63 -
 .../com/cloud/agent/transport/ResponseTest.java    |    46 -
 .../com/cloud/network/HAProxyConfiguratorTest.java |    18 +-
 .../agent/test/CheckGuestOsMappingCommandTest.java |     2 +
 .../api/agent/test/CheckOnHostCommandTest.java     |    10 -
 .../command/ReconcileCommandUtilsTest.java         |    69 -
 debian/changelog                                   |    22 +-
 debian/cloudstack-cli.install                      |     4 +-
 debian/cloudstack-common.install                   |     1 -
 debian/cloudstack-docs.install                     |     4 +-
 debian/cloudstack-management.install               |     3 -
 debian/cloudstack-management.postinst              |     3 -
 debian/control                                     |     2 +-
 debian/rules                                       |    13 +-
 deps/install-non-oss.sh                            |     3 -
 developer/pom.xml                                  |     2 +-
 engine/api/pom.xml                                 |     2 +-
 .../java/com/cloud/vm/VirtualMachineManager.java   |    14 +-
 .../service/NetworkOrchestrationService.java       |    54 +-
 .../service/VolumeOrchestrationService.java        |    24 +-
 .../engine/service/api/OrchestrationService.java   |    27 +-
 .../engine/subsystem/api/storage/ClusterScope.java |     6 -
 .../api/storage/DataStoreCapabilities.java         |    10 +-
 .../subsystem/api/storage/DataStoreDriver.java     |     4 -
 .../subsystem/api/storage/EndPointSelector.java    |     4 -
 .../engine/subsystem/api/storage/HostScope.java    |    10 +-
 .../api/storage/ObjectInDataStoreStateMachine.java |     3 +-
 .../api/storage/PrimaryDataStoreDriver.java        |     8 -
 .../api/storage/PrimaryDataStoreLifeCycle.java     |     4 +-
 .../api/storage/PrimaryDataStoreParameters.java    |    16 -
 .../engine/subsystem/api/storage/SnapshotInfo.java |    12 -
 .../subsystem/api/storage/SnapshotService.java     |     6 -
 .../subsystem/api/storage/SnapshotStrategy.java    |     7 +-
 .../subsystem/api/storage/StorageAction.java       |     2 -
 .../api/storage/StoragePoolAllocator.java          |     1 -
 .../engine/subsystem/api/storage/VolumeInfo.java   |     7 -
 .../engine/subsystem/api/storage/ZoneScope.java    |     6 -
 engine/components-api/pom.xml                      |     2 +-
 .../main/java/com/cloud/agent/AgentManager.java    |     2 -
 .../java/com/cloud/capacity/CapacityManager.java   |     8 +-
 .../cloud/configuration/ConfigurationManager.java  |   139 +-
 .../com/cloud/hypervisor/ExternalProvisioner.java  |    65 -
 .../main/java/com/cloud/network/addr/PublicIp.java |     4 -
 .../java/com/cloud/network/rules/RulesManager.java |     2 -
 .../com/cloud/network/vpc/NetworkACLManager.java   |     2 +-
 .../java/com/cloud/network/vpc/VpcManager.java     |    34 -
 .../main/java/com/cloud/resource/Discoverer.java   |     1 +
 .../java/com/cloud/resource/ResourceManager.java   |    55 +-
 .../java/com/cloud/storage/StorageManager.java     |    19 +-
 .../java/com/cloud/template/TemplateManager.java   |     3 +-
 .../com/cloud/vm/VirtualMachineProfileImpl.java    |     2 +-
 .../com/cloud/vm/VmWorkTakeVolumeSnapshot.java     |     9 +-
 .../com/cloud/vm/VmWorkTakeVolumeSnapshotTest.java |     3 +-
 engine/orchestration/pom.xml                       |     9 +-
 .../java/com/cloud/agent/manager/AgentAttache.java |    74 +-
 .../com/cloud/agent/manager/AgentManagerImpl.java  |   547 +-
 .../cloud/agent/manager/ClusteredAgentAttache.java |     9 +-
 .../agent/manager/ClusteredAgentManagerImpl.java   |   334 +-
 .../agent/manager/ClusteredDirectAgentAttache.java |     5 +-
 .../cloud/agent/manager/ConnectedAgentAttache.java |     9 +-
 .../cloud/agent/manager/DirectAgentAttache.java    |     8 +-
 .../java/com/cloud/agent/manager/DummyAttache.java |     5 +-
 .../cluster/ClusteredAgentRebalanceService.java    |     1 -
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |   574 +-
 .../datacenter/entity/api/db/EngineClusterVO.java  |     8 -
 .../datacenter/entity/api/db/EngineHostPodVO.java  |     8 -
 .../datacenter/entity/api/db/EngineHostVO.java     |    24 -
 .../engine/orchestration/CloudOrchestrator.java    |    51 +-
 .../engine/orchestration/NetworkOrchestrator.java  |   225 +-
 .../engine/orchestration/VolumeOrchestrator.java   |   157 +-
 .../cloud/agent/manager/AgentManagerImplTest.java  |     3 +-
 .../agent/manager/ConnectedAgentAttacheTest.java   |    17 +-
 .../agent/manager/DirectAgentAttacheTest.java      |     3 +-
 .../cloud/vm/VirtualMachineManagerImplTest.java    |   704 +-
 .../orchestration/VolumeOrchestratorTest.java      |   450 +-
 engine/pom.xml                                     |     2 +-
 engine/schema/pom.xml                              |    16 +-
 .../main/java/com/cloud/capacity/CapacityVO.java   |     2 -
 .../java/com/cloud/capacity/dao/CapacityDao.java   |    12 +-
 .../com/cloud/capacity/dao/CapacityDaoImpl.java    |    79 +-
 .../ManagementServiceConfiguration.java            |     2 +-
 .../cloud/configuration/dao/ResourceCountDao.java  |    14 +
 .../configuration/dao/ResourceCountDaoImpl.java    |    15 +-
 .../java/com/cloud/dc/ClusterDetailsDaoImpl.java   |    17 -
 .../src/main/java/com/cloud/dc/ClusterVO.java      |    12 -
 .../src/main/java/com/cloud/dc/DataCenterVO.java   |    11 -
 .../src/main/java/com/cloud/dc/HostPodVO.java      |    11 -
 .../src/main/java/com/cloud/dc/dao/ClusterDao.java |     6 +-
 .../main/java/com/cloud/dc/dao/ClusterDaoImpl.java |    69 +-
 .../main/java/com/cloud/dc/dao/DataCenterDao.java  |     2 -
 .../java/com/cloud/dc/dao/DataCenterDaoImpl.java   |    33 -
 .../src/main/java/com/cloud/dc/dao/HostPodDao.java |     2 -
 .../main/java/com/cloud/dc/dao/HostPodDaoImpl.java |    32 -
 .../src/main/java/com/cloud/dc/dao/VlanDao.java    |     2 -
 .../main/java/com/cloud/dc/dao/VlanDaoImpl.java    |    27 -
 .../main/java/com/cloud/domain/dao/DomainDao.java  |     2 -
 .../java/com/cloud/domain/dao/DomainDaoImpl.java   |    10 -
 .../src/main/java/com/cloud/gpu/GpuCardVO.java     |   147 -
 .../src/main/java/com/cloud/gpu/GpuDeviceVO.java   |   200 -
 .../src/main/java/com/cloud/gpu/VGPUTypesVO.java   |    32 +-
 .../src/main/java/com/cloud/gpu/VgpuProfileVO.java |   191 -
 .../main/java/com/cloud/gpu/dao/GpuCardDao.java    |    39 -
 .../java/com/cloud/gpu/dao/GpuCardDaoImpl.java     |   122 -
 .../main/java/com/cloud/gpu/dao/GpuDeviceDao.java  |    71 -
 .../java/com/cloud/gpu/dao/GpuDeviceDaoImpl.java   |   260 -
 .../java/com/cloud/gpu/dao/HostGpuGroupsDao.java   |    12 -
 .../com/cloud/gpu/dao/HostGpuGroupsDaoImpl.java    |    78 -
 .../java/com/cloud/gpu/dao/VGPUTypesDaoImpl.java   |    59 +-
 .../java/com/cloud/gpu/dao/VgpuProfileDao.java     |    33 -
 .../java/com/cloud/gpu/dao/VgpuProfileDaoImpl.java |   110 -
 .../src/main/java/com/cloud/host/HostVO.java       |    24 -
 .../src/main/java/com/cloud/host/dao/HostDao.java  |    51 +-
 .../main/java/com/cloud/host/dao/HostDaoImpl.java  |   221 +-
 .../java/com/cloud/host/dao/HostDetailsDao.java    |     5 -
 .../com/cloud/host/dao/HostDetailsDaoImpl.java     |    45 -
 .../java/com/cloud/network/as/dao/CounterDao.java  |     1 -
 .../com/cloud/network/as/dao/CounterDaoImpl.java   |    16 -
 .../com/cloud/network/dao/FirewallRulesDao.java    |     6 +-
 .../cloud/network/dao/FirewallRulesDaoImpl.java    |    38 +-
 .../com/cloud/network/dao/IPAddressDaoImpl.java    |     1 -
 .../java/com/cloud/network/dao/IPAddressVO.java    |    12 -
 .../java/com/cloud/network/dao/LoadBalancerVO.java |     9 -
 .../com/cloud/network/dao/NetrisProviderDao.java   |    24 -
 .../cloud/network/dao/NetrisProviderDaoImpl.java   |    52 -
 .../java/com/cloud/network/dao/NetworkDao.java     |     7 -
 .../java/com/cloud/network/dao/NetworkDaoImpl.java |    30 -
 .../dao/PhysicalNetworkTrafficTypeDaoImpl.java     |     2 +-
 .../com/cloud/network/dao/RemoteAccessVpnDao.java  |     2 -
 .../cloud/network/dao/RemoteAccessVpnDaoImpl.java  |     7 -
 .../network/dao/RouterHealthCheckResultVO.java     |     7 +-
 .../cloud/network/dao/Site2SiteVpnGatewayDao.java  |     2 -
 .../network/dao/Site2SiteVpnGatewayDaoImpl.java    |     8 -
 .../java/com/cloud/network/dao/SslCertDao.java     |     2 -
 .../java/com/cloud/network/dao/SslCertDaoImpl.java |     6 -
 .../cloud/network/element/NetrisProviderVO.java    |   265 -
 .../network/rules/dao/PortForwardingRulesDao.java  |     2 -
 .../rules/dao/PortForwardingRulesDaoImpl.java      |    11 -
 .../java/com/cloud/network/vpc/StaticRouteVO.java  |    35 +-
 .../java/com/cloud/network/vpc/VpcOfferingVO.java  |    11 +
 .../src/main/java/com/cloud/network/vpc/VpcVO.java |    12 -
 .../network/vpc/dao/VpcOfferingServiceMapDao.java  |     5 -
 .../vpc/dao/VpcOfferingServiceMapDaoImpl.java      |    19 -
 .../network/vpc/dao/VpcServiceMapDaoImpl.java      |    11 +-
 .../com/cloud/offerings/NetworkOfferingVO.java     |    24 +
 .../cloud/resource/icon/dao/ResourceIconDao.java   |     3 -
 .../resource/icon/dao/ResourceIconDaoImpl.java     |    31 +-
 .../java/com/cloud/service/ServiceOfferingVO.java  |    37 -
 .../com/cloud/service/dao/ServiceOfferingDao.java  |     3 -
 .../cloud/service/dao/ServiceOfferingDaoImpl.java  |    17 +-
 .../java/com/cloud/storage/DiskOfferingVO.java     |     2 +-
 .../java/com/cloud/storage/GuestOSCategoryVO.java  |    45 +-
 .../java/com/cloud/storage/SnapshotPolicyVO.java   |    38 +-
 .../main/java/com/cloud/storage/SnapshotVO.java    |     2 +-
 .../storage/StoragePoolAndAccessGroupMapVO.java    |    64 -
 .../java/com/cloud/storage/StoragePoolHostVO.java  |     6 -
 .../main/java/com/cloud/storage/VMTemplateVO.java  |    27 +-
 .../main/java/com/cloud/storage/dao/BucketDao.java |     4 -
 .../java/com/cloud/storage/dao/BucketDaoImpl.java  |    35 -
 .../com/cloud/storage/dao/DiskOfferingDao.java     |     2 -
 .../com/cloud/storage/dao/DiskOfferingDaoImpl.java |    16 -
 .../cloud/storage/dao/GuestOSCategoryDaoImpl.java  |     1 +
 .../java/com/cloud/storage/dao/GuestOSDao.java     |     8 +-
 .../java/com/cloud/storage/dao/GuestOSDaoImpl.java |    21 +-
 .../java/com/cloud/storage/dao/SnapshotDao.java    |     2 -
 .../com/cloud/storage/dao/SnapshotDaoImpl.java     |    23 -
 .../dao/StoragePoolAndAccessGroupMapDao.java       |    31 -
 .../dao/StoragePoolAndAccessGroupMapDaoImpl.java   |   105 -
 .../storage/dao/StoragePoolDetailsDaoImpl.java     |    15 -
 .../com/cloud/storage/dao/StoragePoolHostDao.java  |     2 -
 .../cloud/storage/dao/StoragePoolHostDaoImpl.java  |    11 -
 .../java/com/cloud/storage/dao/VMTemplateDao.java  |     4 -
 .../com/cloud/storage/dao/VMTemplateDaoImpl.java   |    54 -
 .../main/java/com/cloud/storage/dao/VolumeDao.java |     2 -
 .../java/com/cloud/storage/dao/VolumeDaoImpl.java  |    12 -
 .../upgrade/ConfigurationGroupsAggregator.java     |     2 +-
 .../com/cloud/upgrade/DatabaseUpgradeChecker.java  |     7 -
 .../upgrade/SystemVmTemplateRegistration.java      |     4 +-
 .../cloud/upgrade/dao/DatabaseAccessObject.java    |    30 -
 .../main/java/com/cloud/upgrade/dao/DbUpgrade.java |    37 +-
 .../upgrade/dao/DbUpgradeSystemVmTemplate.java     |    16 +-
 .../java/com/cloud/upgrade/dao/DbUpgradeUtils.java |    16 -
 .../com/cloud/upgrade/dao/Upgrade42010to42100.java |   220 -
 .../com/cloud/upgrade/dao/Upgrade42100to42200.java |   103 -
 .../java/com/cloud/usage/dao/UsageBackupDao.java   |     4 +-
 .../com/cloud/usage/dao/UsageBackupDaoImpl.java    |     8 +-
 .../java/com/cloud/user/AccountDetailsDaoImpl.java |    10 -
 .../src/main/java/com/cloud/user/UserDataVO.java   |    10 -
 .../main/java/com/cloud/vm/ConsoleSessionVO.java   |    47 +-
 .../src/main/java/com/cloud/vm/ImportVMTaskVO.java |   270 -
 ...VMInstanceDetailVO.java => UserVmDetailVO.java} |     8 +-
 .../java/com/cloud/vm/dao/ConsoleSessionDao.java   |     8 +-
 .../com/cloud/vm/dao/ConsoleSessionDaoImpl.java    |    87 +-
 .../java/com/cloud/vm/dao/ImportVMTaskDao.java     |    31 -
 .../java/com/cloud/vm/dao/ImportVMTaskDaoImpl.java |    74 -
 .../src/main/java/com/cloud/vm/dao/NicDao.java     |     4 -
 .../src/main/java/com/cloud/vm/dao/NicDaoImpl.java |    20 -
 .../main/java/com/cloud/vm/dao/UserVmDaoImpl.java  |    15 +-
 ...stanceDetailsDao.java => UserVmDetailsDao.java} |     4 +-
 ...tailsDaoImpl.java => UserVmDetailsDaoImpl.java} |     6 +-
 .../main/java/com/cloud/vm/dao/VMInstanceDao.java  |     3 +-
 .../java/com/cloud/vm/dao/VMInstanceDaoImpl.java   |    44 +-
 .../com/cloud/vm/snapshot/dao/VMSnapshotDao.java   |     4 -
 .../cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java   |    27 -
 .../apache/cloudstack/backup/BackupDetailVO.java   |    98 -
 .../cloudstack/backup/BackupRepositoryVO.java      |    31 +-
 .../apache/cloudstack/backup/BackupScheduleVO.java |    71 +-
 .../org/apache/cloudstack/backup/BackupVO.java     |    62 +-
 .../apache/cloudstack/backup/dao/BackupDao.java    |    10 +-
 .../cloudstack/backup/dao/BackupDaoImpl.java       |   187 +-
 .../cloudstack/backup/dao/BackupDetailsDao.java    |    26 -
 .../backup/dao/BackupDetailsDaoImpl.java           |    31 -
 .../cloudstack/backup/dao/BackupOfferingDao.java   |     2 +-
 .../backup/dao/BackupOfferingDaoImpl.java          |     6 +-
 .../cloudstack/backup/dao/BackupRepositoryDao.java |     2 -
 .../backup/dao/BackupRepositoryDaoImpl.java        |     8 -
 .../backup/dao/BackupScheduleDaoImpl.java          |     5 -
 .../cloudstack/command/ReconcileCommandVO.java     |   216 -
 .../command/dao/ReconcileCommandDao.java           |    45 -
 .../command/dao/ReconcileCommandDaoImpl.java       |   134 -
 .../cloudstack/gui/theme/GuiThemeDetailsVO.java    |    91 -
 .../cloudstack/gui/theme/GuiThemeJoinVO.java       |   141 -
 .../apache/cloudstack/gui/theme/GuiThemeVO.java    |   189 -
 .../cloudstack/gui/theme/dao/GuiThemeDao.java      |    24 -
 .../cloudstack/gui/theme/dao/GuiThemeDaoImpl.java  |    25 -
 .../gui/theme/dao/GuiThemeDetailsDao.java          |    30 -
 .../gui/theme/dao/GuiThemeDetailsDaoImpl.java      |   126 -
 .../cloudstack/gui/theme/dao/GuiThemeJoinDao.java  |    31 -
 .../gui/theme/dao/GuiThemeJoinDaoImpl.java         |   139 -
 .../resourcedetail/ResourceDetailsDao.java         |    10 -
 .../resourcedetail/ResourceDetailsDaoBase.java     |    20 -
 .../datastore/db/ImageStoreDetailsDaoImpl.java     |    19 +-
 .../storage/datastore/db/ObjectStoreDao.java       |     2 -
 .../storage/datastore/db/ObjectStoreDaoImpl.java   |    32 -
 .../storage/datastore/db/ObjectStoreVO.java        |    23 +-
 .../storage/datastore/db/PrimaryDataStoreDao.java  |    24 +-
 .../datastore/db/PrimaryDataStoreDaoImpl.java      |   239 +-
 .../storage/datastore/db/SnapshotDataStoreDao.java |    22 +-
 .../datastore/db/SnapshotDataStoreDaoImpl.java     |   222 +-
 .../storage/datastore/db/SnapshotDataStoreVO.java  |    33 +-
 ...n-daos-between-management-and-usage-context.xml |     3 +-
 .../spring-engine-schema-core-daos-context.xml     |    10 -
 .../cloud.idempotent_drop_unique_key.sql           |    26 -
 .../main/resources/META-INF/db/schema-410to420.sql |     2 +-
 .../META-INF/db/schema-42010to42100-cleanup.sql    |    20 -
 .../resources/META-INF/db/schema-42010to42100.sql  |   759 -
 .../META-INF/db/schema-42100to42200-cleanup.sql    |    20 -
 .../resources/META-INF/db/schema-42100to42200.sql  |    89 -
 .../META-INF/db/views/cloud.account_view.sql       |    40 -
 .../META-INF/db/views/cloud.data_center_view.sql   |     1 -
 .../META-INF/db/views/cloud.domain_view.sql        |    44 +-
 .../META-INF/db/views/cloud.gui_themes_view.sql    |    38 -
 .../META-INF/db/views/cloud.host_view.sql          |     4 -
 .../db/views/cloud.network_offering_view.sql       |     2 +
 .../db/views/cloud.service_offering_view.sql       |    24 -
 .../META-INF/db/views/cloud.storage_pool_view.sql  |    24 +-
 .../META-INF/db/views/cloud.template_view.sql      |     8 +-
 .../META-INF/db/views/cloud.user_vm_view.sql       |    36 +-
 .../META-INF/db/views/cloud.vpc_offering_view.sql  |     1 +
 .../cloud/capacity/dao/CapacityDaoImplTest.java    |   486 +-
 .../java/com/cloud/dc/dao/ClusterDaoImplTest.java  |     4 +-
 .../java/com/cloud/gpu/dao/GpuCardDaoImplTest.java |    57 -
 .../com/cloud/gpu/dao/GpuDeviceDaoImplTest.java    |   277 -
 .../com/cloud/gpu/dao/VgpuProfileDaoImplTest.java  |    70 -
 .../java/com/cloud/host/dao/HostDaoImplTest.java   |     4 +-
 .../com/cloud/network/dao/LoadBalancerVOTest.java  |    45 -
 .../cloud/storage/dao/VMTemplateDaoImplTest.java   |   130 -
 .../upgrade/ConfigurationGroupsAggregatorTest.java |    76 -
 .../upgrade/SystemVmTemplateRegistrationTest.java  |     2 +-
 .../upgrade/dao/DatabaseAccessObjectTest.java      |    53 -
 .../com/cloud/upgrade/dao/DbUpgradeUtilsTest.java  |    29 -
 .../cloud/upgrade/dao/Upgrade42010to42100Test.java |    81 -
 .../cloud/upgrade/dao/Upgrade42100to42200Test.java |   242 -
 .../cloudstack/backup/dao/BackupDaoImplTest.java   |    73 -
 engine/schema/templateConfig.sh                    |     2 +-
 engine/service/pom.xml                             |     2 +-
 engine/service/src/main/webapp/WEB-INF/beans.xml   |   106 +-
 engine/service/src/main/webapp/WEB-INF/web.xml     |    54 +-
 engine/storage/cache/pom.xml                       |     2 +-
 engine/storage/configdrive/pom.xml                 |     2 +-
 engine/storage/datamotion/pom.xml                  |     2 +-
 .../storage/motion/AncientDataMotionStrategy.java  |    97 +-
 .../motion/StorageSystemDataMotionStrategy.java    |   159 +-
 .../motion/AncientDataMotionStrategyTest.java      |   200 -
 engine/storage/image/pom.xml                       |     2 +-
 .../storage/image/TemplateServiceImpl.java         |     4 +-
 .../manager/ImageStoreProviderManagerImpl.java     |    49 +-
 .../storage/image/store/TemplateObject.java        |    10 -
 .../manager/ImageStoreProviderManagerImplTest.java |    63 -
 engine/storage/integration-test/pom.xml            |     2 +-
 .../storage/test/ChildTestConfiguration.java       |     4 +-
 .../cloudstack/storage/test/SnapshotTest.java      |     3 +-
 .../storage/test/SnapshotTestWithFakeData.java     |     2 +-
 .../cloudstack/storage/test/VolumeServiceTest.java |     5 +-
 .../cloudstack/storage/test/VolumeTestVmware.java  |     3 +-
 engine/storage/object/pom.xml                      |     2 +-
 engine/storage/pom.xml                             |     2 +-
 engine/storage/snapshot/pom.xml                    |     2 +-
 .../storage/snapshot/CephSnapshotStrategy.java     |     4 -
 .../storage/snapshot/DefaultSnapshotStrategy.java  |   204 +-
 .../storage/snapshot/ScaleIOSnapshotStrategy.java  |     4 -
 .../storage/snapshot/SnapshotObject.java           |    77 +-
 .../storage/snapshot/SnapshotServiceImpl.java      |   185 +-
 .../snapshot/StorageSystemSnapshotStrategy.java    |     5 +-
 .../vmsnapshot/DefaultVMSnapshotStrategy.java      |    36 +-
 .../KvmFileBasedStorageVmSnapshotStrategy.java     |   689 -
 .../vmsnapshot/ScaleIOVMSnapshotStrategy.java      |    13 +-
 .../vmsnapshot/StorageVMSnapshotStrategy.java      |    23 +-
 ...ing-engine-storage-snapshot-storage-context.xml |     3 -
 .../snapshot/DefaultSnapshotStrategyTest.java      |    99 +-
 .../storage/snapshot/SnapshotServiceImplTest.java  |   157 +-
 .../storage/vmsnapshot/VMSnapshotStrategyTest.java |     6 -
 .../allocator/AbstractStoragePoolAllocator.java    |    86 +-
 .../ClusterScopeStoragePoolAllocator.java          |    38 +-
 .../allocator/ZoneWideStoragePoolAllocator.java    |    19 +-
 .../datastore/ObjectInDataStoreManagerImpl.java    |    58 +-
 .../storage/endpoint/DefaultEndPointSelector.java  |   116 +-
 .../object/datastore/ObjectStoreHelper.java        |     2 -
 .../volume/datastore/PrimaryDataStoreHelper.java   |    39 +-
 .../AbstractStoragePoolAllocatorTest.java          |    88 +-
 .../ZoneWideStoragePoolAllocatorTest.java          |    71 -
 .../datastore/db/SnapshotDataStoreDaoImplTest.java |     4 +-
 .../endpoint/DefaultEndPointSelectorTest.java      |   200 -
 engine/storage/storage.ucls                        |   672 +-
 engine/storage/volume/pom.xml                      |     2 +-
 .../storage/datastore/PrimaryDataStoreImpl.java    |     1 -
 .../storage/datastore/manager/data model.ucls      |   110 +-
 .../datastore/provider/DefaultHostListener.java    |    47 +-
 .../storage/volume/VolumeDataFactoryImpl.java      |     8 -
 .../cloudstack/storage/volume/VolumeObject.java    |    22 -
 .../storage/volume/VolumeServiceImpl.java          |    26 +-
 .../storage/volume/VolumeObjectTest.java           |    17 +-
 .../storage/volume/VolumeServiceTest.java          |    16 +-
 engine/userdata/cloud-init/pom.xml                 |     2 +-
 engine/userdata/pom.xml                            |     2 +-
 .../cloudstack/userdata/UserDataManagerImpl.java   |    30 -
 .../userdata/UserDataManagerImplTest.java          |    90 -
 extensions/HyperV/hyperv.py                        |   308 -
 extensions/MaaS/maas.py                            |   263 -
 extensions/Proxmox/proxmox.sh                      |   510 -
 framework/agent-lb/pom.xml                         |     2 +-
 .../cloudstack/agent/lb/IndirectAgentLB.java       |    33 +-
 framework/ca/pom.xml                               |     2 +-
 framework/cluster/pom.xml                          |     2 +-
 .../java/com/cloud/cluster/ClusterManagerImpl.java |    70 +-
 .../cloud/cluster/dao/ManagementServerHostDao.java |     6 +-
 .../cluster/dao/ManagementServerHostDaoImpl.java   |    42 +-
 .../cluster/dao/ManagementServerHostPeerDao.java   |     3 -
 .../dao/ManagementServerHostPeerDaoImpl.java       |    33 -
 framework/config/pom.xml                           |     2 +-
 .../apache/cloudstack/config/Configuration.java    |     7 +-
 .../cloudstack/framework/config/ConfigDepot.java   |     3 -
 .../cloudstack/framework/config/ConfigKey.java     |   237 +-
 .../framework/config/ScopedConfigStorage.java      |     5 -
 .../framework/config/dao/ConfigurationDao.java     |     3 -
 .../framework/config/dao/ConfigurationDaoImpl.java |    11 -
 .../framework/config/impl/ConfigDepotImpl.java     |    62 +-
 .../framework/config/impl/ConfigurationVO.java     |    15 +-
 .../cloudstack/framework/config/ConfigKeyTest.java |    29 -
 .../framework/config/impl/ConfigDepotImplTest.java |    81 +-
 framework/db/pom.xml                               |     2 +-
 .../main/java/com/cloud/dao/EntityManagerImpl.java |     8 -
 .../utils/crypt/EncryptionSecretKeyChanger.java    |     2 +-
 .../main/java/com/cloud/utils/db/GenericDao.java   |     6 -
 .../java/com/cloud/utils/db/GenericDaoBase.java    |    11 -
 .../main/java/com/cloud/utils/db/SearchBase.java   |    11 -
 .../java/com/cloud/utils/db/SearchCriteria.java    |     6 +-
 .../java/com/cloud/utils/db/TransactionLegacy.java |     9 -
 framework/direct-download/pom.xml                  |     2 +-
 framework/events/pom.xml                           |     2 +-
 framework/extensions/pom.xml                       |    54 -
 .../extensions/api/AddCustomActionCmd.java         |   175 -
 .../extensions/api/CreateExtensionCmd.java         |   140 -
 .../extensions/api/DeleteCustomActionCmd.java      |    96 -
 .../extensions/api/DeleteExtensionCmd.java         |   105 -
 .../extensions/api/ListCustomActionCmd.java        |   110 -
 .../extensions/api/ListExtensionsCmd.java          |   114 -
 .../extensions/api/RegisterExtensionCmd.java       |   118 -
 .../extensions/api/RunCustomActionCmd.java         |   121 -
 .../extensions/api/UnregisterExtensionCmd.java     |   109 -
 .../extensions/api/UpdateCustomActionCmd.java      |   197 -
 .../extensions/api/UpdateExtensionCmd.java         |   136 -
 .../command/CleanupExtensionFilesCommand.java      |    27 -
 .../extensions/command/ExtensionBaseCommand.java   |    63 -
 .../command/ExtensionRoutingUpdateCommand.java     |    34 -
 .../command/ExtensionServerActionBaseCommand.java  |    33 -
 .../command/GetExtensionPathChecksumCommand.java   |    27 -
 .../command/PrepareExtensionPathCommand.java       |    27 -
 .../extensions/dao/ExtensionCustomActionDao.java   |    27 -
 .../dao/ExtensionCustomActionDaoImpl.java          |    59 -
 .../dao/ExtensionCustomActionDetailsDao.java       |    26 -
 .../dao/ExtensionCustomActionDetailsDaoImpl.java   |    28 -
 .../framework/extensions/dao/ExtensionDao.java     |    26 -
 .../framework/extensions/dao/ExtensionDaoImpl.java |    45 -
 .../extensions/dao/ExtensionDetailsDao.java        |    24 -
 .../extensions/dao/ExtensionDetailsDaoImpl.java    |    28 -
 .../extensions/dao/ExtensionResourceMapDao.java    |    32 -
 .../dao/ExtensionResourceMapDaoImpl.java           |    70 -
 .../dao/ExtensionResourceMapDetailsDao.java        |    26 -
 .../dao/ExtensionResourceMapDetailsDaoImpl.java    |    28 -
 .../extensions/manager/ExtensionsManager.java      |   100 -
 .../extensions/manager/ExtensionsManagerImpl.java  |  1696 --
 .../vo/ExtensionCustomActionDetailsVO.java         |    97 -
 .../extensions/vo/ExtensionCustomActionVO.java     |   215 -
 .../extensions/vo/ExtensionDetailsVO.java          |    97 -
 .../vo/ExtensionResourceMapDetailsVO.java          |    97 -
 .../extensions/vo/ExtensionResourceMapVO.java      |   122 -
 .../framework/extensions/vo/ExtensionVO.java       |   179 -
 .../spring-framework-extensions-core-context.xml   |    36 -
 .../extensions/api/AddCustomActionCmdTest.java     |   224 -
 .../extensions/api/CreateExtensionCmdTest.java     |    97 -
 .../extensions/api/DeleteCustomActionCmdTest.java  |    81 -
 .../extensions/api/DeleteExtensionCmdTest.java     |    90 -
 .../extensions/api/ListCustomActionCmdTest.java    |   153 -
 .../extensions/api/ListExtensionsCmdTest.java      |    92 -
 .../extensions/api/RegisterExtensionCmdTest.java   |   133 -
 .../extensions/api/RunCustomActionCmdTest.java     |   127 -
 .../extensions/api/UnregisterExtensionCmdTest.java |   124 -
 .../extensions/api/UpdateCustomActionCmdTest.java  |   240 -
 .../extensions/api/UpdateExtensionCmdTest.java     |   168 -
 .../command/ExtensionBaseCommandTest.java          |    78 -
 .../dao/ExtensionCustomActionDaoImplTest.java      |    68 -
 .../extensions/dao/ExtensionDaoImplTest.java       |    51 -
 .../dao/ExtensionResourceMapDaoImplTest.java       |    86 -
 .../manager/ExtensionsManagerImplTest.java         |  2072 ---
 framework/ipc/pom.xml                              |     2 +-
 framework/jobs/pom.xml                             |     2 +-
 .../framework/jobs/impl/AsyncJobManagerImpl.java   |    88 +-
 framework/managed-context/pom.xml                  |     2 +-
 framework/pom.xml                                  |     3 +-
 framework/quota/pom.xml                            |     2 +-
 .../apache/cloudstack/quota/QuotaManagerImpl.java  |     6 -
 .../activationrule/presetvariables/Account.java    |    16 -
 .../presetvariables/ComputeOffering.java           |    14 -
 .../presetvariables/Configuration.java             |    35 -
 .../DiskOfferingPresetVariables.java               |   165 -
 .../presetvariables/PresetVariableHelper.java      |    83 +-
 .../presetvariables/PresetVariables.java           |    24 -
 .../activationrule/presetvariables/Value.java      |    20 +-
 .../cloudstack/quota/constant/QuotaTypes.java      |    16 -
 .../cloudstack/quota/dao/QuotaCreditsDao.java      |     2 +-
 .../cloudstack/quota/dao/QuotaCreditsDaoImpl.java  |    54 +-
 ...stanceDetailsDao.java => UserVmDetailsDao.java} |     4 +-
 ...tailsDaoImpl.java => UserVmDetailsDaoImpl.java} |    14 +-
 .../apache/cloudstack/quota/vo/QuotaCreditsVO.java |     6 -
 ...VMInstanceDetailVO.java => UserVmDetailVO.java} |     8 +-
 .../quota/spring-framework-quota-context.xml       |     2 +-
 .../presetvariables/PresetVariableHelperTest.java  |   114 +-
 framework/rest/pom.xml                             |     2 +-
 framework/security/pom.xml                         |     2 +-
 framework/spring/lifecycle/pom.xml                 |     2 +-
 framework/spring/module/pom.xml                    |     2 +-
 .../factory/ModuleBasedContextFactoryTest.java     |    79 +-
 ...nheritable.xml => test-context-inheritable.xml} |     0
 .../base/{base-context.xml => test-context.xml}    |     0
 .../{child1-1-context.xml => test-context.xml}     |     0
 .../child1/child1-context-inheritable.xml          |    24 -
 ...text-override.xml => test-context-override.xml} |     0
 .../{child1-context.xml => test-context.xml}       |     0
 .../{child2-context.xml => test-context.xml}       |     0
 packaging/debian/replace.properties                |     1 -
 packaging/el10                                     |     1 -
 packaging/el8/cloud-ipallocator.rc                 |     4 +-
 packaging/el8/cloud.spec                           |    35 +-
 packaging/el8/cloudstack-agent.te                  |     4 +-
 packaging/el8/replace.properties                   |     1 -
 packaging/systemd/cloudstack-agent.service         |     1 -
 packaging/systemd/cloudstack-management.service    |     1 -
 packaging/systemd/cloudstack-usage.service         |     1 -
 plugins/acl/dynamic-role-based/pom.xml             |     2 +-
 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 +-
 .../cloudstack/backup/DummyBackupProvider.java     |   123 +-
 plugins/backup/nas/pom.xml                         |     2 +-
 .../cloudstack/backup/NASBackupProvider.java       |   368 +-
 .../cloudstack/backup/NASBackupProviderTest.java   |   352 -
 plugins/backup/networker/pom.xml                   |     2 +-
 .../cloudstack/backup/NetworkerBackupProvider.java |   266 +-
 .../backup/networker/NetworkerClient.java          |     7 -
 .../backup/networker/NetworkerClientTest.java      |     7 -
 plugins/backup/veeam/pom.xml                       |     2 +-
 .../cloudstack/backup/VeeamBackupProvider.java     |   168 +-
 .../cloudstack/backup/veeam/VeeamClient.java       |   141 +-
 .../cloudstack/backup/VeeamBackupProviderTest.java |     9 +-
 .../cloudstack/backup/veeam/VeeamClientTest.java   |   203 +-
 plugins/ca/root-ca/pom.xml                         |     2 +-
 plugins/database/mysql-ha/pom.xml                  |     2 +-
 plugins/database/quota/pom.xml                     |     2 +-
 .../api/command/QuotaCreditsListCmd.java           |   122 -
 .../command/QuotaValidateActivationRuleCmd.java    |    70 -
 .../api/response/QuotaBalanceResponse.java         |     4 +-
 .../api/response/QuotaCreditsResponse.java         |    63 +-
 .../api/response/QuotaResponseBuilder.java         |     6 -
 .../api/response/QuotaResponseBuilderImpl.java     |   219 +-
 .../QuotaValidateActivationRuleResponse.java       |    76 -
 .../apache/cloudstack/quota/QuotaServiceImpl.java  |     4 -
 .../api/command/QuotaCreditsListCmdTest.java       |    79 -
 .../QuotaValidateActivationRuleCmdTest.java        |    41 -
 .../api/response/QuotaResponseBuilderImplTest.java |   253 +-
 plugins/dedicated-resources/pom.xml                |     2 +-
 .../implicit-dedication/pom.xml                    |     2 +-
 .../implicitplanner/ImplicitPlannerTest.java       |    10 +-
 .../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 +-
 .../cloudstack/mom/rabbitmq/RabbitMQEventBus.java  |     3 +-
 plugins/event-bus/webhook/pom.xml                  |     2 +-
 plugins/ha-planners/skip-heurestics/pom.xml        |     2 +-
 plugins/host-allocators/random/pom.xml             |     2 +-
 plugins/hypervisors/baremetal/pom.xml              |   102 +-
 .../baremetal/manager/BareMetalDiscoverer.java     |     3 +-
 .../main/resources/security_group_agent/cs-sgagent |     2 +-
 plugins/hypervisors/external/pom.xml               |    44 -
 .../agent/manager/ExternalAgentManager.java        |    24 -
 .../agent/manager/ExternalAgentManagerImpl.java    |    55 -
 .../agent/manager/ExternalServerPlanner.java       |   183 -
 .../agent/manager/ExternalTemplateAdapter.java     |   279 -
 .../cloudstack/guru/ExternalHypervisorGuru.java    |   114 -
 .../discoverer/ExternalServerDiscoverer.java       |   295 -
 .../ExternalPathPayloadProvisioner.java            |   903 -
 .../external/resource/ExternalResource.java        |   387 -
 .../core/spring-external-core-context.xml          |    31 -
 .../cloudstack/external-compute/module.properties  |    18 -
 .../spring-external-compute-context.xml            |    31 -
 .../external-discoverer/module.properties          |    18 -
 .../spring-external-discoverer-context.xml         |    34 -
 .../cloudstack/external-planner/module.properties  |    18 -
 .../spring-external-planner-context.xml            |    34 -
 .../cloudstack/external-storage/module.properties  |    18 -
 .../spring-external-storage-context.xml            |    32 -
 .../agent/manager/ExternalTemplateAdapterTest.java |   173 -
 .../discoverer/ExternalServerDiscovererTest.java   |   182 -
 .../ExternalPathPayloadProvisionerTest.java        |   989 --
 .../external/resource/ExternalResourceTest.java    |    93 -
 .../DotNet/ServerResource/.nuget/NuGet.Config      |     2 +-
 .../AgentShell/AgentService.Designer.cs            |     8 +-
 .../ServerResource/AgentShell/AgentService.cs      |     2 +-
 .../AgentShell/AgentSettings.Designer.cs           |    76 +-
 .../AgentShell/AgentSettings.settings              |     2 +-
 .../ServerResource/AgentShell/AgentShell.csproj    |     2 +-
 .../AgentShell/AgentShellException.cs              |     2 +-
 .../DotNet/ServerResource/AgentShell/App.config    |     2 +-
 .../DotNet/ServerResource/AgentShell/Program.cs    |     2 +-
 .../AgentShell/ProjectInstaller.Designer.cs        |     4 +-
 .../ServerResource/AgentShell/ProjectInstaller.cs  |     2 +-
 .../AgentShell/Properties/AssemblyInfo.cs          |    12 +-
 .../ServerResource/AgentShell/packages.config      |     2 +-
 .../ServerResource/HypervResource/App.config       |     2 +-
 .../HypervResource/CloudStackTypes.cs              |    24 +-
 .../HypervResource/HypervResource.csproj           |     2 +-
 .../HypervResource/HypervResourceController.cs     |    10 +-
 .../ServerResource/HypervResource/IWmiCallsV2.cs   |     2 +-
 .../HypervResource/Properties/AssemblyInfo.cs      |    12 +-
 .../ServerResource/HypervResource/WmiCallsV2.cs    |   146 +-
 .../ServerResource/HypervResource/packages.config  |     2 +-
 .../ServerResource/ServerResource.Tests/App.config |     2 +-
 .../HypervResourceController1Test.cs               |   700 +-
 .../HypervResourceControllerTest.cs                |  2294 +--
 .../Properties/AssemblyInfo.cs                     |    12 +-
 .../ServerResource.Tests.csproj                    |     2 +-
 .../ServerResource.Tests/packages.config           |     2 +-
 .../DotNet/ServerResource/ServerResource.sln       |     2 +-
 .../WmiWrappers/Properties/AssemblyInfo.cs         |    12 +-
 .../ROOT.CIMV2.Win32_OperatingSystem.cs            |   712 +-
 .../WmiWrappers/ROOT.CIMV2.Win32_Processor.cs      |   920 +-
 .../ROOT.virtualization.v2.Msvm_ComputerSystem.cs  |  3636 ++--
 .../ROOT.virtualization.v2.Msvm_ConcreteJob.cs     |  3686 ++--
 ...on.v2.Msvm_EthernetPortAllocationSettingData.cs |  2328 +--
 ...OT.virtualization.v2.Msvm_EthernetSwitchPort.cs |  4238 ++---
 ....Msvm_EthernetSwitchPortBandwidthSettingData.cs |   262 +-
 ...on.v2.Msvm_EthernetSwitchPortVlanSettingData.cs |  2044 +--
 ....virtualization.v2.Msvm_ExternalEthernetPort.cs |  4174 ++---
 ...irtualization.v2.Msvm_ImageManagementService.cs |  3050 ++--
 ....virtualization.v2.Msvm_KvpExchangeComponent.cs |  3230 ++--
 ...tion.v2.Msvm_KvpExchangeComponentSettingData.cs |  2072 +--
 ...T.virtualization.v2.Msvm_KvpExchangeDataItem.cs |  1340 +-
 .../ROOT.virtualization.v2.Msvm_LANEndpoint.cs     |  2844 ++--
 ...OOT.virtualization.v2.Msvm_MemorySettingData.cs |  2326 +--
 .../ROOT.virtualization.v2.Msvm_MigrationJob.cs    |   446 +-
 ....virtualization.v2.Msvm_ProcessorSettingData.cs |  2268 +--
 ...zation.v2.Msvm_ResourceAllocationSettingData.cs |  2020 +--
 ...OOT.virtualization.v2.Msvm_ShutdownComponent.cs |   384 +-
 ...ization.v2.Msvm_StorageAllocationSettingData.cs |  2428 +--
 .../ROOT.virtualization.v2.Msvm_StorageJob.cs      |   444 +-
 ...OT.virtualization.v2.Msvm_SummaryInformation.cs |  3074 ++--
 ...ion.v2.Msvm_SyntheticEthernetPortSettingData.cs |  2132 +--
 ...virtualization.v2.Msvm_VirtualEthernetSwitch.cs |  2772 +--
 ....Msvm_VirtualEthernetSwitchManagementService.cs |  3030 ++--
 ...alization.v2.Msvm_VirtualHardDiskSettingData.cs |  2102 +--
 ...ation.v2.Msvm_VirtualSystemManagementService.cs |  3832 ++---
 ...vm_VirtualSystemManagementServiceSettingData.cs |  1618 +-
 ...zation.v2.Msvm_VirtualSystemMigrationService.cs |   362 +-
 ...on.v2.Msvm_VirtualSystemMigrationSettingData.cs |   288 +-
 ...tualization.v2.Msvm_VirtualSystemSettingData.cs |  3320 ++--
 .../DotNet/ServerResource/WmiWrappers/Readme.txt   |     2 +-
 .../ServerResource/WmiWrappers/WmiWrappers.csproj  |     2 +-
 ...fFormattedData_Counters_ProcessorInformation.cs |   404 +-
 plugins/hypervisors/hyperv/pom.xml                 |     2 +-
 .../hyperv/discoverer/HypervServerDiscoverer.java  |     8 +-
 .../motion/HypervStorageMotionStrategy.java        |     1 -
 plugins/hypervisors/kvm/pom.xml                    |     6 +-
 .../kvm/resource/BlockCommitListener.java          |    77 -
 .../hypervisor/kvm/resource/BridgeVifDriver.java   |    14 +-
 .../hypervisor/kvm/resource/DirectVifDriver.java   |     4 +-
 .../hypervisor/kvm/resource/IvsVifDriver.java      |     2 +-
 .../kvm/resource/LibvirtComputingResource.java     |   871 +-
 .../hypervisor/kvm/resource/LibvirtGpuDef.java     |   107 -
 .../kvm/resource/LibvirtKvmAgentHook.java          |    89 +-
 .../hypervisor/kvm/resource/LibvirtVMDef.java      |     6 +-
 .../hypervisor/kvm/resource/LibvirtXMLParser.java  |    21 -
 .../hypervisor/kvm/resource/OvsVifDriver.java      |     4 +-
 .../hypervisor/kvm/resource/VifDriverBase.java     |     9 -
 .../resource/disconnecthook/DisconnectHook.java    |    59 -
 .../disconnecthook/MigrationCancelHook.java        |    50 -
 .../disconnecthook/VolumeMigrationCancelHook.java  |    53 -
 .../LibvirtCheckVirtualMachineCommandWrapper.java  |     7 -
 .../LibvirtConvertInstanceCommandWrapper.java      |    73 +-
 .../LibvirtConvertSnapshotCommandWrapper.java      |   106 -
 .../wrapper/LibvirtCopyVolumeCommandWrapper.java   |    10 -
 ...virtCreateDiskOnlyVMSnapshotCommandWrapper.java |   198 -
 ...atePrivateTemplateFromVolumeCommandWrapper.java |     4 +-
 ...virtDeleteDiskOnlyVMSnapshotCommandWrapper.java |    58 -
 .../LibvirtGetBackupStatsCommandWrapper.java       |    71 -
 .../wrapper/LibvirtGetGPUStatsCommandWrapper.java  |    37 -
 .../LibvirtGetVolumesOnStorageCommandWrapper.java  |     6 +-
 ...bvirtImportConvertedInstanceCommandWrapper.java |    16 +-
 ...bvirtMergeDiskOnlyVMSnapshotCommandWrapper.java |   150 -
 .../wrapper/LibvirtMigrateCommandWrapper.java      |   169 +-
 .../LibvirtMigrateVolumeCommandWrapper.java        |    32 +-
 .../LibvirtModifyStoragePoolCommandWrapper.java    |    28 +-
 .../wrapper/LibvirtReconcileCommandWrapper.java    |   258 -
 .../LibvirtRecreateCheckpointsCommandWrapper.java  |    48 -
 .../wrapper/LibvirtRemoveBitmapCommandWrapper.java |   130 -
 .../resource/wrapper/LibvirtRequestWrapper.java    |     9 +-
 .../LibvirtRestoreBackupCommandWrapper.java        |   247 +-
 ...virtRevertDiskOnlyVMSnapshotCommandWrapper.java |   111 -
 .../LibvirtRevertSnapshotCommandWrapper.java       |    45 +-
 .../wrapper/LibvirtStartCommandWrapper.java        |    10 -
 .../wrapper/LibvirtTakeBackupCommandWrapper.java   |    35 +-
 .../LibvirtUnmanageInstanceCommandWrapper.java     |   174 -
 ...ibvirtUnprepareStorageClientCommandWrapper.java |     2 +-
 .../resource/wrapper/LibvirtUtilitiesHelper.java   |    10 -
 .../kvm/storage/IscsiAdmStorageAdaptor.java        |     4 +-
 .../hypervisor/kvm/storage/KVMPhysicalDisk.java    |    17 +-
 .../hypervisor/kvm/storage/KVMStoragePool.java     |     5 -
 .../kvm/storage/KVMStoragePoolManager.java         |    73 +-
 .../kvm/storage/KVMStorageProcessor.java           |   893 +-
 .../kvm/storage/LibvirtStorageAdaptor.java         |   166 +-
 .../hypervisor/kvm/storage/LibvirtStoragePool.java |     8 +-
 .../kvm/storage/MultipathSCSIAdapterBase.java      |    18 +
 .../kvm/storage/ScaleIOStorageAdaptor.java         |   216 +-
 .../hypervisor/kvm/storage/StorageAdaptor.java     |    11 +-
 .../kvm/storage/StoragePoolInformation.java        |    75 -
 .../apache/cloudstack/utils/linux/KVMHostInfo.java |     7 -
 .../org/apache/cloudstack/utils/qemu/QemuImg.java  |   125 -
 .../apache/cloudstack/utils/qemu/QemuImgFile.java  |     6 -
 .../kvm/resource/DisconnectHooksTest.java          |   191 -
 .../kvm/resource/LibvirtComputingResourceTest.java |   611 +-
 .../hypervisor/kvm/resource/LibvirtGpuDefTest.java |   141 -
 .../kvm/resource/LibvirtKvmAgentHookTest.java      |    43 -
 .../LibvirtConvertInstanceCommandWrapperTest.java  |    23 +-
 .../wrapper/LibvirtMigrateCommandWrapperTest.java  |   221 +-
 .../LibvirtRestoreBackupCommandWrapperTest.java    |   526 -
 .../LibvirtRevertSnapshotCommandWrapperTest.java   |    56 +-
 .../LibvirtUnmanageInstanceCommandWrapperTest.java |   357 -
 ...rtUnprepareStorageClientCommandWrapperTest.java |    14 +-
 .../kvm/storage/KVMPhysicalDiskTest.java           |    64 +-
 .../kvm/storage/KVMStorageProcessorTest.java       |   140 +-
 .../kvm/storage/ScaleIOStorageAdaptorTest.java     |    74 +-
 plugins/hypervisors/ovm/pom.xml                    |     2 +-
 .../com/cloud/ovm/hypervisor/OvmDiscoverer.java    |     3 +-
 .../com/cloud/ovm/hypervisor/OvmResourceBase.java  |     4 +-
 plugins/hypervisors/ovm3/pom.xml                   |     2 +-
 .../cloud/hypervisor/ovm3/objects/OvmObject.java   |     3 +-
 .../hypervisor/ovm3/resources/Ovm3Discoverer.java  |     3 +-
 .../ovm3/resources/Ovm3HypervisorResource.java     |     4 +-
 .../ovm3/resources/Ovm3StorageProcessor.java       |     6 +-
 .../com/cloud/hypervisor/ovm3/objects/XenTest.java |     5 +-
 .../test/resources/scripts/create_pool_cluster.py  |    83 +-
 plugins/hypervisors/simulator/pom.xml              |     2 +-
 .../com/cloud/agent/manager/MockAgentManager.java  |     7 -
 .../cloud/agent/manager/MockAgentManagerImpl.java  |   194 +-
 .../agent/manager/MockStorageManagerImpl.java      |     3 +-
 .../com/cloud/agent/manager/MockVmManagerImpl.java |    60 +-
 .../cloud/agent/manager/SimulatorManagerImpl.java  |     5 +-
 .../com/cloud/resource/SimulatorDiscoverer.java    |     2 -
 .../cloud/resource/SimulatorStorageProcessor.java  |    10 +-
 .../java/com/cloud/simulator/MockGpuDevice.java    |    42 -
 .../java/com/cloud/simulator/MockGpuDeviceVO.java  |   313 -
 .../java/com/cloud/simulator/SimulatorGuru.java    |    33 +-
 .../com/cloud/simulator/dao/MockGpuDeviceDao.java  |    43 -
 .../cloud/simulator/dao/MockGpuDeviceDaoImpl.java  |    67 -
 .../core/spring-simulator-core-context.xml         |     1 -
 plugins/hypervisors/ucs/pom.xml                    |     2 +-
 plugins/hypervisors/vmware/pom.xml                 |     2 +-
 .../java/com/cloud/hypervisor/guru/VMwareGuru.java |     6 +-
 .../hypervisor/vmware/VmwareServerDiscoverer.java  |     4 +-
 .../vmware/manager/VmwareManagerImpl.java          |     4 +-
 .../vmware/manager/VmwareStorageManagerImpl.java   |     3 +-
 .../hypervisor/vmware/resource/VmwareResource.java |    21 +-
 .../network/element/CiscoNexusVSMElement.java      |     1 +
 .../storage/resource/VmwareStorageProcessor.java   |    15 +-
 .../motion/VmwareStorageMotionStrategy.java        |     1 -
 .../com/cloud/hypervisor/guru/VMwareGuruTest.java  |    16 +-
 .../vmware/manager/VmwareManagerImplTest.java      |     2 -
 .../vmware/resource/VmwareResourceTest.java        |    15 +-
 plugins/hypervisors/xenserver/pom.xml              |     2 +-
 .../xenserver/resource/CitrixResourceBase.java     |    19 +-
 .../xenserver/resource/XenServer56Resource.java    |     7 +-
 .../resource/XenServerStorageProcessor.java        |     9 +-
 .../resource/Xenserver625StorageProcessor.java     |    23 +-
 .../xenserver/XenServerResourceNewBase.java        |     7 +-
 .../resource/Xenserver625StorageProcessorTest.java |     8 +-
 plugins/integrations/cloudian/pom.xml              |     2 +-
 .../cloudstack/cloudian/client/CloudianClient.java |   303 +-
 .../cloudian/client/CloudianCredential.java        |    88 -
 .../cloudian/client/CloudianUserBucketUsage.java   |   106 -
 .../cloudstack/cloudian/CloudianClientTest.java    |   416 +
 .../cloudstack/cloudian/CloudianUtilsTest.java     |     2 +-
 .../cloudian/client/CloudianClientTest.java        |   790 -
 plugins/integrations/kubernetes-service/pom.xml    |     2 +-
 .../kubernetes/cluster/KubernetesCluster.java      |    27 -
 .../cluster/KubernetesClusterEventTypes.java       |     2 -
 .../cluster/KubernetesClusterManagerImpl.java      |   686 +-
 .../cluster/KubernetesClusterService.java          |    57 +-
 .../kubernetes/cluster/KubernetesClusterVO.java    |   113 +-
 .../cluster/KubernetesClusterVmMapVO.java          |    44 -
 .../cluster/KubernetesServiceHelperImpl.java       |   134 -
 .../KubernetesClusterActionWorker.java             |   492 +-
 .../actionworkers/KubernetesClusterAddWorker.java  |   326 -
 .../KubernetesClusterDestroyWorker.java            |    29 +-
 .../KubernetesClusterRemoveWorker.java             |   183 -
 ...ernetesClusterResourceModifierActionWorker.java |   351 +-
 .../KubernetesClusterScaleWorker.java              |   257 +-
 .../KubernetesClusterStartWorker.java              |   394 +-
 .../KubernetesClusterUpgradeWorker.java            |    22 +-
 .../cluster/dao/KubernetesClusterVmMapDao.java     |     3 -
 .../cluster/dao/KubernetesClusterVmMapDaoImpl.java |    23 -
 .../cluster/utils/KubernetesClusterUtil.java       |    24 +-
 .../version/KubernetesVersionManagerImpl.java      |    96 +-
 .../version/KubernetesVersionService.java          |     3 -
 ...loadParamsForKubernetesSupportedVersionCmd.java |   127 -
 .../cluster/AddNodesToKubernetesClusterCmd.java    |   133 -
 .../cluster/CreateKubernetesClusterCmd.java        |   142 +-
 .../RemoveNodesFromKubernetesClusterCmd.java       |   125 -
 .../cluster/ScaleKubernetesClusterCmd.java         |    14 -
 .../cluster/StartKubernetesClusterCmd.java         |     6 +-
 .../api/response/KubernetesClusterResponse.java    |   125 +-
 .../src/main/resources/conf/etcd-node.yml          |   134 -
 .../main/resources/conf/k8s-control-node-add.yml   |    14 +-
 .../src/main/resources/conf/k8s-control-node.yml   |    62 +-
 .../src/main/resources/conf/k8s-node.yml           |    29 +-
 .../script/delete-pv-reclaimpolicy-delete          |   156 -
 .../src/main/resources/script/deploy-csi-driver    |    46 -
 .../main/resources/script/remove-node-from-cluster |    43 -
 .../main/resources/script/upgrade-kubernetes.sh    |    10 +-
 .../src/main/resources/script/validate-cks-node    |    45 -
 .../cluster/KubernetesClusterHelperImplTest.java   |   145 -
 .../cluster/KubernetesClusterManagerImplTest.java  |   140 +-
 .../KubernetesClusterScaleWorkerTest.java          |   128 -
 .../KubernetesClusterUpgradeWorkerTest.java        |    83 -
 .../cluster/utils/KubernetesClusterUtilTest.java   |     8 +-
 plugins/integrations/prometheus/pom.xml            |     2 +-
 .../cloudstack/metrics/PrometheusExporterImpl.java |    11 -
 .../api/command/CancelMaintenanceCmd.java          |    70 -
 .../api/command/PrepareForMaintenanceCmd.java      |    80 -
 .../ManagementServerMaintenanceListener.java       |    28 -
 .../ManagementServerMaintenanceManager.java        |   121 -
 .../ManagementServerMaintenanceManagerImpl.java    |   732 -
 ...ncelMaintenanceManagementServerHostCommand.java |    26 -
 ...eForMaintenanceManagementServerHostCommand.java |    42 -
 .../cloudstack/maintenance/module.properties       |    18 -
 .../maintenance/spring-maintenance-context.xml     |    29 -
 ...ManagementServerMaintenanceManagerImplTest.java |   573 -
 plugins/metrics/pom.xml                            |     2 +-
 .../org/apache/cloudstack/api/MetricConstants.java |     2 -
 .../cloudstack/metrics/MetricsServiceImpl.java     |    13 +-
 .../cloudstack/response/HostMetricsResponse.java   |    10 +
 .../response/InfrastructureResponse.java           |     8 -
 plugins/network-elements/bigswitch/pom.xml         |     2 +-
 .../cloud/network/element/BigSwitchBcfElement.java |    54 +-
 plugins/network-elements/brocade-vcs/pom.xml       |     2 +-
 plugins/network-elements/cisco-vnmc/pom.xml        |     2 +-
 .../network/cisco/create-acl-policy-ref.xml        |    68 +-
 .../network/cisco/create-acl-policy-set.xml        |    64 +-
 .../scripts/network/cisco/create-acl-policy.xml    |    62 +-
 .../network/cisco/create-acl-rule-for-dnat.xml     |   156 +-
 .../network/cisco/create-acl-rule-for-pf.xml       |   304 +-
 .../scripts/network/cisco/create-dnat-rule.xml     |   174 +-
 .../network/cisco/create-egress-acl-rule.xml       |   328 +-
 .../create-generic-egress-acl-no-protocol-rule.xml |   180 +-
 .../cisco/create-generic-egress-acl-rule.xml       |   234 +-
 .../cisco/create-generic-ingress-acl-rule.xml      |   234 +-
 .../network/cisco/create-ingress-acl-rule.xml      |   328 +-
 .../main/scripts/network/cisco/create-ip-pool.xml  |   108 +-
 .../network/cisco/create-nat-policy-ref.xml        |    68 +-
 .../scripts/network/cisco/create-nat-policy.xml    |    66 +-
 .../main/scripts/network/cisco/create-pf-rule.xml  |   324 +-
 .../scripts/network/cisco/create-port-pool.xml     |   136 +-
 .../network/cisco/delete-acl-policy-set.xml        |    60 +-
 .../scripts/network/cisco/delete-acl-policy.xml    |    66 +-
 .../scripts/network/cisco/delete-edge-firewall.xml |    60 +-
 .../network/cisco/delete-edge-security-profile.xml |    76 +-
 .../network/cisco/delete-nat-policy-set.xml        |    60 +-
 .../scripts/network/cisco/delete-nat-policy.xml    |    66 +-
 .../src/main/scripts/network/cisco/delete-rule.xml |    62 +-
 .../main/scripts/network/cisco/delete-tenant.xml   |    60 +-
 .../src/main/scripts/network/cisco/delete-vdc.xml  |    60 +-
 .../scripts/network/cisco/disassoc-asa1000v.xml    |    60 +-
 .../scripts/network/cisco/list-acl-policies.xml    |    54 +-
 .../main/scripts/network/cisco/list-children.xml   |    46 +-
 .../scripts/network/cisco/list-nat-policies.xml    |    54 +-
 .../network/cisco/list-policyrefs-in-policyset.xml |    54 +-
 plugins/network-elements/dns-notifier/pom.xml      |     2 +-
 .../network-elements/elastic-loadbalancer/pom.xml  |     2 +-
 .../network/lb/ElasticLoadBalancerManagerImpl.java |    23 +-
 .../cloud/network/lb/LoadBalanceRuleHandler.java   |     2 +-
 plugins/network-elements/globodns/pom.xml          |     2 +-
 .../network-elements/internal-loadbalancer/pom.xml |     2 +-
 .../lb/InternalLoadBalancerVMManagerImpl.java      |    23 +-
 .../internallbvmmgr/LbChildTestConfiguration.java  |     6 -
 .../lb/InternalLoadBalancerVMManagerImplTest.java  |    10 +-
 plugins/network-elements/juniper-contrail/pom.xml  |     2 +-
 .../contrail/management/ContrailManagerImpl.java   |     6 +-
 .../contrail/management/ServiceManagerImpl.java    |     2 +-
 .../management/IntegrationTestConfiguration.java   |     4 +-
 .../contrail/management/ManagementServerMock.java  |     2 +-
 plugins/network-elements/netris/pom.xml            |    44 -
 .../apache/cloudstack/StartupNetrisCommand.java    |    26 -
 .../api/AddOrUpdateNetrisStaticRouteCommand.java   |    48 -
 .../agent/api/CreateNetrisACLCommand.java          |   119 -
 .../agent/api/CreateNetrisVnetCommand.java         |    84 -
 .../agent/api/CreateNetrisVpcCommand.java          |    31 -
 .../agent/api/CreateOrUpdateNetrisACLCommand.java  |   119 -
 ...reateOrUpdateNetrisLoadBalancerRuleCommand.java |    90 -
 .../agent/api/CreateOrUpdateNetrisNatCommand.java  |   148 -
 .../agent/api/DeleteNetrisACLCommand.java          |    46 -
 .../api/DeleteNetrisLoadBalancerRuleCommand.java   |    52 -
 .../agent/api/DeleteNetrisNatRuleCommand.java      |    72 -
 .../agent/api/DeleteNetrisStaticRouteCommand.java  |    23 -
 .../agent/api/DeleteNetrisVnetCommand.java         |    51 -
 .../agent/api/DeleteNetrisVpcCommand.java          |    30 -
 .../agent/api/ListNetrisStaticRoutesAnswer.java    |    36 -
 .../agent/api/ListNetrisStaticRoutesCommand.java   |    23 -
 .../apache/cloudstack/agent/api/NetrisAnswer.java  |    30 -
 .../apache/cloudstack/agent/api/NetrisCommand.java |    70 -
 .../cloudstack/agent/api/ReleaseNatIpCommand.java  |    30 -
 .../agent/api/SetupNetrisPublicRangeCommand.java   |    37 -
 .../agent/api/UpdateNetrisVnetCommand.java         |    51 -
 .../agent/api/UpdateNetrisVpcCommand.java          |    32 -
 .../api/command/AddNetrisProviderCmd.java          |   126 -
 .../api/command/DeleteNetrisProviderCmd.java       |    86 -
 .../api/command/ListNetrisProvidersCmd.java        |    73 -
 .../api/response/NetrisProviderResponse.java       |   123 -
 .../cloudstack/resource/NetrisPortGroup.java       |    30 -
 .../apache/cloudstack/resource/NetrisResource.java |   441 -
 .../resource/NetrisResourceObjectUtils.java        |   103 -
 .../apache/cloudstack/service/NetrisApiClient.java |   100 -
 .../cloudstack/service/NetrisApiClientImpl.java    |  1998 ---
 .../apache/cloudstack/service/NetrisElement.java   |   820 -
 .../cloudstack/service/NetrisGuestNetworkGuru.java |   346 -
 .../cloudstack/service/NetrisProviderService.java  |    32 -
 .../service/NetrisProviderServiceImpl.java         |   217 -
 .../service/NetrisPublicNetworkGuru.java           |   144 -
 .../cloudstack/service/NetrisServiceImpl.java      |   556 -
 .../core/spring-netris-core-managers-context.xml   |    31 -
 .../META-INF/cloudstack/netris/module.properties   |    21 -
 .../cloudstack/netris/spring-netris-context.xml    |    41 -
 .../AddOrUpdateNetrisStaticRouteCommandTest.java   |    91 -
 .../agent/api/CreateNetrisACLCommandTest.java      |   144 -
 .../agent/api/CreateNetrisVnetCommandTest.java     |    95 -
 .../agent/api/CreateNetrisVpcCommandTest.java      |    63 -
 ...eOrUpdateNetrisLoadBalancerRuleCommandTest.java |   139 -
 .../api/CreateOrUpdateNetrisNatCommandTest.java    |   145 -
 .../agent/api/DeleteNetrisACLCommandTest.java      |   103 -
 .../DeleteNetrisLoadBalancerRuleCommandTest.java   |    98 -
 .../agent/api/DeleteNetrisNatRuleCommandTest.java  |    94 -
 .../agent/api/DeleteNetrisVnetCommandTest.java     |    83 -
 .../agent/api/DeleteNetrisVpcCommandTest.java      |    64 -
 .../agent/api/ReleaseNatIpCommandTest.java         |    80 -
 .../api/SetupNetrisPublicRangeCommandTest.java     |    63 -
 .../agent/api/UpdateNetrisVnetCommandTest.java     |   105 -
 .../agent/api/UpdateNetrisVpcCommandTest.java      |    93 -
 .../api/command/AddNetrisProviderCmdTest.java      |   122 -
 .../api/command/DeleteNetrisProviderCmdTest.java   |   101 -
 .../api/command/ListNetrisProvidersCmdTest.java    |   104 -
 .../resource/NetrisResourceObjectUtilsTest.java    |   109 -
 .../cloudstack/resource/NetrisResourceTest.java    |   141 -
 .../service/NetrisApiClientImplTest.java           |   103 -
 .../cloudstack/service/NetrisElementTest.java      |   141 -
 .../service/NetrisGuestNetworkGuruTest.java        |   230 -
 .../service/NetrisProviderServiceImplTest.java     |   220 -
 .../service/NetrisPublicNetworkGuruTest.java       |   225 -
 .../cloudstack/service/NetrisServiceImplTest.java  |    33 -
 plugins/network-elements/netscaler/pom.xml         |     2 +-
 .../cloud/network/vm/NetScalerVMManagerImpl.java   |     2 +-
 plugins/network-elements/nicira-nvp/pom.xml        |     2 +-
 plugins/network-elements/nsx/pom.xml               |     2 +-
 .../api/command/DeleteNsxControllerCmd.java        |     3 +-
 .../apache/cloudstack/resource/NsxNetworkRule.java |   353 +-
 .../apache/cloudstack/resource/NsxOpObject.java    |     8 +-
 .../apache/cloudstack/service/NsxApiClient.java    |    14 +-
 .../org/apache/cloudstack/service/NsxElement.java  |   150 +-
 .../cloudstack/service/NsxGuestNetworkGuru.java    |     9 +
 .../cloudstack/service/NsxPublicNetworkGuru.java   |    18 +-
 .../apache/cloudstack/service/NsxServiceImpl.java  |    48 +-
 .../cloudstack/service/NsxApiClientTest.java       |     6 +-
 .../apache/cloudstack/service/NsxElementTest.java  |    42 +-
 .../service/NsxPublicNetworkGuruTest.java          |    10 +-
 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 +-
 .../command/ConfigTungstenFabricServiceCmd.java    |     1 +
 plugins/network-elements/vxlan/pom.xml             |     2 +-
 .../outofbandmanagement-drivers/ipmitool/pom.xml   |     2 +-
 .../nested-cloudstack/pom.xml                      |     2 +-
 .../outofbandmanagement-drivers/redfish/pom.xml    |     2 +-
 plugins/pom.xml                                    |     9 +-
 plugins/{maintenance => shutdown}/pom.xml          |     6 +-
 .../api/command/BaseShutdownActionCmd.java}        |     8 +-
 .../cloudstack/api/command/CancelShutdownCmd.java  |    10 +-
 .../api/command/PrepareForShutdownCmd.java         |     9 +-
 .../api/command/ReadyForShutdownCmd.java           |    44 +-
 .../cloudstack/api/command/TriggerShutdownCmd.java |    10 +-
 .../api/response/ReadyForShutdownResponse.java}    |    80 +-
 .../cloudstack/shutdown/ShutdownManager.java       |    60 +
 .../cloudstack/shutdown/ShutdownManagerImpl.java   |   267 +
 .../BaseShutdownManagementServerHostCommand.java   |     2 +-
 .../CancelShutdownManagementServerHostCommand.java |     2 +-
 ...pareForShutdownManagementServerHostCommand.java |     2 +-
 ...TriggerShutdownManagementServerHostCommand.java |     2 +-
 .../cloudstack/shutdown}/module.properties         |     2 +-
 .../shutdown/spring-shutdown-context.xml}          |     4 +-
 .../shutdown/ShutdownManagerImplTest.java          |    92 +
 plugins/storage-allocators/random/pom.xml          |     2 +-
 .../allocator/RandomStoragePoolAllocator.java      |     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          |    12 +-
 .../lifecycle/CephObjectStoreLifeCycleImpl.java    |     2 -
 plugins/storage/object/cloudian/README.md          |   175 -
 plugins/storage/object/cloudian/pom.xml            |    70 -
 .../CloudianHyperStoreObjectStoreDriverImpl.java   |   890 -
 ...CloudianHyperStoreObjectStoreLifeCycleImpl.java |   151 -
 .../CloudianHyperStoreObjectStoreProviderImpl.java |    87 -
 .../datastore/util/CloudianHyperStoreUtil.java     |   211 -
 .../storage-object-cloudian/module.properties      |    18 -
 .../spring-storage-object-cloudian-context.xml     |    31 -
 ...loudianHyperStoreObjectStoreDriverImplTest.java |   686 -
 ...dianHyperStoreObjectStoreLifeCycleImplTest.java |   231 -
 ...udianHyperStoreObjectStoreProviderImplTest.java |    59 -
 .../datastore/util/CloudianHyperStoreUtilTest.java |   227 -
 plugins/storage/object/minio/pom.xml               |     2 +-
 .../lifecycle/MinIOObjectStoreLifeCycleImpl.java   |     2 -
 plugins/storage/object/simulator/pom.xml           |     2 +-
 .../SimulatorObjectStoreLifeCycleImpl.java         |     2 -
 plugins/storage/sharedfs/storagevm/pom.xml         |     2 +-
 .../lifecycle/StorageVmSharedFSLifeCycle.java      |    58 +-
 .../src/main/resources/conf/fsvm-init.yml          |    11 +-
 .../lifecycle/StorageVmSharedFSLifeCycleTest.java  |    69 +-
 plugins/storage/volume/adaptive/README.md          |     2 +-
 plugins/storage/volume/adaptive/pom.xml            |     2 +-
 .../storage/datastore/adapter/ProviderAdapter.java |     3 +-
 .../adapter/ProviderAdapterDiskOffering.java       |     8 +-
 .../driver/AdaptiveDataStoreDriverImpl.java        |     4 +-
 plugins/storage/volume/cloudbyte/pom.xml           |     2 +-
 .../ElastistorPrimaryDataStoreLifeCycle.java       |    26 +-
 plugins/storage/volume/datera/pom.xml              |     2 +-
 .../lifecycle/DateraPrimaryDataStoreLifeCycle.java |    40 +-
 plugins/storage/volume/default/pom.xml             |     2 +-
 .../CloudStackPrimaryDataStoreDriverImpl.java      |    38 +-
 .../CloudStackPrimaryDataStoreLifeCycleImpl.java   |    64 +-
 ...loudStackPrimaryDataStoreLifeCycleImplTest.java |    12 +-
 plugins/storage/volume/flasharray/pom.xml          |     2 +-
 .../adapter/flasharray/FlashArrayAdapter.java      |     3 +-
 plugins/storage/volume/linstor/pom.xml             |     2 +-
 .../kvm/storage/LinstorStorageAdaptor.java         |     3 +-
 .../driver/LinstorPrimaryDataStoreDriverImpl.java  |     1 -
 .../LinstorPrimaryDataStoreLifeCycleImpl.java      |    26 +-
 plugins/storage/volume/nexenta/pom.xml             |     2 +-
 .../NexentaPrimaryDataStoreLifeCycle.java          |    19 +-
 plugins/storage/volume/primera/pom.xml             |     2 +-
 .../datastore/adapter/primera/PrimeraAdapter.java  |    68 +-
 plugins/storage/volume/sample/pom.xml              |     2 +-
 plugins/storage/volume/scaleio/pom.xml             |     2 +-
 .../datastore/api/StorageConfiguration.java        |    48 -
 .../storage/datastore/api/StoragePool.java         |    11 -
 .../datastore/client/ScaleIOGatewayClient.java     |     6 -
 .../client/ScaleIOGatewayClientConnectionPool.java |    23 +-
 .../datastore/client/ScaleIOGatewayClientImpl.java |    10 -
 .../driver/ScaleIOPrimaryDataStoreDriver.java      |    97 +-
 .../ScaleIOPrimaryDataStoreLifeCycle.java          |    76 +-
 .../datastore/manager/ScaleIOSDCManager.java       |    94 +-
 .../datastore/manager/ScaleIOSDCManagerImpl.java   |   147 +-
 .../datastore/provider/ScaleIOHostListener.java    |   129 +-
 .../storage/datastore/util/ScaleIOUtil.java        |   307 +-
 .../ScaleIOPrimaryDataStoreLifeCycleTest.java      |    21 +-
 plugins/storage/volume/solidfire/pom.xml           |     2 +-
 .../SolidFirePrimaryDataStoreLifeCycle.java        |    26 +-
 .../SolidFireSharedPrimaryDataStoreLifeCycle.java  |    20 +-
 plugins/storage/volume/storpool/README.md          |    16 +-
 plugins/storage/volume/storpool/pom.xml            |     4 +-
 .../storage/StorPoolModifyStoragePoolAnswer.java   |    12 +-
 .../StorPoolDownloadTemplateCommandWrapper.java    |     3 +-
 .../StorPoolDownloadVolumeCommandWrapper.java      |     6 +-
 .../StorPoolModifyStorageCommandWrapper.java       |    30 +-
 .../kvm/storage/StorPoolStorageAdaptor.java        |   207 +-
 .../kvm/storage/StorPoolStoragePool.java           |     8 -
 .../collector/StorPoolAbandonObjectsCollector.java |   145 +-
 .../driver/StorPoolPrimaryDataStoreDriver.java     |   220 +-
 .../StorPoolPrimaryDataStoreLifeCycle.java         |    10 +-
 .../datastore/provider/StorPoolHostListener.java   |     1 -
 .../storage/datastore/util/StorPoolHelper.java     |    72 +-
 .../storage/datastore/util/StorPoolUtil.java       |    52 -
 .../storage/motion/StorPoolDataMotionStrategy.java |   116 +-
 .../snapshot/StorPoolConfigurationManager.java     |     6 +-
 .../storage/snapshot/StorPoolSnapshotStrategy.java |   296 +-
 plugins/user-authenticators/ldap/pom.xml           |     6 +-
 .../api/command/LdapDeleteConfigurationCmd.java    |     8 +-
 .../api/command/LdapListConfigurationCmd.java      |     7 -
 .../api/response/LdapConfigurationResponse.java    |    19 +-
 .../cloudstack/ldap/LdapConfigurationVO.java       |    20 +-
 .../apache/cloudstack/ldap/LdapManagerImpl.java    |    19 +-
 .../cloudstack/ldap/dao/LdapConfigurationDao.java  |     2 +-
 .../ldap/dao/LdapConfigurationDaoImpl.java         |    19 +-
 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          |     8 +-
 .../command/SAML2LoginAPIAuthenticatorCmdTest.java |     3 -
 plugins/user-authenticators/sha256salted/pom.xml   |     2 +-
 .../static-pin/pom.xml                             |     2 +-
 .../user-two-factor-authenticators/totp/pom.xml    |     2 +-
 pom.xml                                            |    22 +-
 .../bindir/cloud-grab-dependent-library-versions   |    95 +-
 python/bindir/cloud-setup-baremetal                |   168 +-
 python/lib/cloudutils/utilities.py                 |     2 +-
 quickcloud/pom.xml                                 |     2 +-
 requirements-dev.txt                               |    18 -
 requirements.txt                                   |     2 +
 scripts/installer/createtmplt.sh                   |     2 -
 scripts/installer/createvolume.sh                  |     2 -
 scripts/installer/export-templates.sh              |     0
 scripts/installer/pre-check.sh                     |    38 -
 scripts/storage/qcow2/createtmplt.sh               |     2 -
 scripts/storage/qcow2/createvolume.sh              |     2 -
 scripts/storage/qcow2/managesnapshot.sh            |     2 +-
 scripts/storage/secondary/createtmplt.sh           |     4 -
 scripts/storage/secondary/createvolume.sh          |     4 -
 scripts/util/create-kubernetes-binaries-iso.sh     |    49 +-
 scripts/util/keystore-setup                        |    68 +-
 .../hypervisor/external/provisioner/provisioner.sh |   157 -
 scripts/vm/hypervisor/kvm/gpudiscovery.sh          |   936 --
 scripts/vm/hypervisor/kvm/nasbackup.sh             |    97 +-
 .../xenserver/add_to_vcpus_params_live.sh          |     0
 scripts/vm/hypervisor/xenserver/storagePlugin      |    46 +-
 scripts/vm/hypervisor/xenserver/vmopspremium       |   135 +-
 scripts/vm/network/ovs-pvlan-kvm-vm.sh             |     0
 scripts/vm/network/vnet/modifyvxlan-evpn.sh        |   163 -
 server/pom.xml                                     |     8 +-
 .../manager/allocator/impl/FirstFitAllocator.java  |   111 +-
 .../java/com/cloud/alert/AlertManagerImpl.java     |    53 +-
 server/src/main/java/com/cloud/api/ApiDBUtils.java |    77 +-
 .../src/main/java/com/cloud/api/ApiDispatcher.java |     2 +-
 .../main/java/com/cloud/api/ApiResponseHelper.java |   458 +-
 server/src/main/java/com/cloud/api/ApiServer.java  |    55 +-
 server/src/main/java/com/cloud/api/ApiServlet.java |   132 +-
 .../api/dispatch/ParamGenericValidationWorker.java |     1 -
 .../java/com/cloud/api/query/QueryManagerImpl.java |   414 +-
 .../com/cloud/api/query/ViewResponseHelper.java    |    66 +-
 .../cloud/api/query/dao/AccountJoinDaoImpl.java    |    56 +-
 .../cloud/api/query/dao/AsyncJobJoinDaoImpl.java   |    20 +-
 .../com/cloud/api/query/dao/DataCenterJoinDao.java |     2 -
 .../cloud/api/query/dao/DataCenterJoinDaoImpl.java |    44 +-
 .../com/cloud/api/query/dao/DomainJoinDaoImpl.java |    54 +-
 .../api/query/dao/DomainRouterJoinDaoImpl.java     |     4 +
 .../java/com/cloud/api/query/dao/HostJoinDao.java  |     2 -
 .../com/cloud/api/query/dao/HostJoinDaoImpl.java   |    47 +-
 .../api/query/dao/ProjectAccountJoinDaoImpl.java   |     3 +-
 .../query/dao/ProjectInvitationJoinDaoImpl.java    |     3 +-
 .../api/query/dao/ResourceTagJoinDaoImpl.java      |     4 +
 .../api/query/dao/ServiceOfferingJoinDaoImpl.java  |    16 -
 .../com/cloud/api/query/dao/SnapshotJoinDao.java   |     8 +-
 .../cloud/api/query/dao/SnapshotJoinDaoImpl.java   |    62 +-
 .../cloud/api/query/dao/StoragePoolJoinDao.java    |     2 -
 .../api/query/dao/StoragePoolJoinDaoImpl.java      |    46 +-
 .../cloud/api/query/dao/TemplateJoinDaoImpl.java   |    64 +-
 .../com/cloud/api/query/dao/UserVmJoinDao.java     |    17 +-
 .../com/cloud/api/query/dao/UserVmJoinDaoImpl.java |   150 +-
 .../api/query/dao/VpcOfferingJoinDaoImpl.java      |     9 +-
 .../java/com/cloud/api/query/vo/AccountJoinVO.java |    70 -
 .../com/cloud/api/query/vo/DataCenterJoinVO.java   |     9 +-
 .../java/com/cloud/api/query/vo/DomainJoinVO.java  |    90 +-
 .../java/com/cloud/api/query/vo/HostJoinVO.java    |    28 -
 .../cloud/api/query/vo/ManagementServerJoinVO.java |     4 -
 .../cloud/api/query/vo/NetworkOfferingJoinVO.java  |    20 +
 .../cloud/api/query/vo/ServiceOfferingJoinVO.java  |   114 +-
 .../com/cloud/api/query/vo/StoragePoolJoinVO.java  |     7 -
 .../com/cloud/api/query/vo/TemplateJoinVO.java     |    43 +-
 .../java/com/cloud/api/query/vo/UserVmJoinVO.java  |   107 +-
 .../com/cloud/api/query/vo/VpcOfferingJoinVO.java  |     8 +
 .../cloud/api/response/ApiResponseSerializer.java  |    18 +-
 .../com/cloud/capacity/CapacityManagerImpl.java    |    27 +-
 .../main/java/com/cloud/configuration/Config.java  |   184 +-
 .../configuration/ConfigurationManagerImpl.java    |   692 +-
 .../AgentBasedConsoleProxyManager.java             |    10 +-
 .../java/com/cloud/consoleproxy/AgentHookBase.java |    31 +-
 .../cloud/consoleproxy/ConsoleProxyManager.java    |    59 +-
 .../consoleproxy/ConsoleProxyManagerImpl.java      |   221 +-
 .../deploy/DeploymentPlanningManagerImpl.java      |    46 +-
 .../java/com/cloud/deploy/FirstFitPlanner.java     |   140 +-
 .../com/cloud/ha/HighAvailabilityManagerImpl.java  |     8 +-
 .../com/cloud/hypervisor/HypervisorGuruBase.java   |    33 +-
 .../main/java/com/cloud/hypervisor/KVMGuru.java    |     2 +-
 .../kvm/discoverer/LibvirtServerDiscoverer.java    |     6 +-
 .../cloud/hypervisor/kvm/dpdk/DpdkHelperImpl.java  |    13 +-
 .../metadata/ResourceMetaDataManagerImpl.java      |     4 +-
 .../com/cloud/network/IpAddressManagerImpl.java    |    90 +-
 .../cloud/network/NetworkMigrationManagerImpl.java |     2 +-
 .../java/com/cloud/network/NetworkModelImpl.java   |    35 +-
 .../java/com/cloud/network/NetworkServiceImpl.java |   164 +-
 .../com/cloud/network/SshKeysDistriMonitor.java    |    30 +-
 .../com/cloud/network/as/AutoScaleManagerImpl.java |    43 +-
 .../network/element/ConfigDriveNetworkElement.java |    24 +-
 .../network/element/VirtualRouterElement.java      |     5 +-
 .../network/firewall/FirewallManagerImpl.java      |     2 +-
 .../network/guru/ExternalGuestNetworkGuru.java     |     5 +-
 .../com/cloud/network/guru/GuestNetworkGuru.java   |    20 +-
 .../com/cloud/network/guru/PublicNetworkGuru.java  |    14 +-
 .../network/lb/LoadBalancingRulesManagerImpl.java  |   106 +-
 .../cloud/network/router/CommandSetupHelper.java   |    91 +-
 .../cloud/network/router/NetworkHelperImpl.java    |    37 +-
 .../cloud/network/router/NicProfileHelperImpl.java |     4 +-
 .../router/VirtualNetworkApplianceManager.java     |     6 -
 .../router/VirtualNetworkApplianceManagerImpl.java |   581 +-
 .../cloud/network/router/VpcNetworkHelperImpl.java |     2 +-
 .../VpcVirtualNetworkApplianceManagerImpl.java     |    20 +-
 .../com/cloud/network/rules/RulesManagerImpl.java  |    35 +-
 .../network/security/SecurityGroupListener.java    |    33 +-
 .../cloud/network/vpc/NetworkACLManagerImpl.java   |    11 +-
 .../cloud/network/vpc/NetworkACLServiceImpl.java   |    11 +-
 .../java/com/cloud/network/vpc/VpcManagerImpl.java |   582 +-
 .../network/vpn/RemoteAccessVpnManagerImpl.java    |    72 +-
 .../cloud/network/vpn/Site2SiteVpnManagerImpl.java |    76 +-
 .../java/com/cloud/resource/DiscovererBase.java    |    20 +-
 .../com/cloud/resource/ResourceManagerImpl.java    |  1158 +-
 .../resource/RollingMaintenanceManagerImpl.java    |    14 +-
 .../resourceicon/ResourceIconManagerImpl.java      |    17 -
 .../resourcelimit/ResourceLimitManagerImpl.java    |   197 +-
 .../com/cloud/server/ConfigurationServerImpl.java  |    73 +-
 .../java/com/cloud/server/ManagementServer.java    |     4 -
 .../server/ManagementServerHostStatsEntry.java     |    21 -
 .../com/cloud/server/ManagementServerImpl.java     |   572 +-
 .../main/java/com/cloud/server/StatsCollector.java |    21 +-
 .../com/cloud/servlet/ConsoleProxyClientParam.java |     6 -
 .../com/cloud/servlet/ConsoleProxyServlet.java     |    19 +-
 .../com/cloud/storage/CreateSnapshotPayload.java   |    19 -
 .../java/com/cloud/storage/StorageManagerImpl.java |   461 +-
 .../com/cloud/storage/StoragePoolAutomation.java   |    10 +-
 .../cloud/storage/StoragePoolAutomationImpl.java   |    23 +-
 .../java/com/cloud/storage/TemplateProfile.java    |    20 +-
 .../com/cloud/storage/VolumeApiServiceImpl.java    |   246 +-
 .../cloud/storage/listener/StoragePoolMonitor.java |   122 +-
 .../secondary/SecondaryStorageVmManager.java       |     7 -
 .../cloud/storage/snapshot/SnapshotManager.java    |    29 +-
 .../storage/snapshot/SnapshotManagerImpl.java      |   623 +-
 .../upload/params/TemplateUploadParams.java        |     5 +-
 .../cloud/storage/upload/params/UploadParams.java  |     2 -
 .../storage/upload/params/UploadParamsBase.java    |    33 +-
 .../com/cloud/tags/ResourceManagerUtilImpl.java    |     2 -
 .../cloud/template/HypervisorTemplateAdapter.java  |   137 +-
 .../java/com/cloud/template/TemplateAdapter.java   |     5 +-
 .../com/cloud/template/TemplateAdapterBase.java    |   225 +-
 .../com/cloud/template/TemplateManagerImpl.java    |   151 +-
 .../main/java/com/cloud/test/DatabaseConfig.java   |     6 +-
 .../java/com/cloud/user/AccountManagerImpl.java    |    19 +-
 .../src/main/java/com/cloud/vm/UserVmManager.java  |     7 -
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  |  1089 +-
 .../cloud/vm/snapshot/VMSnapshotManagerImpl.java   |    56 +-
 .../affinity/AffinityGroupServiceImpl.java         |     7 -
 .../agent/lb/IndirectAgentLBServiceImpl.java       |   482 +-
 .../cloudstack/backup/BackupManagerImpl.java       |  1146 +-
 .../backup/BackupRepositoryServiceImpl.java        |    53 +-
 .../command/ReconcileCommandServiceImpl.java       |  1146 --
 .../consoleproxy/ConsoleAccessManagerImpl.java     |   444 +-
 .../org/apache/cloudstack/gpu/GpuServiceImpl.java  |  1392 --
 .../cloudstack/gui/theme/GuiThemeServiceImpl.java  |   445 -
 .../jsinterpreter/JsInterpreterHelper.java         |   240 -
 .../cloudstack/network/RoutedIpv4ManagerImpl.java  |     5 +-
 .../deployment/RouterDeploymentDefinition.java     |    19 +-
 .../RouterDeploymentDefinitionBuilder.java         |     4 -
 .../deployment/VpcRouterDeploymentDefinition.java  |     6 +-
 .../cloudstack/network/ssl/CertServiceImpl.java    |   105 +-
 .../resource/ResourceCleanupServiceImpl.java       |    35 +-
 .../apache/cloudstack/snapshot/SnapshotHelper.java |   168 +-
 .../storage/object/BucketApiServiceImpl.java       |    68 +-
 .../volume/VolumeImportUnmanageManagerImpl.java    |     2 +-
 .../cloudstack/user/UserPasswordResetManager.java  |     5 -
 .../user/UserPasswordResetManagerImpl.java         |     9 +-
 .../cloudstack/vm/ImportVmTasksManagerImpl.java    |   245 -
 .../cloudstack/vm/UnmanagedVMsManagerImpl.java     |   305 +-
 .../cloudstack/vm/lease/VMLeaseManagerImpl.java    |   382 -
 .../core/spring-server-core-managers-context.xml   |    22 +-
 .../spring-server-compute-context.xml              |     2 -
 .../allocator/impl/FirstFitAllocatorTest.java      |   231 -
 .../java/com/cloud/alert/AlertManagerImplTest.java |    49 -
 .../java/com/cloud/api/ApiResponseHelperTest.java  |   352 +-
 .../com/cloud/api/query/QueryManagerImplTest.java  |   261 +-
 .../cloud/api/query/dao/UserVmJoinDaoImplTest.java |     4 +-
 .../ConfigurationManagerImplTest.java              |   161 +-
 .../configuration/ConfigurationManagerTest.java    |     2 +-
 .../deploy/DeploymentPlanningManagerImplTest.java  |    14 +-
 .../java/com/cloud/hypervisor/KVMGuruTest.java     |     4 +-
 .../hypervisor/kvm/dpdk/DpdkHelperImplTest.java    |    23 +-
 .../com/cloud/network/MockNetworkModelImpl.java    |     5 -
 .../com/cloud/network/NetworkModelImplTest.java    |   143 +-
 .../com/cloud/network/NetworkServiceImplTest.java  |   177 +-
 .../cloud/network/as/AutoScaleManagerImplTest.java |    40 +-
 .../element/ConfigDriveNetworkElementTest.java     |    12 +-
 .../network/element/VirtualRouterElementTest.java  |     8 +-
 .../lb/LoadBalancingRulesManagerImplTest.java      |   209 +-
 .../cloud/network/lb/UpdateLoadBalancerTest.java   |    44 +-
 .../VirtualNetworkApplianceManagerImplTest.java    |    28 +-
 .../SecurityGroupManagerTestConfiguration.java     |     4 +-
 .../com/cloud/network/vpc/VpcManagerImplTest.java  |    12 +-
 .../cloud/resource/MockResourceManagerImpl.java    |    78 +-
 .../cloud/resource/ResourceManagerImplTest.java    |   603 +-
 .../RollingMaintenanceManagerImplTest.java         |    16 +-
 .../ResourceLimitManagerImplTest.java              |   224 +-
 .../com/cloud/server/ManagementServerImplTest.java |   467 +-
 .../com/cloud/storage/StorageManagerImplTest.java  |   839 +-
 .../cloud/storage/VolumeApiServiceImplTest.java    |   105 +-
 .../storage/listener/StoragePoolMonitorTest.java   |    31 +-
 .../storage/snapshot/SnapshotManagerImplTest.java  |   217 +-
 .../storage/snapshot/SnapshotManagerTest.java      |   124 +-
 .../cloud/template/TemplateManagerImplTest.java    |    36 +-
 .../com/cloud/user/AccountManagerImplTest.java     |     3 -
 .../AccountManagerImplVolumeDeleteEventTest.java   |     4 +-
 .../com/cloud/user/AccountManagetImplTestBase.java |     3 -
 .../com/cloud/user/MockAccountManagerImpl.java     |   351 +-
 .../java/com/cloud/vm/FirstFitPlannerTest.java     |   151 +-
 .../java/com/cloud/vm/UserVmManagerImplTest.java   |  1239 +-
 .../cloud/vm/snapshot/VMSnapshotManagerTest.java   |    24 +-
 .../cloud/vpc/MockConfigurationManagerImpl.java    |    15 +-
 .../java/com/cloud/vpc/MockNetworkManagerImpl.java |    26 +-
 .../java/com/cloud/vpc/MockNetworkModelImpl.java   |     5 -
 .../cloud/vpc/MockResourceLimitManagerImpl.java    |    15 -
 .../java/com/cloud/vpc/NetworkACLServiceTest.java  |     6 -
 .../java/com/cloud/vpc/VpcTestConfiguration.java   |     4 +-
 .../cloud/vpc/dao/MockConfigurationDaoImpl.java    |    12 +-
 .../java/com/cloud/vpc/dao/MockNetworkDaoImpl.java |    15 -
 .../vpc/dao/MockVpcOfferingServiceMapDaoImpl.java  |    11 -
 .../agent/lb/IndirectAgentLBServiceImplTest.java   |    10 +-
 .../cloudstack/backup/BackupManagerTest.java       |  1928 +--
 .../backup/BackupRepositoryServiceImplTest.java    |   243 -
 .../consoleproxy/ConsoleAccessManagerImplTest.java |   705 +-
 .../apache/cloudstack/gpu/GpuServiceImplTest.java  |  1495 --
 .../gui/theme/GuiThemeServiceImplTest.java         |   215 -
 .../jsinterpreter/JsInterpreterHelperTest.java     |   228 -
 .../deployment/RouterDeploymentDefinitionTest.java |     3 -
 .../VpcRouterDeploymentDefinitionTest.java         |     3 -
 .../cloudstack/network/ssl/CertServiceTest.java    |   296 +-
 .../networkoffering/ChildTestConfiguration.java    |     6 -
 .../networkoffering/CreateNetworkOfferingTest.java |    24 +-
 .../resource/ResourceCleanupServiceImplTest.java   |    57 +-
 .../cloudstack/service/NetrisServiceMockTest.java  |   134 -
 .../cloudstack/snapshot/SnapshotHelperTest.java    |    56 +-
 .../storage/object/BucketApiServiceImplTest.java   |   183 -
 .../VolumeImportUnmanageManagerImplTest.java       |     2 +-
 .../cloudstack/vm/UnmanagedVMsManagerImplTest.java |   194 +-
 .../vm/lease/VMLeaseManagerImplTest.java           |   316 -
 .../resources/SecurityGroupManagerTestContext.xml  |    42 +-
 .../src/test/resources/SnapshotDaoTestContext.xml  |    50 +-
 .../test/resources/StoragePoolDaoTestContext.xml   |    80 +-
 .../src/test/resources/VpcApiUnitTestContext.xml   |    80 +-
 server/src/test/resources/VpcTestContext.xml       |   124 +-
 .../src/test/resources/createNetworkOffering.xml   |   162 +-
 server/src/test/resources/testContext.xml          |   160 +-
 services/console-proxy/pom.xml                     |     2 +-
 services/console-proxy/rdpconsole/pom.xml          |     2 +-
 services/console-proxy/rdpconsole/rdp-config.bat   |    10 +-
 .../rdpconsole/src/test/doc/dev-rdp-config.bat     |    24 +-
 services/console-proxy/server/pom.xml              |     2 +-
 .../java/com/cloud/consoleproxy/ConsoleProxy.java  |    12 +-
 .../consoleproxy/ConsoleProxyClientParam.java      |    18 +-
 .../ConsoleProxyHttpHandlerHelper.java             |     3 -
 .../consoleproxy/ConsoleProxyNoVNCHandler.java     |     2 -
 .../consoleproxy/ConsoleProxyNoVncClient.java      |    11 +-
 .../com/cloud/consoleproxy/vnc/NoVncClient.java    |     5 +-
 .../cloud/consoleproxy/vnc/network/NioSocket.java  |    36 +-
 services/pom.xml                                   |     2 +-
 services/secondary-storage/controller/pom.xml      |     2 +-
 .../PremiumSecondaryStorageManagerImpl.java        |     5 +-
 .../SecondaryStorageManagerImpl.java               |    27 +-
 services/secondary-storage/pom.xml                 |     2 +-
 services/secondary-storage/server/pom.xml          |     2 +-
 .../storage/formatinspector/Qcow2Inspector.java    |    28 -
 .../resource/NfsSecondaryStorageResource.java      |    59 +-
 .../storage/template/DownloadManagerImpl.java      |     5 +-
 .../storage/template/UploadManagerImpl.java        |    15 -
 .../resource/NfsSecondaryStorageResourceTest.java  |     3 +-
 setup/bindir/cloud-setup-databases.in              |    36 +-
 setup/bindir/cloud-setup-encryption.in             |   204 +-
 setup/db/221to222upgrade.sh                        |     0
 setup/db/create-schema-simulator.sql               |    28 -
 setup/db/deploy-db-clouddev.sh                     |     0
 setup/db/deploy-db-simulator.sh                    |     0
 setup/dev/advancedsg.cfg                           |   142 +-
 setup/dev/basic.cfg                                |     2 +-
 systemvm/agent/noVNC/app/error-handler.js          |     2 +-
 systemvm/agent/noVNC/app/locale/cs.json            |    24 +-
 systemvm/agent/noVNC/app/locale/de.json            |    29 +-
 systemvm/agent/noVNC/app/locale/el.json            |    51 +-
 systemvm/agent/noVNC/app/locale/es.json            |    16 +-
 systemvm/agent/noVNC/app/locale/fr.json            |    56 +-
 systemvm/agent/noVNC/app/locale/it.json            |    10 +-
 systemvm/agent/noVNC/app/locale/ja.json            |    47 +-
 systemvm/agent/noVNC/app/locale/ko.json            |    22 +-
 systemvm/agent/noVNC/app/locale/nl.json            |    78 +-
 systemvm/agent/noVNC/app/locale/pl.json            |    25 +-
 systemvm/agent/noVNC/app/locale/pt_BR.json         |    26 +-
 systemvm/agent/noVNC/app/locale/ru.json            |    26 +-
 systemvm/agent/noVNC/app/locale/sv.json            |    37 +-
 systemvm/agent/noVNC/app/locale/tr.json            |     2 +-
 systemvm/agent/noVNC/app/locale/zh_CN.json         |    90 +-
 systemvm/agent/noVNC/app/locale/zh_TW.json         |    22 +-
 systemvm/agent/noVNC/app/localization.js           |    53 +-
 systemvm/agent/noVNC/app/styles/base.css           |   951 +-
 systemvm/agent/noVNC/app/styles/constants.css      |    30 -
 systemvm/agent/noVNC/app/styles/input.css          |   785 +-
 systemvm/agent/noVNC/app/ui.js                     |   195 +-
 systemvm/agent/noVNC/app/webutil.js                |    98 +-
 systemvm/agent/noVNC/core/crypto/aes.js            |   178 -
 systemvm/agent/noVNC/core/crypto/bigint.js         |    34 -
 systemvm/agent/noVNC/core/crypto/crypto.js         |    90 -
 systemvm/agent/noVNC/core/crypto/dh.js             |    55 -
 systemvm/agent/noVNC/core/crypto/rsa.js            |   132 -
 systemvm/agent/noVNC/core/decoders/copyrect.js     |     2 +-
 systemvm/agent/noVNC/core/decoders/h264.js         |   321 -
 systemvm/agent/noVNC/core/decoders/hextile.js      |    36 +-
 systemvm/agent/noVNC/core/decoders/jpeg.js         |   219 +-
 systemvm/agent/noVNC/core/decoders/raw.js          |    53 +-
 systemvm/agent/noVNC/core/decoders/rre.js          |     2 +-
 systemvm/agent/noVNC/core/decoders/tight.js        |    80 +-
 systemvm/agent/noVNC/core/decoders/tightpng.js     |     2 +-
 systemvm/agent/noVNC/core/decoders/zlib.js         |    51 -
 systemvm/agent/noVNC/core/decoders/zrle.js         |     4 +-
 systemvm/agent/noVNC/core/deflator.js              |     7 +-
 systemvm/agent/noVNC/core/{crypto => }/des.js      |    72 +-
 systemvm/agent/noVNC/core/display.js               |    78 +-
 systemvm/agent/noVNC/core/encodings.js             |     8 +-
 systemvm/agent/noVNC/core/inflator.js              |     5 +-
 systemvm/agent/noVNC/core/input/domkeytable.js     |     2 +-
 systemvm/agent/noVNC/core/input/fixedkeys.js       |     2 +-
 systemvm/agent/noVNC/core/input/gesturehandler.js  |     2 +-
 systemvm/agent/noVNC/core/input/keyboard.js        |    59 +-
 systemvm/agent/noVNC/core/input/util.js            |     2 +-
 systemvm/agent/noVNC/core/input/vkeys.js           |     2 +-
 systemvm/agent/noVNC/core/ra2.js                   |   345 +-
 systemvm/agent/noVNC/core/rfb.js                   |  1003 +-
 systemvm/agent/noVNC/core/util/browser.js          |    85 +-
 systemvm/agent/noVNC/core/util/cursor.js           |     6 +-
 systemvm/agent/noVNC/core/util/element.js          |     2 +-
 systemvm/agent/noVNC/core/util/events.js           |     2 +-
 systemvm/agent/noVNC/core/util/eventtarget.js      |     2 +-
 systemvm/agent/noVNC/core/util/int.js              |     2 +-
 systemvm/agent/noVNC/core/util/logging.js          |     2 +-
 systemvm/agent/noVNC/core/{crypto => util}/md5.js  |    13 +-
 systemvm/agent/noVNC/core/util/strings.js          |     2 +-
 systemvm/agent/noVNC/core/websock.js               |   140 +-
 systemvm/agent/noVNC/defaults.json                 |     1 -
 systemvm/agent/noVNC/docs/novnc_proxy.1            |     8 +-
 systemvm/agent/noVNC/mandatory.json                |     1 -
 systemvm/agent/noVNC/package.json                  |    17 +-
 systemvm/agent/noVNC/po/fr.po                      |   243 +-
 systemvm/agent/noVNC/po/it.po                      |    12 +-
 systemvm/agent/noVNC/po/pt_BR.po                   |    28 +-
 systemvm/agent/noVNC/utils/convert.js              |     2 +-
 systemvm/agent/noVNC/vnc.html                      |    97 +-
 systemvm/agent/noVNC/vnc_lite.html                 |    16 +-
 systemvm/agent/scripts/run-proxy.sh                |     0
 systemvm/agent/scripts/ssvm-check.sh               |     0
 systemvm/agent/scripts/utils.sh                    |     0
 systemvm/agent/ui/viewer.ftl                       |    10 +-
 .../system/hyperv-daemons.hv-fcopy-daemon.service  |     2 +-
 .../system/hyperv-daemons.hv-kvp-daemon.service    |     2 +-
 .../system/hyperv-daemons.hv-vss-daemon.service    |     2 +-
 .../etc/systemd/system/open-vm-tools.service       |     2 +-
 .../debian/etc/systemd/system/xe-daemon.service    |     2 +-
 systemvm/debian/opt/cloud/bin/cks_iso.sh           |    34 -
 systemvm/debian/opt/cloud/bin/configure.py         |    39 +-
 systemvm/debian/opt/cloud/bin/cs/CsAddress.py      |   110 +-
 systemvm/debian/opt/cloud/bin/cs/CsConfig.py       |    13 +-
 systemvm/debian/opt/cloud/bin/cs/CsDatabag.py      |    12 -
 systemvm/debian/opt/cloud/bin/cs/CsDhcp.py         |    11 +-
 systemvm/debian/opt/cloud/bin/cs/CsGuestNetwork.py |    14 +-
 systemvm/debian/opt/cloud/bin/cs/CsLoadBalancer.py |    36 -
 systemvm/debian/opt/cloud/bin/cs/CsRoute.py        |    21 -
 .../debian/opt/cloud/bin/cs/CsVpcGuestNetwork.py   |    15 +-
 systemvm/debian/opt/cloud/bin/passwd_server_ip.py  |    13 +-
 systemvm/debian/opt/cloud/bin/patched.sh           |     0
 systemvm/debian/opt/cloud/bin/setup/bootstrap.sh   |     4 -
 .../debian/opt/cloud/bin/setup/cloud-early-config  |    24 +-
 systemvm/debian/opt/cloud/bin/setup/init.sh        |     2 -
 systemvm/debian/opt/cloud/bin/setup/postinit.sh    |    95 -
 systemvm/debian/opt/cloud/bin/setup/router.sh      |     8 +-
 systemvm/debian/opt/cloud/bin/setup/sharedfsvm.sh  |     6 -
 .../opt/cloud/bin/update_interface_config.sh       |     0
 .../debian/opt/cloud/templates/check_bumpup.sh     |     0
 systemvm/debian/root/func.sh                       |     0
 .../debian/root/health_checks/cpu_usage_check.py   |     4 +-
 systemvm/debian/root/health_checks/dhcp_check.py   |     2 +-
 .../debian/root/health_checks/disk_space_check.py  |     2 +-
 systemvm/debian/root/monitorServices.py            |    92 +-
 systemvm/patch-sysvms.sh                           |    14 +-
 systemvm/pom.xml                                   |     2 +-
 systemvm/test/runtests.sh                          |     0
 test/conf/config.xml                               |   206 +-
 .../maint/test_egress_rules_host_maintenance.py    |     6 +-
 ...est_acl_sharednetwork_deployVM-impersonation.py |   102 +-
 test/integration/component/test_deploy_vm_lease.py |   358 -
 test/integration/component/test_egress_rules.py    |    60 +-
 .../component/test_project_resources.py            |     6 +-
 test/integration/component/test_project_usage.py   |    25 +-
 .../component/test_rootvolume_resize.py            |     2 +-
 test/integration/component/test_security_groups.py |    72 +-
 test/integration/component/test_update_vm.py       |     4 +-
 test/integration/component/test_vpn_users.py       |   118 +-
 test/integration/plugins/linstor/README.md         |     6 +-
 test/integration/plugins/scaleio/README.md         |     6 +-
 .../plugins/storpool/MigrateVolumeToStorPool.py    |    19 +-
 .../plugins/storpool/TestEncryptedVolumes.py       |   135 +-
 .../plugins/storpool/TestStorPoolVolumes.py        |   155 +-
 .../plugins/storpool/TestTagsOnStorPool.py         |   147 +-
 .../plugins/storpool/TestVmSnapshots.py            |    20 +-
 test/integration/plugins/storpool/sp_util.py       |   134 -
 test/integration/plugins/storpool/storpool.cfg     |   154 -
 .../test_snapshot_copy_on_primary_storage.py       |   255 -
 .../plugins/storpool/test_storpool_tiers.py        |   137 +-
 .../smoke/test_attach_multiple_volumes.py          |     4 -
 .../smoke/test_backup_recovery_dummy.py            |    92 +-
 test/integration/smoke/test_backup_recovery_nas.py |   267 -
 .../smoke/test_deploy_vgpu_enabled_vm.py           |   234 +-
 test/integration/smoke/test_extension_custom.py    |   619 -
 .../test_extension_custom_action_lifecycle.py      |   281 -
 test/integration/smoke/test_extension_lifecycle.py |   480 -
 test/integration/smoke/test_kubernetes_clusters.py |   294 +-
 test/integration/smoke/test_network_acl.py         |    26 -
 ..._and_safe_shutdown.py => test_safe_shutdown.py} |    65 +-
 test/integration/smoke/test_service_offerings.py   |   161 +-
 test/integration/smoke/test_ssl_offloading.py      |   568 -
 test/integration/smoke/test_ssvm.py                |     9 +-
 test/integration/smoke/test_systemvm_userdata.py   |   410 -
 test/integration/smoke/test_usage.py               |    12 +-
 .../smoke/test_vm_lifecycle_unmanage_kvm_import.py |   473 -
 .../test_vm_lifecycle_with_snapshot_or_volume.py   |   318 -
 .../delegatedAdmin/delegated_admin_cleanup.xml     |   252 +-
 .../delegatedAdmin/delegated_admin_createusers.xml |   624 +-
 .../delegated_admin_verify_part1.xml               |   840 +-
 .../delegated_admin_verify_part2.xml               |  1904 +--
 .../pickuser_domainlevel1_domainlevel2.xml         |   244 +-
 ...ickuser_domainlevel1admin_domainlevel1admin.xml |   244 +-
 .../pickuser_domainlevel1admin_rootadmin.xml       |   244 +-
 .../pickuser_domainlevel2_child_domainlevel1.xml   |   244 +-
 ...pickuser_domainlevel2_nonchild_domainlevel1.xml |   244 +-
 .../pickuser_domainlevel2_rootadmin1.xml           |   244 +-
 .../pickuser_rootadmin1_rootadmin2.xml             |   244 +-
 .../pickuser_rootadmin_vs_domainlevel1admin.xml    |   244 +-
 test/metadata/func/directnw_regression.xml         |  3820 ++---
 test/metadata/func/expunge.xml                     |  2414 +--
 test/metadata/func/flatnetwork.xml                 |  1066 +-
 test/metadata/func/ha.xml                          |   734 +-
 test/metadata/func/iso.xml                         |  1814 +-
 test/metadata/func/loadbalancers.xml               |  4072 ++---
 test/metadata/func/localstorage_volume_test.xml    |   306 +-
 test/metadata/func/mgmtvmsync.xml                  |  1302 +-
 test/metadata/func/private_templates.xml           |  1822 +-
 test/metadata/func/regression.xml                  |  8886 +++++-----
 test/metadata/func/regression_new.xml              | 15344 ++++++++---------
 test/metadata/func/regression_test.xml             |  6966 ++++----
 test/metadata/func/regression_user.xml             |  4764 +++---
 test/metadata/func/regression_works.xml            | 16836 +++++++++----------
 test/metadata/func/resource_limits.xml             |  3788 ++---
 test/metadata/func/roughflatstress.xml             |  1382 +-
 test/metadata/func/roughregression.xml             | 12024 ++++++-------
 test/metadata/func/securitygroups.xml              |  1540 +-
 test/metadata/func/sharedstorage_volume_test.xml   |  2748 +--
 test/metadata/func/snapshot_iso.xml                |  1292 +-
 test/metadata/func/snapshots.xml                   |  1654 +-
 test/metadata/func/snapshots_contd.xml             |  1252 +-
 test/metadata/func/templatedwnldstress.xml         |  1514 +-
 test/metadata/func/templates_sync.xml              |  2120 +--
 test/metadata/func/userapi.xml                     |  2586 +--
 test/metadata/func/vmapi.xml                       |  1782 +-
 test/metadata/func/vmsync.xml                      |   814 +-
 test/pom.xml                                       |    12 +-
 test/scripts/run.bat                               |     4 +-
 test/selenium/ReadMe.txt                           |    66 +
 .../api => test/selenium/browser}/__init__.py      |     0
 test/selenium/browser/firefox.py                   |    55 +
 test/selenium/common/Global_Locators.py            |   230 +
 .../api => test/selenium/common}/__init__.py       |     0
 test/selenium/common/shared.py                     |   148 +
 .../api => test/selenium/cspages}/__init__.py      |     0
 test/selenium/cspages/accounts/accountspage.py     |   175 +
 test/selenium/cspages/accounts/userspage.py        |   146 +
 .../selenium/cspages/cspage.py                     |     7 +-
 .../selenium/cspages/dashboard}/__init__.py        |     0
 test/selenium/cspages/dashboard/dashboardpage.py   |    73 +
 .../selenium/cspages/login}/__init__.py            |     0
 test/selenium/cspages/login/loginpage.py           |   103 +
 .../api => test/selenium/cstests}/__init__.py      |     0
 .../selenium/cstests/regressiontests}/__init__.py  |     0
 .../selenium/cstests/smoketests}/__init__.py       |     0
 test/selenium/cstests/smoketests/adduser_test.py   |   103 +
 .../cstests/smoketests/adduseraccount_test.py      |    96 +
 .../selenium/cstests/smoketests/deleteuser_test.py |   100 +
 .../cstests/smoketests/deleteuseraccount_test.py   |    91 +
 .../cstests/smoketests/global_settings_test.py     |    69 +
 .../smoketests/login_logout_as_JohnD_test.py       |    61 +
 .../cstests/smoketests/login_logout_test.py        |   190 +
 .../selenium/cstests/smoketests/navigation_test.py |    79 +
 test/selenium/cstests/smoketests/smokecfg.py       |    62 +
 test/selenium/lib/Global_Locators.py               |   222 +
 .../selenium/lib/initialize.py                     |    38 +-
 test/selenium/smoke/Login_and_Accounts.py          |   254 +
 test/selenium/smoke/Service_Offering.py            |   426 +
 test/selenium/smoke/TemplatesAndISO.py             |   244 +
 test/selenium/smoke/VM_lifeCycle.py                |   613 +
 test/selenium/smoke/main.py                        |   142 +
 test/systemvm/README.md                            |    16 +-
 tools/apidoc/gen_toc.py                            |    22 +-
 tools/apidoc/generatecommand.xsl                   |    48 +-
 tools/apidoc/generatecommands.xsl                  |     2 +-
 tools/apidoc/generatetoc_footer.xsl                |     8 +-
 tools/apidoc/generatetoc_header.xsl                |    14 +-
 tools/apidoc/includes/main.css                     |    14 +-
 tools/apidoc/pom.xml                               |     2 +-
 tools/appliance/README.md                          |     4 +-
 .../cks/ubuntu/22.04/cks-ubuntu-2204.json          |    56 -
 tools/appliance/cks/ubuntu/22.04/http/meta-data    |    16 -
 tools/appliance/cks/ubuntu/22.04/http/user-data    |   103 -
 .../cks/ubuntu/22.04/scripts/add-interface-rule.sh |    41 -
 .../cks/ubuntu/22.04/scripts/apt_upgrade.sh        |    37 -
 .../appliance/cks/ubuntu/22.04/scripts/cleanup.sh  |    80 -
 .../ubuntu/22.04/scripts/configure-cloud-init.sh   |    51 -
 .../ubuntu/22.04/scripts/configure_networking.sh   |    73 -
 .../cks/ubuntu/22.04/scripts/setup-interfaces.sh   |    63 -
 .../cks/ubuntu/22.04/scripts/setup_template.sh     |    43 -
 tools/appliance/cks/ubuntu/build.sh                |   346 -
 .../systemvmtemplate/scripts/apt_upgrade.sh        |     0
 .../systemvmtemplate/scripts/authorized_keys.sh    |     0
 .../appliance/systemvmtemplate/scripts/cleanup.sh  |     0
 .../systemvmtemplate/scripts/configure_acpid.sh    |     0
 .../scripts/configure_conntrack.sh                 |     0
 .../systemvmtemplate/scripts/configure_grub.sh     |     0
 .../systemvmtemplate/scripts/configure_locale.sh   |     0
 .../systemvmtemplate/scripts/configure_login.sh    |     0
 .../scripts/configure_networking.sh                |     0
 .../scripts/configure_persistent_config.sh         |     0
 .../scripts/configure_systemvm_services.sh         |     6 +-
 .../appliance/systemvmtemplate/scripts/finalize.sh |     0
 .../scripts/install_systemvm_packages.sh           |     0
 tools/build/installer/debinstall_full.sh           |     0
 tools/checkstyle/pom.xml                           |     2 +-
 tools/devcloud-kvm/README.md                       |     4 +-
 .../devcloud-kvm/devcloud-kvm-advanced-fusion.cfg  |    94 +-
 tools/devcloud-kvm/devcloud-kvm-advanced.cfg       |   102 +-
 tools/devcloud-kvm/devcloud-kvm.cfg                |    68 +-
 tools/devcloud-kvm/pom.xml                         |     2 +-
 tools/devcloud4/README.md                          |     4 +
 tools/devcloud4/advanced/README.md                 |     4 +-
 tools/devcloud4/advanced/marvin.cfg                |     4 +-
 tools/devcloud4/basic/README.md                    |     4 +-
 tools/devcloud4/basic/marvin.cfg                   |     4 +-
 tools/devcloud4/common/configure-network.sh        |     0
 .../files/default/createtmplt.sh                   |     4 -
 tools/devcloud4/pom.xml                            |     2 +-
 tools/docker/Dockerfile                            |     2 +-
 tools/docker/Dockerfile.marvin                     |     4 +-
 tools/docker/Dockerfile.smokedev                   |     1 +
 tools/docker/README.md                             |     8 +-
 tools/docker/docker_run_tests.sh                   |     0
 tools/eclipse/set-eclipse-profile.sh               |     0
 tools/git/git-pr                                   |     2 +-
 tools/marvin/marvin/cloudstackConnection.py        |     3 +-
 .../marvin/config/Baremetal_AdvZone_Vmware.cfg     |     6 +-
 tools/marvin/marvin/config/setup.cfg               |     2 +-
 tools/marvin/marvin/config/test_data.py            |     2 +-
 tools/marvin/marvin/lib/base.py                    |   513 +-
 tools/marvin/marvin/misc/build/CI.md               |    76 +-
 tools/marvin/marvin/misc/build/README.md           |    41 +-
 tools/marvin/marvin/misc/build/asf_test.cfg        |   142 +-
 tools/marvin/marvin/misc/build/kvm.cfg             |   212 +-
 tools/marvin/marvin/misc/build/xen.cfg             |   212 +-
 tools/marvin/pom.xml                               |     2 +-
 tools/marvin/setup.py                              |     2 +-
 tools/ngui/README.md                               |    34 +-
 tools/ngui/static/css/app.css                      |     2 +-
 tools/ngui/templates/index.html                    |   106 +-
 tools/pom.xml                                      |     2 +-
 .../before_upgrade_data_collection.sh              |     0
 .../cloud_schema_comparision.sh                    |     0
 .../fresh_install_data_collection.sh               |     0
 .../test_config_before_and_after_upgrade.sh        |     0
 ...test_config_between_fresh_and_upgraded_setup.sh |     0
 .../usage_schema_comparison.sh                     |     0
 ui/README.md                                       |    12 +-
 ui/docs/development.md                             |     2 +
 ui/docs/full-test-plan.template.md                 |     4 +-
 ui/docs/smoke-test-plan.template.md                |     4 +-
 ui/package-lock.json                               |    14 -
 ui/package.json                                    |     7 +-
 ui/public/assets/asf-logo.svg                      |   116 -
 ui/public/assets/feather.svg                       |    89 -
 ui/public/cloud-image-templates.json               |   110 -
 ui/public/config.json                              |    18 +-
 ui/public/css/apache-theme.css                     |  1169 --
 ui/public/css/dark-theme.css                       |  1592 --
 ui/public/example.html                             |     2 +-
 ui/public/index.html                               |    10 +-
 ui/public/locales/de_DE.json                       |     1 -
 ui/public/locales/el_GR.json                       |     2 +-
 ui/public/locales/en.json                          |   405 +-
 ui/public/locales/es.json                          |     1 -
 ui/public/locales/ja_JP.json                       |     1 -
 ui/public/locales/ko_KR.json                       |     1 -
 ui/public/locales/pt_BR.json                       |    18 +-
 ui/public/locales/te.json                          |  3737 ----
 ui/public/locales/zh_CN.json                       |     1 -
 ui/src/api/index.js                                |    72 +-
 ui/src/components/CheckBoxSelectPair.vue           |     8 +-
 ui/src/components/header/AnnouncementBanner.vue    |   145 -
 ui/src/components/header/SamlDomainSwitcher.vue    |     6 +-
 ui/src/components/header/TranslationMenu.vue       |     1 -
 ui/src/components/header/UserMenu.vue              |    15 +-
 ui/src/components/page/GlobalLayout.vue            |    33 +-
 ui/src/components/view/ActionButton.vue            |     4 +-
 ui/src/components/view/AnnotationsTab.vue          |    10 +-
 ui/src/components/view/BackupMetadata.vue          |   137 -
 ui/src/components/view/DedicateData.vue            |    18 +-
 ui/src/components/view/DedicateDomain.vue          |     6 +-
 ui/src/components/view/DedicateModal.vue           |    10 +-
 ui/src/components/view/DeployVMFromBackup.vue      |  2761 ---
 ui/src/components/view/DetailSettings.vue          |     8 +-
 ui/src/components/view/DetailsTab.vue              |    99 +-
 ui/src/components/view/EventsTab.vue               |    19 +-
 ui/src/components/view/GPUDevicesTab.vue           |   902 -
 ui/src/components/view/GPUSummaryTab.vue           |   294 -
 ui/src/components/view/GPUTab.vue                  |   440 -
 .../components/view/ImageDeployInstanceButton.vue  |   150 -
 ui/src/components/view/ImageStoreSelectView.vue    |     4 +-
 ui/src/components/view/InfoCard.vue                |   244 +-
 .../InstanceVolumesStoragePoolSelectListView.vue   |     4 +-
 ui/src/components/view/ListResourceTable.vue       |     6 +-
 ui/src/components/view/ListView.vue                |   783 +-
 ui/src/components/view/NicNetworkSelectForm.vue    |     4 +-
 ui/src/components/view/ObjectListTable.vue         |    89 -
 ui/src/components/view/ObjectStoreBrowser.vue      |    10 +-
 ui/src/components/view/ResourceCountUsage.vue      |     5 +-
 ui/src/components/view/ResourceIcon.vue            |    16 +-
 ui/src/components/view/ResourceLimitTab.vue        |    12 +-
 ui/src/components/view/ResourceView.vue            |     4 +-
 ui/src/components/view/SearchView.vue              |   351 +-
 ui/src/components/view/SettingsTab.vue             |   148 +-
 ui/src/components/view/StatsTab.vue                |     4 +-
 ui/src/components/view/StoragePoolSelectView.vue   |     6 +-
 ui/src/components/view/TestWebhookDeliveryView.vue |     4 +-
 ui/src/components/view/TreeView.vue                |     8 +-
 ui/src/components/view/UploadResourceIcon.vue      |     6 +-
 ui/src/components/view/VgpuProfilesTab.vue         |   405 -
 ui/src/components/view/VmwareData.vue              |     4 +-
 ui/src/components/view/VolumesTab.vue              |     4 +-
 ui/src/components/view/WebhookDeliveriesTab.vue    |    12 +-
 .../components/widgets/BlockRadioGroupSelect.vue   |   154 -
 ui/src/components/widgets/Console.vue              |    46 +-
 ui/src/components/widgets/DetailsInput.vue         |   186 -
 ui/src/components/widgets/InfiniteScrollSelect.vue |     6 +-
 ui/src/components/widgets/OsLogo.vue               |    57 +-
 ui/src/components/widgets/Status.vue               |    24 +-
 ui/src/config/router.js                            |     4 -
 ui/src/config/section/account.js                   |     6 +-
 ui/src/config/section/compute.js                   |   183 +-
 ui/src/config/section/config.js                    |   190 +-
 ui/src/config/section/event.js                     |     2 +-
 ui/src/config/section/extension.js                 |   147 -
 ui/src/config/section/extension/customaction.js    |    94 -
 ui/src/config/section/image.js                     |    17 +-
 ui/src/config/section/infra.js                     |    23 -
 ui/src/config/section/infra/backupRepositories.js  |    63 -
 ui/src/config/section/infra/clusters.js            |    26 +-
 ui/src/config/section/infra/hosts.js               |    21 +-
 ui/src/config/section/infra/managementServers.js   |    43 +-
 ui/src/config/section/infra/objectStorages.js      |     4 +-
 ui/src/config/section/infra/phynetworks.js         |     7 +-
 ui/src/config/section/infra/pods.js                |     5 +-
 ui/src/config/section/infra/primaryStorages.js     |     2 +-
 ui/src/config/section/infra/zones.js               |     9 +-
 ui/src/config/section/network.js                   |     3 +-
 ui/src/config/section/offering.js                  |    28 +-
 ui/src/config/section/project.js                   |     4 -
 ui/src/config/section/storage.js                   |   134 +-
 ui/src/config/section/user.js                      |    23 +-
 ui/src/core/ext.js                                 |     4 +-
 ui/src/core/lazy_lib/components_use.js             |     2 -
 ui/src/core/lazy_lib/icons_use.js                  |    10 -
 ui/src/main.js                                     |    81 +-
 ui/src/store/getters.js                            |     2 -
 ui/src/store/modules/app.js                        |     6 -
 ui/src/store/modules/user.js                       |    56 +-
 ui/src/store/mutation-types.js                     |     1 -
 ui/src/style/README.md                             |     9 +-
 ui/src/style/objects/form.scss                     |     8 -
 ui/src/utils/extension.js                          |    30 -
 ui/src/utils/guiTheme.js                           |   103 -
 ui/src/utils/plugins.js                            |    88 +-
 ui/src/utils/request.js                            |    34 +-
 ui/src/utils/util.js                               |    21 -
 ui/src/views/AutogenView.vue                       |   362 +-
 ui/src/views/auth/ForgotPassword.vue               |     4 +-
 ui/src/views/auth/Login.vue                        |    56 +-
 ui/src/views/auth/ResetPassword.vue                |     4 +-
 ui/src/views/compute/AssignInstance.vue            |     7 +-
 ui/src/views/compute/AttachIso.vue                 |    10 +-
 ui/src/views/compute/AutoScaleDownPolicyTab.vue    |    26 +-
 ui/src/views/compute/AutoScaleLoadBalancing.vue    |    27 +-
 ui/src/views/compute/AutoScaleUpPolicyTab.vue      |    26 +-
 ui/src/views/compute/AutoScaleVmProfile.vue        |    15 +-
 ui/src/views/compute/BackupScheduleWizard.vue      |    32 +-
 ui/src/views/compute/ChangeAffinity.vue            |     6 +-
 ui/src/views/compute/CreateAutoScaleVmGroup.vue    |   550 +-
 ui/src/views/compute/CreateKubernetesCluster.vue   |   460 +-
 ui/src/views/compute/CreateSSHKeyPair.vue          |     8 +-
 ui/src/views/compute/CreateSnapshotWizard.vue      |     6 +-
 ui/src/views/compute/DeployVM.vue                  |  1313 +-
 ui/src/views/compute/DeployVnfAppliance.vue        |   663 +-
 ui/src/views/compute/DestroyVM.vue                 |     6 +-
 ui/src/views/compute/EditVM.vue                    |   100 +-
 ui/src/views/compute/InstanceSchedules.vue         |     8 +-
 ui/src/views/compute/InstanceTab.vue               |    25 +-
 ui/src/views/compute/KubernetesAddNodes.vue        |   186 -
 ui/src/views/compute/KubernetesRemoveNodes.vue     |   151 -
 ui/src/views/compute/KubernetesServiceTab.vue      |    63 +-
 ui/src/views/compute/MigrateVMStorage.vue          |     4 +-
 ui/src/views/compute/MigrateWizard.vue             |    11 +-
 ui/src/views/compute/RegisterUserData.vue          |    57 +-
 ui/src/views/compute/ReinstallVm.vue               |   194 +-
 ui/src/views/compute/ResetSshKeyPair.vue           |     6 +-
 ui/src/views/compute/ResetUserData.vue             |    24 +-
 ui/src/views/compute/ScaleKubernetesCluster.vue    |   156 +-
 ui/src/views/compute/ScaleVM.vue                   |    12 +-
 ui/src/views/compute/StartBackup.vue               |   166 -
 ui/src/views/compute/StartVirtualMachine.vue       |    10 +-
 ui/src/views/compute/UpgradeKubernetesCluster.vue  |     6 +-
 ui/src/views/compute/backup/BackupSchedule.vue     |    42 +-
 .../views/compute/backup/CreateBackupSchedule.vue  |   183 -
 ui/src/views/compute/backup/FormSchedule.vue       |    69 +-
 .../compute/wizard/ComputeOfferingSelection.vue    |   135 +-
 .../wizard/DeployInstanceBackupSelection.vue       |   154 -
 ui/src/views/compute/wizard/MultiDiskSelection.vue |     4 +-
 .../views/compute/wizard/MultiNetworkSelection.vue |     4 +-
 .../views/compute/wizard/NetworkConfiguration.vue  |    97 +-
 ui/src/views/compute/wizard/NetworkSelection.vue   |    17 +-
 .../compute/wizard/OsBasedImageRadioGroup.vue      |   213 -
 .../views/compute/wizard/OsBasedImageSelection.vue |   375 -
 .../wizard/OsBasedImageSelectionSearchView.vue     |   119 -
 ui/src/views/compute/wizard/OwnershipSelection.vue |     8 +-
 .../compute/wizard/SecurityGroupSelection.vue      |     4 +-
 .../views/compute/wizard/TemplateIsoRadioGroup.vue |    10 +-
 .../views/compute/wizard/TemplateIsoSelection.vue  |    13 +-
 ui/src/views/compute/wizard/UserDataSelection.vue  |     5 -
 .../wizard/VolumeDiskOfferingSelectView.vue        |   280 -
 .../compute/wizard/ZoneBlockRadioGroupSelect.vue   |    51 -
 ui/src/views/dashboard/CapacityDashboard.vue       |    42 +-
 ui/src/views/dashboard/Dashboard.vue               |     4 +-
 ui/src/views/dashboard/SetupTwoFaAtLogin.vue       |    12 +-
 ui/src/views/dashboard/UsageDashboard.vue          |   109 +-
 ui/src/views/dashboard/VerifyOauth.vue             |     4 +-
 ui/src/views/dashboard/VerifyTwoFa.vue             |     4 +-
 ui/src/views/extension/AddCustomAction.vue         |   247 -
 ui/src/views/extension/CreateExtension.vue         |   256 -
 .../views/extension/ExtensionCustomActionsTab.vue  |   274 -
 ui/src/views/extension/ExtensionResourcesTab.vue   |   135 -
 .../extension/ExternalConfigurationDetails.vue     |   116 -
 ui/src/views/extension/ParametersInput.vue         |   328 -
 ui/src/views/extension/RegisterExtension.vue       |   200 -
 ui/src/views/extension/RunCustomAction.vue         |   386 -
 ui/src/views/extension/UpdateCustomAction.vue      |   232 -
 ui/src/views/extension/UpdateExtension.vue         |   160 -
 ui/src/views/iam/AddAccount.vue                    |    12 +-
 ui/src/views/iam/AddLdapAccount.vue                |    16 +-
 ui/src/views/iam/AddUser.vue                       |   132 +-
 ui/src/views/iam/ChangeUserPassword.vue            |     4 +-
 ui/src/views/iam/ConfigureSamlSsoAuth.vue          |     8 +-
 ui/src/views/iam/CreateRole.vue                    |     8 +-
 ui/src/views/iam/DeleteAccount.vue                 |     6 +-
 ui/src/views/iam/DomainActionForm.vue              |     4 +-
 ui/src/views/iam/DomainView.vue                    |    31 +-
 ui/src/views/iam/EditAccount.vue                   |     6 +-
 ui/src/views/iam/EditUser.vue                      |     4 +-
 ui/src/views/iam/ImportRole.vue                    |     4 +-
 ui/src/views/iam/RolePermissionTab.vue             |    12 +-
 ui/src/views/iam/SSLCertificateTab.vue             |   184 +-
 ui/src/views/iam/SetupTwoFaAtUserProfile.vue       |    12 +-
 .../views/image/AddKubernetesSupportedVersion.vue  |   173 +-
 ui/src/views/image/IsoZones.vue                    |   158 +-
 ui/src/views/image/RegisterOrUploadIso.vue         |    18 +-
 ui/src/views/image/RegisterOrUploadTemplate.vue    |   146 +-
 ui/src/views/image/TemplateVnfSettings.vue         |     6 +-
 ui/src/views/image/TemplateZones.vue               |   149 +-
 ui/src/views/image/UpdateISO.vue                   |    30 +-
 .../image/UpdateKubernetesSupportedVersion.vue     |     4 +-
 ui/src/views/image/UpdateTemplate.vue              |    44 +-
 .../views/image/UpdateTemplateIsoPermissions.vue   |    12 +-
 ui/src/views/infra/AddObjectStorage.vue            |    93 +-
 ui/src/views/infra/AddPrimaryStorage.vue           |    29 +-
 ui/src/views/infra/AddSecondaryStorage.vue         |     8 +-
 ui/src/views/infra/AsyncJobsTab.vue                |     4 +-
 ui/src/views/infra/ChangeHostPassword.vue          |     4 +-
 ui/src/views/infra/ChangeStoragePoolScope.vue      |     6 +-
 ui/src/views/infra/ClusterAdd.vue                  |   438 +-
 ui/src/views/infra/ClusterDRSTab.vue               |    12 +-
 ui/src/views/infra/ClusterUpdate.vue               |   271 -
 ui/src/views/infra/ConfigureHostOOBM.vue           |     4 +-
 ui/src/views/infra/Confirmation.vue                |    51 +-
 ui/src/views/infra/ConnectedAgentsTab.vue          |    88 -
 ui/src/views/infra/CpuSockets.vue                  |     4 +-
 ui/src/views/infra/HostAdd.vue                     |   527 +-
 ui/src/views/infra/HostEnableDisable.vue           |     6 +-
 ui/src/views/infra/HostInfo.vue                    |    12 +-
 ui/src/views/infra/HostUpdate.vue                  |   109 +-
 ui/src/views/infra/InfraSummary.vue                |    21 +-
 ui/src/views/infra/ManagementServerPeerTab.vue     |     4 +-
 ui/src/views/infra/Metrics.vue                     |     6 +-
 ui/src/views/infra/MigrateData.vue                 |     6 +-
 ui/src/views/infra/PodAdd.vue                      |     8 +-
 ui/src/views/infra/PodUpdate.vue                   |   213 -
 ui/src/views/infra/Resources.vue                   |     4 +-
 ui/src/views/infra/StorageBrowser.vue              |     8 +-
 ui/src/views/infra/UpdatePrimaryStorage.vue        |    80 +-
 ui/src/views/infra/UsageRecords.vue                |    22 +-
 ui/src/views/infra/ZoneUpdate.vue                  |   268 -
 ui/src/views/infra/network/DedicatedVLANTab.vue    |    14 +-
 ui/src/views/infra/network/EditTrafficLabel.vue    |    13 +-
 ui/src/views/infra/network/IpRangesTabGuest.vue    |    10 +-
 .../views/infra/network/IpRangesTabManagement.vue  |     8 +-
 ui/src/views/infra/network/IpRangesTabPublic.vue   |    39 +-
 ui/src/views/infra/network/IpRangesTabStorage.vue  |    10 +-
 ui/src/views/infra/network/ServiceProvidersTab.vue |    57 +-
 ui/src/views/infra/network/TrafficTypesTab.vue     |    18 +-
 .../infra/network/providers/AddF5LoadBalancer.vue  |     6 +-
 .../network/providers/AddNetscalerLoadBalancer.vue |     6 +-
 .../infra/network/providers/AddNiciraNvpDevice.vue |     6 +-
 .../network/providers/AddPaloAltoFirewall.vue      |     6 +-
 .../views/infra/network/providers/ProviderItem.vue |    32 +-
 .../infra/network/providers/ProviderListView.vue   |     6 +-
 ui/src/views/infra/routers/RouterHealthCheck.vue   |     9 +-
 .../views/infra/zone/AdvancedGuestTrafficForm.vue  |    59 +-
 ui/src/views/infra/zone/AsNumbersTab.vue           |     8 +-
 ui/src/views/infra/zone/BgpPeersTab.vue            |    16 +-
 ui/src/views/infra/zone/IpAddressRangeForm.vue     |    20 +-
 ui/src/views/infra/zone/Ipv4GuestSubnetsTab.vue    |    16 +-
 ui/src/views/infra/zone/PhysicalNetworksTab.vue    |    10 +-
 ui/src/views/infra/zone/SystemVmsTab.vue           |     4 +-
 ui/src/views/infra/zone/ZoneWizard.vue             |    42 +-
 ui/src/views/infra/zone/ZoneWizardAddResources.vue |    24 +-
 ui/src/views/infra/zone/ZoneWizardLaunchZone.vue   |   172 +-
 .../infra/zone/ZoneWizardNetworkSetupStep.vue      |    94 +-
 .../zone/ZoneWizardPhysicalNetworkSetupStep.vue    |     7 +-
 .../infra/zone/ZoneWizardRegisterTemplate.vue      |   298 -
 .../views/infra/zone/ZoneWizardZoneDetailsStep.vue |    10 +-
 ui/src/views/network/AclRulesTab.vue               |    22 +-
 ui/src/views/network/ChangeBgpPeerForNetwork.vue   |     6 +-
 ui/src/views/network/ChangeBgpPeerForVpc.vue       |     6 +-
 .../views/network/CreateIpv4SubnetForNetwork.vue   |     8 +-
 ui/src/views/network/CreateIsolatedNetworkForm.vue |    16 +-
 ui/src/views/network/CreateL2NetworkForm.vue       |    12 +-
 ui/src/views/network/CreateNetwork.vue             |     6 +-
 ui/src/views/network/CreateNetworkPermission.vue   |     4 +-
 ui/src/views/network/CreateSharedNetworkForm.vue   |    24 +-
 ui/src/views/network/CreateVlanIpRange.vue         |     8 +-
 ui/src/views/network/CreateVpc.vue                 |    32 +-
 ui/src/views/network/CreateVpnCustomerGateway.vue  |     4 +-
 ui/src/views/network/EgressRulesTab.vue            |    12 +-
 ui/src/views/network/EnableStaticNat.vue           |    12 +-
 ui/src/views/network/FirewallRules.vue             |    18 +-
 ui/src/views/network/GuestIpRanges.vue             |     8 +-
 ui/src/views/network/GuestVlanNetworksTab.vue      |     4 +-
 .../views/network/IngressEgressRuleConfigure.vue   |    16 +-
 ui/src/views/network/InternalLBAssignVmForm.vue    |    10 +-
 ui/src/views/network/InternalLBAssignedVmTab.vue   |     6 +-
 ui/src/views/network/IpAddressesTab.vue            |    36 +-
 ui/src/views/network/Ipv6FirewallRulesTab.vue      |     8 +-
 ui/src/views/network/LoadBalancing.vue             |   349 +-
 ui/src/views/network/NetworkPermissions.vue        |     8 +-
 ui/src/views/network/NicsTab.vue                   |    32 +-
 ui/src/views/network/NicsTable.vue                 |     4 +-
 ui/src/views/network/PortForwarding.vue            |    20 +-
 ui/src/views/network/PublicIpResource.vue          |    39 +-
 ui/src/views/network/ReservePublicIP.vue           |    10 +-
 ui/src/views/network/RoutersTab.vue                |     4 +-
 ui/src/views/network/RoutingFirewallRulesTab.vue   |     8 +-
 ui/src/views/network/StaticRoutesTab.vue           |   140 +-
 ui/src/views/network/UpdateNetwork.vue             |     8 +-
 ui/src/views/network/VnfAppliancesTab.vue          |     4 +-
 ui/src/views/network/VpcTab.vue                    |   157 +-
 ui/src/views/network/VpcTiersTab.vue               |    32 +-
 ui/src/views/network/VpnDetails.vue                |   172 +-
 .../views/network/tungsten/FirewallPolicyTab.vue   |     8 +-
 ui/src/views/network/tungsten/FirewallRuleTab.vue  |    18 +-
 ui/src/views/network/tungsten/FirewallTagTab.vue   |    10 +-
 ui/src/views/network/tungsten/LogicalRouterTab.vue |     8 +-
 ui/src/views/network/tungsten/NetworkPolicyTab.vue |    10 +-
 .../network/tungsten/TungstenFabricPolicyRule.vue  |     8 +-
 .../network/tungsten/TungstenFabricPolicyTag.vue   |    10 +-
 .../network/tungsten/TungstenFabricTableView.vue   |    10 +-
 ui/src/views/offering/AddComputeOffering.vue       |   315 +-
 ui/src/views/offering/AddDiskOffering.vue          |    19 +-
 ui/src/views/offering/AddNetworkOffering.vue       |   191 +-
 ui/src/views/offering/AddVpcOffering.vue           |   114 +-
 ui/src/views/offering/ImportBackupOffering.vue     |     8 +-
 ui/src/views/offering/UpdateOfferingAccess.vue     |    10 +-
 ui/src/views/plugins/ApiDocsPlugin.vue             |     4 +-
 ui/src/views/plugins/CloudianPlugin.vue            |     4 +-
 ui/src/views/plugins/quota/CreateQuotaTariff.vue   |    56 +-
 ui/src/views/plugins/quota/EditQuotaTariff.vue     |    63 +-
 .../views/plugins/quota/EditTariffValueWizard.vue  |     4 +-
 .../views/plugins/quota/EmailTemplateDetails.vue   |     6 +-
 ui/src/views/plugins/quota/QuotaBalance.vue        |     6 +-
 .../views/plugins/quota/QuotaSummaryResource.vue   |     4 +-
 ui/src/views/plugins/quota/QuotaUsage.vue          |     6 +-
 ui/src/views/project/AccountsTab.vue               |    12 +-
 ui/src/views/project/AddAccountOrUserToProject.vue |    12 +-
 ui/src/views/project/InvitationTokenTemplate.vue   |     4 +-
 ui/src/views/project/InvitationsTemplate.vue       |     6 +-
 .../views/project/iam/ProjectRolePermissionTab.vue |    12 +-
 ui/src/views/project/iam/ProjectRoleTab.vue        |    10 +-
 ui/src/views/setting/ConfigurationTab.vue          |     6 +-
 ui/src/views/setting/ConfigurationTable.vue        |     1 -
 ui/src/views/setting/ConfigurationValue.vue        |    34 +-
 ui/src/views/storage/AttachVolume.vue              |     6 +-
 ui/src/views/storage/ChangeOfferingForVolume.vue   |     6 +-
 .../views/storage/ChangeSharedFSDiskOffering.vue   |     6 +-
 .../storage/ChangeSharedFSServiceOffering.vue      |     8 +-
 ui/src/views/storage/CreateBucket.vue              |    11 +-
 ui/src/views/storage/CreateSharedFS.vue            |    12 +-
 .../views/storage/CreateSnapshotFromVMSnapshot.vue |     6 +-
 ui/src/views/storage/CreateTemplate.vue            |    14 +-
 ui/src/views/storage/CreateVMFromBackup.vue        |   267 -
 ui/src/views/storage/CreateVolume.vue              |    14 +-
 ui/src/views/storage/FormSchedule.vue              |    66 +-
 ui/src/views/storage/MigrateImageStoreResource.vue |     6 +-
 ui/src/views/storage/MigrateVolume.vue             |    10 +-
 ui/src/views/storage/RecurringSnapshotVolume.vue   |   157 +-
 ui/src/views/storage/ResizeVolume.vue              |     6 +-
 ui/src/views/storage/RestoreAttachBackupVolume.vue |     6 +-
 ui/src/views/storage/ScheduledSnapshots.vue        |     4 +-
 ui/src/views/storage/SharedFSTab.vue               |     6 +-
 ui/src/views/storage/SnapshotZones.vue             |    89 +-
 ui/src/views/storage/TakeSnapshot.vue              |    73 +-
 ui/src/views/storage/UpdateBucket.vue              |     6 +-
 ui/src/views/storage/UpdateSharedFS.vue            |     4 +-
 ui/src/views/storage/UploadLocalVolume.vue         |    12 +-
 ui/src/views/storage/UploadVolume.vue              |    12 +-
 ui/src/views/tools/CreateWebhook.vue               |     8 +-
 ui/src/views/tools/ImportUnmanagedInstance.vue     |    92 +-
 ui/src/views/tools/ImportVmTasks.vue               |   205 -
 ui/src/views/tools/ManageInstances.vue             |   393 +-
 ui/src/views/tools/ManageVolumes.vue               |    20 +-
 ui/src/views/tools/SelectVmwareVcenter.vue         |     8 +-
 ui/tests/common/index.js                           |    10 -
 ui/tests/unit/components/view/ActionButton.spec.js |    30 +-
 ui/tests/unit/views/AutogenView.spec.js            |   274 +-
 ui/tests/unit/views/compute/MigrateWizard.spec.js  |    48 +-
 usage/pom.xml                                      |     2 +-
 .../java/com/cloud/usage/UsageManagerImpl.java     |   138 +-
 .../com/cloud/usage/parser/BackupUsageParser.java  |    32 +-
 .../com/cloud/usage/parser/BucketUsageParser.java  |    33 +-
 .../cloud/usage/parser/IPAddressUsageParser.java   |    45 +-
 .../usage/parser/LoadBalancerUsageParser.java      |    46 +-
 .../usage/parser/NetworkOfferingUsageParser.java   |    46 +-
 .../com/cloud/usage/parser/NetworkUsageParser.java |    41 +-
 .../cloud/usage/parser/NetworksUsageParser.java    |    34 +-
 .../usage/parser/PortForwardingUsageParser.java    |    44 +-
 .../usage/parser/SecurityGroupUsageParser.java     |    44 +-
 .../com/cloud/usage/parser/StorageUsageParser.java |    44 +-
 .../java/com/cloud/usage/parser/UsageParser.java   |    31 +-
 .../cloud/usage/parser/VMInstanceUsageParser.java  |    42 +-
 .../usage/parser/VMSnapshotOnPrimaryParser.java    |    48 +-
 .../cloud/usage/parser/VMSnapshotUsageParser.java  |    48 +-
 .../com/cloud/usage/parser/VPNUserUsageParser.java |    44 +-
 .../com/cloud/usage/parser/VmDiskUsageParser.java  |    41 +-
 .../com/cloud/usage/parser/VolumeUsageParser.java  |    44 +-
 .../com/cloud/usage/parser/VpcUsageParser.java     |    33 +-
 utils/pom.xml                                      |     2 +-
 .../com/cloud/utils/ConstantTimeComparator.java    |     5 +-
 utils/src/main/java/com/cloud/utils/FileUtil.java  |    15 -
 .../src/main/java/com/cloud/utils/StringUtils.java |   148 +-
 .../src/main/java/com/cloud/utils/ThreadUtil.java  |    40 -
 utils/src/main/java/com/cloud/utils/UriUtils.java  |     2 +-
 utils/src/main/java/com/cloud/utils/UuidUtils.java |     7 -
 .../java/com/cloud/utils/db/EntityManager.java     |     3 -
 .../java/com/cloud/utils/json/JsonMergeUtil.java   |   108 -
 .../main/java/com/cloud/utils/net/NetUtils.java    |    34 -
 .../java/com/cloud/utils/nio/HandlerFactory.java   |     2 +-
 utils/src/main/java/com/cloud/utils/nio/Link.java  |     4 +-
 .../main/java/com/cloud/utils/nio/NioClient.java   |     4 -
 .../java/com/cloud/utils/nio/NioConnection.java    |   168 +-
 .../main/java/com/cloud/utils/nio/NioServer.java   |     8 +-
 .../main/java/com/cloud/utils/script/Script.java   |    36 +-
 .../utils/storage/TemplateDownloaderUtil.java      |    61 -
 .../com/cloud/utils/validation/ChecksumUtil.java   |     3 +-
 .../cloudstack/utils/security/DigestHelper.java    |     8 +-
 .../test/java/com/cloud/utils/LogUtilsTest.java    |     2 +-
 .../test/java/com/cloud/utils/StringUtilsTest.java |    15 -
 .../com/cloud/utils/UriUtilsParametrizedTest.java  |     2 +-
 .../test/java/com/cloud/utils/UriUtilsTest.java    |     5 +-
 .../com/cloud/utils/json/JsonMergeUtilTest.java    |   108 -
 .../java/com/cloud/utils/net/NetUtilsTest.java     |    19 -
 .../ReflectionToStringBuilderUtilsTest.java        |     2 +-
 .../utils/security/DigestHelperTest.java           |    11 -
 utils/src/test/resources/testContext.xml           |    96 +-
 vmware-base/pom.xml                                |     2 +-
 .../hypervisor/vmware/mo/HypervisorHostHelper.java |     3 +-
 .../hypervisor/vmware/mo/VirtualMachineMO.java     |     6 -
 2479 files changed, 118151 insertions(+), 247179 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/bug.yml
 delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.yaml
 delete mode 100644 .github/linters/.yamllint.yml
 delete mode 100644 .github/workflows/codeql-analysis.yml
 delete mode 100644 .markdownlintignore
 delete mode 100644 PRE-COMMIT.md
 delete mode 100644 api/src/main/java/com/cloud/network/SDNProviderNetworkRule.java
 delete mode 100644 api/src/main/java/com/cloud/network/netris/NetrisLbBackend.java
 delete mode 100644 api/src/main/java/com/cloud/network/netris/NetrisNetworkRule.java
 delete mode 100644 api/src/main/java/com/cloud/network/netris/NetrisProvider.java
 delete mode 100644 api/src/main/java/com/cloud/network/netris/NetrisService.java
 delete mode 100644 api/src/main/java/com/cloud/vm/VmDiskInfo.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/CreateGpuCardCmd.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/CreateGpuDeviceCmd.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/CreateVgpuProfileCmd.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/DeleteGpuCardCmd.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/DeleteGpuDeviceCmd.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/DeleteVgpuProfileCmd.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/DiscoverGpuDevicesCmd.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/ListGpuDevicesCmdByAdmin.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/ManageGpuDeviceCmd.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/UnmanageGpuDeviceCmd.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/UpdateGpuCardCmd.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/UpdateGpuDeviceCmd.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/UpdateVgpuProfileCmd.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/guest/AddGuestOsCategoryCmd.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/guest/DeleteGuestOsCategoryCmd.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsCategoryCmd.java
 rename api/src/main/java/org/apache/cloudstack/api/command/admin/host/{CancelHostMaintenanceCmd.java => CancelMaintenanceCmd.java} (98%)
 rename api/src/main/java/org/apache/cloudstack/api/command/admin/host/{PrepareForHostMaintenanceCmd.java => PrepareForMaintenanceCmd.java} (98%)
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/management/RemoveManagementServerCmd.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ConfigureStorageAccessCmd.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListStorageAccessGroupsCmd.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/vm/CreateVMFromBackupCmdByAdmin.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ListImportVMTasksCmd.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/backup/repository/UpdateBackupRepositoryCmd.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/consoleproxy/ListConsoleSessionsCmd.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/gpu/ListGpuCardsCmd.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/gpu/ListGpuDevicesCmd.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/gpu/ListVgpuProfilesCmd.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/gui/theme/CreateGuiThemeCmd.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/gui/theme/ListGuiThemesCmd.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/gui/theme/RemoveGuiThemeCmd.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/gui/theme/UpdateGuiThemeCmd.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/userdata/BaseRegisterUserDataCmd.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/userdata/DeleteCniConfigurationCmd.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/userdata/ListCniConfigurationCmd.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/userdata/RegisterCniConfigurationCmd.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/vm/BaseDeployVMCmd.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/vm/CreateVMFromBackupCmd.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/utils/OfferingUtils.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/response/ConsoleSessionResponse.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/response/ExtensionCustomActionParameterResponse.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/response/ExtensionCustomActionResponse.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/response/ExtensionResourceResponse.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/response/ExtensionResponse.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/response/GpuCardResponse.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/response/GpuDeviceResponse.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/response/GuiThemeResponse.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/response/ImportVMTaskResponse.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/response/KubernetesUserVmResponse.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/response/StorageAccessGroupResponse.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/response/VgpuProfileResponse.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/command/ReconcileCommandService.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/consoleproxy/ConsoleSession.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/extension/CustomActionResultResponse.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/extension/Extension.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/extension/ExtensionCustomAction.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/extension/ExtensionHelper.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/extension/ExtensionResourceMap.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/gpu/GpuCard.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/gpu/GpuDevice.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/gpu/GpuService.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/gpu/VgpuProfile.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/gui/theme/GuiTheme.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/gui/theme/GuiThemeDetails.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/gui/theme/GuiThemeJoin.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/gui/theme/GuiThemeService.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/vm/ImportVmTask.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/vm/ImportVmTasksManager.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/vm/lease/VMLeaseManager.java
 delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmdTest.java
 delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/CreateGpuCardCmdTest.java
 delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/CreateGpuDeviceCmdTest.java
 delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/CreateVgpuProfileCmdTest.java
 delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/DeleteGpuCardCmdTest.java
 delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/DeleteGpuDeviceCmdTest.java
 delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/DeleteVgpuProfileCmdTest.java
 delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/DiscoverGpuDevicesCmdTest.java
 delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/ListGpuDevicesCmdByAdminTest.java
 delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/ManageGpuDeviceCmdTest.java
 delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/UnmanageGpuDeviceCmdTest.java
 delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/UpdateGpuCardCmdTest.java
 delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/UpdateGpuDeviceCmdTest.java
 delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/gpu/UpdateVgpuProfileCmdTest.java
 delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/guest/AddGuestOsCategoryCmdTest.java
 delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsCategoryCmdTest.java
 delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsCmdTest.java
 delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/backup/ListBackupScheduleCmdTest.java
 delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/consoleproxy/ListConsoleSessionsCmdTest.java
 delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/gpu/ListGpuCardsCmdTest.java
 delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/gpu/ListGpuDevicesCmdTest.java
 delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/gpu/ListVgpuProfilesCmdTest.java
 delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmdTest.java
 delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotPoliciesCmdTest.java
 delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmdTest.java
 delete mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/vm/ListVMsCmdTest.java
 delete mode 100644 api/src/test/java/org/apache/cloudstack/extension/ExtensionCustomActionTest.java
 delete mode 100644 client/src/main/java/org/apache/cloudstack/ACSRequestLog.java
 delete mode 100644 core/src/main/java/com/cloud/agent/api/ConvertSnapshotAnswer.java
 delete mode 100644 core/src/main/java/com/cloud/agent/api/ConvertSnapshotCommand.java
 delete mode 100644 core/src/main/java/com/cloud/agent/api/GetExternalConsoleAnswer.java
 delete mode 100644 core/src/main/java/com/cloud/agent/api/GetExternalConsoleCommand.java
 delete mode 100644 core/src/main/java/com/cloud/agent/api/HandleCksIsoCommand.java
 delete mode 100644 core/src/main/java/com/cloud/agent/api/MigrateAgentConnectionAnswer.java
 delete mode 100644 core/src/main/java/com/cloud/agent/api/MigrateAgentConnectionCommand.java
 delete mode 100644 core/src/main/java/com/cloud/agent/api/PrepareExternalProvisioningAnswer.java
 delete mode 100644 core/src/main/java/com/cloud/agent/api/PrepareExternalProvisioningCommand.java
 delete mode 100644 core/src/main/java/com/cloud/agent/api/RecreateCheckpointsCommand.java
 delete mode 100644 core/src/main/java/com/cloud/agent/api/RemoveBitmapCommand.java
 delete mode 100644 core/src/main/java/com/cloud/agent/api/RunCustomActionAnswer.java
 delete mode 100644 core/src/main/java/com/cloud/agent/api/RunCustomActionCommand.java
 delete mode 100644 core/src/main/java/com/cloud/agent/api/UnmanageInstanceAnswer.java
 delete mode 100644 core/src/main/java/com/cloud/agent/api/UnmanageInstanceCommand.java
 delete mode 100644 core/src/main/java/com/cloud/agent/api/storage/CreateDiskOnlyVmSnapshotAnswer.java
 delete mode 100644 core/src/main/java/com/cloud/agent/api/storage/CreateDiskOnlyVmSnapshotCommand.java
 delete mode 100644 core/src/main/java/com/cloud/agent/api/storage/DeleteDiskOnlyVmSnapshotCommand.java
 delete mode 100644 core/src/main/java/com/cloud/agent/api/storage/MergeDiskOnlyVmSnapshotCommand.java
 delete mode 100644 core/src/main/java/com/cloud/agent/api/storage/RevertDiskOnlyVmSnapshotAnswer.java
 delete mode 100644 core/src/main/java/com/cloud/agent/api/storage/RevertDiskOnlyVmSnapshotCommand.java
 delete mode 100644 core/src/main/java/com/cloud/agent/api/storage/SnapshotMergeTreeTO.java
 delete mode 100644 core/src/main/java/org/apache/cloudstack/backup/BackupStorageStatsAnswer.java
 delete mode 100644 core/src/main/java/org/apache/cloudstack/backup/GetBackupStorageStatsCommand.java
 delete mode 100644 core/src/main/java/org/apache/cloudstack/command/CommandInfo.java
 delete mode 100644 core/src/main/java/org/apache/cloudstack/command/ReconcileAnswer.java
 delete mode 100644 core/src/main/java/org/apache/cloudstack/command/ReconcileCommand.java
 delete mode 100644 core/src/main/java/org/apache/cloudstack/command/ReconcileCommandUtils.java
 delete mode 100644 core/src/main/java/org/apache/cloudstack/command/ReconcileCopyAnswer.java
 delete mode 100644 core/src/main/java/org/apache/cloudstack/command/ReconcileCopyCommand.java
 delete mode 100644 core/src/main/java/org/apache/cloudstack/command/ReconcileMigrateAnswer.java
 delete mode 100644 core/src/main/java/org/apache/cloudstack/command/ReconcileMigrateCommand.java
 delete mode 100644 core/src/main/java/org/apache/cloudstack/command/ReconcileMigrateVolumeAnswer.java
 delete mode 100644 core/src/main/java/org/apache/cloudstack/command/ReconcileMigrateVolumeCommand.java
 delete mode 100644 core/src/main/java/org/apache/cloudstack/command/ReconcileVolumeAnswer.java
 rename core/src/main/java/org/apache/cloudstack/storage/command/{CheckDataStoreStoragePolicyComplianceCommand.java => CheckDataStoreStoragePolicyComplainceCommand.java} (93%)
 delete mode 100644 core/src/test/java/com/cloud/agent/resource/virtualnetwork/model/LoadBalancerRuleTest.java
 delete mode 100644 core/src/test/java/com/cloud/agent/transport/ResponseTest.java
 delete mode 100644 core/src/test/java/org/apache/cloudstack/command/ReconcileCommandUtilsTest.java
 delete mode 100644 engine/components-api/src/main/java/com/cloud/hypervisor/ExternalProvisioner.java
 delete mode 100644 engine/schema/src/main/java/com/cloud/gpu/GpuCardVO.java
 delete mode 100644 engine/schema/src/main/java/com/cloud/gpu/GpuDeviceVO.java
 delete mode 100644 engine/schema/src/main/java/com/cloud/gpu/VgpuProfileVO.java
 delete mode 100644 engine/schema/src/main/java/com/cloud/gpu/dao/GpuCardDao.java
 delete mode 100644 engine/schema/src/main/java/com/cloud/gpu/dao/GpuCardDaoImpl.java
 delete mode 100644 engine/schema/src/main/java/com/cloud/gpu/dao/GpuDeviceDao.java
 delete mode 100644 engine/schema/src/main/java/com/cloud/gpu/dao/GpuDeviceDaoImpl.java
 delete mode 100644 engine/schema/src/main/java/com/cloud/gpu/dao/VgpuProfileDao.java
 delete mode 100644 engine/schema/src/main/java/com/cloud/gpu/dao/VgpuProfileDaoImpl.java
 delete mode 100644 engine/schema/src/main/java/com/cloud/network/dao/NetrisProviderDao.java
 delete mode 100644 engine/schema/src/main/java/com/cloud/network/dao/NetrisProviderDaoImpl.java
 delete mode 100644 engine/schema/src/main/java/com/cloud/network/element/NetrisProviderVO.java
 delete mode 100644 engine/schema/src/main/java/com/cloud/storage/StoragePoolAndAccessGroupMapVO.java
 delete mode 100644 engine/schema/src/main/java/com/cloud/storage/dao/StoragePoolAndAccessGroupMapDao.java
 delete mode 100644 engine/schema/src/main/java/com/cloud/storage/dao/StoragePoolAndAccessGroupMapDaoImpl.java
 delete mode 100644 engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade42010to42100.java
 delete mode 100644 engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade42100to42200.java
 delete mode 100644 engine/schema/src/main/java/com/cloud/vm/ImportVMTaskVO.java
 rename engine/schema/src/main/java/com/cloud/vm/{VMInstanceDetailVO.java => UserVmDetailVO.java} (90%)
 delete mode 100644 engine/schema/src/main/java/com/cloud/vm/dao/ImportVMTaskDao.java
 delete mode 100644 engine/schema/src/main/java/com/cloud/vm/dao/ImportVMTaskDaoImpl.java
 rename engine/schema/src/main/java/com/cloud/vm/dao/{VMInstanceDetailsDao.java => UserVmDetailsDao.java} (84%)
 rename engine/schema/src/main/java/com/cloud/vm/dao/{VMInstanceDetailsDaoImpl.java => UserVmDetailsDaoImpl.java} (81%)
 delete mode 100644 engine/schema/src/main/java/org/apache/cloudstack/backup/BackupDetailVO.java
 delete mode 100644 engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupDetailsDao.java
 delete mode 100644 engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupDetailsDaoImpl.java
 delete mode 100644 engine/schema/src/main/java/org/apache/cloudstack/command/ReconcileCommandVO.java
 delete mode 100644 engine/schema/src/main/java/org/apache/cloudstack/command/dao/ReconcileCommandDao.java
 delete mode 100644 engine/schema/src/main/java/org/apache/cloudstack/command/dao/ReconcileCommandDaoImpl.java
 delete mode 100644 engine/schema/src/main/java/org/apache/cloudstack/gui/theme/GuiThemeDetailsVO.java
 delete mode 100644 engine/schema/src/main/java/org/apache/cloudstack/gui/theme/GuiThemeJoinVO.java
 delete mode 100644 engine/schema/src/main/java/org/apache/cloudstack/gui/theme/GuiThemeVO.java
 delete mode 100644 engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeDao.java
 delete mode 100644 engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeDaoImpl.java
 delete mode 100644 engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeDetailsDao.java
 delete mode 100644 engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeDetailsDaoImpl.java
 delete mode 100644 engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeJoinDao.java
 delete mode 100644 engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeJoinDaoImpl.java
 delete mode 100644 engine/schema/src/main/resources/META-INF/db/procedures/cloud.idempotent_drop_unique_key.sql
 delete mode 100644 engine/schema/src/main/resources/META-INF/db/schema-42010to42100-cleanup.sql
 delete mode 100644 engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql
 delete mode 100644 engine/schema/src/main/resources/META-INF/db/schema-42100to42200-cleanup.sql
 delete mode 100644 engine/schema/src/main/resources/META-INF/db/schema-42100to42200.sql
 delete mode 100644 engine/schema/src/main/resources/META-INF/db/views/cloud.gui_themes_view.sql
 delete mode 100644 engine/schema/src/test/java/com/cloud/gpu/dao/GpuCardDaoImplTest.java
 delete mode 100644 engine/schema/src/test/java/com/cloud/gpu/dao/GpuDeviceDaoImplTest.java
 delete mode 100644 engine/schema/src/test/java/com/cloud/gpu/dao/VgpuProfileDaoImplTest.java
 delete mode 100644 engine/schema/src/test/java/com/cloud/network/dao/LoadBalancerVOTest.java
 delete mode 100644 engine/schema/src/test/java/com/cloud/upgrade/ConfigurationGroupsAggregatorTest.java
 delete mode 100644 engine/schema/src/test/java/com/cloud/upgrade/dao/Upgrade42010to42100Test.java
 delete mode 100644 engine/schema/src/test/java/com/cloud/upgrade/dao/Upgrade42100to42200Test.java
 delete mode 100644 engine/schema/src/test/java/org/apache/cloudstack/backup/dao/BackupDaoImplTest.java
 mode change 100755 => 100644 engine/schema/templateConfig.sh
 delete mode 100644 engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/KvmFileBasedStorageVmSnapshotStrategy.java
 delete mode 100644 engine/storage/src/test/java/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocatorTest.java
 delete mode 100644 engine/storage/src/test/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelectorTest.java
 delete mode 100755 extensions/HyperV/hyperv.py
 delete mode 100755 extensions/MaaS/maas.py
 delete mode 100755 extensions/Proxmox/proxmox.sh
 delete mode 100644 framework/extensions/pom.xml
 delete mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/AddCustomActionCmd.java
 delete mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/CreateExtensionCmd.java
 delete mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/DeleteCustomActionCmd.java
 delete mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/DeleteExtensionCmd.java
 delete mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/ListCustomActionCmd.java
 delete mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/ListExtensionsCmd.java
 delete mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/RegisterExtensionCmd.java
 delete mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/RunCustomActionCmd.java
 delete mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/UnregisterExtensionCmd.java
 delete mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/UpdateCustomActionCmd.java
 delete mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/UpdateExtensionCmd.java
 delete mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/command/CleanupExtensionFilesCommand.java
 delete mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/command/ExtensionBaseCommand.java
 delete mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/command/ExtensionRoutingUpdateCommand.java
 delete mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/command/ExtensionServerActionBaseCommand.java
 delete mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/command/GetExtensionPathChecksumCommand.java
 delete mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/command/PrepareExtensionPathCommand.java
 delete mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionCustomActionDao.java
 delete mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionCustomActionDaoImpl.java
 delete mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionCustomActionDetailsDao.java
 delete mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionCustomActionDetailsDaoImpl.java
 delete mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionDao.java
 delete mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionDaoImpl.java
 delete mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionDetailsDao.java
 delete mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionDetailsDaoImpl.java
 delete mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionResourceMapDao.java
 delete mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionResourceMapDaoImpl.java
 delete mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionResourceMapDetailsDao.java
 delete mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/dao/ExtensionResourceMapDetailsDaoImpl.java
 delete mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManager.java
 delete mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManagerImpl.java
 delete mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/vo/ExtensionCustomActionDetailsVO.java
 delete mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/vo/ExtensionCustomActionVO.java
 delete mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/vo/ExtensionDetailsVO.java
 delete mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/vo/ExtensionResourceMapDetailsVO.java
 delete mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/vo/ExtensionResourceMapVO.java
 delete mode 100644 framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/vo/ExtensionVO.java
 delete mode 100644 framework/extensions/src/main/resources/META-INF/cloudstack/core/spring-framework-extensions-core-context.xml
 delete mode 100644 framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/AddCustomActionCmdTest.java
 delete mode 100644 framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/CreateExtensionCmdTest.java
 delete mode 100644 framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/DeleteCustomActionCmdTest.java
 delete mode 100644 framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/DeleteExtensionCmdTest.java
 delete mode 100644 framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/ListCustomActionCmdTest.java
 delete mode 100644 framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/ListExtensionsCmdTest.java
 delete mode 100644 framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/RegisterExtensionCmdTest.java
 delete mode 100644 framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/RunCustomActionCmdTest.java
 delete mode 100644 framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/UnregisterExtensionCmdTest.java
 delete mode 100644 framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/UpdateCustomActionCmdTest.java
 delete mode 100644 framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/api/UpdateExtensionCmdTest.java
 delete mode 100644 framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/command/ExtensionBaseCommandTest.java
 delete mode 100644 framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/dao/ExtensionCustomActionDaoImplTest.java
 delete mode 100644 framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/dao/ExtensionDaoImplTest.java
 delete mode 100644 framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/dao/ExtensionResourceMapDaoImplTest.java
 delete mode 100644 framework/extensions/src/test/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManagerImplTest.java
 delete mode 100644 framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/Configuration.java
 delete mode 100644 framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/DiskOfferingPresetVariables.java
 rename framework/quota/src/main/java/org/apache/cloudstack/quota/dao/{VMInstanceDetailsDao.java => UserVmDetailsDao.java} (87%)
 rename framework/quota/src/main/java/org/apache/cloudstack/quota/dao/{VMInstanceDetailsDaoImpl.java => UserVmDetailsDaoImpl.java} (80%)
 rename framework/quota/src/main/java/org/apache/cloudstack/quota/vo/{VMInstanceDetailVO.java => UserVmDetailVO.java} (89%)
 rename framework/spring/module/src/test/resources/testhierarchy/base/{base-context-inheritable.xml => test-context-inheritable.xml} (100%)
 rename framework/spring/module/src/test/resources/testhierarchy/base/{base-context.xml => test-context.xml} (100%)
 rename framework/spring/module/src/test/resources/testhierarchy/child1-1/{child1-1-context.xml => test-context.xml} (100%)
 delete mode 100644 framework/spring/module/src/test/resources/testhierarchy/child1/child1-context-inheritable.xml
 rename framework/spring/module/src/test/resources/testhierarchy/child1/{child1-context-override.xml => test-context-override.xml} (100%)
 rename framework/spring/module/src/test/resources/testhierarchy/child1/{child1-context.xml => test-context.xml} (100%)
 rename framework/spring/module/src/test/resources/testhierarchy/child2/{child2-context.xml => test-context.xml} (100%)
 delete mode 120000 packaging/el10
 delete mode 100644 plugins/backup/nas/src/test/java/org/apache/cloudstack/backup/NASBackupProviderTest.java
 delete mode 100644 plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaCreditsListCmd.java
 delete mode 100644 plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaValidateActivationRuleCmd.java
 delete mode 100644 plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaValidateActivationRuleResponse.java
 delete mode 100644 plugins/database/quota/src/test/java/org/apache/cloudstack/api/command/QuotaCreditsListCmdTest.java
 delete mode 100644 plugins/database/quota/src/test/java/org/apache/cloudstack/api/command/QuotaValidateActivationRuleCmdTest.java
 delete mode 100644 plugins/hypervisors/external/pom.xml
 delete mode 100644 plugins/hypervisors/external/src/main/java/org/apache/cloudstack/agent/manager/ExternalAgentManager.java
 delete mode 100644 plugins/hypervisors/external/src/main/java/org/apache/cloudstack/agent/manager/ExternalAgentManagerImpl.java
 delete mode 100644 plugins/hypervisors/external/src/main/java/org/apache/cloudstack/agent/manager/ExternalServerPlanner.java
 delete mode 100644 plugins/hypervisors/external/src/main/java/org/apache/cloudstack/agent/manager/ExternalTemplateAdapter.java
 delete mode 100644 plugins/hypervisors/external/src/main/java/org/apache/cloudstack/guru/ExternalHypervisorGuru.java
 delete mode 100644 plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/discoverer/ExternalServerDiscoverer.java
 delete mode 100644 plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/provisioner/ExternalPathPayloadProvisioner.java
 delete mode 100644 plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/resource/ExternalResource.java
 delete mode 100644 plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/core/spring-external-core-context.xml
 delete mode 100644 plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-compute/module.properties
 delete mode 100644 plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-compute/spring-external-compute-context.xml
 delete mode 100644 plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-discoverer/module.properties
 delete mode 100644 plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-discoverer/spring-external-discoverer-context.xml
 delete mode 100644 plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-planner/module.properties
 delete mode 100644 plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-planner/spring-external-planner-context.xml
 delete mode 100644 plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-storage/module.properties
 delete mode 100644 plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/external-storage/spring-external-storage-context.xml
 delete mode 100644 plugins/hypervisors/external/src/test/java/org/apache/cloudstack/agent/manager/ExternalTemplateAdapterTest.java
 delete mode 100644 plugins/hypervisors/external/src/test/java/org/apache/cloudstack/hypervisor/external/discoverer/ExternalServerDiscovererTest.java
 delete mode 100644 plugins/hypervisors/external/src/test/java/org/apache/cloudstack/hypervisor/external/provisioner/ExternalPathPayloadProvisionerTest.java
 delete mode 100644 plugins/hypervisors/external/src/test/java/org/apache/cloudstack/hypervisor/external/resource/ExternalResourceTest.java
 delete mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BlockCommitListener.java
 delete mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtGpuDef.java
 delete mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/disconnecthook/DisconnectHook.java
 delete mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/disconnecthook/MigrationCancelHook.java
 delete mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/disconnecthook/VolumeMigrationCancelHook.java
 delete mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertSnapshotCommandWrapper.java
 delete mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCreateDiskOnlyVMSnapshotCommandWrapper.java
 delete mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtDeleteDiskOnlyVMSnapshotCommandWrapper.java
 delete mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetBackupStatsCommandWrapper.java
 delete mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetGPUStatsCommandWrapper.java
 delete mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMergeDiskOnlyVMSnapshotCommandWrapper.java
 delete mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtReconcileCommandWrapper.java
 delete mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRecreateCheckpointsCommandWrapper.java
 delete mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRemoveBitmapCommandWrapper.java
 delete mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRevertDiskOnlyVMSnapshotCommandWrapper.java
 delete mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUnmanageInstanceCommandWrapper.java
 delete mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/StoragePoolInformation.java
 delete mode 100644 plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/DisconnectHooksTest.java
 delete mode 100644 plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtGpuDefTest.java
 delete mode 100644 plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapperTest.java
 delete mode 100644 plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUnmanageInstanceCommandWrapperTest.java
 delete mode 100644 plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/MockGpuDevice.java
 delete mode 100644 plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/MockGpuDeviceVO.java
 delete mode 100644 plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/dao/MockGpuDeviceDao.java
 delete mode 100644 plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/dao/MockGpuDeviceDaoImpl.java
 delete mode 100644 plugins/integrations/cloudian/src/main/java/org/apache/cloudstack/cloudian/client/CloudianCredential.java
 delete mode 100644 plugins/integrations/cloudian/src/main/java/org/apache/cloudstack/cloudian/client/CloudianUserBucketUsage.java
 create mode 100644 plugins/integrations/cloudian/src/test/java/org/apache/cloudstack/cloudian/CloudianClientTest.java
 delete mode 100644 plugins/integrations/cloudian/src/test/java/org/apache/cloudstack/cloudian/client/CloudianClientTest.java
 rename {api => plugins/integrations/kubernetes-service}/src/main/java/com/cloud/kubernetes/cluster/KubernetesCluster.java (81%)
 delete mode 100644 plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterAddWorker.java
 delete mode 100644 plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterRemoveWorker.java
 delete mode 100644 plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/admin/kubernetes/version/GetUploadParamsForKubernetesSupportedVersionCmd.java
 delete mode 100644 plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/AddNodesToKubernetesClusterCmd.java
 delete mode 100644 plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/RemoveNodesFromKubernetesClusterCmd.java
 delete mode 100644 plugins/integrations/kubernetes-service/src/main/resources/conf/etcd-node.yml
 delete mode 100755 plugins/integrations/kubernetes-service/src/main/resources/script/delete-pv-reclaimpolicy-delete
 delete mode 100644 plugins/integrations/kubernetes-service/src/main/resources/script/deploy-csi-driver
 delete mode 100644 plugins/integrations/kubernetes-service/src/main/resources/script/remove-node-from-cluster
 delete mode 100644 plugins/integrations/kubernetes-service/src/main/resources/script/validate-cks-node
 delete mode 100644 plugins/integrations/kubernetes-service/src/test/java/com/cloud/kubernetes/cluster/KubernetesClusterHelperImplTest.java
 delete mode 100644 plugins/integrations/kubernetes-service/src/test/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterScaleWorkerTest.java
 delete mode 100644 plugins/integrations/kubernetes-service/src/test/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterUpgradeWorkerTest.java
 delete mode 100644 plugins/maintenance/src/main/java/org/apache/cloudstack/api/command/CancelMaintenanceCmd.java
 delete mode 100644 plugins/maintenance/src/main/java/org/apache/cloudstack/api/command/PrepareForMaintenanceCmd.java
 delete mode 100644 plugins/maintenance/src/main/java/org/apache/cloudstack/maintenance/ManagementServerMaintenanceListener.java
 delete mode 100644 plugins/maintenance/src/main/java/org/apache/cloudstack/maintenance/ManagementServerMaintenanceManager.java
 delete mode 100644 plugins/maintenance/src/main/java/org/apache/cloudstack/maintenance/ManagementServerMaintenanceManagerImpl.java
 delete mode 100644 plugins/maintenance/src/main/java/org/apache/cloudstack/maintenance/command/CancelMaintenanceManagementServerHostCommand.java
 delete mode 100644 plugins/maintenance/src/main/java/org/apache/cloudstack/maintenance/command/PrepareForMaintenanceManagementServerHostCommand.java
 delete mode 100644 plugins/maintenance/src/main/resources/META-INF/cloudstack/maintenance/module.properties
 delete mode 100644 plugins/maintenance/src/main/resources/META-INF/cloudstack/maintenance/spring-maintenance-context.xml
 delete mode 100644 plugins/maintenance/src/test/java/org/apache/cloudstack/maintenance/ManagementServerMaintenanceManagerImplTest.java
 delete mode 100644 plugins/network-elements/netris/pom.xml
 delete mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/StartupNetrisCommand.java
 delete mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/AddOrUpdateNetrisStaticRouteCommand.java
 delete mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/CreateNetrisACLCommand.java
 delete mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/CreateNetrisVnetCommand.java
 delete mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/CreateNetrisVpcCommand.java
 delete mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/CreateOrUpdateNetrisACLCommand.java
 delete mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/CreateOrUpdateNetrisLoadBalancerRuleCommand.java
 delete mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/CreateOrUpdateNetrisNatCommand.java
 delete mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/DeleteNetrisACLCommand.java
 delete mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/DeleteNetrisLoadBalancerRuleCommand.java
 delete mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/DeleteNetrisNatRuleCommand.java
 delete mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/DeleteNetrisStaticRouteCommand.java
 delete mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/DeleteNetrisVnetCommand.java
 delete mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/DeleteNetrisVpcCommand.java
 delete mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/ListNetrisStaticRoutesAnswer.java
 delete mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/ListNetrisStaticRoutesCommand.java
 delete mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/NetrisAnswer.java
 delete mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/NetrisCommand.java
 delete mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/ReleaseNatIpCommand.java
 delete mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/SetupNetrisPublicRangeCommand.java
 delete mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/UpdateNetrisVnetCommand.java
 delete mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/UpdateNetrisVpcCommand.java
 delete mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/api/command/AddNetrisProviderCmd.java
 delete mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/api/command/DeleteNetrisProviderCmd.java
 delete mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/api/command/ListNetrisProvidersCmd.java
 delete mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/api/response/NetrisProviderResponse.java
 delete mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/resource/NetrisPortGroup.java
 delete mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/resource/NetrisResource.java
 delete mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/resource/NetrisResourceObjectUtils.java
 delete mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisApiClient.java
 delete mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisApiClientImpl.java
 delete mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisElement.java
 delete mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisGuestNetworkGuru.java
 delete mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisProviderService.java
 delete mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisProviderServiceImpl.java
 delete mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisPublicNetworkGuru.java
 delete mode 100644 plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisServiceImpl.java
 delete mode 100644 plugins/network-elements/netris/src/main/resources/META-INF/cloudstack/core/spring-netris-core-managers-context.xml
 delete mode 100644 plugins/network-elements/netris/src/main/resources/META-INF/cloudstack/netris/module.properties
 delete mode 100644 plugins/network-elements/netris/src/main/resources/META-INF/cloudstack/netris/spring-netris-context.xml
 delete mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/AddOrUpdateNetrisStaticRouteCommandTest.java
 delete mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/CreateNetrisACLCommandTest.java
 delete mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/CreateNetrisVnetCommandTest.java
 delete mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/CreateNetrisVpcCommandTest.java
 delete mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/CreateOrUpdateNetrisLoadBalancerRuleCommandTest.java
 delete mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/CreateOrUpdateNetrisNatCommandTest.java
 delete mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/DeleteNetrisACLCommandTest.java
 delete mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/DeleteNetrisLoadBalancerRuleCommandTest.java
 delete mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/DeleteNetrisNatRuleCommandTest.java
 delete mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/DeleteNetrisVnetCommandTest.java
 delete mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/DeleteNetrisVpcCommandTest.java
 delete mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/ReleaseNatIpCommandTest.java
 delete mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/SetupNetrisPublicRangeCommandTest.java
 delete mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/UpdateNetrisVnetCommandTest.java
 delete mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/agent/api/UpdateNetrisVpcCommandTest.java
 delete mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/api/command/AddNetrisProviderCmdTest.java
 delete mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/api/command/DeleteNetrisProviderCmdTest.java
 delete mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/api/command/ListNetrisProvidersCmdTest.java
 delete mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/resource/NetrisResourceObjectUtilsTest.java
 delete mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/resource/NetrisResourceTest.java
 delete mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/service/NetrisApiClientImplTest.java
 delete mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/service/NetrisElementTest.java
 delete mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/service/NetrisGuestNetworkGuruTest.java
 delete mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/service/NetrisProviderServiceImplTest.java
 delete mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/service/NetrisPublicNetworkGuruTest.java
 delete mode 100644 plugins/network-elements/netris/src/test/java/org/apache/cloudstack/service/NetrisServiceImplTest.java
 rename server/src/main/java/com/cloud/network/SDNProviderOpObject.java => plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/resource/NsxOpObject.java (94%)
 rename plugins/{maintenance => shutdown}/pom.xml (90%)
 rename plugins/{maintenance/src/main/java/org/apache/cloudstack/api/command/BaseMSMaintenanceActionCmd.java => shutdown/src/main/java/org/apache/cloudstack/api/command/BaseShutdownActionCmd.java} (85%)
 rename plugins/{maintenance => shutdown}/src/main/java/org/apache/cloudstack/api/command/CancelShutdownCmd.java (83%)
 rename plugins/{maintenance => shutdown}/src/main/java/org/apache/cloudstack/api/command/PrepareForShutdownCmd.java (85%)
 rename plugins/{maintenance => shutdown}/src/main/java/org/apache/cloudstack/api/command/ReadyForShutdownCmd.java (66%)
 rename plugins/{maintenance => shutdown}/src/main/java/org/apache/cloudstack/api/command/TriggerShutdownCmd.java (85%)
 rename plugins/{maintenance/src/main/java/org/apache/cloudstack/api/response/ManagementServerMaintenanceResponse.java => shutdown/src/main/java/org/apache/cloudstack/api/response/ReadyForShutdownResponse.java} (52%)
 create mode 100644 plugins/shutdown/src/main/java/org/apache/cloudstack/shutdown/ShutdownManager.java
 create mode 100644 plugins/shutdown/src/main/java/org/apache/cloudstack/shutdown/ShutdownManagerImpl.java
 rename plugins/{maintenance/src/main/java/org/apache/cloudstack/maintenance => shutdown/src/main/java/org/apache/cloudstack/shutdown}/command/BaseShutdownManagementServerHostCommand.java (95%)
 rename plugins/{maintenance/src/main/java/org/apache/cloudstack/maintenance => shutdown/src/main/java/org/apache/cloudstack/shutdown}/command/CancelShutdownManagementServerHostCommand.java (95%)
 rename plugins/{maintenance/src/main/java/org/apache/cloudstack/maintenance => shutdown/src/main/java/org/apache/cloudstack/shutdown}/command/PrepareForShutdownManagementServerHostCommand.java (95%)
 rename plugins/{maintenance/src/main/java/org/apache/cloudstack/maintenance => shutdown/src/main/java/org/apache/cloudstack/shutdown}/command/TriggerShutdownManagementServerHostCommand.java (95%)
 copy plugins/{metrics/src/main/resources/META-INF/cloudstack/metrics => shutdown/src/main/resources/META-INF/cloudstack/shutdown}/module.properties (98%)
 copy plugins/{metrics/src/main/resources/META-INF/cloudstack/metrics/spring-metrics-context.xml => shutdown/src/main/resources/META-INF/cloudstack/shutdown/spring-shutdown-context.xml} (87%)
 create mode 100644 plugins/shutdown/src/test/java/org/apache/cloudstack/shutdown/ShutdownManagerImplTest.java
 delete mode 100644 plugins/storage/object/cloudian/README.md
 delete mode 100644 plugins/storage/object/cloudian/pom.xml
 delete mode 100644 plugins/storage/object/cloudian/src/main/java/org/apache/cloudstack/storage/datastore/driver/CloudianHyperStoreObjectStoreDriverImpl.java
 delete mode 100644 plugins/storage/object/cloudian/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/CloudianHyperStoreObjectStoreLifeCycleImpl.java
 delete mode 100644 plugins/storage/object/cloudian/src/main/java/org/apache/cloudstack/storage/datastore/provider/CloudianHyperStoreObjectStoreProviderImpl.java
 delete mode 100644 plugins/storage/object/cloudian/src/main/java/org/apache/cloudstack/storage/datastore/util/CloudianHyperStoreUtil.java
 delete mode 100644 plugins/storage/object/cloudian/src/main/resources/META-INF/cloudstack/storage-object-cloudian/module.properties
 delete mode 100644 plugins/storage/object/cloudian/src/main/resources/META-INF/cloudstack/storage-object-cloudian/spring-storage-object-cloudian-context.xml
 delete mode 100644 plugins/storage/object/cloudian/src/test/java/org/apache/cloudstack/storage/datastore/driver/CloudianHyperStoreObjectStoreDriverImplTest.java
 delete mode 100644 plugins/storage/object/cloudian/src/test/java/org/apache/cloudstack/storage/datastore/lifecycle/CloudianHyperStoreObjectStoreLifeCycleImplTest.java
 delete mode 100644 plugins/storage/object/cloudian/src/test/java/org/apache/cloudstack/storage/datastore/provider/CloudianHyperStoreObjectStoreProviderImplTest.java
 delete mode 100644 plugins/storage/object/cloudian/src/test/java/org/apache/cloudstack/storage/datastore/util/CloudianHyperStoreUtilTest.java
 delete mode 100644 plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/api/StorageConfiguration.java
 delete mode 100644 requirements-dev.txt
 mode change 100755 => 100644 scripts/installer/export-templates.sh
 delete mode 100755 scripts/installer/pre-check.sh
 delete mode 100755 scripts/vm/hypervisor/external/provisioner/provisioner.sh
 delete mode 100755 scripts/vm/hypervisor/kvm/gpudiscovery.sh
 mode change 100755 => 100644 scripts/vm/hypervisor/xenserver/add_to_vcpus_params_live.sh
 mode change 100755 => 100644 scripts/vm/network/ovs-pvlan-kvm-vm.sh
 delete mode 100755 scripts/vm/network/vnet/modifyvxlan-evpn.sh
 delete mode 100644 server/src/main/java/org/apache/cloudstack/command/ReconcileCommandServiceImpl.java
 delete mode 100644 server/src/main/java/org/apache/cloudstack/gpu/GpuServiceImpl.java
 delete mode 100644 server/src/main/java/org/apache/cloudstack/gui/theme/GuiThemeServiceImpl.java
 delete mode 100644 server/src/main/java/org/apache/cloudstack/jsinterpreter/JsInterpreterHelper.java
 delete mode 100644 server/src/main/java/org/apache/cloudstack/vm/ImportVmTasksManagerImpl.java
 delete mode 100644 server/src/main/java/org/apache/cloudstack/vm/lease/VMLeaseManagerImpl.java
 delete mode 100644 server/src/test/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocatorTest.java
 copy plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/MockAccountManager.java => server/src/test/java/com/cloud/user/MockAccountManagerImpl.java (67%)
 delete mode 100644 server/src/test/java/org/apache/cloudstack/backup/BackupRepositoryServiceImplTest.java
 delete mode 100644 server/src/test/java/org/apache/cloudstack/gpu/GpuServiceImplTest.java
 delete mode 100644 server/src/test/java/org/apache/cloudstack/gui/theme/GuiThemeServiceImplTest.java
 delete mode 100644 server/src/test/java/org/apache/cloudstack/jsinterpreter/JsInterpreterHelperTest.java
 delete mode 100644 server/src/test/java/org/apache/cloudstack/service/NetrisServiceMockTest.java
 delete mode 100644 server/src/test/java/org/apache/cloudstack/storage/object/BucketApiServiceImplTest.java
 delete mode 100644 server/src/test/java/org/apache/cloudstack/vm/lease/VMLeaseManagerImplTest.java
 mode change 100755 => 100644 setup/db/221to222upgrade.sh
 mode change 100755 => 100644 setup/db/deploy-db-clouddev.sh
 mode change 100755 => 100644 setup/db/deploy-db-simulator.sh
 delete mode 100644 systemvm/agent/noVNC/app/styles/constants.css
 delete mode 100644 systemvm/agent/noVNC/core/crypto/aes.js
 delete mode 100644 systemvm/agent/noVNC/core/crypto/bigint.js
 delete mode 100644 systemvm/agent/noVNC/core/crypto/crypto.js
 delete mode 100644 systemvm/agent/noVNC/core/crypto/dh.js
 delete mode 100644 systemvm/agent/noVNC/core/crypto/rsa.js
 delete mode 100644 systemvm/agent/noVNC/core/decoders/h264.js
 delete mode 100644 systemvm/agent/noVNC/core/decoders/zlib.js
 rename systemvm/agent/noVNC/core/{crypto => }/des.js (87%)
 rename systemvm/agent/noVNC/core/{crypto => util}/md5.js (93%)
 delete mode 100644 systemvm/agent/noVNC/defaults.json
 delete mode 100644 systemvm/agent/noVNC/mandatory.json
 mode change 100755 => 100644 systemvm/agent/scripts/run-proxy.sh
 mode change 100755 => 100644 systemvm/agent/scripts/ssvm-check.sh
 mode change 100755 => 100644 systemvm/agent/scripts/utils.sh
 delete mode 100755 systemvm/debian/opt/cloud/bin/cks_iso.sh
 mode change 100755 => 100644 systemvm/debian/opt/cloud/bin/patched.sh
 mode change 100755 => 100644 systemvm/debian/opt/cloud/bin/setup/init.sh
 mode change 100755 => 100644 systemvm/debian/opt/cloud/bin/setup/sharedfsvm.sh
 mode change 100755 => 100644 systemvm/debian/opt/cloud/bin/update_interface_config.sh
 mode change 100755 => 100644 systemvm/debian/opt/cloud/templates/check_bumpup.sh
 mode change 100755 => 100644 systemvm/debian/root/func.sh
 mode change 100755 => 100644 systemvm/patch-sysvms.sh
 mode change 100755 => 100644 systemvm/test/runtests.sh
 delete mode 100644 test/integration/component/test_deploy_vm_lease.py
 delete mode 100644 test/integration/plugins/storpool/storpool.cfg
 delete mode 100644 test/integration/plugins/storpool/test_snapshot_copy_on_primary_storage.py
 delete mode 100644 test/integration/smoke/test_backup_recovery_nas.py
 delete mode 100644 test/integration/smoke/test_extension_custom.py
 delete mode 100644 test/integration/smoke/test_extension_custom_action_lifecycle.py
 delete mode 100644 test/integration/smoke/test_extension_lifecycle.py
 rename test/integration/smoke/{test_ms_maintenance_and_safe_shutdown.py => test_safe_shutdown.py} (58%)
 delete mode 100644 test/integration/smoke/test_ssl_offloading.py
 delete mode 100644 test/integration/smoke/test_systemvm_userdata.py
 delete mode 100644 test/integration/smoke/test_vm_lifecycle_unmanage_kvm_import.py
 delete mode 100644 test/integration/smoke/test_vm_lifecycle_with_snapshot_or_volume.py
 create mode 100644 test/selenium/ReadMe.txt
 copy {api/test/integration/api => test/selenium/browser}/__init__.py (100%)
 create mode 100644 test/selenium/browser/firefox.py
 create mode 100644 test/selenium/common/Global_Locators.py
 copy {api/test/integration/api => test/selenium/common}/__init__.py (100%)
 create mode 100644 test/selenium/common/shared.py
 copy {api/test/integration/api => test/selenium/cspages}/__init__.py (100%)
 create mode 100644 test/selenium/cspages/accounts/accountspage.py
 create mode 100644 test/selenium/cspages/accounts/userspage.py
 copy core/src/main/resources/META-INF/cloudstack/allocator/module.properties => test/selenium/cspages/cspage.py (90%)
 copy {api/test/integration/api => test/selenium/cspages/dashboard}/__init__.py (100%)
 create mode 100644 test/selenium/cspages/dashboard/dashboardpage.py
 copy {api/test/integration/api => test/selenium/cspages/login}/__init__.py (100%)
 create mode 100644 test/selenium/cspages/login/loginpage.py
 copy {api/test/integration/api => test/selenium/cstests}/__init__.py (100%)
 copy {api/test/integration/api => test/selenium/cstests/regressiontests}/__init__.py (100%)
 copy {api/test/integration/api => test/selenium/cstests/smoketests}/__init__.py (100%)
 create mode 100644 test/selenium/cstests/smoketests/adduser_test.py
 create mode 100644 test/selenium/cstests/smoketests/adduseraccount_test.py
 create mode 100644 test/selenium/cstests/smoketests/deleteuser_test.py
 create mode 100644 test/selenium/cstests/smoketests/deleteuseraccount_test.py
 create mode 100644 test/selenium/cstests/smoketests/global_settings_test.py
 create mode 100644 test/selenium/cstests/smoketests/login_logout_as_JohnD_test.py
 create mode 100644 test/selenium/cstests/smoketests/login_logout_test.py
 create mode 100644 test/selenium/cstests/smoketests/navigation_test.py
 create mode 100644 test/selenium/cstests/smoketests/smokecfg.py
 create mode 100644 test/selenium/lib/Global_Locators.py
 copy systemvm/test/TestCsDhcp.py => test/selenium/lib/initialize.py (55%)
 create mode 100644 test/selenium/smoke/Login_and_Accounts.py
 create mode 100644 test/selenium/smoke/Service_Offering.py
 create mode 100644 test/selenium/smoke/TemplatesAndISO.py
 create mode 100644 test/selenium/smoke/VM_lifeCycle.py
 create mode 100644 test/selenium/smoke/main.py
 delete mode 100644 tools/appliance/cks/ubuntu/22.04/cks-ubuntu-2204.json
 delete mode 100644 tools/appliance/cks/ubuntu/22.04/http/meta-data
 delete mode 100644 tools/appliance/cks/ubuntu/22.04/http/user-data
 delete mode 100755 tools/appliance/cks/ubuntu/22.04/scripts/add-interface-rule.sh
 delete mode 100755 tools/appliance/cks/ubuntu/22.04/scripts/apt_upgrade.sh
 delete mode 100755 tools/appliance/cks/ubuntu/22.04/scripts/cleanup.sh
 delete mode 100755 tools/appliance/cks/ubuntu/22.04/scripts/configure-cloud-init.sh
 delete mode 100755 tools/appliance/cks/ubuntu/22.04/scripts/configure_networking.sh
 delete mode 100755 tools/appliance/cks/ubuntu/22.04/scripts/setup-interfaces.sh
 delete mode 100755 tools/appliance/cks/ubuntu/22.04/scripts/setup_template.sh
 delete mode 100755 tools/appliance/cks/ubuntu/build.sh
 mode change 100755 => 100644 tools/appliance/systemvmtemplate/scripts/apt_upgrade.sh
 mode change 100755 => 100644 tools/appliance/systemvmtemplate/scripts/authorized_keys.sh
 mode change 100755 => 100644 tools/appliance/systemvmtemplate/scripts/cleanup.sh
 mode change 100755 => 100644 tools/appliance/systemvmtemplate/scripts/configure_acpid.sh
 mode change 100755 => 100644 tools/appliance/systemvmtemplate/scripts/configure_conntrack.sh
 mode change 100755 => 100644 tools/appliance/systemvmtemplate/scripts/configure_grub.sh
 mode change 100755 => 100644 tools/appliance/systemvmtemplate/scripts/configure_locale.sh
 mode change 100755 => 100644 tools/appliance/systemvmtemplate/scripts/configure_login.sh
 mode change 100755 => 100644 tools/appliance/systemvmtemplate/scripts/configure_networking.sh
 mode change 100755 => 100644 tools/appliance/systemvmtemplate/scripts/configure_persistent_config.sh
 mode change 100755 => 100644 tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh
 mode change 100755 => 100644 tools/appliance/systemvmtemplate/scripts/finalize.sh
 mode change 100755 => 100644 tools/appliance/systemvmtemplate/scripts/install_systemvm_packages.sh
 mode change 100755 => 100644 tools/build/installer/debinstall_full.sh
 mode change 100755 => 100644 tools/devcloud4/common/configure-network.sh
 mode change 100755 => 100644 tools/docker/docker_run_tests.sh
 mode change 100755 => 100644 tools/eclipse/set-eclipse-profile.sh
 mode change 100755 => 100644 tools/utils/database_comparision_during_upgrade/before_upgrade_data_collection.sh
 mode change 100755 => 100644 tools/utils/database_comparision_during_upgrade/cloud_schema_comparision.sh
 mode change 100755 => 100644 tools/utils/database_comparision_during_upgrade/fresh_install_data_collection.sh
 mode change 100755 => 100644 tools/utils/database_comparision_during_upgrade/test_config_before_and_after_upgrade.sh
 mode change 100755 => 100644 tools/utils/database_comparision_during_upgrade/test_config_between_fresh_and_upgraded_setup.sh
 mode change 100755 => 100644 tools/utils/database_comparision_during_upgrade/usage_schema_comparison.sh
 delete mode 100644 ui/public/assets/asf-logo.svg
 delete mode 100644 ui/public/assets/feather.svg
 delete mode 100644 ui/public/cloud-image-templates.json
 delete mode 100644 ui/public/css/apache-theme.css
 delete mode 100644 ui/public/css/dark-theme.css
 delete mode 100644 ui/public/locales/te.json
 delete mode 100644 ui/src/components/header/AnnouncementBanner.vue
 delete mode 100644 ui/src/components/view/BackupMetadata.vue
 delete mode 100644 ui/src/components/view/DeployVMFromBackup.vue
 delete mode 100644 ui/src/components/view/GPUDevicesTab.vue
 delete mode 100644 ui/src/components/view/GPUSummaryTab.vue
 delete mode 100644 ui/src/components/view/GPUTab.vue
 delete mode 100644 ui/src/components/view/ImageDeployInstanceButton.vue
 delete mode 100644 ui/src/components/view/ObjectListTable.vue
 delete mode 100644 ui/src/components/view/VgpuProfilesTab.vue
 delete mode 100644 ui/src/components/widgets/BlockRadioGroupSelect.vue
 delete mode 100644 ui/src/components/widgets/DetailsInput.vue
 delete mode 100644 ui/src/config/section/extension.js
 delete mode 100644 ui/src/config/section/extension/customaction.js
 delete mode 100644 ui/src/config/section/infra/backupRepositories.js
 delete mode 100644 ui/src/utils/extension.js
 delete mode 100644 ui/src/utils/guiTheme.js
 delete mode 100644 ui/src/views/compute/KubernetesAddNodes.vue
 delete mode 100644 ui/src/views/compute/KubernetesRemoveNodes.vue
 delete mode 100644 ui/src/views/compute/StartBackup.vue
 delete mode 100644 ui/src/views/compute/backup/CreateBackupSchedule.vue
 delete mode 100644 ui/src/views/compute/wizard/DeployInstanceBackupSelection.vue
 delete mode 100644 ui/src/views/compute/wizard/OsBasedImageRadioGroup.vue
 delete mode 100644 ui/src/views/compute/wizard/OsBasedImageSelection.vue
 delete mode 100644 ui/src/views/compute/wizard/OsBasedImageSelectionSearchView.vue
 delete mode 100644 ui/src/views/compute/wizard/VolumeDiskOfferingSelectView.vue
 delete mode 100644 ui/src/views/compute/wizard/ZoneBlockRadioGroupSelect.vue
 delete mode 100644 ui/src/views/extension/AddCustomAction.vue
 delete mode 100644 ui/src/views/extension/CreateExtension.vue
 delete mode 100644 ui/src/views/extension/ExtensionCustomActionsTab.vue
 delete mode 100644 ui/src/views/extension/ExtensionResourcesTab.vue
 delete mode 100644 ui/src/views/extension/ExternalConfigurationDetails.vue
 delete mode 100644 ui/src/views/extension/ParametersInput.vue
 delete mode 100644 ui/src/views/extension/RegisterExtension.vue
 delete mode 100644 ui/src/views/extension/RunCustomAction.vue
 delete mode 100644 ui/src/views/extension/UpdateCustomAction.vue
 delete mode 100644 ui/src/views/extension/UpdateExtension.vue
 delete mode 100644 ui/src/views/infra/ClusterUpdate.vue
 delete mode 100644 ui/src/views/infra/ConnectedAgentsTab.vue
 delete mode 100644 ui/src/views/infra/PodUpdate.vue
 delete mode 100644 ui/src/views/infra/ZoneUpdate.vue
 delete mode 100644 ui/src/views/infra/zone/ZoneWizardRegisterTemplate.vue
 delete mode 100644 ui/src/views/storage/CreateVMFromBackup.vue
 delete mode 100644 ui/src/views/tools/ImportVmTasks.vue
 delete mode 100644 utils/src/main/java/com/cloud/utils/ThreadUtil.java
 delete mode 100644 utils/src/main/java/com/cloud/utils/json/JsonMergeUtil.java
 delete mode 100644 utils/src/main/java/com/cloud/utils/storage/TemplateDownloaderUtil.java
 delete mode 100644 utils/src/test/java/com/cloud/utils/json/JsonMergeUtilTest.java