You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by gi...@apache.org on 2025/12/17 13:23:06 UTC

(cloudstack) branch dependabot/maven/org.springframework-spring-web-6.0.0 updated (2d1b673946b -> c65d0633011)

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

github-bot pushed a change to branch dependabot/maven/org.springframework-spring-web-6.0.0
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


 discard 2d1b673946b build(deps): bump spring-web from 5.3.23 to 6.0.0
     add 44e13900e66 schema: Add upgrade path from 4.17.2.0 same as 4.17.1.0 (#6965)
     add ed1ac1c1610 schema: Fix migration path (#6927)
     add 8aaa5edaa14 api: fixed flaky test (#6967)
     add 19a4e9dd50e veeam: Fix escape powershell comand when listing Veeam repository names (#6943)
     add 0b491427479 debian: add python3-setuptools to dependencies (#6930)
     add 90203934ec1 server: Fix double ServiceOfferingDao (#6911)
     add 66747d04c4b storpool: fix on remove the Iops limits (#6902)
     add b7f845ab134 server: fix nic device id fro imported vm (#6953)
     add 11d27a5a3af systemvm: vpc router fix /etc/network/interfaces is misconfigured (#6435)
     add 7f760cc395b test: add nic validation in import vm test (#6964)
     add 335e26bb1d2 test: fix failure on non-VMware env (#6969)
     add 4de66f98555 server: fix listing vm metrics for infra resources (#6851)
     add 1be7c2f3488 Merge remote-tracking branch 'origin/4.17'
     add 5516f74fcef systemvm: fix management route (#6921)
     add 01b79e797c2 Merge remote-tracking branch 'origin/4.17' into main
     add d331b2f98fd schema: Add upgrade path from 4.17.1.0 to 4.17.2.0 (#6981)
     add 72b6ab9c512 Merge remote-tracking branch 'origin/4.17' into main
     add f2e7d6b90ea Allow ssvm agent certs to contain host IP for NAT situations (#6864)
     add 3106dba28c1 git-pr py3 compatible (#6961)
     add def7ce655df Fix spelling (#6898)
     add 00757176125 api: fix listVirtuaMachinesMetrics API for user (#6985)
     add f7f03adddbf Merge remote-tracking branch 'origin/4.17' into main
     add 8fd4ed88c27 delete configuration `task.cleanup.retry.interval` (#6910)
     add fc5bd85ecbf Improves CPU usage info (#6784)
     add 162af93e114 make api rate limit test more robust (#6984)
     add 2ed7868f275 Inserts timer in check detach volume (#6508)
     add 1af4f2c47a4 Rephrasing confusing messages (#6876)
     add 5b9a989ab0d Updating pom.xml version numbers for release 4.17.2.0
     add 458883575ae Updating pom.xml version numbers for release 4.17.3.0-SNAPSHOT
     add 239e9dd8613 Merge remote-tracking branch 'origin/4.17' into main
     add 96aaeac2a00 Fixes script that perform change password on hosts (#6783)
     add 43b4525f71e [VMware] Remove unnecessary logs on VM deployments (#6996)
     add 41717b09777 allow a new upgrade version without DB changes to be inserted (#6858)
     add 87b25b94f5e scripts: parametrize systemvm, router restart (#6574)
     add 588287af17f test: use normal user for createing networks, vpcs (#6988)
     add 95074f69ba2 README: that time of the year! :christmas_tree: (#6982)
     add 9ccec161db5 Minor console access refactor and improvements (#6919)
     add 6d74815798f Fixing grammar and spelling in en.json (#6884)
     add 575fffc097e Allow root admin to deploy in VPCs in child domains (#6832)
     add cc676cbc833 Metrics plugin: expose full domain path instead of name (#6959)
     add 440d7805cbc Support for parameter `cidrlist` added to the UI (#6869)
     add 889045fba5a new plugins: Add non-strict affinity groups (#6845)
     add 34e4376c164 ui: fix persist networks config in deploy vm form (#6994)
     add 512aa9cbc51 AutoScaling: update smoke test and consider db upgrade from a fork (#6977)
     add 2dc9f1e32c1 .github: Migrate Travis to Github Actions and Simulator based CI (#6956)
     add bf5cacb3bb2 gha(linters): enable 7 more Python `flake8` checks (#7005)
     add cdaad257ea3 resolve sanity check last id file acces problems (#6825)
     add d0902893b82 Fix spelling (#7002)
     add 0fe2e6950e9 Improving code related to the Agent properties (#6348)
     add 9f8533eaf02 Gives the possibility to redirect to external links when the property is defined (#6505)
     add 91645349b06 Allow privateips on console proxy (#6808)
     add fb22c5c3c95 kvm: correctly set vm cpu topology (#6870)
     add 08881d69c78 checksums for new macchinina ova template (#7001)
     add fab4fc2a140 Merge remote-tracking branch 'origin/4.17'
     add 4ade096aeb2 server: fix broken unit test in configurationManagerImplTest (#7018)
     add d52e4d72b60 systemvmtemplate: update Debian ISO URL and checksum (#7013)
     add 2bb64397935 ui: fix suitable shared network not showing while import (#7016)
     add 63bc5a8caec packaging: consolidate suse15 to el8 (#6995)
     add f4e359dbb09 Merge remote-tracking branch 'origin/4.17'
     add ca7e1ac1abb packaging: allow universal EL pkging to support EL8, EL9, Suse15 (#6844)
     add ffccfc61729 Ensure Prometheus doesn't return values when the capacity_state is Disabled (#7007)
     add dc40ea130fc UI: fix ui test errors (#7030)
     add 9a18ea28dd2 .github: use ubuntu:22.04 for Sonar jacoco coverage checks
     add 1c2728da918 Semicolons not required (#7035)
     add 0bedb58fbe1 engine/orchestration: enable unit tests and fix errors (#7034)
     add 97c7a0743cc README: Replace Travis badge with Github Actions
     add d5f01005416 utils: fix NetUtils method to retrieve all IPs for a CIDR (#7026)
     add 194b0b4610b Merge remote-tracking branch 'apache/4.17' into main
     add 73a610da943 revert cleanup of test_acl_sharenetworks (#7033)
     add 4133f0e9799 Update usage when scaling vms (#7011)
     add a9b49f3ae90 Cleanup APIs getCommandName (#7022)
     add af59e76df6c add index to speed up querying IPs in the network-tab (#7028)
     add 4d76054377f Fix volume snapshot in VM with attached ISO (#7037)
     add 3044d63a8be Configurable MTU for VR (#6426)
     add 908981e8484 Allow download of System VM templates through the  UI (#7039)
     add 3ace9a514cd alter ordering of backup offerings (#7044)
     add e8aff6f4451 UI: user must specify the start of guest vlan range for advanced zone (#7038)
     add e952e032015 Merge release branch 4.17 to main
     add d0b34b75765 test: fix NetworkOrchestrator unit test failure (#7049)
     add 1380c604b1e server: add Host Control Plane State to uservm and systemvm response (#6946)
     add 89d4c7537fd utils: fix human-readable parsing failures (#7008)
     add 16ec8105e4a Merge release branch 4.17 to main
     add c2b75f4c81c README: revert project logo and update README
     add 20306d61292 Allow creating atmost 1 physical network with null tag (#6781)
     add 6790371fe2d fix merge diff display (#7047)
     add eb5c8a5a8c9 server: correctly list suitable hosts for migration with uefi capability (#7024)
     add 2d1d2944e53 merge release branch 4.17 into main
     add 76ec980c76e ui: remove max value (8) of maxsnaps because it might be greater than 8 (#7066)
     add a3289f8ac0c Merge remote-tracking branch 'apache/4.17' into main
     add 9009dd1db88 Emc networker b&r (#6550)
     add cc527523fa7 Allow users to inform timezones on APIs that have the date parameter (#7032)
     add 602f22a0d37 UI: fix cannot list lb rules if cidr_list is NULL (#7058)
     add d2bb6a2510e UI: support serviceofferingid when create vpc offering (#7054)
     add dffbc87278f escapes for injection prtection (#7069)
     add 03674ce1742 Merge release branch 4.16 to 4.17
     add f3e05543ccc Merge release branch 4.17 to main
     add 9cfebdf6e56 Allow domain admins to inform tags when creating offerings (#7052)
     add b392084950d Enable live volume migration for StorPool and small fixes (#6661)
     add df96af3de47 delete F5 and SRX plugins (#7023)
     add a85973a0cab ssvm: synchorise when adding iptables and routing rules (#6942)
     add 00426ede465 Add `pre-commit` workflow with 3 Git hooks (#6273)
     add c2350f96755 update owasp dep checker for 'column width bug' (#7068)
     add d33d84fa0fb server/UI: fix some issues with network offering details (#7057)
     add c1b17d2c42b Merge remote-tracking branch 'apache/4.17'
     add 08d54da938c tests: assess prerequisite before doing the actual test (#7040)
     add 44185744780 simulator: use ubuntu 22.04 in Dockerfile (#6978)
     add aad03530af9 Search for resource type efficiently (#6242)
     add c0a32d00b73 Use Super-Linter Slim Image (#6610)
     add 1dd064c8a9f server: fix cannot update vm if it uses unconstraint dynamic offering (#7077)
     add 4d80ea68465 UI: fix diskofferingstrictness is not passed when create compute offering (#7072)
     add e5158b29ee9 vmware: encode disk path for URL based access (#6989)
     add 0c925be44d7 merge LTS 4.17 in main
     add f9117df0b5b server: allow expunging VMs in Expunging state (#7086)
     add 3ea2f1dc9fd updates roles read-only (#7080)
     add 4bb43f7879d UI: do not show FW/LB/PF tabs for CKS cluster in advanced network with SG (#7076)
     add 566578297b6 Merge release branch 4.17 to main
     add 52c321a0c6c Fix spelling (#7087)
     add 55d2d26449c kvm: make UEFI host check to support both Ubuntu and EL (#7084)
     add 743ebe7278b kvm: get vm disk stats for ceph disks (#7045)
     add 38f3027a7c9 CKS: do not save cks username/password which are useless (#7097)
     add d04d60b0797 [VMWare] Limit IOPS in Compute/Disk Offerings   (#6386)
     add 6f6cec5f567 .github: run all gha on ubuntu latest (#7091)
     add 0fd416d074c UI: Enable shared network with scope option in advanced zone with SG (#7067)
     add dc1a4529139 UI: add filter user/all to list user/all volumes (#7075)
     add 3dc0e499dcf storage: validate disk size range of custom disk offering when resize volume (#7073)
     add fe0e44abe98 UI: display cpu cores and speed instead of cputotal by default (#7106)
     add 792f8356e51 KVM: revert libvirtd config and retry if fail to add a host (#7090)
     add ee6ed215c2f Merge release branch 4.17 to main
     add e8c32d68fcb Add support for vSphere 8.0 (#7046)
     add 911f951e2af Handle console session in multiple management servers (#7094)
     add 37b2a4826d7 api/server: add project id/name in ssh keypair response (#7100)
     add 9366c4ea01a CKS: remove details when delete a cks cluster (#7104)
     add 536a387326f api: fix new password is applied on host when update host password with update_passwd_on_host=false (#7092)
     add 07e4debeabc Merge release branch 4.17 to main
     add 221118289b0 fix guestOsMapper and move mapping code to latest upgrade (#7095)
     add f5b3cb59ee9 [Veeam] enable volume attach/detach in VMs with Backup Offerings (#6581)
     add 57d4f5697e8 UI: fix podid is not passed when add ip ranges to basic network (#7117)
     add d74f64a2e16 Use lowercase HTTP header field names so we are compatible with HTTP/2 (#7006)
     add 2dd29558fef server: fix listnetworkofferings with domain, refactor listvpofferings (#6748)
     add 42f0d758c16 vpc/network: set mtu of networks/vpcs/nics during 4.18 upgrade (#7124)
     add e7b7efe1177 marvin: install mysql-connector-python version 8.0.31 (#7111)
     add 833d1b45239 cloudstack-setup-agent: mask libvirt non-monolithic services (#7114)
     add 8838943a761 VR: fix warning Expected X answers while executing SetXXXCommand but Y (#7050)
     add abef381aa65 marvin: newer python setuptools doesn't like -SNAPSHOT in marvin version (#7120)
     add a7d2d8d750d Merge release branch 4.17 to main
     add 10c77c88c8a CKS: fix upgrade of HA cluster (#7118)
     add 0d85fb6c4ca Update cloud.spec to include tar for el8 systems (#7113)
     add ea14c59210f vmware: support vsphere 8.0 and 8.0.0.1 versions (#7119)
     add d288bb0c78e KVM support of iothreads and IO driver policy (#6909)
     add e8c1b5509ea VR: fix public-key is missing in VR after acquiring public IP (#7103)
     add f39b02aec71 Use long instead of int in DB statistics for Queries and Uptime. (#7125)
     add 46924a57823 Merge release branch 4.17 to main
     add 61a722548fc Create API to reassign volume (#6938)
     add eac357cb77f kvm: Secure KVM VNC Console Access Using the CA Framework (#7015)
     add 028ca74fb6c ui,server,api: resource metrics improvements (#6803)
     add c78a777d3a0 Fix: memory leak on volume allocation (#7136)
     add 83c2bfacd87 Merge branch '4.17'
     add 26eaae78723 Allow VPC offering creation only with active VR service offerings  (#6957)
     add 3b6ce970971 infra: edge zones (#6840)
     add d8c7e34b383 Improve global settings UI to be more intuitive/logical (#5797)
     add c774b865c99 Tungsten integration (#7065)
     add 2d914edff0a cks: Fix provider deployment when cluster is in a project (#7147)
     add bcf5ff1ec83 UI: fix missing networkid and zoneid when add instance from vpc network (#7151)
     add e1d36577663 server: add/update user vm details for new root disk size (issue 7139) (#7145)
     add 154f3ac1a75 Merge release branch 4.17 to main
     add bc900789b59 ui: Fix UI not loading after merge conflict issue (#7156)
     add 954fed6ed6b ui: Removed duplicate local labels (#7158)
     add 9c4b3a68471 Adjusts/fixes in quota tariff APIs (#7146)
     add 89bf4750ab9 Add console session cleanup task (#7132)
     add 056e7d15bc2 Fix ping NFS server on ssvm-check.sh (#6900)
     add 75a30058e90 ui: fix build issue and incorrect merge conflict in en.json (#7157)
     add 62e342c1bc7 utils,framework/db: Introduce new database encryption cipher based on AesGcmJce (#7003)
     add 5c20e7844c1 Quota VM_DISK tariff calculation (#7152)
     add 6d287793a55 guestos: add el9 distros (#7059)
     add b93608eadab Github Action: Build docker image for cloudstack-simulator (#7122)
     add e32016d4a13 .github: set docker repository to apache (#7176)
     add 0efa4f6e510 Make displayText in createNetwork optional (#7112)
     add 66f351543ad server: do not deploy or upgrade vm with inactive service offering (#7063)
     add 147ea06af33 UI: fix security group lists in project view (#7164)
     add 2149e82856f Merge release branch 4.17 to main
     add 1b89a22ab09 fix merge conflicts of merge branch '4.17'
     add f3e8f39f2b7 smoke test: fix test_vm_deployment_planner (#7183)
     add c44ba8ff3c2 UI: Integrate Tungsten Fabric (#7166)
     add 23d89813b77 Added steps to get the offical docker image for cloudstack simulator form Apache (#7192)
     add e62062f0243 server: fix exception while list users with keyword (#7169)
     add 3b67be2d523 Merge release branch 4.17 to main
     add e61ab3d6e9d scripts: fix kvm host undefined version (#7179)
     add 90c92f2710c Fix login issue after logout from Configuration page (#7197)
     add a3feccf70c9 User two factor authentication (#6924)
     add 8ef35466de2 Tungsten: fix functional issues (#7173)
     add dcf01f7bef4 .github: Skip Coverage Check when forks are updated (#7177)
     add ea18b866844 .github: disable Sonar check on forks as it requires crendential (#7199)
     add f2d1a34271e ui: fix add zone dialog for fix errors (#7201)
     add 933970d9da0 UI: fix 'Next' button is stuck if no public ip range (#7198)
     add 597a8030b7c integration test fixes for 4.18 (#7190)
     add 49566480530 Fix console proxy on XCPng/Xen (#7243)
     add 80c1b6b2a29 engine/schema: fix IDEMPOTENT_ADD_FOREIGN_KEY procedure does not work on mysql8 (#7252)
     add d12e9cbf164 UI missing changes (#7231)
     add b0d189c3ed5 UI: Fix domain admins cannot create service offerings (#7261)
     add 3d2fffc425c UI: Fix keyboard options regression (#7230)
     add 74846369970 Userdata sql changes using procedures (#7255)
     add bc5dbe95e9e .github: use tag name as docker image name for new tags (#7233)
     add dd515346d5b Fix select default host option on deployment wizard (#7256)
     add 1a4bf075487 Merge release branch 4.17 to main
     add eef63d99a49 packaging: fix centos8/el8 upgrade (#7267)
     add 1a03f69a3a3 cleanup: remove testing logs (#7270)
     add e61051e4fcc SQL: Remove snapshot references if primary storage pool has been removed (#7205)
     add c8ee0e7c302 Fix Quota plugin state on QuotaSummaryResponse (#7257)
     add a3670496ad3 Change 2FA plugin related global setting names (#7275)
     add 0457cc559e0 .github: allow only read permission in sonar-check.yml
     add aa881f6bf30 avoid hard coded guest OS IDs (#7279)
     add b8bc0b3e13f Fix VNC SecurityType None on RFB v3.8 (#7287)
     add c4b444d0322 UI: fix error message when create load balancer as a normal user (#7286)
     add 3ee32244d87 bash evaluation as opposed to gha.
     add 2fc443e909c bash evaluation within quotes
     add da58a20cc2c repair vi typo
     add cb26721c324 Don't log VNC password in VirtualMachineTO (#7291)
     add 8592de95fa0 Move PassphraseVO to use String instead of byte[] to support Encrypt annotation (#7302)
     add ad64ee3090b [Usage] Fix wrong usage_type (#7229)
     add 39d19dd1e9d Fix VNC TLS for non-root linux users on the QEMU configuration (#7304)
     add f64f7b9d12a api: userdata api access (#7319)
     add 0574087284f Updating pom.xml version numbers for release 4.18.0.0
     add 05cda2729f0 Updating pom.xml version numbers for release 4.18.1.0-SNAPSHOT
     add fb4f6a334d7 Updating pom.xml version numbers for release 4.19.0.0-SNAPSHOT
     add 74a414e76fe Fix build failure and 4.18.0.0->4.18.1.0 upgrade path
     add 1d2e3fe24d3 Merge remote-tracking branch 'origin/4.18'
     add 9f7a7ad66c5 checkstyle not updated
     add ccbb0cfc545 Merge remote-tracking branch 'origin/main'
     add 2aa3f980e8f Fix schema path for 419 upgrade path (#7346)
     add 9ca5f287eb4 Support Jetty's live cert reload on HTTPS frontend (#7355)
     add 523ab58d028 Fix PR 7131 bugs and vulnerabilities (#7140)
     add 1d0762e43a8 Merge release branch 4.18 to main
     add c2e17310d61 Add three more `pre-commit` checks (#7083)
     add cfee78e07c1 ui: Added UEFI support flag in host details view (#7361)
     add 17b86316155 Add service ip to listManagementServers API response (#7374)
     add b5c5d196660 removed vulnerable workflow
     add 9e1c7a2a90d UI: fix default network is not passed to deployvm API (#7367)
     add 9fb20056d55 Fixed avoid set variables which is causing deployment failures (#7372)
     add 16694d8bec8 Merge branch '4.17' into 4.18
     add c2cffcc5a94 Merge release branch 4.18 to main
     add 11ff2d20e8f UI: fix templates/offerings are not listed in autoscale vm profile when login as user (#7343)
     add 3dfbb408acb Merge release branch 4.18 to main
     add fcf07f1fb41 Added upper case JPEG extension for icon upload (#7200)
     add f11f1956e86 fixed L2 network creation for particular account (#7382)
     add 330a330555e test: add smoke test for user role for userdata crud api (#7332)
     add f597b8fd455 Merge remote-tracking branch 'origin/4.18'
     add 9aee625ab45 orchestration: fix error on deleted template vm start (#7327)
     add ce981574c33 Merge remote-tracking branch 'apache/4.17' into 4.18
     add f5873402441 Merge remote-tracking branch 'apache/4.18' into main
     add 57ff125f83d add button to copy a VM console URL (#7351)
     add 1e253401b0c [Veeam] Block operations in restoring VMs (#7238)
     add 4116323de34 Updated wrong doc parameters in UserVmService. (#7321)
     add 5d5fa04c8ba saml: Add EncryptedElementType key resolver to SAML plugin (#7268)
     add ec3698dfbe1 Added details about account/domain to which network will be assigned during creation (#7387)
     add c35d7ac9356 ui: show static-nat tag for public ip (#7395)
     add 82a6a1f6c42 Merge remote-tracking branch 'apache/4.18' into main
     add be66eb2a35b Auto Enable/Disable KVM hosts (#7170)
     add 30998d0ab7e server: fix userdatadetails parsing (#7328)
     add 0d6674e3b3d Merge remote-tracking branch 'origin/4.18'
     add 9e130421205 Console: upgrade noVNC from v1.2.0 to v1.4.0 (#7281)
     add 52fa31b446d Merge remote-tracking branch 'origin/4.18'
     add 723ace8b784 Make DisplayText Non-Mandatory for Various Forms. (#7180)
     add b2f1965ccbd Fix ScaleVM to consider resize volume in any type of service offering (#7359)
     add a28b4398c59 Merge branch '4.17' into 4.18
     add b7bd996300c Merge release branch 4.18 to main
     add 54606dc965d server: fix 4.18/main build error after merge forward
     add 9abf5cf5df2 Merge branch '4.18'
     add 9df1a7bc0eb ui: Fixed the Description coloumn in the UI for Quota traffic page (#7402)
     add 1827219b4a8 pom.xml: bump only required dependencies (#7388)
     add d6b581263f4 ui: allow creating account networkdomain (#7394)
     add 6886fca1050 server: list vm search vm ip using keyword (#7406)
     add e6f737fdf9a Merge remote-tracking branch 'apache/4.18' into main
     add 3c25a354265 ui: AntD3 upgrade (#7306)
     add 55e35c6e0c3 ui: show vpn users tab in networks section (#7277)
     add d1707009f6b Merge remote-tracking branch 'apache/4.17' into 4.18
     add 6672c13254c Merge remote-tracking branch 'apache/4.18' into main
     add 965d29a899f ui: show only advanced zones for vmautoscale form (#7411)
     add 0ad94ce58c9 ui: CreateNetwork isolated/L2 form, added accounts list under selected domain (#7393)
     add 59a2b3137e5 Merge remote-tracking branch 'apache/4.18' into main
     add 62b332e0ded api, ui: listing archived events (#7396)
     add 941cc83372f Feature: Safely shutdown cloudstack (#6755)
     add d8717299707 ui: allow clearing dns during zone update (#7276)
     add 4c9c1d2d7bf Merge remote-tracking branch 'apache/4.17' into 4.18
     add b774ee5d117 vmware: Datastore cluster synchronization should check if the child datastores are in UP state or not (#7385)
     add 65512af779c server: Roles search by keyword (#7384)
     add 2dc016adde7 Fix for direct download templates with multiple bypassed references (#7400)
     add 8a42ab9ce41 Merge remote-tracking branch 'origin/4.18'
     add 3e9d7e05544 server: rephrase error message for iso vm reinstall (#7407)
     add fdc0f4fcb39 Merge remote-tracking branch 'apache/4.18' into main
     add dddaeb75932 Fix shutdown header to match antdv design (#7429)
     add 96897f07f28 Set hypervisor hostname via userdata only when the global settings are allowed (#7360)
     add 2a68259d0d5 Merge remote-tracking branch 'origin/4.17' into 4.18
     add 2fc879d5f15 Merge remote-tracking branch 'apache/4.18' into main
     add b866e40d17e Don't allow users to remove their account or user. (#7242)
     add afccde5cfc2 server,engine-schema: fix listing service offering for vm scale (#7398)
     add dabefca2b69 debian/control: build packages on ubuntu 22.04 (#7269)
     add 514df7b3a05 Merge release branch 4.18 to main
     add 69be0af32d3 Allow admin/users to add comments to Management Servers (#7379)
     add fcbcddbcb96 ui: Allow admin/user to filter by state for Pods, Clusters and Hosts (#7373)
     add 79eae89a87e ui: Add filtering by state in account, systemvms, router and storagepool (#7368)
     add fb51504dff0 server: dedicate vxlan range to account (#7215)
     add 41bbedb530e Merge remote-tracking branch 'apache/4.17' into 4.18
     add a5676b0d013 ui: syntax fix for build failure
     add e035d736413 Merge remote-tracking branch 'apache/4.18' into main
     add 2ac1b7e9599 ui: Fix Management server comments PR 7379 UI issue (#7450)
     add 0ed49508961 server: allow updating project name (#7149)
     add 80c999cc81e GitHub Workflows security hardening (#6762)
     add 58850458731 refactor: delete unsed serviceoffering classes in quota module (#7439)
     add e166f96094c ssvm: fix post request header case mismatch (#7445)
     add 575ffc6acc1 Merge remote-tracking branch 'apache/4.18' into main
     add 8e7c1f7bd7b schema: acquired for console_session turned into datetime (#7414)
     add 957c0a5193a Hide option to upload volume when user does not have permission (#7427)
     add 8b5bfb145e3 create parameter to determine whether roles are public or private (#6960)
     add b280370a983 Few UI fixes and details improvements (#7434)
     add e234c3ccdc7 server: guard vm start inter-cluster migration with config (#7401)
     add 8bbe2f7cb22 engine/schema: use junit 4 (same as the rest of the project tests)
     add b84744d9a5b server: validate ip address value on update config (#7415)
     add d147f1cc3b2 ui: fix custom offering cpuspeed during vm import (#7423)
     add ec0f8bddf62 Support local storage live migration for direct download templates (#7453)
     add cb0874f5b9e novnc: Send console text slower to avoid overloading remote keyboard buffer (#7477)
     add bdd53633148 Qemu migration hook: check for source length before using element 0 (#7482)
     add 3cb4c801fb4 server: fix null pointer on powerflex attach volume edge case (#7498)
     add 8604cb53281 server: Fix DirectDownload certificate check initial delay (#7494)
     add ad21e863423 addAnnotation: added the various entity type supported by the api call (#7478)
     add 897dad619b8 marvin: replace encodestring for encodebytes (#7027)
     add a2561df25b5 Merge remote-tracking branch 'origin/4.18'
     add 4243afbf04b .asf: grant triaging role access to frequent contributors
     add 9d46df57f2c kvm: add vm setting for nic multiqueue number and packed virtqueues (#7333)
     add 35862d45323 no write for external forks
     add 216c5653081 replace pull_request_target with pull_request
     add 45928d2d9f5 vim-oops
     add 2dc8b742c96 .asf.yaml: dummy commit to re-inforce asf.yaml config to kickin
     add 88ff77dae10 ui: fix action notifications (#7499)
     add 66cbe0a0512 replace pull_request_target with pull_request
     add 0e4a5a1fa41 .github: restrict sonar and CI actions to only apache/cloudstack
     add 0af56179a59 Merge remote-tracking branch 'origin/4.18'
     add a582b2a5a16 ui: fix sourceIP is not passed when create internal LB (#7512)
     add e613b90feea ui: set default cpu, memory value for k8s version (#7513)
     add 5e442df5a08 ssvm: continue with other secondary storages if fails to program a secondary storage (#7264)
     add d9e0a3e6c32 server: add config SSVM capacity scan (#7448)
     add 8c546bd5a68 router: do not restart conntrackd if no guest networks (issue 6702) (#7265)
     add 232c86a715a Merge remote-tracking branch 'origin/4.18'
     add 9ddfeac57e8 .asf.yaml: Added soreana to the .asf.yml (#7518)
     add a0eb0aa5f7a api,server: fix VM.CREATE events on vm deploy without start (#7421)
     add 62fa45aa819 Merge remote-tracking branch 'origin/4.18'
     add b6443a2b1fd increase log detail for limit checking, fix getDomainReservation() (#7506)
     add 44024a8a8b4 github-actions: fix ui build workflow (#7522)
     add 2f309b573bc Merge remote-tracking branch 'origin/4.18'
     add 9c690280a33 .asf.yaml: update repo labels
     add 1bd47d38cbc .asf.yaml: fix typo
     add 11d45654a6b misc: fix spelling (#7206)
     add 257c0929cfa Modified the link in readme file (#7329)
     add 3e8c0684ed5 Prometheus: Ensure tagged hosts maintenance status is reported consistently (#7471)
     add c9b103c8a71 agent: Update DhcpProtocolParserServer.java (#7488)
     add 43a5d6260f0 Enable CPU cap in VRs (#7234)
     add 83fd75f7072 Marvin: Fix deployDataCenter's cleanup (#7521)
     add c47554919c4 ui: fix tags for security group rules (#7424)
     add 32caf9057e1 engine-storage: fix errored template becomes active (#7485)
     add 22871ad2da8 ui: fix infocard tempalte, iso fields (#7527)
     add 5e71cea2c59 Fix Tungsten Fabric errors on adding a new zone due to duplicated entries on ntwk_service_map (#7455)
     add 0024cb03721 Merge branch '4.18'
     add b0d7a20d5d2 CONTRIBUTING.md: remove unneeded whitespace from start of code blocks (#7553)
     add 8ff0071becf ui,api: make description option for createKubernetesCluster (#7541)
     add 48af4625a22 Fix end of file precommit for TemplateServiceImplTest.java (#7561)
     add 2b3e2e48a07 ui: show zones and offerings to users (#7557)
     add 47af4327455 Merge remote-tracking branch 'origin/4.18'
     add 8849e0f464c server: fix volume detach operation when no vm host (#7526)
     add 4138ca7c5d0 systemvmtemplate: fix Debian 11.7.0 ISO URL
     add ce44ff41486 Merge remote-tracking branch 'origin/4.18'
     add 0c13024329e refactor: remove duplicate inject (#7548)
     add 2457d202ddf Fix acquire console session issue (#7558)
     add 8d6241fb1bf Enable two more `flake8` rules (#7552)
     add c3535880d25 Create user 'cloud' in cloudstack-usage postinstall (#7559)
     add f6365801953 cks,ui: allow changing stopped cluster offering, improvements (#7475)
     add 17e765e6bc9 test: reduce PowerMock usage for code coverage (#7452)
     add ef9dec11e76 guestos: add Windows Server 2022 (#7508)
     add 7319debc87e cks: k8s cluster on vpc tier (#7479)
     add 0941d01e97d secondary-storage: delete backedup snapshot dir on delete (#7524)
     add f905f5f39a9 Merge remote-tracking branch 'apache/4.18' into main
     add 841fd725601 engine-schema: fix schema change for #6960 (#7579)
     add b2e9993b0ac vmware: do not create vm datastore when attach an existing volume on solidfire (#7160)
     add 2d6a0698121 server: improve storage GC to skip expunging possible duplicate volumes (#7313)
     add ea2b5379850 fix tools/build/setnextversion.sh: do not update tools/apidoc/pom.xml (#7163)
     add bd5d478a3ad Refactor test and change IP range (#6512)
     add f298008215d Merge remote-tracking branch 'apache/4.16' into 4.17
     add b030ea19a47 Merge remote-tracking branch 'apache/4.17' into 4.18
     add 6ea5f56e626 Merge remote-tracking branch 'apache/4.18' into main
     add c944727d338 server: fix apache/4.18 merge failure
     add d93fe913642 [UI] Use CPU frequency of unconstrained offerings when importing VMs from vCenter (#7222)
     add 9cb561e03be Remove excessive logs in LogUtils (#7228)
     add 811b6293afb .github: Use parallel builds for github actions (#7592)
     add 24da2bcf78f marvin: fix test_data for parsing failure (#7602)
     add 20865901d1f Merge remote-tracking branch 'apache/4.16' into 4.17
     add 03910c27835 Merge remote-tracking branch 'apache/4.17' into 4.18
     add c00a1ba532e Merge remote-tracking branch 'apache/4.18' into main
     add 41e8ad74875 api,server,ui: vr,systemvm in public ip response (#7403)
     add ae10263b3b3 Possibility to choose the source NAT IP address on a isolated network or VPC (#6442)
     add 5fda9c36873 Upgrade mockito (#7577)
     add 5fa9b8f6834 cks: enable by default (#7509)
     add 27b0a64b400 Fix scaleio tests (#7622)
     add e26d49de4da agent: remove powermock from tests (#7637)
     add 071a071434d backgroundColor of user-menu-avatar was hardcoded to primary color value instead of accessing it from @primary-color in config.json file. Updated the code to access the primary color from config.json (#7532)
     add 0d3ac9f8d96 interpret /etc/redhet-release better (#7570)
     add 4ef7ebbded8 ssvm: pass all accessible secondary storage to ssvm (#7410)
     add fb29608f610 consider last host only for root-admin (#7597)
     add 1aa4f807419 accept first word from host os string for backwards compatibility (#7620)
     add 658daef7158 utils: fix check for mrtalink url (#7636)
     add 3748f32bc7f engine-orchestration,vmware: hypervisor migration during start vm migration (#7444)
     add 40cc10a73de Allow volume migrations in ScaleIO within and across ScaleIO storage clusters (#7408)
     add 09a4a252d7c Merge remote-tracking branch 'apache/4.18' into HEAD
     add 5347d067b44 scaleio: fix build error after 4.18 merge forward (#7669)
     add 9e1609dd5ae [4.18] Bump the version to 4.18.1.0-SNAPSHOT (#7664)
     add b635ecbd8a3 Merge remote-tracking branch 'origin/4.18'
     add cb4e35f44b0 [main] Bump version to 4.19.0.0-SNAPSHOT (#7665)
     add 0466bf9d471 server,api,ui: host auto-select for migrateVirtualMachineWithVolume (#7554)
     add 409e3202a3c Fix and enable tests for storage plugins (#7657)
     add fa3f2a75eb5 feature: VM Scheduler (#7397)
     add 06caf32bc8c Guest os mappings improvements (#6979)
     add 908b3b7dfa3 Remove powermock from ldap & project-role-based plugin (#7658)
     add c3718ab92e9 Fix storpool test & remove powermock (#7652)
     add 0acc66f51d7 server: Add check on host's status while deleting config drive on host cache (#7584)
     add c8092012473 Fix: Volumes on lost local storage cannot be removed (#7594)
     add faaf72b1a4a Volume encryption support for StorPool plug-in (#7539)
     add 985f0ecb533 Tungsten: change conserve_mode of default network offering to 0 (#7511)
     add 973b0e28fda test: fix Super-Linter Check error in storpool tests
     add 83dca2bf518 ui: fix vm import for L2 n/w in Setup state (#7628)
     add 41403c9cf9f Merge remote-tracking branch 'apache/4.18'
     add f3ad9e6743a marvin: fix smoke test failures if mgmt server is Ubuntu (#7583)
     add 5975ea80c97 Merge remote-tracking branch 'origin/4.18'
     add c6237c48aca Retrieve only resource count on user dashboard (#7617)
     add 2fcbe6241f2 cks: Add unmanaged kubernetes cluster (#7515)
     add de6ce503dce api: correct error on resize volume resource allocation failure (#7687)
     add 70820137e64 scaleio: Avoid race condition while handling host disconnect and connect scenarios (#282) (#7689)
     add 31dbdd0f5c0 engine-orchestration: fix volume size resource count mismatch (#7666)
     add 3b054b26653 Merge remote-tracking branch 'origin/4.18'
     add 3c5fdeafdc0 [Veeam] restored VMs without NICs (#6282)
     add 70d5470f488 If ResourceCountCheckTask throws an exception the scheduled task is not going to run again until the management servers are restarted. (#7670)
     add 1275db4081a UI: Zone wizard fix (#7588)
     add 5e5d194d77b server: do not check zone imagestores for directdownload template delete (#7607)
     add fbb9dec6e5c Merge release branch 4.18 to main
     add 3e04779f606 console proxy: use AeadBase64Encryptor instead of AES/CBC/PKCS5Padding (#7237)
     add 8e171785d1b cleanup removal of physical network (#7630)
     add 02be2cdf67d Merge release branch 4.18 to main
     add d66f83ba2fb UI: fix wrong vpcid when create network in VPC (#7707)
     add 0cbe77024a8 Fix foreign key constraints and the mysql procedure that is used (#7381)
     add acc6f4e725e NPE guard (#7691)
     add e6ef8a5225b use `Files.createTempDirectory()` instead of `new File()` (#7713)
     add c733a23c905 Fix direct download URL checks (#7693)
     add 939ee9e1534 server,engine-orchestration: allocate vm without transaction (#7695)
     add 2132f46fcb3 Merge branch '4.18'
     add 594c70dde0e Sync precommit config from main (#7732)
     add a706bf2380e Merge branch '4.18'
     add d2cd3c81cbf Fix lint errors (#7727)
     add c956d329f5d Fix test_vm_schedule's intermittent failures (#7726)
     add 2752c49fa72 agent: get the right controll cidr (#7580)
     add f0cc76a3a82 vmware: fix unmanaged instance listing when different name & internal CS name (#7641)
     add 5383bf64f43 Merge remote-tracking branch 'origin/4.18'
     add b1fc2798726 Generate cloud-init multipart user data for template append policy (#7643)
     add caaf25b6951 test: fix ci failures on main branch (#7733)
     add b5eebc4347a Fix codecov github action (#7747)
     add 981d74825a8 Add L2 networks to Zones with SG (#7719)
     add d575cae3e3f server: allow migration of all VMs with local storage on KVM (#7656)
     add 73a269e3b36 guarantee MAC uniqueness (#7634)
     add 0aade286f5a proper storage construction (#6797)
     add f32a63be602 Storage and volumes statistics tasks for StorPool primary storage (#7404)
     add 6bb95c02006 Merge release branch 4.18 to main
     add 729e6d14465 userdata: fix append scenarios (#7741)
     add 9c5e489d828 eof added to StorPoolStatsCollector (#7754)
     add 56d98ea2e74 SSVM: 'allow from' private IP in other SSVMs if the public IP is in allowed internal sites cidrs (#7288)
     add afec876951f Merge release branch 4.18 to main
     add cee7a713aa2 server: clear resource reservation and increment resource count in a transaction (#7724)
     add 80ca3acf157 Allow encrypted volume migration for PowerFlex volumes (#7757)
     add f057f4b412e ui: fix userdata base64 encoding (#7749)
     add 90baae3dcdf utils: fix RBD URI if credentials contains slash (#7708)
     add 63216425d5b Set encrypted PowerFlex disk format correctly (#7735)
     add 62a8f4ef72a Merge remote-tracking branch 'origin/4.18'
     add 7042ce4ad05 Run startServer in tearDown for test_safe_shutdown to ensure management server is up even if the tests fail (#7767)
     add 6dd2ce86b53 UI: add step to create bearer token for kubernetes dashboard (#7764)
     add bde80f14aac Fix NPE in management server logs due to /proc/cpuinfo output (#7765)
     add 4000fd09f17 UI: fix userdataid or userdata content is passed when userdata append/override is unchecked (#7758)
     add f9b7bcfd102 add remove tag to remove acl item method (#7750)
     add 8db8aa41637 Merge branch '4.18'
     add 665fb83e73c Remove powermock from kubernetes plugin (#7788)
     add a738204e8ad Remove powermock from nicira nvp (#7789)
     add 0bab0db881b Introducing concept of domain VPCs (#7153)
     add 3f2449f3d89 packaging: install tzdata-java on centos7/centos8 (#7768)
     add cdf01879ec3 ui: fix 404 error when list volumes of system vms (#7772)
     add 01e5c25523a search in (too) large result sets (#7766)
     add d9588822828 server: get id from persisted object ReservationVO (#7785)
     add d89d40595cb cloudutils: fix adding rocky9 host failure due to missing /etc/sysconfig/libvirtd (#7779)
     add f4a4417e4c7 pom.xml: add property project.systemvm.template.location (#7706)
     add d127d7939de KVM: fix SSVM starting when overprovisioning memory (#7663)
     add a2eb10304f2 UI: Filter templates by zone and hypervisor type when reinstall a VM (#7739)
     add d51d8a4a13b Merge release branch 4.18 to main
     add 0d9292c9ea1 Remove powermock from database/quota plugin (#7795)
     add e876ef096ef Fix links to `release notes` in README and CHANGES (#7797)
     add 6f4503488be pre-commit: apply `end-of-file-fixer` to all files (#7551)
     add fd13184dda9 UI unit test: fix expected values (#7792)
     add 2bb079189c2 make NoopDbUpgrade do a systemvm template check (#7564)
     add 60ab494c259 packaging: unalias cp before package upgrade (#7722)
     add 87f218c68cd UI: decode userdata in EditVM dialog (#7796)
     add da7fc72c660 Refactoring StorPool's smoke tests (#7392)
     add c86684fbdd0 UI: allow new keys for VM details (#7793)
     add 7ee697fcc5c Merge release branch 4.18 to main
     add b4032d9984e include all VMs when projects selected not just for admins (#7667)
     add 57779a8586c Remove nic allocation txn during Vm deploy. During Vm deploy failure, this will allow cleanup of any nics that are successfully provisioned (#7809)
     add 6b218257465 make details optional for addGuestOs API (#7812)
     add e3bd2c0a8cf Merge branch '4.18'
     add 90443cdd431 Remove powermock from xenserver hypervisor plugin (#7806)
     add 84974a1e086 Remove powermock from vmware-base & vmware hypervisor plugin (#7798)
     add dc5e4f3ec6e Allow KVM overcommit to work without reducing minimum VM memory when vm ballooning is disabled (#7810)
     add eb31e3d7950 Merge release branch 4.18 to main
     add 0318e9fccb9 test_vm_deployment_planner: fix using wrong hypervisor (#7718)
     add 55f0801b18e Remove powermock from network elements (#7791)
     add ab0297ea9b3 VM.CREATE/VOLUME.DELETE/VOLUME.DESTROY not being emitted (#7760)
     add 4f85c5568fc engine/schema: fix CPU cap limitation for upgraded environment (#7808)
     add dea13734808 server: clean network offerings for domain on remove (#7775)
     add 32448e1ac7b Merge branch '4.18'
     add 9df23f951b7 Prometheus exporter fix cpu/memory usage labels (#7629)
     add ac882f3d07c Merge remote-tracking branch 'origin/4.18'
     add 927818b55ff added docker command for ubuntu 22.04 to  Building DEB packages (#7315)
     add 82f91066338 Remove powermock from kvm hypervisor plugin (#7818)
     add a1af03f4133 noVNC: fix JP keyboard on vmware7+ which uses websocket URL (#7694)
     add fa58f59619c kvm: Added VNI Devices as normal bridge slave devs (#7836)
     add b32ba953cff test: upgrade kubernetes versions to 1.25.0/1.26.0 (#7685)
     add fdb23dae40f server: Use max secondary storage defined on the account during upload  (#7441)
     add 1605b2f0dbd server: remove registered userdata when cleanup an account (#7777)
     add 7b64236469c Merge release branch 4.18 to main
     add 9bc0dd7a690 pre-commit fix line ending (#7851)
     add d9319e645c7 storpool: fix pom.xml which caused docker image build failures (#7845)
     add 29c7b3167eb cloudstack: bump to use 4.18.1.0 systemvmtemplate (#7828)
     add 540dcc1040a Merge remote-tracking branch 'apache/4.18'
     add feb9509547a ui: assorted improvements (#7833)
     add 62feb24de65 Merge remote-tracking branch 'origin/4.18'
     add d22a3d517d8 ui: fix conflict/regression found in AutogenView
     add 0204377032f Fix UI unit tests (#7856)
     add bf9c71430b6 CKS: check access when get kubernetescluster config (#7854)
     add 2c6072273b8 VMware: Fix casting exception during backup NIC synchronization (#7831)
     add 72e3491cefa server: Fix allocation of more public IPs than the account's limit (#7832)
     add a47a4f4ad4f CPVM: fix cpu usage for console vm when using vnc over websockets (#6970)
     add aa02d9b3c15 test: skip live storage migration on CentOS 7 (#7862)
     add 5559668f126 Merge branch '4.18'
     add fe70f4d801c Remove powermock from services (#7860)
     add 8b5ba13b817 plugins: Add Custom hypervisor minimal changes (#7692)
     add b0ae701ca4e Remove Super-Linter action and move `flake8` to pre-commit (#7861)
     add 7049a6058d2 UI: Add domain and account fields to Register/Upload Template/ISO view (#7872)
     add 1065e9046b1 Fix backup dates (#6473)
     add 9083a677ae1 systeminstances field (#7871)
     add 0b4afedb5b5 pre-commit: add hook to check for the existence of private keys (#7805)
     add 0bd7462c54a Link README logo to website (#7884)
     add 19aacad46bb UI: Show iso urls (#7869)
     add cf249f64a3b api: Force-stop descriptions (#7866)
     add e8b491177f1 server: Replace Hashtable with LinkedHashMap in createIsoResponse (#7844)
     add c8d6e505393 VMware: add support for 8.0b (8.0.0.2), 8.0c (8.0.0.3) (#7380)
     add d8a5c890602 server: get only Ready ISO to mount (#7848)
     add 87d6c4fbd5f packaging: install tzdata-java or timezone-java (#7875)
     add 5b339673109 Fix role escalation prevention (#7853)
     add add64bd7e69 security group: replace vm.getPrivateMacAddress() with nic.getMacAddress() (#7293)
     add f7345e861f8 cpvm: Fix CPVM not releasing CPU after closing console (#7826)
     add d296f54c7f2 Api: update command domainId/account descriptions (#7876)
     add ddc2a362a88 UI: Add missing tooltips to Register/Upload Templates/ISOs views (#7879)
     add 6d242176363 server: Allow admins to disable the 2FA of users in subdomains (#7870)
     add 6cded7e0102 Support GNU sed apidoc for MacOS build (#7888)
     add 405ef82aefd UI: Fix hide delete button for templates that are in Installing template state (#7882)
     add 78bdde9e981 AutoScaling: support Managed User Data (#7769)
     add 5097d2aa8bd ui: fix creating zone with vxlan if Guest physical network is not the last (#7801)
     add db0e7a65afb server: check hostId when attach disk to a Stopped vm with local storage (#7886)
     add ea832bce136 Merge branch '4.18'
     add 2ef159eeb84 merge issues
     add 0e9a19f24db ui: Fix project theme on reload or refresh (#7893)
     add e4117e68d2f engine/schema: fix duplicated guest OSes in 4.18.0.0 (#7799)
     add 27f148e79e7 Merge branch '4.18'
     add 8cb30551d58 UI: update ip ranges of shared networks (#7896)
     add d87f39ad27f ui: make it clear that deletion of a volume will not delete any snapshots (#7897)
     add 594d212a8bc Merge branch '4.18'
     add b37834fe759 ui: bump UI pkg version to match CloudStacks (#7894)
     add 7cdf864c71d Merge release branch 4.18 to main
     add 47b6f0fd056 Fix tungsten unit test (#7904)
     add c683de4a55b kvm: fix unit test LibvirtReplugNicCommandWrapperTest (#7908)
     add 2e1c2821a82 UI: Add central project store and watch functionality (#7900)
     add a0702279aae server Don't allow inadvertent deletion of hidden details via API (#7880)
     add 8ad1009ad2d ui: fix notification list reordering intermittently (#7609)
     add 3c38ed7a656 server: allow user to list available IPs on shared networks (#7898)
     add 3b05797344c Merge remote-tracking branch 'origin/4.18'
     add e964395bd45 vmware: improve solidfire storage plugin integration and fix cases (#3) (#7761)
     add f5a1f4130d5 server: fix global setting system.vm.public.ip.reservation.mode.strictness is not really dynamic (#7909)
     add 8dc5fdd067d server: fix cannot get systemvm ips in dedicated ranges (#7144)
     add b19db10ea68 server: try with all supported hypervisors (ordered, no duplications) when deploy a virtual router (#7877)
     add 6f7725ab353 ui: Fix refresh and re-route behaviour (#7846)
     add 93bd5b7a692 ui: speed up compute instance listing (#7911)
     add 24ae5aa5fad Merge branch '4.18'
     add 57d4d0d94a7 UI: Infer template settings in the deploy VM wizard (#7867)
     add f563c165cb3 Merge release branch 4.18 to main
     add 0dd6bb7c67b systemvm: update size and state of systemvm template during registration (#7874)
     add 26581b77411 server: throw new exception when rootdisksize is required but not set (#7913)
     add 7362e5338c9 Merge remote-tracking branch 'origin/4.18'
     add 439d70fd2b9 xen/xcpng: set vmr.VCPUsMax to minimum of global setting and host cpu cores (#7887)
     add 40d7da6707d Merge release branch 4.18 to main
     add 2f701e1f893 New configs for quota email's headers and footers (#7852)
     add 819dd7b75c1 server: remove supportedOwner from Resource.ResourceType (#7416)
     add 78411fd405c test: fix test_vm_autoscaling.py which does not work due to userdata improvement (#7921)
     add 5917fed773c refactor getUploadParamsForIso (#7813)
     add 2e6100d85bb utils: build both SHADED and original jars (#7912)
     add 54a7a5d7e1d utils: rename cloud-utils-*-SHADED.jar to cloud-utils-*-bundled.jar to fix the build error on MacOS (#7944)
     add 2cccd8f754a db: Add index on cluster_details.name for FirstFitPlanner speedup (#7922)
     add 89e0a4ca25c PowerFlex: Handle missing volumes gracefully during delete volume (#7924)
     add 57c61fb33cf Fix direct download https compressed qcow2 template checker (#7932)
     add 0bb05f7871a ui: don't skip if dataview has multiple items in response (#7947)
     add 126dd5fa4cf kvm: fix live vm migration between local storage pools (#7945)
     add f049f5409e0 server: fix dualstack ipv6 networks for vxlan (#7933)
     add f6b2a587272 Merge branch '4.18'
     add 710f34ee90c api: Fix listLoadBalancerRuleInstances api call (#7892)
     add 940733cedfb UI: Fix user role login due to missing API access on custom hypervisor name (#7939)
     add c4e53c0095b Allow editing of host and storage tags of system offerings in the UI (#7941)
     add 3ec30076356 Generate coverage for Simulator based integration tests & ui tests in github actions (#7784)
     add 4bdff06acd3 Updating pom.xml version numbers for release 4.18.1.0
     add 246bb24b0fc Updating pom.xml version numbers for release 4.18.2.0-SNAPSHOT
     add b8c8e17318c upgrade: fix debian/changelog
     add 0bfef5d9da4 Merge commit 'b8c8e17318cc28e57d1b38f2aa2f0b456c9bac52'
     add edcd0da62ed UI: update versions to 4.19.0
     add f049d4d189f Increase reserve on ScaleIO disk formatting for fragmentation (#7955)
     add 45616aaf614 Merge remote-tracking branch 'origin/4.18'
     add 4eb110af736 Remove unneeded duplicate words (#7850)
     add d25521e96fa Fix issues in VM Scheduler (#7782)
     add c428d3bb341 Add and improve logs in snapshot scheduling (#6925)
     add 9c9b17885ff upgrade: fix upgrade from 4.18.1.0 to 4.18.2.0-SNAPSHOT (#7959)
     add 09ae0499b21 ldap trust map cleanup on domain delete (#7915)
     add 0375714ded5 Merge release branch 4.18 to main
     add 481d2bd9c3f Remove powermock from core (#7978)
     add 84277e783b5 remove powermock from engine (#7975)
     add e721f3b379b Remove powermock from server (#7986)
     add c69e3c5f42d Remove powermock from engine/storage/configdrive (#7988)
     add 9c65767f95b api: remove powermock from tests (#7645)
     add 3071ad69f62 Publish event for VM.STOP when out of band stop is detected (#7878)
     add f539c4b81ad Merge release branch 4.18 to main
     add b614a74027d Fixup CheckedReservationTest (#7997)
     add 951ba04cf0e VR live patching: Allow live patch of VPC VRs even if networks are in allocated / shutdown state (#7958)
     add ef742210b5d Fix 2FA becoming enabled when the user inputs the wrong code during setup (#7972)
     add 30e34ef310f Merge remote-tracking branch 'origin/4.18'
     add 155a30748cf Allow configkey to set 'cloud-name' cloud-init metadata (#7964)
     add 84e770bf958 Remove powermock from pom.xml (#8000)
     add b34da2658fc contributor-howto (#7995)
     add d73cfbd6b76 add BryanMLima as a collaborator (#8003)
     add d58d60cd6ce Add GaOrtiga to .asf.yaml as collaborator (#8005)
     add 5da176a7b31 Add SadiJr to .asf.yaml as collaborator (#8006)
     add f069c698079 Add JoaoJandre to .asf.yaml as collaborator (#8007)
     add 28c4be1cf2c Fix style for LibvirtComputingResource variable names and its dependencies (#7991)
     add 3c608290db9 Fix tests on CS build when cloudstack-management service is running (#8009)
     add 8aa45c1a98e fix units labels (#8001)
     add 10d7e6cf6ff VR: remove apache2 config for removed VPC tiers (#7982)
     add b20554820b2 Merge release branch 4.18 to main
     add 348a63dc98d LibvirtServerDiscoverer should only process added KVM hosts (#7979)
     add 3694667f507 Trigger out of band VM state update via libvirt event when VM stops (#7963)
     add 285387105ff Fix the poll for the API ReadyForShutdown even after logout (#8004)
     add 221f863939e Use direct download timeout configs for URL check (#7948)
     add 8cd7147b25b Merge remote-tracking branch 'origin/4.18'
     add ca54e6c7880 Improve the description of config password.policy.minimum.digits (#7989)
     add 7541cb97bd2 Add Service Offering to listSystemVMs and fix link from VR to its offering (#7938)
     add 8d81ec425db keep deleted projects name (#7858)
     add 14ca1720993 mvn: fix userdata dependency version (#8017)
     add 2b35a02f8f0 Improve logs in NfsSecondaryStorageResource class, (#7211)
     add 1bda2343f35 Improve logs when searching one storage pool to allocate a new volume (#7212)
     add 8939ebbf4e9 ui: allow copying password from notification (#7985)
     add ae5dda867fd Normalize encryption on global configurations values (#6812)
     add 31e2b629eeb Removed state for removed accounts (#7868)
     add a2566048fe3 removal of unused interfaces (#7984)
     add 9f5c3ffc553 Improve logs in UnmanagedVMsManagerImpl class (#7213)
     add f2c17756578 fix: cleanup directory if empty after removal of snapshot (#8002)
     add f70b42a018d Merge release branch 4.18 to main
     add 9a8cd139510 cleanup: remove unused class org.apache.cloudstack.network.NetworkOrchestrator (#7983)
     add 96205a51ef9 linstor: resize root disk on offerings with different size (#7952)
     add d627539688f Merge branch '4.18'
     add 5c5ea091ad0 load (domains) continuously in dropdown boxes (#7931)
     add 3d8cc63bc32 server: fix mysql error when list Shared templates for project (#8020)
     add 2e9b3d8e084 Merge release branch 4.18 to main
     add cc6f21b4df8 PULL_REQUEST_TEMPLATE.md: add extra question on testing PR (#8035)
     add 884953cde18 ui: add button in zone physical network list (#8028)
     add e21b8882e47 cleanups as suggested by errorprone (#7088)
     add b9e423b7a9e Add extra checks for test_vm_schedule to avoid intermittent failures (#8036)
     add 4c59dea0d13 [Veeam] Don't interrupt backup syncronization (#7225)
     add 82b981854b8 KVM Agent config to reserve dom0 CPUs (#7987)
     add 5d9ae31f1b0 UI: Admin, account and project dashboard improvements (#7956)
     add 51add0a0662 systemvm: check if patchfile exists and is valid tarball before patching (#7953)
     add 9b8eaeea78a Fix: Convert volume to another directory instead of copying it while taking volume snapshots on KVM (#8041)
     add a20ab40b674 Ensure getCapacityState() is not called for hosts in maintenance (#8025)
     add 72cf9740f93 Merge branch '4.18'
     add e333f2705aa user-shared networks: fix few issues (#6887)
     add c0128e2f9a4 Improve template download error message (#8029)
     add c3aeba1f4a4 Merge remote-tracking branch 'origin/4.18'
     add b58ffec4cd2 [cleanup] Deleted file FakeDhcpSnooper.java and DhcpSnooper.java (#7672)
     add 66e5d41a15f ui: Fix sorter across different components (#8046)
     add e0ab2a4bd4a Enable four more `flake8` rules (#7811)
     add 7e998f92283 pre-commit: add hook `check-merge-conflict` (#7883)
     add 43aed457060 Format quota email currency values (#7605)
     add e290ac54514 systemvm: remove config in /etc/pam.d/systemd-user to fix user@0.service (#8048)
     add a9f3af85cb1 Default value of force should be false for template delete operation (#7731)
     add 864a1958680 .github: run Sonar Check only on PRs from apache/cloudstack branches (#8058)
     add b4c7705d4bc Merge remote-tracking branch 'apache/4.18' into main
     add d2ad9363a26 ui: update dashboard screenshot for README (#8069)
     add 8b281284a26 ui: Fix non admin logouts (#8065)
     add 7b4cf1b1c68 ui: update vm deploy form iso label (#8075)
     add 8350ce5aa40 storage: allow VM snapshots without memory for KVM when global setting allows (#8062)
     add 8a34afa8ab8 Merge remote-tracking branch 'origin/4.18'
     add dccd37af505 Run ResourceCountCheckTask only in the longest running management server (#7977)
     add fb3a2ecb57e Fix NPE if global setting implicit.host.tags is set to null (#8066)
     add 3e7f21a1909 vm-import: fix stopped managed vms listing in unmanaged instances (#7606)
     add 9df580cef45 Merge remote-tracking branch 'apache/4.18' into main
     add 0c14e4603d8 Allow password definition during VM deploy (#6947)
     add 3486a3c310c  Add domainpath to listnetwork and UI network tab (#7386)
     add 55bef2b069c Add option to define password during password reset (#6863)
     add 0b3438bfbed Update pom.xml reflections version (#8019)
     add 314537a8df3 Merge release branch 4.18 to main
     add e437d1016f6 Snapshot removal and storage cleanup logs (#8031)
     add ba24a18f27d kvm: fix direct download template size (#8093)
     add 065abe2a3b6 test,refactor: fix test_project_resources cleanup (#8097)
     add c9d230369a7 Merge release branch 4.18 to main
     add 4a86a0d2339 linstor: Fix template volume missing on copy node (#8082)
     add be039a1e46e Merge remote-tracking branch 'apache/4.18' into main
     add 91a570e4619 Refactoring swift util test (#8099)
     add e35fdff7678 ui: add action to delete traffic type (#8076)
     add 76ab621a5a3 Fix UUID for child datastores in all cases (#8057)
     add 8eaf2648b64 Merge release branch 4.18 to main
     add 9834d5168fd pre-commit: standardize more line endings to `lf` (#7804)
     add 0183e252794 Fix VM snapshot size during storage capacity check (#8101)
     add 540c7b802f4 test: add test for standalone snapshot (#8104)
     add 20046ffe61d Merge remote-tracking branch 'apache/4.18' into main
     add 67cb9b9e40b linstor: fix template copy on non hyperconverged setups (#8114)
     add fcbf540369d Merge remote-tracking branch 'apache/4.18' into main
     add f62b6340334 ui: correctly show volume physical size (#8119)
     add a2ec1f37778 marvin,test: fix directdownload template checksum test (#8096)
     add e199678101e ui: fix bulk delete template from zones (#8118)
     add 1bb6130795c Merge remote-tracking branch 'apache/4.18' into main
     add d3d3027ba63 Fix ISOs and templates listing pagination (#7974)
     add a8700bff7f7 server: set Default NIC when VM has no default NIC (#7859)
     add 99ded8169be Merge remote-tracking branch 'apache/4.18' into main
     add 543c54c7189 api,server,ui: snapshot copy, multi-zone replica (#7873)
     add b09acb8fd05 UI: Fix deploy VM wizard vApp properties (#8072)
     add ae724b9d4c2 Fix EULA section while parsing OVF file (#8081)
     add 39d6c20fb39 Merge remote-tracking branch 'apache/4.18' into main
     add 8fe13f91a10 OSType response: isuserdefined as string not bool #8127 (#8128)
     add ebf14096221 dashboard: on admin dashboard use red-dot icon when hosts are in alert (#8144)
     add 27ae7d8bc48 Fixup: register vmscheduler configkey (#8116)
     add fb76fd10f0e Add winterhazel to .asf.yaml collaborators (#8147)
     add 68e1d46698e reduce collaborators count to 10 (#8149)
     add ea90848429d Feature: Add support for DRS in a Cluster (#7723)
     add 4ff592ac2c1 Use UserVmDao for listVirtualMachines API to increase performance (#8012)
     add 6ae3b73ca2d Create snapshot from VM snapshot without memory for NFS/Local storage (#8117)
     add 587d1d7dba1 Merge remote-tracking branch 'apache/4.18' into main
     add a06f8a8763d Fixup updateSnapshotInfo failure due to forward merging (#8150)
     add bd52fa8a12a New feature: VNF templates and appliances integration (#8022)
     add 67eddd7c0e1 Fix allignment on layout on right panel (#8060)
     add 235e4fe1907 Oauth2 integration with CloudStack (#7996)
     add 288f066d9fc Add logs to script execution (#6874)
     add 5362bad442e Storage Management (#7949)
     add 2dac6cb6743 ui: fix snapshot copy actions for non-rootadmins (#8164)
     add b2b707b90ed Add pre-commit hooks: check-symlinks and destroyed-symlinks (#8071)
     add 9c4d18f9b13 role ispublic param on UI (#7973)
     add f090c77f419 misc: fix spelling (#7549)
     add e1b6093c64d add 'management.network.cidr' ip to mgmt certificate (#7728)
     add a3565fc8dbb Update GPU support for V100,T4,A5500. (#6639)
     add 78213da8286 appliance: use Debian 11.8.0 and systemvm version to 4.19.0 (#8084)
     add 3b11663d87e Fix failure on agent reconnection (#8089)
     add 1e133d05c7a kvm: Handle the failures when setting up memory balloon stats period for KVM VMs (#8049)
     add e6f048bc2e8 CKS: fix wrong format of cluster size on UI (#8182)
     add a15cb81c85d Merge remote-tracking branch 'apache/4.18' into main
     add ec3d0f54fed Standardize StringUtils usages in NetworlModelImpl (#7980)
     add 39c0706f1f5 Update XenServer610WrapperTest.java (#8139)
     add 2f97e3bd835 refactor MockNetworkVO (#8137)
     add 9e8f591ace1 Refactoring org.apache.cloudstack.network.tungsten.service (#8098)
     add 8fa8cefb5b7 Add and improve logs in ACS bootstrap process (#6890)
     add 256892b3f83 build: fix failure after forward merge
     add b2938c05283 Refactor testCRUDAcl into Separate Test Cases (#7705)
     add a7c6599ae24 Bump the `actions/checkout` action to `v4` (#8133)
     add 6afffe1e176 Fix JSON string comparision fin tests (#8183)
     add 121531e2c3a Polish UI (#7855)
     add 0caf18bc1a0 ui: indent issue in list view (#8184)
     add 2bb182c3e1e KVM Host HA enhancement for StorPool storage (#8045)
     add e9b24b6c326 Make authentication request parameter order to be deterministic (#8185)
     add 861107fa5b1 CKS: make clustertype optional to keep backwards compatibility (#8180)
     add e65c9ffe700 Fix: Select another pod if all hosts in the pod becomes unavailable (#8085)
     add b2e83271f8b ui: Admin, account and project dashboard improvements (#8193)
     add 11b5831d726 Advanced SG: allow create/update physical networks with vlan range (#8122)
     add 3d7281d4516 Merge branch '4.18' into main
     add d3917ef8f68 Remove powermock form VM Manager test (#8199)
     add 68e504aff97 Linstor backup snaphots (#8067)
     add e7900478eb2 ui: fix vmware nicadapter detail for register template (#8173)
     add 29a223bf9b7 Merge remote-tracking branch 'apache/4.18'
     add 86444809c3a updated the api documentation for createNetworkOffering and updateNetworkOffering (#7545)
     add e7bb89c4b28 Merge release branch 4.18 to main
     add 7b31a5196d4 Update requirements file and fix minimum pre-commit version (#7901)
     add 30ca5d1a196 Flexible URI for connection with DB and new MariaDB driver (#7895)
     add cfd6bffacf2 PULL_REQUEST_TEMPLATE.md: fix spelling (#8220)
     add d0f3233fda3 edge-zone,kvm,iso,cks: allow k8s deployment with direct-download iso (#8142)
     add b79e3937b46 UI: fix scale vm if first disk offering is dymamic (#8213)
     add 05b9b6e2e77 Merge branch '4.18' into main
     add df4cd2aae42 Inject hypervisor type and volume format on Quota tariffs (#8138)
     add 96b07d797b7 Fix flaky tungsten test using comparator (#8232)
     add 04061f12e5a storagetype API param in list service/disk offerings (#8215)
     add b7835d02d25 Fix deploy as is VM start after template deletion (#8115)
     add c7100c3d751 Merge release branch 4.18 to main
     add 1f29f6f0409 Public IP quarantine feature (#7378)
     add be4a648f5ab Create global configuration to allow changing the default nic adapter for user VMs in VMware (#7954)
     add 267a457efc5 Externalize KVM HA heartbeat frequency (#6892)
     add cc45bffdbd3 Improved concatenation way in PropertiesStorage.java (#7486)
     add 0735b91037d api: introduce domainid and account parameter in createTemplate API (#8210)
     add 60017723357 multi local storage handling for kvm (#6699)
     add 6eb04a86a6b Fixed Hashmap Key value comparision (#8238)
     add db27c0ad2a2 Set number of hours per month with actual number in Quota (#7210)
     add adbb5520ca5 Database VIEW management via separated files (#7417)
     add c7ed4ca272c schema: revert incorrect removal of oauth changes in #7417 (#8245)
     add eaa4123068a VNF: fix UI bugs and polish (#8227)
     add 1a2dbebe489 Let Prometheus exporter plugin support utf8 characters (#8228)
     add 1b56a8e8733 Fixed spelling and added missing states to response (#8248)
     add 98d643efe6c Merge release branch 4.18 to main
     add 5c7e4b7edc8 api: add ipaddress argument to disassociateIPAddress (#8222)
     add f0b757e91ea [StepSecurity] ci: Harden GitHub Actions (#8209)
     add b0a9949775b ui: include domain and account field for createTemplate forms (#8257)
     add 60b399f8758 Fix create private gateway rollback (#8244)
     add 3c7c75bacfd Clear pool id if volume allocation fails (#8202)
     add 8f390873772 Fix typo in ssvm check script (#8191)
     add 956efb27d93 allow filtering of listDiskOffering and listServiceOffering APIs by account or project (#7082)
     add a31f2116282 Merge remote-tracking branch 'remote/4.18'
     add 26b01f6f3be Flexible tags for hosts and storage pools (#7489)
     add cb62ce67671 Global ACL for VPCs (#7150)
     add 37a2350159d Fix upload of volumes, templates and ISOs through HTTP (#8264)
     add 5651eab49cf ObjectStore Framework with MinIO and Simulator plugins (#7752)
     add 108651ad403 api: make displaytext form upload template/iso optional (#8289)
     add b0910fc61d7 Add dynamic secondary storage selection (#7659)
     add cb2b6aca45c server: check if there are active nics before network GC (#8204)
     add 98cd3b9a243 UI: Removed ICMP input fields for protocol number from ACL List rules modal (#8253)
     add 7d6dc41f99b UI: Removed redundant IP Address Column when create Port forwarding rules (#8275)
     add 724394682c7 server: Initial new vpnuser state (#8268)
     add d3cad4266af Merge release branch 4.18 to main
     add a15b706fbe7 Linstor: Allow snapshot backup also to work on non hyperconverged setups (#8271)
     add a6b570845f6 lower level and no stack traces at info or higher (#8278)
     add 4c91cc7c6f5 ui: change ipaddress tab label for shared networks (#8305)
     add b00fd6bb4d3 Merge remote-tracking branch 'apache/4.18'
     add db6dd52f443 kvm: fix ide controller for rocky/alma vms (#8247)
     add 14376ce2983 Merge release branch 4.18 to main
     add fdfbb4fad13 Prioritize hypervisor.uri configuration (#8254)
     add 371ad9f55b3 New Feature: Import VMware VMs into KVM (#7881)
     add 22a4464c670 change args visibility when editing a default role (#8322)
     add 88f64de848b Update cloudstack-help-text (#8329)
     add 4e9c4a5895b Fix intermittent build failures (#8312)
     add 9773ba3e951 Allow autoscale group and name override (#8324)
     add 7ea068c4dcf kvm: fix error 'Failed to find passphrase for keystore: cloud.jks' when enable SSL for kvm agent (#7923)
     add 7eb36367c90 Add lock mechanism considering template id, pool id, host id in PowerFlex Storage (#8233)
     add bba554bcc47 linstor: Fix possible NPE if Linstor storage-pool data missing (#8319)
     add f42feb1568d CKS: update imagePullPolicy to IfNotPresent in yaml files (#8296)
     add c599011ef59 Merge remote-tracking branch 'apache/4.18'
     add 2993c993632 Add missing hosts info to the prometheus exporter output. (#8328)
     add 4e46f5ad17f Add logs to listLoadBalancerRuleInstances API (#8094)
     add 1031c31e6aa FiberChannel Multipath for KVM + Pure Flash Array and HPE-Primera Support (#7889)
     add 231a9eae2eb ui: add action to declare/cancel host as degraded (#8327)
     add fc44df7c95e CKS: create HA cluster with 3 control VMs instead 2 (#8297)
     add ea569ffaadc expand tags in csv (#8258)
     add a11fc43788e server: fix diskoffering details in vm response (#8135)
     add 4bdf35b7b0a Merge remote-tracking branch 'apache/4.18'
     add 12dcf5cc6f4 Move subdomains between domains (#7446)
     add 05d0dd851f4 .asf.yaml: Enable Github Discussions for CloudStack (#8274)
     add 031b4c675c2 .asf.yaml: dummy commit to force asf.yaml effect
     add ce586e3eca5 server: fix resource count during assign volume (#8171)
     add 05b0a8ae864 Merge remote-tracking branch 'apache/4.18'
     add 3ce7c39bef8 cks: handle errors while scaling cluster (#8107)
     add 080a5aee007 Merge remote-tracking branch 'apache/4.18'
     add a791d46abed events,alerts: Add missing indexes (#8276)
     add 27a3d617292 Fix unmanage VM marvin tests and small UI fixes for import (#8338)
     add 3bb318bab90 kvm: Add support for cgroupv2 (#8252)
     add 82f7abddb30 Merge remote-tracking branch 'apache/4.18'
     add ab20b1220fe KVM Ingestion - Import Instance (#7976)
     add 0bc7fb540a4 client/pom.xml: fix code coverage is not updated in some modules (#8346)
     add de095ba70d2 server: fix url check for storages without a valid url (#8353)
     add dda672503f2 Remove unneeded duplicate words (#8358)
     add 127fd9d2f06 UI: Project column in Default View (#8287)
     add af872224d6a README: that time of the year! 🎄 (#8365)
     add 16d45f731d7 Save the account which deliberately removed a public IP from quarantine (#8339)
     add 33e2a4dd663 VPC: update default network offering for vpc tier to conserve_mode=1 (#8309)
     add ab70108f157 CKS: create Security Groups for CKS clusters of each account (#8316)
     add 2253a33c1ec Merge remote-tracking branch 'apache/4.18'
     add 7c06d289d28 Fixup test_image_store_object_migration.py (#8378)
     add 64ecd00eb70 test: fix test_host_ping.py to restore original host state (#8380)
     add f5c7018e5ea Merge remote-tracking branch 'apache/4.18'
     add 1411da1a22b Add e2e tests for listing resources (#8281)
     add 969e094419d server: improve stats collector logs to state what the collector does (#8387)
     add 6d916cad348 Merge remote-tracking branch 'origin/4.18'
     add 9d3a7be4dd9 server: fix debug message when expunge a vm (#8374)
     add d83d9949298 test: additional check to ensure hosts are left in up state (#8383)
     add 26214ea139b Merge remote-tracking branch 'apache/4.18'
     add ab808995ffe Revert "Add e2e tests for listing resources (#8281)" (#8396)
     add 08749d8354f server: skip password policies check on empty password (#8370)
     add a97ce242ba9 Merge remote-tracking branch 'apache/4.18'
     add 9d4f0715d43 change of the guard (#8408)
     add 2eaed804351 ui: fix ssl check in image store browser (#8430)
     add 687610dd5f5 Fix bootstrap exceptions (#8397)
     add 66ae96b5eb6 ui: fix layout for action button for template form (#8434)
     add 746bae740ea ui: fix default domainid for add account (#8435)
     add 3f9dd4dc07f Fix VMware VM ingestion template selection and default template failure (#8429)
     add f023fc53c0a engine-schema: fix finding guestos mapping with parent version (#8426)
     add a68dc0bfb5d Merge remote-tracking branch 'apache/4.18'
     add 5c32a0edbaa ui: prevent scheduling readyforshutdown job when api inaccessible (#8448)
     add 514d2c2a26c schema,engine-schema: explicit VMware 8.0.0.2, 8.0.0.3 support, logs (#8444)
     add 9a915b11c42 Fix KVM import unmanaged instance (#8433)
     add 2b28a664fe0 Updated jetty maxFormContentSize value to 1048576 bytes (default is 200000 bytes), to support user data upto 1048576 bytes (#8420)
     add d6ac91f2df0 minio: fix store user creation (#8425)
     add 32f379270c1 Register managed user data using POST call from UI (to support user data content > 4096 bytes) (#8487)
     add 76aff0f422a Add reconnect button to hosts on alert (#8468)
     add 4d42b8da0d3 Merge remote-tracking branch 'apache/4.18'
     add c569fe91191 Fix KVM import and list unmanaged VMs (#8445)
     add b8d3e342be2 Fix KVM import unmanaged instances on basic zone (#8465)
     add 4f40eae1c40 DRS: Use free metrics insteado of used for computation (#8458)
     add e87ce0c7230 Fix reorder/list pools when cluster details are not set, while deploying vm / attaching volume (#8373)
     add c43b7c04f4c ui: fix labels when migrating instances from vmware (#8490)
     add 64f4480ef41 Fix Vmware to KVM migration (#8485)
     add 59e78cbc455 Fix KVM unmanage disks path (#8483)
     add a3a4833c3e0 Fixes for KVM unmanaged instances import on advanced network and VNC password (#8492)
     add 3936f7c2cf0 vm-import: kvm import and fix volume size when lesser than 1GiB (#8500)
     add c3b77cb7b82 Fix host stuck in connecting state (#8502)
     add 62efe7433db scripts: mark multipath scripts as executable (#8524)
     add 3bcf6f0faf4 Rename "Import QCOW...." to "Import QCOW2....." (#8519)
     add 8d42ca8ccfd Use project version on pom dependencies (#8529)
     add 80bbb29abfb CleanUp Async Jobs after mgmt server maintenance (#8394)
     add 19250403e64 ui: fix create k8s cluster multiple listing (#8539)
     add fedcf66de06 Externalise a few timeouts & fix timeout for hostSupportsUefi in libvirt ready command wrapper (#8547)
     add 39e0a8e8d43 Change Cryptsetup validation (#8482)
     add 2746225b999 Updating pom.xml version numbers for release 4.19.0.0
     add a7b97ff3b04 Updating pom.xml version numbers for release 4.19.1.0-SNAPSHOT
     add 67bd3aad71f Updating tools/checkstyle/pom.xml version numbers for release 4.19.1.0-SNAPSHOT
     add cf0d436fc82 Merge remote-tracking branch 'apache/4.19' into main
     add 7dffbc6e475 Updating pom.xml version numbers for release 4.20.0.0-SNAPSHOT
     add af8a582055c api/utils/ui: List protocol numbers and icmp types (#8293)
     add 3550f6a959a tools,changelog: fix nextversion (#8606)
     add e33f98f52c4 Merge remote-tracking branch 'apache/4.19'
     add d5d8b6d086a tools,changelog: fix nextversion 4.20.0.0-SNAPSHOT (#8607)
     add d353fcc599d engine-schema: upgrade path 4.19.0.0 to 4.20.0.0 (#8608)
     add 8ea9fc911d1 StoragePoolType as class (#8544)
     add f702f7f57c6 Remove sensitive params (VmPassword, etc) from VMWork log (#8553)
     add 2df68021761 Allocate new ROOT volume (on restore virtual machine operation) only when resource count increment succeeds (#8555)
     add 9f1b34aeb22 Fix libvirt domain event listener by properly processing events (#8437)
     add 5361b415e6a Image Store: View Access status of the image store and view events (#8467)
     add 2f299492f65 Fix API `moveUser` parameters descriptions (#8499)
     add 0ba26912df3 Fix typo in alert name (#8579)
     add 94c8b1da5ce Option to create StorPool primary storage with a valid URL (#8356)
     add 25009bfb764 Merge remote-tracking branch 'origin/4.19'
     add d8b4be6cef6 @alexandremattiioli is committer now (#8525)
     add 48410d0d67e Bump `actions/setup-python` to `v5` (#8419)
     add c0643a8f6e4 Update server.properties.in (#8509)
     add 4d370a3772d Merge remote-tracking branch 'origin/4.19'
     add 33bb92acce2 Veeam: Support Veeam 11 and 12 (#8241)
     add b34f0931373 veeam: fix some issues with restoring volume from backup and attaching it to VM (#8570)
     add 1c98b5a4e56 Change Cryptsetup validation (#8482)
     add 3f33592b676 systemvm: vncport evaluation (#8369)
     add 1d5230b5168 server: use ed25519 instead of rsa when generate public/private keys (#8549)
     add ca55fc08e9f Added missing metrics English locale strings (#8560)
     add b2e29931e89 UI: fix icmp code/type of ACL rule are not display if the value is 0 (#8589)
     add b8904f75ddf Merge remote-tracking branch 'apache/4.18' into 4.19
     add 54225ecd150 Veeam: fix incompatible types: String cannot be converted to Date
     add c7955471528 server: fix build error with BackupManagerTest.tryRestoreVMTestRestoreSucceeded
     add 37bb24f29e0 Merge branch '4.19'
     add 399bd0a067d Upgrade to mockito 4 and handle Mockito deprecations (#8427)
     add b0ac78705d4 Add IOPS to disk offerings details (#8447)
     add df412a99d2f test: Add e2e tests for listing resources (#8410)
     add 376243975ba README: silently revert to the original project logo
     add affead11607 Merge remote-tracking branch 'origin/4.19'
     add 69e8ebc03fc CKS: retry if unable to drain node or unable to upgrade k8s node (#8402)
     add 0d36098c768 Merge remote-tracking branch 'origin/4.18' into 4.19
     add 2bfa9de2825 Merge remote-tracking branch 'origin/4.19'
     add 49cecaed067 Normalize loggers and upgrade log4j 1.2 to log4j 2.19 (#7131)
     add e53d3274fa3 Fix cloudstack-ui package: bad directory permissions and missing WEB-INF (#8568)
     add 3fa052c1f57 Fix cloudstack-ui package: bad directory permissions and missing WEB-INF (#8568)
     add 7394af30718 Merge remote-tracking branch 'origin/4.18' into 4.19
     add 0447040c08b Merge remote-tracking branch 'origin/4.19'
     add bb70da0fed9 add compute offering details in UI (#8563)
     add 4de2f38cd13 Adding vmId as part of error response when vm create fails. (#8484)
     add 1d1b3321416 remove StorPool tags from detached volumes (#8377)
     add 56f0448f0d4 Linstor fix migration while node offline (#8610)
     add a1f547a0110 Merge remote-tracking branch 'origin/4.18' into 4.19
     add cfb4d4378f2 Merge remote-tracking branch 'origin/4.19'
     add 9b18243b876 Fix merge forward bug (#8636)
     add 3291a62fc12 Allow locking and unlocking users via UI (#8337)
     add 27520f83fec packaging: bundle cmk in cloudstack-management package (#8574)
     add 2729ee110eb Enable over provisioning for SharedMountPoint primary storages (#8481)
     add 393f3d7727a linstor: use relative hostname path (#8633)
     add af2e277999a Merge remote-tracking branch 'apache/4.18' into 4.19
     add a924a110e18 Veeam: revert unnecessary state change if restore backup and attach to another VM (#8614)
     add d7362dd332f Migrating volumes filter (#8631)
     add 70b634fff21 Linstor: add HA support and small cleanups (#8407)
     add 1955d8f3db0 Add advance settings to fine tune DRS imbalance calculation (#8521)
     add d8cd1228496 zone wizard: allow only one untagged physical network with guest traffic type (#8625)
     add 672206c3124 kvm:  ITCO watchdog added (#8282)
     add e47a910019d VR: fix issue between VPC VMs and other Public IPs in the same subnet as additional Public IPs (#8599)
     add a8028eecbdb Merge remote-tracking branch 'origin/4.18' into 4.19
     add bda49ab08ff Merge remote-tracking branch 'shapeblue/merged-4-18' into 4.19
     add 93406f5582b Merge remote-tracking branch 'apache/4.19'
     add 90526419a3d fix build error after merge-forward
     add 187f17c216d fix build errors with DRS plugins after merge-forward
     add 4a0ca2071d3 An ICMP ACL rule should not be able to have code and type null (#8464)
     add a31449b1049 Allow altering only either CPU or memory during VM live scale (#8234)
     add 17516fd9890 test: skip check for volume stats history on xenserver (#8661)
     add f86c62e49a5 UI: load domain lists only if listDomains API is available (#8660)
     add 6f3e4e63022 fix_filter_and_pagination (#8306)
     add a0e592e945e prevent nic removal on out of bounds router stop (#8371)
     add 6af1c25f520 Merge remote-tracking branch 'apache/4.19'
     add 592038a3042 api,server,ui: granular resource limit management (#8362)
     add 8f6721ed4c4 Improve some UserVmManagerImpl's methods name and docs (#8673)
     add e9416c4987e Move views into separate files for easier modification (#8647)
     add e74a72b4ef8 test: fix test_guest_os.py failure on xcpng82 (#8659)
     add 275abaff6bc Refactor updateDiskOffering API (#8446)
     add 1a1131154ef Fixup vm powerstate update (#8545)
     add ed579bfeca5 UI: remove duplicated section for backup (#8678)
     add 3aafb286b9d Fixed deleteVlanIpRange API description (#8700)
     add 8d4b4dcec42 CKS: add kube config path in extra control nodes (#8658)
     add af942e2260f vpc: optimize createMonitorServiceCommand() execution (#8385)
     add e09fd2e26b9 Fixup: Optimize getRouterHealthChecksConfig method (#8677)
     add 2a56c61adea Merge remote-tracking branch 'apache/4.18' into 4.19
     add 0926e5c15a9 Merge remote-tracking branch 'apache/4.19'
     add 87284f03f08 Upgrade to JRE17 and Upgrade System VMs/VRs to Python3 and Debian 12 (#8497)
     add 7342fbd8e1a docs: fix spelling in code comments (#8690)
     add e545259bd36 Added JS Script to pick Favicon, Title from config file (#7418)
     add 08dc1bbcd4b UI: cleanup arrangement of instance schedule modal dialog (#8620)
     add b4404fbcc7e db: fix wrong cloud.domain_view (#8705)
     add 18c3d470c6c CKS: fix /opt/bin/deploy-cloudstack-secret in CKS control nodes (#8697)
     add f731fe882c5 Storage plugin support to check if volume on datastore requires access for migration (#8655)
     add f4987bf8ee6 Merge release branch 4.18 to 4.19
     add 3baa45bc2a8 forward Merge branch '4.19' into main
     add d1715821634 Fix false positives in Usage sanity checks of templates and network offerings  (#8136)
     add c8a4575bcd0 Fix `deleteUser` API to prevent deletion of the caller (#8691)
     add 6f27b1f459f Improve logs when adding components to avoid set (#7214)
     add 68a3e9e8398 engine-schema,test: fix domain searchbuilder, test check (#8725)
     add 45d267ccbf2 UI: fix permission of VNF appliances (#8668)
     add c462be1412d New API "checkVolume" to check and repair any leaks or issues reported by qemu-img check (#8577)
     add 813d53d031a Sync the pool stats in DB with the actual stats from stats collector (#8686)
     add bbe56ae2838 Update actions/setup-java from v3 to v4 (#8709)
     add 4e34e6b3348 console proxy client sleep more generic (#8694)
     add 56e04505266 Logging improvements on migration in the VmwareResource (#8300)
     add 52d5b271617 UI: Add button to show public IPs associated with vlanid (#8717)
     add 9bd359a039a UI: Fix error message in zone wizard (#8721)
     add 9fd410be36d Merge remote-tracking branch 'apache/4.18' into 4.19
     add b29ec2bf12a Merge remote-tracking branch 'apache/4.19'
     add f36273888be build: fix logger post forward-merge
     add 10f72a17f6e server: use ecdsa instead of ed25519 when generate public/private keys (#8719)
     add e86363be8e7 Merge remote-tracking branch 'apache/4.18' into 4.19
     add 240db195674 Merge remote-tracking branch 'apache/4.19'
     add 9a73a2f9e14 Display dates in Quota and Usage messages according to the timezone configurations (#8230)
     add 6dc3d06037c NSX integration (#7919)
     add e87c6cfcb1d Fix resource count discrepancies (#8302)
     add a7ec8738a27 kvm: fix NPE while import KVM VMs from other hosts (#8720)
     add b82ea3de2d2 Update pre-populated quota tariffs' unit types (#8591)
     add 0b080cfd820 [UI] Allow detach ISO from instance toolbar when ISO is attached (#8716)
     add 986d754768d SG: fix SQL exception when add security group rule with allowed account/group (#8616)
     add 223a9b8031c Quota tariff events (#8030)
     add d99b1b9c2d0 Merge branch '4.18' into 4.19
     add 001c769054b Linstor 4.19 fix selecting non enabled hosts (#8653)
     add 0208e094ce6 build: fix failure after latest forward-merge
     add f25d35c5d6b VM Import: Use datastore name when datastore path is not set to search for pools on DB (#8759)
     add db564b12b69 Merge branch '4.19'
     add 92bfb4dcaac Support KVM storage implementations controlling logical/physical block io size (#8724)
     add d487a1c3417 Fix disk offering override in VM deployment wizard (#8070)
     add f8fd22c2d62 Usage: Fixup entity exists exception (#8726)
     add 0780f0e5c61 Merge remote-tracking branch 'apache/4.18' into 4.19
     add bb244842fa1 Merge remote-tracking branch 'apache/4.19'
     add 7b02c4cc482 Add autofocus to 2FA input (#8766)
     add f76c6f3ea97 Quota email configuration (#8307)
     add e0731c50985 Fix the removal of network offering tags (#8758)
     add 9acba904237 Fix 404 when moving a VM to out of a project (#8650)
     add ffd59720dd8 storage,plugins: delegate allow zone-wide volume migration check and access grant check to storage drivers (#8762)
     add 0043540fa30 Use join instead of views (#8321)
     add 9d748f0837f server: update default value of setting 'expose.dns.externally' to 'false' (#8776)
     add fe5d7412364 Merge branch '4.18' into '4.19'
     add 33dc7465c2b Merge remote-tracking branch 'origin/4.19'
     add 720407ba737 snapshot: don't schedule next snapshot job for a removed volume (#8735)
     add 8c62365dbb1 VPC VR: fix empty iptables if there is no vpc tier (#8787)
     add 308ed1399ee Merge remote-tracking branch 'origin/4.18' into 4.19
     add 0e32380e0a3 Merge remote-tracking branch 'origin/4.19'
     add 502a633ddd0 build: fix build failure after merge-forward
     add 24d5c45f7f4 Add indexes for vm_stats (#8737)
     add 2e88eb45a3b Update mysql-connector version (#8753)
     add 01d44347e72 Merge remote-tracking branch 'origin/4.19'
     add 88017ad45e3 Fix Virtual router count in Capacity dashboard (#8807)
     add 9245354b434 Merge remote-tracking branch 'origin/4.19'
     add 12f65fbcc01 build/packaging: build nsx only if noredist is passed (#8772)
     add 4b4dfef96f5 fix simulator CI failure test_04_list_storage_pools_keyword_filter (#8814)
     add adc05f8d590 Fix XenServer nested extra configuration (#8698)
     add e44c17e0770 Fix spelling in docs and code comments only (#8774)
     add 449ee8e509e Show network metrics for System VMs (#8679)
     add 88d250487c2 Normalize characters with diacritics in Brazilian Portuguese locale (#8829)
     add a0b642cdb85 Refactor cloud-agent module logs for Log4j2 (#8714)
     add 93f31828f59 Hypervisor as class (#8798)
     add c4036800de5 Fix: check root disk offering tagged limits during VM deploy (#8871)
     add 9072f8ee1c8 Add ReservationDao bean to the Usage Server (#8868)
     add ed7389caa38 add gpordeus as collaborator (#8879)
     add f4058705d7b UI: add dialog to select a VPC tier when create LB for autoscaling in VPC (#8793)
     add 08d9d06d453 api,server,ui: add project ID and name to UserDataResponse (#8656)
     add 31301f56f64 Fix missing actions on Guest IP ranges for networks (#8777)
     add 6c6023b790c UI: Fix irrelevant conversion options in import instance modal (#8838)
     add f7603dcbcc8 AllLinesParser: Enable draining of stdout (#8670)
     add 38f028613fc Fix getRepair method in checkVolume command (#8840)
     add fc3c625beba server: fix security issues caused by extraconfig on KVM
     add 67e2061f4b8 api: client verification in servlet
     add 939d0b9011a engine-storage: control download redirection
     add 72b2eb0087f server: fix security issues caused by extraconfig on KVM
     add 00f687db1be api: client verification in servlet
     add b642500f153 Merge remote-tracking branch 'origin/4.18' into 4.19
     add ff3e9bd821f engine-storage: control download redirection
     add 16aba6b5881 Merge remote-tracking branch 'origin/4.18' into 4.19
     add 7a9985b42bf upgrade: add unit tests from/to a security release (#8870)
     add f2da882d68f Merge remote-tracking branch 'origin/4.18' into 4.19
     add 02305fbc5f4 Merge remote-tracking branch 'apache/4.19'
     add b8f8321f0f9 Allow listing of inactive offerings (#8821)
     add c25264bada3 UI Fixes: allow filtering on alertype in UI & add events tab (#8630)
     add 55b28d645fb Merge remote-tracking branch 'apache/4.19'
     add 632eb40b7c3 add collaborator hsato03 (#8884)
     add 2959cc67652 cleanup collaborators (#8888)
     add a5508acc54d server: fix haproxy misconfiguration after VPC VR start (#8881)
     add c7626ebfd63 Merge remote-tracking branch 'apache/4.18' into 4.19
     add 3fd5680d9a1 Merge remote-tracking branch 'apache/4.19'
     add c24c1a5c000 Fix VM import & VM delete with custom offering (#8813)
     add a44f28bb312 Merge branch '4.19'
     add 730cc5d5b8f Change iops on offering change (#8872)
     add d3e020a5452 Mark libvirt events experimental, add properties flag (#8825)
     add 19f79b1d94f Merge branch '4.19'
     add b998e7dbb63 Allow overriding root disk offering & size, and expunge old root disk while restoring a VM (#8800)
     add 44aa08c02a3 Fixup 4.19 build issue (#8905)
     add 45daa1ce591 Merge remote-tracking branch 'apache/4.19'
     add 31f28f6516d Limit infrastructure details revealed to the end user after a failed migration on KVM (#8680)
     add 090c1e38a6b Improve vm.allocation.algorithm global setting description (#8823)
     add ebaf5a47b94 Speedup resource count calculation (#8903)
     add 63a0797b180 Introduce scheduled executor wrapper with dynamic interval (#8916)
     add 38ca11f99ac build: fix build failure after merge-forward
     add 0a26f3315a1 Fix listStoragePoolsMetricsCmd (#8885)
     add 6cd5c6a1d01 linstor: Do not pretend handling disconnect paths that are non Linstor (#8897)
     add a55ba96a08e Merge remote-tracking branch 'origin/4.18' into 4.19
     add 075b4130412 Fix VR inheriting boot settings from user's VM (#8894)
     add 7721133ea9a Fix display of properties related to backup size (#8845)
     add 44b8d3af0ca ui: bump UI dependencies versions (#8923)
     add 85110147071 Fix error message for checkVolume command (#8842)
     add 154566f914c Updating pom.xml version numbers for release 4.18.2.0
     add 8a101fbbc11 Updating pom.xml version numbers for release 4.18.3.0-SNAPSHOT
     add cadbb563afa Merge remote-tracking branch 'origin/4.18' into 4.19
     add 7de8a6d0826 Merge LTS branch '4.19' into main
     add dfd5158d678 Allow kvm storage plugin to customize diskdef, add geometry (#8839)
     add 5f8450f28f1 Add a shutdownhook to remove jobs owned by the process (#8896)
     add d4a5459a830 UI: Fix missing locale strings for Status widget (#8792)
     add 7affbb1dacf protect against null-path (#8915)
     add 78e07cff62d Merge release branch 4.18 to 4.19
     add 3cabe69cd50 Merge release branch 4.19 to main
     add e1922da2499 merge forward error in logger name (#8949)
     add 8ff2c018cc5 test: fix test failures in ActionEventInterceptorTest (#8938)
     add 49d244f2513 [Usage] Create VPC billing (#7235)
     add 21182dabcd8 Update netty version for compatibility/staying current (#8945)
     add c081f60427d server: Fix null pointer exception in restore VM (#8930)
     add 6502dde8c33 field enlarged and db upgrade (#8675)
     add 7b57480d601 Merge remote-tracking branch 'apache/4.19' into main
     add bf9fdaddbd2 Fix build errors due to log4j 2.x changes
     add 582249c1f72 Fix permission to manipulate VMs and templates settings through UI (#8778)
     add 5a52ca78ae5 kvm: export sysinfo for arm64 domains for cloud-init to work (#8940)
     add 405aac38bc9 linstor: Only set allow-two-primaries if resource is already in use (#8802)
     add 0577b0ac8ef server: add logs to public ip allocation attempt (#8239)
     add 0fa71f56966 Merge remote-tracking branch 'origin/4.18' into 4.19
     add 93d4816ee8e Merge remote-tracking branch 'origin/4.19'
     add 2ca3be41f7d Fix spelling in code comments (#8866)
     add 865da730e55 log sanitation on output of jobs (#8890)
     add f6802e91983 server: fix duplicated records for templates if there are multiple zones (#8933)
     add c31aebc1886 Merge release branch 4.19 to main
     add 66c10bf42fd logger issues
     add 6c24ff90985 pre-commit autoupdate (#8867)
     add 0de469ab731 Infra25725 add codecov token to workflow (#8960)
     add 65f57124f5d UI: ignore error when list public ips for CKS clusters on Shared network (#8489)
     add 80adf5ead10 Merge release branch 4.18 to 4.19
     add 65eef59e0bd Merge release branch 4.19 to main
     add 0b857def685 New feature: Import/Unamange DATA volume from storage pool (#8808)
     add a358c9a4102 Merge release branch 4.19 to main
     add 1efce77ead1 sanatise trace logging of async jobs (#8892)
     add 4fe2b66e9db add bernardodemarco to .asf.yaml collaborators (#8965)
     add e330d76a72d Log4j2 refactor cloud engine orchestration module (#8742)
     add a6f3560152b fix log4j to log4j2 issue (#8966)
     add 96ae479000a [Usage] Create network billing (#7236)
     add 6def370f4a2 test: fix unknown parameter hostid in test_vm_life_cycle.py (#8948)
     add 4ffeec6ba45 vpc: create vpc tiers with dns server of vpc instead of zone (#8621)
     add 5f6acca049e packaging: move contrail network plugin to noredist (#8932)
     add 0514caedd6a Merge release branch 4.18 to 4.19
     add 0af923e6181 Merge branch '4.19'
     add 27124c10319 Add ability to set cpu.threadspercore similar to existing cpu.corespersocket (#8850)
     add 3b0e6ac90c0 VR: fix dnmasq misconfiguration if there are multiple IP ranges in a shared network (#8741)
     add 77df9ad4d78 codecov: fix Github action workflow
     add 5745674da5f Merge remote-tracking branch 'origin/4.18' into 4.19
     add 4c27574570d .github: fix codecov action configuration
     add 836ef9ec709 Merge remote-tracking branch 'origin/4.19'
     add 89231106ff9 Hide volumes tab in instance page when user does not have permission to list volumes (#8713)
     add cfdb33a0522 Fixup resource limit checks (#8935)
     add b93a86c9da8 Clean up `.asf.yaml` collaborators (#8982)
     add 380385d0451 plugin: fix nsx build failure with mvn 3.9 (#8974)
     add 00ee5fd4298 Show menu section if user has access to at least one of its pages (#8978)
     add 6e823b2cd34 Order the `.gitignore` file (#8989)
     add 54926c324ff sanatise log in case multiple passwordsa have been passed (#8891)
     add e409c6d870a Fixup listing of serivce offering & storagepools with tags (#8937)
     add 80a8b80a9d5 Update volume's passphrase to null if diskOffering doesn't support encryption (#8904)
     add 08132acaa2f Fix restore VM with allocated root disk (#8977)
     add b23ceefc7ea utils: cleanup MacAddress and MacAddressTest (#8988)
     add 0e08a126dfd systemvm: add template_zone_ref record when add a new zone with same hypervisor type (#8395)
     add cec6ade257c change live migration API used on kvm (#8952)
     add eead2710f81 explanatory error message on delete attempt of default system offering (#8883)
     add 9d5d4e55648 linstor: cleanup diskless nodes on disconnect (#8790)
     add 3de1f8b4baf Merge remote-tracking branch 'origin/4.18' into 4.19
     add e61f3bae4da Merge branch '4.19'
     add f41c934c94a Fix build error with MigrateKVMAsync
     add db572f4478d Fix spelling, word case, duplicate words in code comments only (#8987)
     add f7b95cd8f06 UI: hide Cleanup/Expunge when delete a CloudManaged CKS cluster (#8593)
     add 027149487b5 Fix: Update rootdisksize detail on restore VM (#8981)
     add d5241d319c3 Merge release branch 4.19 to main
     add 981310c2fe7 UI: Fix the Add / Remove Vmware DC button on Zone detail view (#8781)
     add d1ca79b65b3 ui: show systemvm agent version in the list and resource view (#9011)
     add 5c9d79e3fb4 Upgrade org.json:json version (#8750)
     add aad410ae6c0 Merge remote-tracking branch 'origin/4.18' into 4.19
     add 433956c6ae1 Merge remote-tracking branch 'origin/4.19'
     add ab8197c55e1 Add password enabled during ISO register and update (#8992)
     add e520525fe73 Use parameter dcId as wrapper to prevent NPE (#8986)
     add b91c3879c81 ui: add support to change Account role for admins (#9012)
     add ea11128cb37 linstor: disconnect-disk also search for resource name in Linstor (#9035)
     add 92ba4765930 Merge release branch 4.18 to 4.19
     add 0d8f7d40037 Merge release branch 4.19 to main
     add 0d1bc7dfd0c Limit `listRoles` API visibility (#8639)
     add f80d2052845 linstor: Fix volume format and make resource available on copy target (#8811)
     add 87e7c57d08c Fixup e2e test_restore_vm (#9025)
     add e9ff2707bbd Merge branch '4.19'
     add 21af134087a Fix exceeding of resource limits with powerflex (#9008)
     add 5f73172bcbe Fix failure test with ConfigKeyScheduledExecutionWrapperTest (#9103)
     add 2a63483b4c5 framework/config: make logic in ::value() defensive (#9108)
     add 6b4955affe9 Fix message publish in transaction (#8980)
     add a0f87187da1 ui: fix documentation link for VM autoscaling (#9044)
     add ea9a0f4adf8 ui: fix haenable in edit vm form (#9049)
     add f0df8d7831a ui: fix limit format (#9060)
     add 33659fdf069 server,test: fix resourceid for VOLUME.DETROY in restore VM (#9032)
     add b38f1364e6a Merge branch '4.19'
     add e817e04343a  Fix typo keyparis -> keypairs in InvalidParameterValueException (#9100)
     add c6762f1a41d ui: fix projectrolepermissions listing with description (#9091)
     add daf6b9d1030 api,ui: vm template format, fix vm info link (#9094)
     add 2d4d370be80 ui: support isdynamicallyscalable param for iso (#9092)
     add 57e67afdf0d api,server: list autoscalevmgroups with keyword (#9046)
     add acce88ff392 Merge remote-tracking branch 'apache/4.19'
     add 371ce12abef Normalize dates in Usage and Quota APIs (#8243)
     add c563fda0819 Add two more `pre-commit` hooks (#9077)
     add e159a593f12 Add `markdownlint` with `pre-commit` (#9078)
     add 40c5d353773 Fix spelling in docs, logs, exception messages etc (#9076)
     add 28e8e2d0096 pre-commit: add hook to trim trailing whitespace (#8205)
     add ad66edf6e65 UI: Add search filters (#9068)
     add 283a4853aad ui: fix create network access in deploy vm wizard (#9117)
     add c07953cc93e ui: fix columns for exportacls csv (#9118)
     add 8bb7bbea888 ui: add move to top/bottom for acl rules list (#9119)
     add 261530c92a9 server: honor listall param for listiso api (#9064)
     add c36a3b8cc33 ui: fix create menu item access (#9104)
     add c970141e250 engine-schema: add removed columne for cloud.user_data, fix delete op (#9120)
     add f1c3d2c4bee Merge release branch 4.19 to main
     add 5433e775e53 New feature: Implicit host tags (#8929)
     add 9b3c318db6a upgrade: move 4.19.0->4.20.0 to 4.19.1->4.20.0 (#8893)
     add 19f96355ac0 Update .asf.yaml
     add 0c615312f95 log messages (#9093)
     add 87b55af1979 Fixup response code on incorrect credentials (#8671)
     add d77998c2d44 utils,ui: obfuscate sensitive log info, use POST for configureOutOfBandManagement (#9126)
     add 875cd149195 server: fix fail to list public ips of shared networks sometimes (#8624)
     add 68a231aaee0 Show site to site VPN connections in UI (#9066)
     add 631d6ad09bc Do not retrieve VM's stats on normal VM listing (#8782)
     add 91c7bc722f2 server,cks: check if vm is cks node during vm destroy (#9057)
     add 7a341942373 cleanup: remove test/src-not-used/ (#9007)
     add c791c138e75 ui: change reporting link to Github Discussions (#9023)
     add 2339412f734 linstor: make getDevicePath more robust (#9143)
     add c779b1c6164 Merge branch '4.18' into 4.19
     add b29391c3291 Merge LTS branch '4.19' into main
     add 81cdf3cfbfe Fix instance & backup resource table columns (#9147)
     add 2542582c1e0 logging migration in merge missing
     add be552fdce9c feature: webhooks (#8674)
     add cc8dc84f647 server: fix resource reservation leakage (#9169)
     add 10f4de03181 kvm: consider provisioning type for local data volumes (#9141)
     add 0b54fbb5399 ui: Updated units names (#8543)
     add 3f2761ec7c6 Merge remote-tracking branch 'origin/4.18' into 4.19
     add 8d211e75c01 Merge remote-tracking branch 'origin/4.19'
     add 21d07132add engine-schema: make adding/dropping indexes idempotent (#9171)
     add ee39104ec04 fix  null host tags while creating zone (#8976)
     add 1383625c93e Fix `*.smtp.useAuth`, `quota.usage.smtp.useStartTLS` and `*.smtp.enabledSecurityProtocols` settings definitions (#9031)
     add 3fe2b46dd0b [UI] Add option to specify account/project while deploying VMs and creating networks (#8919)
     add 3b8d2202dcd fix unwanted kvm root volume migration (#8908)
     add faf94387a63 Disable logs to stdout and capture remaining stdout logs to a file (#8880)
     add c9a95bc22c5 Add unit tests for null cpu for null parameters for set allocated cpu (#9137)
     add 66f7f762636 fix createVMSchedule action name (#9226)
     add 64593574d88 test update and get connected hosts (#9136)
     add 6fda757936b While starting VM with 'considerlasthost' enabled, don't load host tags/details for the last host when it doesn't exist [main] (#9063)
     add 525c2c6fe93 Show in which primary storage volumes are allocated in instance details page and volume migration pop-ups (#8835)
     add 3321971adc1 UI: Update AddAccountOrUserToProject to show a drop down for account & user (#9072)
     add fcca3e8f391 api,server: encryptformat in volume response (#9106)
     add 7aacbcb559e api: listApis should return params based on caller (#8973)
     add 4bd0b1c24f1 ui: refactor global createmenu (#9139)
     add 43ab8a93674 cks,ui: fix npe and check for disable zone (#9105)
     add acae5c5b9eb kvm: Update the java doc for the method disconnectPhysicalDiskByPath (#9210)
     add 6edcf32c5ee Fix vsphere storage policy when compute offering uses the disk offering attached to it (#9203)
     add 2e3f76ec031 Improve error messaging / logs when listing VMs on the remote KVM host (for import) (#9204)
     add edf7394919f server: search template name and display text if keyword is passed (#9215)
     add ca597200156 vpc,event: fix events for createVpc (#9055)
     add 15772189990 server,event: fix events for storage maintenance (#9056)
     add 4ec0f823cf3 ScaleIO volume live migration - use usable bytes from source disk to format the destination disk (#9174)
     add 0f770194df7 Configure config drive ISO with password file on reinstallation of VM  with password-enabled template (#9113)
     add 503ae64a3db Upload volume format check with the supported hypervisor, fail if supported hypervisor not found on zone (#9224)
     add 4de975ff252 list by isEncrypted (#8643)
     add c756e4370ad List volumes by service offering id (#9211)
     add 10dc5ad7744 ui; fix admin dashboard vue warnings (#9140)
     add e2e46e31087 ui: fix dashboard on saml user login (#9097)
     add 5c749eced26 logging: httpupload do not warn with exception trace (#9220)
     add b2ef53b8a2d kvm: replace ISO path in vm XML configuration during vm migration (#9212)
     add 6fe835e1183 Merge branch '4.19'
     add cb48202b348 fix build error LibvirtGetVolumeStatCommandWrapper
     add 1cf1786ebb8 [Quota] Add API to list preset variables (#8372)
     add 8221be3a8ce Fix marvin package version while building packages (#9230)
     add 78ace3a750c saml: introduce saml2.check.signature (#9219)
     add f45267174a1 ui: list only accessible networks during import (#9194)
     add 0f8a839a1d9 engine/schema: force index in user_vm_view to speed up VM instance listing (#9198)
     add b3c3f917186 api: add to cpu speed parameter a description of the cgroup2 case (#9191)
     add 517cddcb15c Fix error message if specific host does not have capacity (#9218)
     add 2fef0a32bc8 cks: fix list apis response count (#8701)
     add abbc61c01ec engine-orchestration: expunge destroyed system vm volume (#9197)
     add 19e9020c9bb ui: fix dashboard retrievals based on permissions (#9237)
     add 034a5c84662 linstor: ui show Server and resource-group fields with custom protocol (#9138)
     add 37f4398c80e linstor: Support VM-Instance Disk snapshots (#8796)
     add 74f5e52e6ea Fix unit test failure (#9238)
     add 2ca0857bd59 api: listVM API improvement followup, change returning of stats detail (#9177)
     add 6ce2a58f9bc ui: improve sort utility for metrics (#9247)
     add df5c5465594 server: remove username required condition for listVmsForImport (#9124)
     add ce9b2c52f32 cks: fix events (#9070)
     add 8d02e5f808c test: fix test/integration/smoke/test_register_userdata.py which caused networks not to be deleted (#9244)
     add cb9b3134f7f Merge branch '4.19'
     add 3a5c4a0cba5 fix build error with LinstorVMSnapshotStrategy
     add aab13619491 server: fix mgmt server 503 error by renaming kubernetesClusterHelper to kubernetesServiceHelper
     add a9caee3c6f8 add readratemax and writeratemax (#9227)
     add ed86dc973b1 protect against missing service offering (#9235)
     add 00fe25ab01c Fix allocation of VMs with multiple clusters (#8611)
     add 96288ecf1fa fix: domain limits tab ui is now able to present 0 to the user (#9166)
     add bb0c1f93afe Add volume encryption checks during the disk offering change (#9209)
     add 7e71e505788 [Quota] Improve Quota balance calculation flow (#8581)
     add f360f7048da vmware: do not tear down vm disks if deploy-as-is vm has vm snapshots (#9243)
     add 591cc4f0027 Add action button to enable/disable Oauth provider (#9242)
     add a10eee25b34 Add method for decrypting values accordingly (#9088)
     add 75341963614 UI: Fix Userdata registration from UI (#8791)
     add 6c7426e3a7e Prevent network disruption on adding a VPC tier for redundant VRs (#9251)
     add 4e7c6682fd4 While starting VM with considerlasthost enabled, don't load host tags/details for the last host when it doesn't exist (#9037)
     add 56b69b157ea prevent duplicate ip table rules in SSVM (#8530)
     add 7c5b7ca0777 Extra parameter for UpdateImageStore (#8941)
     add 050ee44137a Merge branch '4.18' into 4.19
     add 373f0170020 Merge branch '4.19'
     add 3e6900ac1a5 api,server: purge expunged resources (#8999)
     add 8b02624e610 User data content size validation, and related code improvements (#8418)
     add 227c15624d9 vxlan: do not create duplicated network for private gateway (#9232)
     add 7a0cd55e989 ui: fix user create featured template from volume (#9253)
     add 2315a73a209 User friendly name of Downloaded Templates Volumes and ISOs (#9252)
     add 81269ad62af VNF: add API listVnfAppliances (#8994)
     add cc52b38e54d Update extraconfig for platform param in xen/xcpng (#9248)
     add 3997e596786 Merge release branch 4.18 to 4.19
     add 84b91cc9a3d assertion improvement on cluster DRS (#8508)
     add d81ffd2d864 Merge remote-tracking branch 'apache/4.19'
     add fbeee491377 fix build errors after forward-merge
     add 7dce3d87d48 [linstor] Fix revertSnapshot (#9271)
     add 8806e44e4fb Merge release branch 4.19 to main
     add f6ceeab3b3a server: Enforce strict host tag check (#9017)
     add ae3fa5d0de3 Add configuration to limit the number of rows deleted from vm_stats (#8740)
     add 097359bef9e plugins/shutdown: fix triggerShutdown scheduling and response (#9276)
     add 5ab23cd9c97 Timeout config to copy the disks of remote KVM instance while importing the instance from an external host (#9213)
     add ded7b4dbe5a test: fix test failure on ubuntu 24.04: "top: unknown option 'n'" (#9262)
     add 083ac069ca4 fix assignvm template permission check (#8886)
     add 60f234c682d remove Project Template Permissions inhibition (#9196)
     add 0c422aca767 server: fix additional zones cannot be removed (#9261)
     add 674495b162b Fixup startVM on simulator (#9199)
     add 313a165e62b server: add global setting consoleproxy.sslEnabled (#8809)
     add 9055610034b Remove duplicate network state checks before shutdown network (#8462)
     add 59e9ab9efee Fix volume response for service offering with disk offering (#9273)
     add 7e00678691e set isSystem for SVM IPs (#9281)
     add f4612c51ec4 libvirtstorage: Make sure netfs storage was really mounted (#8887)
     add 6a518e29b74 Allow deletion of external managed cks nodes (#9183)
     add c17aa0d9ada Import Remote KVM VM logging improvements (#9284)
     add f792684b9c4 Support migration of VM imported from a remote host (#9259)
     add f944d4c61d1 debian: add cpu-checker to debian/control (#9263)
     add 3e30283500f Fix migration from local storage to NFS in KVM (#8909)
     add 8b07b66f145 Fix volume snapshot of encrypted NFS/StorPool volume (#8873)
     add de266a4cb85 api,server: allow updating hypervisor capabilities with hypervisor and  version (#8475)
     add 4d6df586da2 engine-schema: fix options for host.allocators.order config (#8733)
     add fcfa3713373 kvm: support Rocky/RHEL/OL/Alma in the same cluster (#8641)
     add 42e71175d77 Merge remote-tracking branch 'origin/4.18' into 4.19
     add 6ee66033596 Updates to HPE-Primera and Pure FlashArray Drivers to use Host-based VLUN Assignments (#8889)
     add 620ed164d8b VMware: Improve error messaging / logs when starting non-user VMs, and secondary storage not available or doesn't have enough capacity (#9207)
     add 3923f80c225 Merge branch '4.19'
     add 3a0c3125916 fix build error with FiberChannelAdapter after forward-merge
     add 4eb43651e2d Ability to specify NFS mount options while adding a primary storage and modify them on a pre-existing primary storage  (#8947)
     add 7f0d9a03045 [Veeam] Check for failures in the restore process (#7224)
     add 6d7c042bc1d Accept a role ID on linking an account to LDAP (#8236)
     add 2bf36ef9353 DRS: Ensure the destination host is part of the same cluster (#9245)
     add dc74d5ba888 Let network guru decide if ipv6 cidr size can't be equal to 64 (#9289)
     add 4f85c3fd231 Honour listall param for list templates api (#9300)
     add ae4b6d3b6c4 CKS/calico: set arp_ignore and arp_announce to 0 in k8s controller/nodes (#9186)
     add 121839277b9 UI: ignore error host is already in the database when create a zone (#9231)
     add 6c06e85c803 Temporarily backup StorPool volume before expunge (#8843)
     add f7f7013ed02 Added ostypeid in the snapshot response (#9150)
     add 52247c57bb9 agent: reconnect after waiting 5 seconds (#9258)
     add 7a8066d3cad server: fix resource count updated unmanage vm (#8169)
     add b22315db85e server: event for HA vm start (#9202)
     add 22cd00ffb17 veeam: fix issues with PreSetup and DVS and Solidfire (#9256)
     add 53faf0f66a5 xenserver: attach regular iso with configdrive (#9216)
     add 23f8856c7d4 Update AssignToLoadBalancerRuleCmd.java (#9306)
     add 46f672563eb Improve migration of external VMware VMs into KVM cluster (#8815)
     add a4e9d7f21a7 Change vm.stats.remove.batch.size to delete.batch.query.size & allow delete of volume_stats in batches (#9283)
     add a5c8bb3bfc3 server: apply rules when VR of Domain VPC is recreated (#8354)
     add d4446ee09dc Revert listAll behaviour for templates (#9309)
     add 646c894ec68 Fix for race when automatically assigning IP to Vms (#9240)
     add c7f1ba5b8ee server: refactor listNetworks api database retrievals (#9184)
     add 65753755379 extract host from websocket to add route (#8922)
     add 94503e687ca UI: improve ux and fix some minor bugs (#9307)
     add 351de5fabd9 engine/orchestration: Update overcommit ratio during live VM migration (#9178)
     add 6b25ed7a027 prevent an NPE on an uninitialised TemplateObject (#8898)
     add 644f3a3f48f Add, Delete Storage Pool commands should be able execute on a host in maintenance (#9301)
     add 983f164c57f Fixed src datastore on copy check for PowerFlex/ScaleIO storage driver (#9310)
     add bcbf152a052 Merge branch '4.18' into 4.19
     add 90fe1d5fdcc Merge branch '4.19'
     add e010c9be936 Fixup main build error (#9314)
     add 814c8b6a121 differentiate between instalation ISO and attached ISO (#9146)
     add 2ca1b474bd6 PowerFlex/ScaleIO SDC client connection improvements (#9268)
     add 063dc601140 Change storage pool scope from Cluster to Zone and vise versa (#8875)
     add d79735606bb Handle public IP race conditions (#9234)
     add 0ec7c728758 Merge branch '4.19'
     add de683a51633 add ownership selection to create volume (#9265)
     add 7c32bd2506e Fixup main build errors (#9330)
     add a35d79a681e ui: fix minor issue with webhook forms (#9335)
     add 79b1427d3e5 test_primary_storage_scope.py should only run with kvm, vmware and simulator (#9323)
     add 94e5ceff7ff linstor-ui: Fix add primary storage if Linstor protocol selected (#9327)
     add 374ea7d4823 UI: fix "Request failed." error when open vnf appliances tab of network (#9334)
     add 121a35d6666 linstor: do not use the same static ApiClient for all calls (#9326)
     add eb1a0ef7f2b linstor: deleteAsync fallback to volume UUID if path not set yet (#9325)
     add ba85b4d4ffc Merge release branch 4.18 to 4.19
     add 2cf838cc1d1 framework/cluster: improve cluster service, integration API server
     add beebeed5e23 framework/cluster: improve cluster service and integration API service
     add d99cf93d7c2 Merge remote-tracking branch 'apache/4.18' into 4.19
     add 3c9bc07d069 Merge remote-tracking branch 'apache/4.19'
     add b080215c085 utils: honor custom timeout for script execution for exit value
     add 1144f5258d5 Merge remote-tracking branch 'apache/4.19'
     add b69cc0272d4 pre-commit: enable Python Flake8 rule `E713` (#9016)
     add f35f3f6a965 UI: create network form constantly tries to list domains - which is not permitted for normal users (#9348)
     add c35ba606a10 ui: fix account list on domain change in filterview (#9345)
     add f381763917a test: fix simulator CI failure test_cluster_drs (#9354)
     add 7977d1475e2 plugins: make default signature check mandatory (#9357)
     add ca66b76cb92 Fix instance & backup resource table columns (#9147)
     add 0af88353fbd Merge branch '4.19'
     add 354627a19d5 UI: fix CreateIsolatedNetworkForm.vue (#9359)
     add a1d8bab43f2 Bump actions/cache to `v4` (#9353)
     add c6d3f6e623e pre-commit: enable Python flake8 rule `E271` (#9358)
     add 806692bceaa pre-commit: enable Python flake8 rule `E272` (#9361)
     add 9f1577d2a8d pre-commit: check more file types for trailing whitespace (#9352)
     add 37c91abd3d4 NPE fix, for test_hostha_kvm_host_fencing (#9355)
     add 5c365fa8202 systemvmtemplate: bump new systemvmtemplate 4.19.1 (#9349)
     add 32cc1d46a5c Copy on pool host when storage pool has ScopeType.HOST (#9356)
     add cea4801be18 Merge remote-tracking branch 'origin/4.19'
     add c923e673cfd pre-commit: add `XML` files to the `trailing-whitespace` check (#9131)
     add 2919cac6432 pre-commit: add `codespell` to check spelling (#8197)
     add 407990650f6 Improvements on information about disk sizes and offerings on VM deployment wizard's InfoCard (#9249)
     add 77cc75ab02a Fix radio buttons in instance migration pop-up (#8836)
     add a87778be9a4 Refactor KubernetesClusterResourceModifierActionWorker (#8801)
     add b9c7275c253 Quota tariff order (#8347)
     add afdf4d7d46c Add limit configuration for number of projects (#9172)
     add c71ab9598e3 test: refactor ActionEventInterceptorTest to prevent failures (#9384)
     add d9f77b841c5 Ignore non-managed pools for storage pool access preparation (#9376)
     add 22ef08154dc Switch back to CLOUD_DB after purging usage records (#9367)
     add 877c4d9a64b LibvirtOvsFetchInterfaceCommandWrapperTest fix (test fails in mac) - skip it if no interfaces with eth and wl (#9382)
     add 7f8f1137099 Merge branch '4.18' into 4.19
     add 50586a94816 UI assorted fixes (#9381)
     add 2cfb541a1d7 saml: purge token after first response and improve setting description (#9377)
     add 6a8494be3be engine-schema,cks: fix finding non removed network vms (#9339)
     add 7db83db3dd9 Fix radio buttons in instance migration pop-up (#8836)
     add 21c98af13de Fix backup offering buttons for instances in data view (#9391)
     add 8a00e25de91 Fix list backups after backup vm is expunged (#9392)
     add a53365d1c7f Merge release branch 4.18 to 4.19
     add 35fd17c62ee Merge branch '4.19'
     add 56c661c1dff Icon changed for control-outlined (#9402)
     add f24fb20e6b3 ui: add new API docs tab (#9409)
     add 9f4c8959743 Updating pom.xml version numbers for release 4.19.1.0
     add 3faf7cd2f15 Updating pom.xml version numbers for release 4.19.2.0-SNAPSHOT
     add e41add31e72 saml: signature check improvements
     add 54c8b71fb54 Merge remote-tracking branch 'apache/4.18' into 4.19
     add d41dc17b2c2 Merge remote-tracking branch 'apache/4.19'
     add dc1556ca383 Change exception when orchestrating VM start (#9062)
     add 817251f1f89 Enhancement in the accuracy of the logs regarding the capacity, usage, and threshold of secondary storages (#9043)
     add 1662af131e7 [4.20] VR: fix issue if userdata is binary data (#8739)
     add 49cd5ba64ad Fix link to removed volumes being shown in info card and list view (#8833)
     add f8385a48da2 Add systemvmtemplate arm64 build support (#9437)
     add f358813e1d1 Merge remote-tracking branch 'origin/4.19' into main
     add 33be0ae745c Fix removal of usage records (#9442)
     add cf0e44dd7ec UI: Display Firewall, LB and Port Forwading rules tab for CKS clusters deployed on isolated networks (#9458)
     add 3d32ab5a491 Merge remote-tracking branch 'origin/4.18' into 4.19
     add 7f4a6861b3a Merge remote-tracking branch 'origin/4.19'
     add cd8442a42b6 test: improve purge expunged resources b/g task testcase (#9426)
     add 7214c13e106 packaging: bundle latest cmk x86 build with deb and rpm packages (#9450)
     add 5baac44139d ui: add UI too to view and download usage records (#8615)
     add 0be87ac6545 Fixup CKS UI for external managed clusters (#9434)
     add d606ee7a07b ui: vm metrics note about behaviour across hypervisors (#9399)
     add f0ba90568d8 api: Fix missing keys in listZonesMetrics response (#9419)
     add 9033ab709e6 Fix snapshot chain being deleted on XenServer (#9447)
     add 2e0024e216d server, api: account and api entity access improvements
     add d541e9014df Merge branch '4.18' into 4.19
     add 6fbdda951ac [4.19] server, api, ui: access improvements and assorted fixes (#22)
     add b73f634ea61 Merge branch '4.19'
     add 47a6b7011d7 Fix build
     add 161d156af1a Support user resource name / displaytext with emoji, unicode chars, and some sql exception msg improvements (#9340)
     add cb0527d7050 ui: rename autoscale instance group to simply autoscaling group (#9487)
     add 150e7e0b16a Fix imports
     add 21f3fde7b40 libvirtstorageadaptor: better handle failed libvirt storagepool destroy (#9390)
     add bf116762788 test: fix component test test_acl_sharednetwork_deployVM-impersonation.py (#9499)
     add cc1dcf51b77 Merge remote-tracking branch 'origin/4.19'
     add b429e843cd1 created VPC message a little less misleading (#9396)
     add cf1428ddcca Fix column from op_dc_ip_address_alloc not being referenced correctly by its ORM class (#8812)
     add c98f1b8b3ca Ensure affinity groups are honored when VMs are deployed in parallel (#9201)
     add 6e6a2766637 add procedures procedure (#9385)
     add 287a47266b0 Merge branch '4.19'
     add 3399abddb0c NSX: add back removed code for NSX (#9435)
     add 01c721fcda5 Improvements to quota tariffs APIs and UI (#9225)
     add 8ca1843efae Allow deletion of system VM templates (#8556)
     add 2ba64f2521a fix removeSecondaryStorageSelector response for docs (#9264)
     add 27f23f4f75a linstor: Improve copyPhysicalDisk performance (#9417)
     add 3d8d4875fe3 Merge release branch 4.18 to 4.19
     add 5bf81cf0023 Merge release branch 4.19 to main
     add f84e04372c9 Fix being able to expunge a VM through destroyVirtualMachine even when role rule does not allow (#8689)
     add 7fb8d77eb84 UI: Improve router listing page (#9551)
     add 296a44e932e Fix main branch issues (#9553)
     add 1ef0833e7a3 UI: Add filter to list encrypted volumes (#9548)
     add 7a9bb835bc7 Fix Template and ISO upload events (#9545)
     add eaab991a44a Merge branch '4.18' into 4.19
     add b1057166aee Merge branch '4.19'
     add f5c7729871a Fix to allow actions on the network if it belongs to a project (#9550)
     add 9b22cd590d2 Download Volume Snapshots (#8878)
     add b215abc30a2 server: do not check affinity groups if no vm group mappings (#9542)
     add 1e12a802104 orchestration,hypervisor: allow custom manufacture, product for vm (#9163)
     add c9f1c5790d1 Fix snapshot scheduling with expired jobs (#8832)
     add bc286656796 Add support for network data in Config Drive (#9329)
     add 1a403f1a9d2 open up extra-config to all users (#9422)
     add 0597def630e test: fix component tests test_acl_isolatednetwork and test_acl_isolatednetwork_delete (#9571)
     add de3537c98a3 Added domain path to all entities (#9540)
     add 22097027410 Fix usage volume size after resizing (#9459)
     add 9148701285f [UI] Add project toggle for buckets (#9589)
     add f5efe56fb53 Merge remote-tracking branch 'apache/4.19'
     add b61c3b81022 add domainpath to WebhookResponse
     add d7ca05e5ba9 Build: drop EL7 support, support JRE17 for packages and sonar check (#8609)
     add d32ace6731d New Feature: Enable/Disable Roles (#9549)
     add ede39d8edc4 Configuration to disable URL validation when registering templates/ISOs (#8751)
     add 70131be8c22 Fix `deleteAccount` API to prevent deletion of the caller (#8743)
     add c05edc40f4c Updated invalid parameter/value to com.cloud.exception.InvalidParameterValueException (#9455)
     add 7692b745e8a Fix NPE when sending copy command to least busy SSVM (#9125)
     add 11497c601fd [VMware] Update data disk controller same as the root disk controller type when it is not set in the VM detail (#9433)
     add 6c0492366c0 [VMware] Disconnect/Detach config drive ISO (if exists) on stop VM (#9468)
     add 674129cd588 Update project account for all the events with project account owner, except for create project event (#9572)
     add 48e745cad28 Add certificate validation to check headers (#9255)
     add 5a496e725b9 Merge remote-tracking branch 'apache/4.19'
     add e6cb7f26ac2 systemvm: have flags to check x86_64 to install specifics for amd64 arch (#9600)
     add 2a1db67eeb6 Improve logs in primary storage removal process (#8649)
     add 12d9c26747d Added support for storpool_qos service  (#8755)
     add b4325eccfb4 Fix userdata append header restrictions (#9575)
     add 0204cb75e37 ui: show guest networks for guest vlans list (#9554)
     add 6e988b8953f Merge remote-tracking branch 'apache/4.19'
     add a5f55602fc3 LOGGER -> logger in CloudInitUserDataProvider.java
     add 8c301b16ff3 fixed incorrect label in vrs and svms (#9617)
     add abaf4b52ad1 Fix VGPU available devices listing (#9573)
     add af607b9c4e7 Merge branch '4.19'
     add 929cfbc3e26 Update to Debian 12 (#9627)
     add 0692a296ce9 engine-orchestration: fix issue for empty product in vm metadata (#9610)
     add f9c4edc66fa SystemVM template changes - updated debian version & other changes (#9625)
     add 628aba618b5 add min details to search view (#9616)
     add 882dea21c1f Update .asf.yaml (#9629)
     add f2a1ee57cac Update en.json (#8958)
     add 24dc3178a39 Testcases Added (#9116)
     add a0e16c55dac updated install-non-oss with vmware v7.0 and v8.0 (#9205)
     add 39152323e3b kvm: Present the UUID of the VM as serial through smbios information (#9236)
     add b78aede2b70 Updated listStoragePools response - added new managed parameter (#9588)
     add 21435590201 server: fix volume migration check for local volume attach on a stopped (#9578)
     add 1ca9a10912d VR: remove vpn user info when apply vpn users list (#9568)
     add 0ba9a292d50 Add validation for secstorage.allowed.internal.sites (#9567)
     add e06f80e8991 storage: fix private templates are not copied to new image store (#9206)
     add 601e9b67ead Fix snapshot deletion on template creation failure (#9239)
     add 537c0a1e8d2 linstor: set/unset allow-two-primaries and protocol on rc level (#9560)
     add a851ee375c1 Merge remote-tracking branch 'origin/4.18' into 4.19
     add 60c9c9adb67 Merge remote-tracking branch 'origin/4.19'
     add f9451fce3a3 Notify users when upgrades are available or restart is required for network or VPC (#7610)
     add bc393923515 Fix PR lint error caused by deps/install-non-oss.sh (#9631)
     add b155e3d2090 Merge remote-tracking branch 'origin/main'
     add 5ff0b999da2 Bump org.apache.commons:commons-compress from 1.21 to 1.26.0 (#8683)
     add 787acfd1725 vmware: Add support for VMware 8.0u2 (8.0.2.x) and 8.0u3 (8.0.3.x) (#9591)
     add 31b0ed0a18c framework/config,server: configkey caching (#9628)
     add 7e085d5e1df framework/db: use HikariCP as default and improvements (#9518)
     add 36d37f70a82 Display associated resource name on storage pools objects (#9449)
     add b7a2b0419cc server: Global setting to allow/disallow users to force stop a vm (#9569)
     add 97c1a86b646 linstor: update java-linstor dependency to 0.5.2 (#9632)
     add dda9ef2dc83 UI: list vms with details=min when attach a volume to vm (#9634)
     add 2245d985986 Merge remote-tracking branch 'origin/4.19'
     add 716ab205ea4 Added update, enable, disable events to the updateStoragePool API (#9543)
     add 6a559f46e3c Go back to default timestamp on logging (#8925)
     add 72d0546d8b0 Shared Network Firewall (Security groups) in Advanced zone without security groups (#9415)
     add 605534b4173 feature: Shared Storage Filesystem as a First Class Feature (#9208)
     add c3f0d14d315 storage/object: Add support for Ceph RGW Object Store (#8389)
     add 85765c3125f backup: simple NAS backup plugin for KVM (#9451)
     add 679ce1a6395 feature: Dynamic and Static Routing (#9470)
     add 0fae0c021f0 propagate sort order through retrieval sequence (#9624)
     add f683d2dd241 Merge remote-tracking branch 'origin/4.19'
     add 52b06962bcd engine/schema: update url links to match new systemvmtemplate names (#9647)
     add 8c8d115a1e1 feature: Support Multi-arch Zones (#9619)
     add 82f113b1e1a ui: refactor config update/reset notification (#9639)
     add b11897cdfa8 Add logs to `LibvirtComputingResource`'s metrics collection process (#8511)
     add f156c4e0a5a Refactor type and range validation in configuration update process (#9107)
     add f8d8a9c7b38 NSX Integration fixes (#8906)
     add 1303a4f323d Feature: Allow adding delete protection for VMs & volumes (#9633)
     add ebaf064d923 Fix root disk resize (don't allow) when service offering has root disk size, only allow through service offering change (#9428)
     add 3f5a77ef580 Linstor: Fix migrate primary storage (#9528)
     add a93f7154a07 fix start VMs through group action (#9652)
     add abfa92928ce merge conflicts 4.19 -> main
     add b068c68bffb merge conflict (in loggers)
     add 501d8c1e091 Add logs to CPVM connection process (#8924)
     add b1f683db6b8 Allow more generic searches of ACLs (#9566)
     add 6ec3c486ddb Enhance the `listAffinityGroups` API by adding the dedicated resources related to an affinity group (#9188)
     add 638c1526d0a Fix the Cloudian Integration SSO Redirect link (#9656)
     add 0655075f51c Feature: Forgot password (#9509)
     add a0932b0f165 Restore listNetworks behavior & clean up the code (#9461)
     add 15e25bc1cef Merge release branch 4.19 to main
     add 68f459b334c CapacityManagementImpl.updateCapacityForHost(..) use VM update time in capacity calculation. (#9662)
     add b19c069ade5 allow domain suffix update in shared networks (#9585)
     add 1d4700a0bdd Provide encryption key for DATA volume type (in addition to ROOT) to copy volume. (#9663)
     add a88967bf617 Minor naming changes in Shared FileSystems 4.20 Feature (#9675)
     add f37afa829dd Fixed listEvents intermittent exception: (#9661)
     add 5f8077824af Implemented the lateral expansion of the area-box in the forms (create/update) of the quota tariff (#9681)
     add aa6447636eb Fix toc generation for api docs (#9655)
     add a506bf1f2e6 refactor schema-41910to42000.sql (#9680)
     add 1d37ff23ac1 pre-commit run --all-files; fix end of file with ui/src/style/objects/form.scss (#9696)
     add 7d95952bc1a Enable Backup and Recovery for Shared Filesystems (#9676)
     add 94a47ac7783 VR: fix password server exception when no password is found (#9699)
     add a8ab47bb278 CPVM: move focus on input area after clearing clipboard (#9669)
     add a385ff1a214 UI: Fix VPC network offerings listing on VPC tier creation (#9557)
     add cfbdeba17c7 refactor: cloud-sysvmadm script (#9200)
     add 2e9986c6a63 list by displayname instead of name (#8503)
     add 89482a25830 Merge release branch 4.18 to 4.19
     add e16a9715111 Fix resource count discrepancy while associating IP address to a network or vpc (#9563)
     add 50d7ebf5cf5 UI: enable project menu on mobile (#9700)
     add 7f2ab635e97 lb: fix haproxy cannot start if algorithm is not lowercase (#9698)
     add 075f9811c4b [VMware] Make disk controller selection on volume attachment consistent with VM creation and start (#9636)
     add 41e7a2a6897 Merge release branch 4.19 to main
     add 477beaffbf9 merge conflicts (in loggers)
     add a303c7c91ae Fix build errors (#9714)
     add ee1cd91e988 fixed an issue where requests to the api createDomain were being sent with the field networkdomain as an empty string whenever the user typed something in the form and cleared it causing an exception (#9637)
     add 9ce7ef49cf9 build/packaging: build tungsten plugin only if noredist is passed (#9006)
     add 0a93dcec742 ui: load project list with minimum details (#9711)
     add 9df783ca4be Filter out networks without access while getting networks with SG with free IPs (#9596)
     add 727b3b0d5b2 Removed deprecated instruction MAINTAINER (#8846)
     add d15a0744251 Revert "list by displayname instead of name (#8503)" (#9720)
     add 00bb9ecc0bd Merge branch '4.18' into 4.19
     add 2398b5c8c99 server: apply network ACL even if there is no network ACLs in the ACL list (#9374)
     add 21d107c3499 Merge branch '4.19'
     add 4ce86711f96 PowerFlex on demand disable config key (#9664)
     add 53aa92199b2 server: fix nfs version option during mount (#9559)
     add bb820f799b0 CKS: fix creation on shared network if HA is enabled (#8588)
     add cb4713fabeb Merge release branch 4.18 to 4.19
     add bf2cedea79c Merge branch 4.19 to main
     add 04c428cb2f7 CKS: add ConfigDrive to cloud-init datasource_list in systemvm template (#7650)
     add c1594714343 Shutdown expunged resources cleanup executor properly, and allow other components to configure/start/stop on error (#9723)
     add 67ce326a8e5 Fix ISO url in test_usage.py (#9739)
     add 2fa17617ba6 Merge release branch 4.19 to main
     add 046870ef764 debian12: update debian/control (#9738)
     add 00fe5f14719 cleanup validations for VPN connection creation (#9195)
     add 28f425a9f97 Hide UserData field from the EditVM view for VMs that do not offer it (#9731)
     add 2e4dd69fa17 API: Fix listing Userdata by keyword or name (#9751)
     add e666dca403d linked clone for file based storage (#8911)
     add ee0ab2ac9e4 Session Token Invalidation on Logout
     add 7d70e32378f fix quota resource access validation
     add 066d5bcbff1 Validate QCOW2 on upload and register
     add 5ab0a52d662 util: check JSESSIONID in cookies if user is passed
     add 0602f46d82b Fix Vue devServer after CSRF fix
     add dbfc7f23a7f Merge branch '4.19'
     add 554ea220f01 Fix merge errors
     add 017cf2c367f Filter list VMs by IP address (#9547)
     add bcc81799eaa Merge remote-tracking branch 'apache/4.19' into main
     add c0add074acc Fix `updateTemplatePermission` when the UI is set to a language other than English (#9766)
     add 843c1950e7c Fix Listing backup schedules (#9749)
     add f10d9fecbe8 fix forward-merge errors
     add 96610603caf UI: fix unit tests (#9798)
     add 44597724f58 make saml auth request option `forceauthn` configurable (#9756)
     add 46201ee0437 Merge remote-tracking branch 'origin/4.19'
     add 627784eaf62 packaging: add libvirt-daemon-driver-storage-rbd as cloudstack-agent dependency (#9799)
     add 7fbd0a9fb4d linstor: enable discard for Linstor storage pools (#9770)
     add 20901c74430 Merge remote-tracking branch 'origin/4.19'
     add 019f2c60ceb server: fix vm_stats records are not removed if batchsize is 0 (#9818)
     add be247334a7f StorPool: fix of delete snapshot (#9855)
     add 175eed294c8 Fix primary storage update form not showing existing values (#9809)
     add a6cef7a78dd linstor/kvm: Workaround a qemu bug and IDE bus discard enabled. (#9859)
     add 8af08ddafbc Merge branch '4.19'
     add 006db90f75b kvm: fix ovs network creation issue (#9869)
     add 9ae5b6a999b utils: fix invalid JSESSIONID cookie in https setup (#9856)
     add a6e9aec769f Fix Kubernetes cluster listing when user is unable to scale (#9867)
     add 22c6f08f77b engine-storage: Set SecretConsumerDetail for VM live migration with storage on shared NFS (#9222)
     add 4f5561937cb framework/cluster: improve cluster service and integration API service
     add ef5b5bbd4e5 Updating pom.xml version numbers for release 4.18.2.1
     add f0faa4a6b30 saml: signature check improvements
     add 22baf2494d6 Updating pom.xml version numbers for release 4.18.2.2
     add e7dce2bcce5 server, api: account and api entity access improvements
     add b458e5b9974 Merge pull request #19 from shapeblue/fix-userkeys-cve
     add be191f5ad79 Updating pom.xml version numbers for release 4.18.2.3
     add 24d12f13277 Session Token Invalidation on Logout
     add b97bd3bee14 fix quota resource access validation
     add 1861e78361e Validate QCOW2 on upload and register
     add 124d6b8b816 util: check JSESSIONID in cookies if user is passed
     add 8830d3aea16 Fix Vue devServer after CSRF fix
     add 54b3519df12 Updating pom.xml version numbers for release 4.18.2.4
     add 1af41585b75 Merge tag '4.18.2.4' into 4.18
     add 371e244375b linstor: fix live migrate on non-hyperconverged setups (#9832)
     add 896b8bfabf1 VR: fix wrong check when compare two configuration files (#9822)
     add 5b7c86aa452 Merge remote-tracking branch 'origin/4.18' into 4.19
     add f7b7339bcfb Merge branch '4.19'
     add 8608f28842b Fix ctrl-enter on vm start dialog (#9743)
     add 03bdf118462 server: Fix listServiceOfferings regression (#9894)
     add adbf3709095 Revert "storage: fix private templates are not copied to new image store (#9206)" (#9839)
     add dfe4a67859c kvm: ref-count secondary storage pool usage (#9498)
     add b38ee63c48a Merge branch '4.19'
     add b75742da431 enum name changed for logger update reverted (#9922)
     add 966b75d0b98  Verify QCOW2 features on direct download of template
     add 84538da27c0 Updating pom.xml version numbers for release 4.18.2.5
     add 6ef2eaca14e Merge tag '4.18.2.5' into 4.18
     add 24c28ad4602 Merge branch '4.18' into 4.19
     add a2690e98644 imports
     add a82a2429f49 Merge branch '4.19'
     add 8a2c0f3f732 UI: Improve filtering of VM and template settings (#9683)
     add 2fe3fcef7c7 Updating pom.xml version numbers for release 4.20.0.0
     add c63c7ee63e5 Updating pom.xml version numbers for release 4.20.1.0-SNAPSHOT
     add d9774a8462b Updating pom.xml version numbers for release 4.21.0.0-SNAPSHOT
     add 26095e28ded Add support for telugu language (#9956)
     add 528fca2f179 Added-cpu-core-and-memory-range-fot-type-offers-CustomConstrained (#9930)
     add db2e89a3a2c UI: make a newly added Network the default one (#9708)
     add 546ef31aedb UI: Add UI support for `forvpc` and `guestiptype` parameters of the `listNetworkOfferings` API (#9947)
     add ef6c0c443d6 Prepend VPC name to VPC network tier name (#9780)
     add a2d5aa997fc displaying info of the labels from form CreateSSHKeyPair (#9970)
     add dc0ebe985c4 Remove info about the environment from exception when revert VM snapshot (#9944)
     add 2c412f8947c Adjust misformatted logs (#9889)
     add 5886780240b Change vmsnapshot.max config to be dynamic (#9883)
     add 8f63660424a pom.xml: revert systemvm template version to 4.20.0.0 (#10004)
     add 22a66044918 Routed mode: minor improvements and fixes (#9697)
     add 34056d956ca Improvement: management server peer states (#9885)
     add 8a1da3804c0 Resize volume: add pool capacity disablethreshold for resize and allow volume auto migration (#9761)
     add 58138f2da30 fix: remove double <form> element from 2FA form (#9851)
     add d17de834a57 Disable API Key Access for users, accounts and domains (#9741)
     add f3a474bb9ef UI: make a newly added Network the default one (#9708) (#10022)
     add 52e7b41a54e Add support for functionality in hypervisor class (#9736)
     add da94ae2c1c5 Merge remote-tracking branch 'apache/4.20'
     add c56fc7f81c7 fix section divider display on auth page (#9966)
     add a73841a693c get expunged VM data for job result (#9949)
     add d54b105a037 Linstor: add support for ISO block devices and direct download (#9792)
     add 37eec061669 Allow VMWare import via another host (#9787)
     add a8cb7abca36 Add new column `last_id` to the table volumes (#9759)
     add 4189bac8e0d enable to create VPC portfowarding rules with source cidr (#7081)
     add b6937b6a51a UI: Allow accounts of the `User` type to add other accounts or users to projects through UI (#9927)
     add 7cfeab1a6b1 UI: Tooltip on the host information card to display the CPU speed in MHz and the memory value in MB (to 3 decimal places) (#9971)
     add da542345855 Merge branch '4.19' into 4.20.merge
     add 9b6f9b5f7d8 Merge release branch 4.20 to main
     add 4ac4d9cf29a API to validate Quota activation rule (#9605)
     add 666efc4b974 Simplify validation for creating volume templates via UI (#9828)
     add b3dc402aa8f engine/schema: move SQLs to 4.20.0 to 4.20.1 upgrade (#10018)
     add ef1a58d8370 Remove user from project before deletion (#10008)
     add a2ea719bced cloudstack-migrate-databases: sql AND added (#10033)
     add 52584d93dc7 Prevent password updates for SAML and LDAP users (#9999)
     add 5ee61c226a3 Merge branch '4.19' into 4.20
     add 9960e400309 UI: Fix userdata and load balancer selection (#10016)
     add 205ebfb8b5d Merge release branch 4.20 to main
     add 762d5493ddc move sql code to the right file (#10035)
     add 8b9db0869f3 Merge release branch 4.19 to 4.20
     add 97f9e8e8163 Merge release branch 4.20 to main
     add 0eb94a13962 move upgrade code to the right file (#10036)
     add 27d2de180ff Merge release branch 4.20 to main
     add 4c801e24f44 Fix Create dropdown menu not changing language (#10023)
     add 810c4108c7b engine/schema: Add access modifier to `VolumeVO` (#9394)
     add cb530c1749d Merge remote-tracking branch 'origin/4.20'
     add 47f60190a92 .github: fix test_certauthority_root in 4.19 (#10037)
     add 971a5b25ec3 Remove SNI option that is correct as default in _run.sh (#10028)
     add 9231c1c6ba9 Merge remote-tracking branch 'origin/4.19' into 4.20
     add c94d0abab49 Merge remote-tracking branch 'origin/4.20'
     add f75a194c095 Persist IP addresses related to VM access via CPVM (#9534)
     add 91ab67c9522 Add logs to VMware instance configuration process (#9080)
     add 54bc1501402 fix typo in SnapshotManager.java (#10104)
     add 73c3339bf15 List users by their authentication source (#10115)
     add e57a82a4f52 UI: Fixes in the Usage UI (#10000)
     add 48767611546 ui: Allow font-awesome icon usage and optimise icon size inconsistency (#9744)
     add f9b176744e6 SAML2: add cookie with HttpOnly too #10013 (#10047)
     add 38c7c6e9865 UI: remove duplicated Instance Name in Public IP details page (#10087)
     add 14460f49e15 Merge remote-tracking branch 'apache/4.19' into 4.20
     add ac19379c967 UI: create VPC network offering with conserve mode (#10082)
     add a278849507f server: fix typo removeaccessvpn in VirtualRouterElement (#10086)
     add 8639ba8b013 server: simplify role change validation (#9173)
     add a2f2e87c120 linstor: improve heartbeat check with also asking linstor (#10105)
     add b4ad04badfb Allow config drive deletion of migrated VM, on host maintenance (#10045)
     add a9587bfd2e3 kvm-storage: provide isVMMigrate information to storage plugins (#10093)
     add 0944fa1c9cf set ulimit for server according to redhat spec (#10040)
     add 188eacd9eb1 Certificate and VM hostname validation improvements (#10051)
     add ed1b145a3a0 VR: apply iptables rules when add/remove static routes (#10064)
     add b7f0aac5194 Merge branch '4.19' into 4.20
     add 9295a1624df Merge release branch 4.20 to main
     add b1ba9bf626d text in echo change in git-pr
     add ee893d12027 Clean up Python code; Python `2` to `3` (#8993)
     add cbac6cc05bd Add ownership selection to VPC form (#10124)
     add 0b2952ca43f Merge release branch 4.20 to main
     add 631bba279b1 README: it's that time of the year! (#10125)
     add 6a2c7b02201 pre-commit: enable markdownlint rule `MD012` (#9364)
     add b48de4e0234 pre-commit: enable `markdownlint` rule `MD018` (#9134)
     add 330ed25a6c1 Support to enable/disable VM High Availability manager and related alerts (#10118)
     add 32af4a25d01 Update ownership selection component to be language independent (#10052)
     add 75eda38b6b8 UI: fix cannot open 'Edit tags' modal for static routes (#10065)
     add 5c01cff3043 VR: fix site-2-site VPN if split connections is enabled (#10067)
     add 41c27e116c6 Merge release branch 4.19 to 4.20
     add 2daffa34f22 Merge release branch 4.20 to main
     add 57867dc6b03 pre-commit: add hook `check-yaml` (#9133)
     add 0b66f5a86a7 pre-commit: remove trailing-whitespace from more file types (#10131)
     add 0128046429f pre-commit update markdownlint; enable rules MD009,MD019; fix license header (#10145)
     add fd24509ba7e pre-commit: fix `.cs` files with the `trailing-whitespace` hook (#9794)
     add 2b070880c10 pre-commit check `.cfg` files with the trailing whitespace hook (#10151)
     add 0f3ea8ceb2e Add pre-commit hook `fix-byte-order-marker` (#10147)
     add 5bae1188ff6 pre-commit fix mixed line endings in XML files (#10148)
     add 3d0b4fca847 UI: Add cluster arch type to the zone creation wizard (#10080)
     add d8c321d57ae check tags while fetching storage pool for importing vm (#9764)
     add 79316450d19 Merge release branch 4.19 to 4.20
     add cfafcaeb01b log name change after merge forward
     add 30b2588c062 Merge release branch 4.20 to main
     add d1cf45365a6 Revert "pre-commit: add hook `check-yaml` (#9133)" (#10161)
     add a4224e58ccf Improve logging to include more identifiable information (#9873)
     add 9bc283e5c26 Introducing granular command timeouts global setting (#9659)
     add bd488c4bba0 server, plugin: enhance storage stats for IOPS (#10034)
     add 21416cd4034 Restrict the migration of volumes attached to VMs in Starting state (#9725)
     add 4f9c3492ec9 Merge release branch 4.19 to 4.20
     add ab76d3c9ccb merge errors fixed
     add fadb39ece73 Merge release branch 4.20 to main
     add afc95f1ccc5 CheckOnHostCommand: add missing timeout setting (#9677)
     add 7adc7329922 upgrade: consider multiple hypervisors and secondary storages (#10046)
     add fce77733a5d no retrieval of null hosts (#10175)
     add 35fe19f096d systemvm: fix keystore is reset when patch a systemvm (#9900)
     add e2cfddb1b6a Merge branch '4.19' into 4.20
     add bd874eaa44e Merge release branch 4.20 to main
     add baad8ddc914 network: Add BGP+EVPN+VXLAN script to main repository and Agent package (#9778)
     add d9a7b6e511b Rollback of changes with errors during the VM assign (#7061)
     add cf5bd803110 consider a valid ipv4 address as a validish ipv4 /32 cidr (#10174)
     add e278bcd08ac [VMware] Consider CD/DVD drive when calculating next free unit number for volume attachment over IDE controller (#9644)
     add bf1ff10a906 Merge branch '4.19' into 4.20
     add 0c13ded943c Merge release branch 4.20 to main
     add 449d3c7cb1d Create API to list Quota credits (#9590)
     add 0ed6895db4f feature and bug templates (#10186)
     add 2300c1caa3a Add project-user association normalization script to 4.20.1 upgrade (#10116)
     add 796bd4f72cc Clean up network permissions on account deletion (#10176)
     add 9967bb3fe89 fix slider component for global settings of the range type (#10187)
     add 9f594c96991 Merge branch '4.19' into 4.20
     add a163831b7e8 Maintenance mode: Add host to deployment planner avoid list to fix local storage vm migration (#9892)
     add ecd60a4e461 Merge release branch 4.20 to main
     add 1c626c884c6 Update bug.yml
     add c5e8f63452a Fix NPE issues during host rolling maintenance, due to host tags and custom constrained/unconstrained service offering (#9844)
     add 00c659b7a76 api: fix access for listSystemVmUsageHistory (#10032)
     add 0b8076c38cf Configure org.eclipse.jetty.server.Request.maxFormKeys from server.properties and increase the default value (#10214)
     add 70776b067a4 fix listing of VMs by network (#10204)
     add 1ff68cf9b10 linstor: Fix ZFS snapshot backup (#10219)
     add 5167c3b613f Merge branch '4.19' into 4.20
     add 81e052cfebf Merge release branch 4.20 to main
     add 96b757c35bc packaging: have noarch defined for rpms (#10057)
     add 7e295ec4e19 [KVM] Add watchdog model none to disable use of watchdogs on KVM agent (#10203)
     add 91f1adab862 UI: set redundant state as N/A for non-redundant routers (#10227)
     add d053bb97ecf Fix to allow actions on the network if it belongs to a project (#9550)
     add b186272f687 kvm: add SCSI controllers based on the number of virtio-SCSI disks (#9823)
     add 09f154796a2 server: Fix host CPU number (#10218)
     add 1e59f5cd0cd ui: fix passing vlan while creating vpc tier (#10239)
     add 20759187b31 Fix local storage deletion cases (#10231)
     add 4d9fd1b73fa Added displaynetwork option in filters for listnetwork only for admin (#10209)
     add c9fea62276c [UI] Switch between allocated and used capacity on dashboard (#10215)
     add 2aa2e92dff4 Handle special characters when exporting ACLs (#10259)
     add 4787885fc09 cks: prevent npe on cluster listing with removed offering (#10075)
     add 0a77eb7f85f deal with NPE during host reconnect (#10158)
     add 34d2a3bc86d Merge branch '4.19' into 4.20
     add 98f56639541 Merge branch '4.20'
     add 789e2699406 Add lucas-a-martins as a project collaborator (#10283)
     add 33a37da9ec7 server: investigate pending HA work when executing in new MS session (#10167)
     add f652ad0d98c extra null guard (#10264)
     add 717ce981d4d Merge release branch 4.19 to 4.20
     add 048649d3515 Merge release branch 4.20 to main
     add 3b108b968f0 Support for Management Server Maintenance Mode (#9854)
     add 398ffc3b2c7 Add preset variable account created (#10200)
     add 5df15a7aa62 KVM/s390x Support:  Add support for KVM on s390x architecture (#10038)
     add 4cf6fc95f22 Revert Holiday season Apache logo (#10302)
     add 4201a2dc11b Fix Usage job not executing successfully (#10244)
     add 1c84ce4e23e server: fix attach uploaded volume (#10267)
     add 6f03f9e726e validate inserted values in numeric global settings (#10279)
     add 3313cc58295 ui: fix loading for hypervisor filter in serachview (#10292)
     add ee0dc5b2d64 list hosts API fix, when any stale entries exists on storage_pool_host_ref for the removed pools (#9852)
     add 0f544c9a3b0 api/ui: add specifyvlan to network response (#10236)
     add b9890875cc1 CKS: use --delete-emptydir-data instead of deprecated --delete-local-data (#10234)
     add b93589b5bdf server: reset 2fa user configuration on incomplete setup (#10247)
     add d9af9bdb36e fix SQL syntax erros and target 419 (#10273)
     add c70e4e29be4 fix npe on account creation (#10274)
     add 0fbf6379f98 UI: Fix domain view when opening details for a specific domainid (#10245)
     add bbe9c905926 packaging: support both mysql and mariadb on EL8/EL9 (#9941)
     add 641a60670e1 changed the kubernetestool url (#10295)
     add a335feab6a3 fix allocation of vmfs storage pools (#10201)
     add 97be6f2e5d1 ui: fix column filter for templates, isos (#10288)
     add ae2ffbe40bf Merge remote-tracking branch 'apache/4.19' into 4.20
     add 7abda3b9639 Merge remote-tracking branch 'apache/4.20'
     add 0b5a5e8043d api,agent,server,engine-schema: scalability improvements (#9840)
     add fbb1ff78d63 Static Routes: fix check on wrong global configuration (#10066)
     add 5447950f095 Allow creation of Shared Networks without IP range if network offering has no services - specifyvlan = true (#10168)
     add 27efc779eac api,ui: fix empty source cidr value for firewall rule (#10208)
     add 0d5047b8b73 Improve listing of HA and non-HA hosts when ha.tag setting is defined and hosts have multiple tags along with ha tag (#10240)
     add 085bd3bda5f Merge branch '4.19' into 4.20
     add 2654890e868 Merge branch '4.20'
     add cd81398cb71 removing inactive collaborators from .asf.yaml (#10298)
     add 22c71928dd2 Change debian packages maintainer (#10321)
     add 986ec81b664 Add direct download option to Users GUI (#10193)
     add 2ef16132ee9 Merge remote-tracking branch 'origin/4.20'
     add 648170cf9bb Fix lint error coming up in main (#10342)
     add a7beaaf73b8 Add Resource Limits to Backups and Object Storage (#10017)
     add 0a92cc03496 UI: Add VM state to Volume list view (#10341)
     add c5afee21018 UI improvements  (#9773)
     add 50a54dde5cc Make Description as optional in network acl list (#10343)
     add 5aa79a6e05d UI: Add offer ha column to system offerings table (#10297)
     add 60af31c9c0b Decrypt zone, cluster, storage details for configuration values (#10237)
     add fa5c11e6b2e UI: list backup offerings by zoneid when assign vm to backup offering (#10217)
     add c1bc57b844b List default network offerings when multiple physical networks for guest traffic type exists (#10222)
     add 238d0c5e30a Fix NPE while checking for user data provider (#10255)
     add 37c29f82eda server: fix snapshot physical size (#10216)
     add 1b2f6c99985 Hide register template, create/upload volume and create vpc buttons when zone is not created. (#10243)
     add 55e8eaab89c Linstor: encryption support (#10126)
     add 90c960eeed9 VPC VR: fix ACL between tier and private gateway (#10268)
     add df99a294832 linstor: Fix using multiple primary storage with same linstor-controller (#10280)
     add 802bf5fce7c Revert "server: fix attach uploaded volume (#10267)" (#10323)
     add a627ab67c29 server: fix pod retrieval during volume attach (#10324)
     add c09720a19a4 systemvm-registration: update seeded template_store_ref sizes (#10317)
     add 3337f425ffd Primera pure patches & various small fixes (#10132)
     add a1117acbdfb List only untagged offerings for Shared networks when tag isn't passed (#10320)
     add 58a63f64fd6 Fix VMWare leftovers when deleting VM without root disk (#9735)
     add d453c63848f cleanup VM IP after expunge in redundant VPC (#10183)
     add d920aba176c server: fix scale vm with same disk offering id (#10235)
     add d3170bfa165 UI: Fixup missing buttons (#10357)
     add 4f604c00b65 Support virtio-blk root disk controller (#10229)
     add aa6c581e405 Add the option to filter by host when retrieving of unregistered VMs (#9925)
     add ae1d7cc8609 Fix private gateway acl on static routes (#10262)
     add 4f3e8e8c5a6 Merge branch '4.19' into 4.20
     add 0dcb8da03a2 Merge branch '4.20'
     add f8563b86e7d Fix NPE during kubernetes cluster creation when network has rules with ports saved as null on DB (#9223)
     add 2a4a1f73d04 Support multi-scope configuration settings (#10300)
     add a093f00ab52 Add IOPS and bytes preset variables to `VOLUME` usage type (#10326)
     add 617fee84165 Add `offerHa` and `forceHa` preset variables to `RUNNING_VM` usage type (#9500)
     add 864751d5f99 Fix ordering of secondary storages with the algorithm `firstfitleastconsumed` (#8557)
     add a8b18a53942 Add nicoschmdt as a project collaborator (#10422)
     add 59e054396a8 UI: Fix all list items appearing twice in search view (#10365)
     add 8c4a085a16d Validate the direct downloaded template file format (QCOW2) if the template file exists (#10332)
     add 42a77c76461 LinstorStorageAdaptor: fix lint error (#10378)
     add 8e1f5b1e49b Fill fields in login, forgotPassword and resetPassword from url (#10291)
     add 07564b7933e Enable multiple services on configdrive network service provider (#10372)
     add 69285a62c94 UI: Fix selection of domain filters in the `SearchView` component (#10386)
     add 5204960bac8 made id parameter required (#10338)
     add 789f94b664a VR: fix duplicated lines in .htaccess (#10254)
     add c121d5bb6db usage: use runtime scope when running maven usage profile (#10331)
     add 6a3314c40b9 Fixup alerting and logging error in BGPServiceImpl (#10252)
     add 21b5e4dcae5 Veeam: set backed_volumes for each backup (#9898)
     add c0e05c4a6d7 Fix Usage inconsistencies (#9888)
     add ee32f4cfe8c Add cpu speed detection methods (#9762)
     add 4b432c82ca0 List only those hosts matching source host arch in multi-arch zones (#10369)
     add c80b8860e49 Fix hostId verification on unsuccessful expunge operation (#10418)
     add 7bef25666fd UI: Fix Apache CloudStack description on the onboarding page (#10373)
     add 212f2a3898c UI: Fix `docHelp` links for Add Hosts, Add Clusters, Disable Clusters and Enable Clusters forms (#10394)
     add b6cebe22f9e Fixed VMware import issue - check and update pools in the order of the disks (do not update by position) (#10409)
     add b9ebc7b721b VMware Import - Support external VMs in any folders/subfolders other than the root folder ('vm') of datacenter (#10411)
     add 66f8a351dd5 migrate Vmware to KVM ui issues (#10413)
     add e196275d5a6 ipmi: extra log sanitation (#10428)
     add 08ad1c70ba3 Merge branch '4.19' into 4.20
     add 24b7c662519 Merge branch '4.20'
     add 48f890a6931 resolve merge problems in the backup framework (#10457)
     add e8ac477e9f8 engine/orchestration: fix missing vm powerstate update vm state (#10407)
     add 37c4df9ada1 fix: enforce the cpu shares within allowed range (#10221)
     add 4e321d43565 Updating pom.xml version numbers for release 4.19.2.0
     add 4a3686297dc Updating pom.xml version numbers for release 4.19.3.0-SNAPSHOT
     add 5526ef0168c spurious versions
     add 91db905659d Merge commit '5526ef0168c' into 4.20
     add 1f092667641 UI: Fix filtering of templates by account (#10425)
     add a09c579b5b2 UI: Fixes and minor enhacements to the Public IP Addresses section (#10351)
     add f992ebb52a5 fix volume migration across cluster-scope pools (#10266)
     add 88916dcf2bb Merge branch '4.19' into 4.20
     add 3a28a87483e Merge branch '4.20' of https://github.com/apache/cloudstack
     add 2d00933d65e systemvmtemplate: bump version Debian 12.9.0 and ACS 4.20.1 (#10462)
     add 69cf299c62a Merge remote-tracking branch 'origin/4.20'
     add eab37eca437 Change L2 network offering form to not require a compute offering (#10389)
     add bdae23ed536 Fix listing disk offerings for newly created VMs that haven't yet been started (#10476)
     add 9b8c862f9f6 removing the usage of volumeFreeze StorPool API call (#8575)
     add b92fd17ef15 UI: Add change host password (#10337)
     add 3aabedd4473 UI: Proper explanation for the global setting to avoid ambiguity (#10042)
     add f0179855f54 add use of virsh domifaddr to get VM external DHCP IP (#10376)
     add f50de8981af cloudstack-setup-databases: fix mode and group of key file (#10466)
     add 217e5344461 linstor: improve integration-tests (#10439)
     add a9fbc6b0563 UI: Filter accounts by domain while creating templates - from Volume / Snapshot (#10455)
     add a89607da659 UI: List host OOBM details when enabled and configured (#10472)
     add b41acf28d4c UI: Show Host OOBM parameter in form if configured (#10484)
     add 48ed5e24175 Merge branch '4.19' into 4.20
     add 5cbe3da703c Remove isMirrored hardcoded parameter value from execution of createDiskOffering API through UI (#10474)
     add a6b1403ca6c Merge branch '4.20' of https://github.com/apache/cloudstack into 4.20
     add 7f4e6a9d51d NAS B&R Plugin enhancements (#9666)
     add 80b5d5c0298 ui: do not cache config.json and locale files (#10497)
     add a841ed949fc Refactor alert email generation method (#8831)
     add cdf19b552ca lint: fix test_linstor_volumes.py (#10502)
     add 35a7438033a test: fix failure in test_06_purge_expunged_vm_background_task (#10501)
     add 1c1dad977e5 Merge remote-tracking branch 'apache/4.20'
     add d94aaa8b597 Add Cloudian HyperStore Object Storage (#9748)
     add 8b092951cbd prometheus: don't poll the same tag multiple times (#10450)
     add b8359e8f62e UI: Allow custom footer in password reset page (#10461)
     add 1f0ffee8583 VPC: fix private mtu of vpc tier (#10257)
     add cd6d1a23a2b KVM: return null state instead of Disconnected when investigate a host without NFS (#10515)
     add 8ce34ad791e kvm: find cluster-wide pools only in Up state when investigate a host (#10516)
     add 0427abf855f Merge branch '4.19' of https://github.com/apache/cloudstack into 4.20
     add b387bc1664c Merge branch '4.20' of https://github.com/apache/cloudstack
     add 54c1f92efd2 Fix Stats Collector to not divide by zero (#10492)
     add 95c24810ab4 linstor: try to delete -rst resource before snapshot backup (#10443)
     add f8adedc2802 Merge release branch 4.19 to 4.20
     add 9c6f2a9e14c Merge release branch 4.20 to main
     add 35e809e7ce4 Set external Id to null after backupProvider.removeVMFromBackup (#10562)
     add e091aad792b Merge branch '4.19' of https://github.com/apache/cloudstack into 4.20
     add 1732f676db8 Merge branch '4.20' of https://github.com/apache/cloudstack
     add 02d0dca24b2 List only VMs associated to a userdata (#10569)
     add 704d7a97879 Merge branch '4.19' of https://github.com/apache/cloudstack into 4.20
     add ea36568e47b Merge branch '4.20' of https://github.com/apache/cloudstack
     add 9dceae46148 MS maintenance improvements (#10417)
     add e6b2df2e0ff [Infra] reset collaborators
     add a521985662a [Infra] reset collaborators list
     add 9a3fa89e323 remove trailing white space
     add 8a338ea12c3 In Install.md->CloudStack UI Commands(npm) (#10593)
     add 7f3f1042959 add UI support for filtering ISOs by account (#10488)
     add f47bd61279c framework/cluster: fix NPE for ms-host status when mgr stops (#10500)
     add 33cdddfcd1b Fix to propagate updated management servers list and lb algorithm in host and indirect.agent.lb.algorithm settings resp, to systemvm agents (#10524)
     add 653b9738400 Update ubuntu image link for template download (#10559)
     add 8df1161f14e framework-config: improve configkey caching (#10513)
     add 16b7b71e36e Fix secondary storage selectors feature (#10546)
     add 6b4adbb20a3 Preview-Experimental Support EL10 as Management Server and KVM host (#10496)
     add 0b7aef7a0f7 enhancement: iterate directly on HostJoinVO (#10613)
     add 89e6b1f8ea0 server: fix npe during start vr edge case (#10366)
     add 7978141464c api: fix EntityReference in NetworkResponse.java (#10563)
     add f4a7c8ab89a linstor: implement missing deleteDatastore (#10561)
     add 6c40a7bebbc deal with null return for create deployment plan for maintenance (#10518)
     add c1ff799df23 ui: fix considerlasthost for start vm (#10602)
     add c9c02d030e5 UI: fix list of vpc network offerings (#10595)
     add fc1f260d529 Host status auto refresh (#10606)
     add 6f334eb1874 Update test_linstor_volumes.py for spello
     add 3afab9a7032 Updated setup-sysvm-tmplt script, to run cmds accessing destdir with sudo (#10263)
     add 5f93ce71bb9 Merge branch '4.19' into 4.20
     add 8af021c6f63 Merge branch '4.20'
     add 8d18c1e7887 Change resource settings tab to be type based (#10596)
     add 5e8238c3820 noop Update of .asf.yaml
     add 99b6f45a87b Update .asf.yaml
     add 2dfe6a63337 Update .asf.yaml
     add cb4848bc1a6 Add support to RBD erasure code pools (#9808)
     add ba835541abe Update .asf.yaml
     add 806737068bb Update .asf.yaml
     add 0934fb1b53e docs: fix grammar and spelling in CONTRIBUTING.md (#10642)
     add fd3d605dd1b Add sudo87 as collaborator (#10654)
     add f206137f833 docs: fixes grammar and spelling in Markdown files only (#10656)
     add f275c28838d test(python): fix code comment typo; Valiate -> Validate (#10536)
     add bc5728a7ff0 systemvm: Bump systemvm template version to debian 12.10 (#10628)
     add ee94ae575b7 Enhance VPC Network Tier form to auto-populate  Gateway, and Netmask (#10617)
     add d5ba39387b6 fix projects metrics on dashboard (#10651)
     add e08f88f0ae6 define the limit of projects through the UI (#10652)
     add 5d5ac17c685 xenserver: do not destroy halted hypervisor vm (#9175)
     add 6850147c9e8 Merge branch '4.19' into 4.20
     add 4c31f9d533e Merge release branch 4.20 to main
     add d1df418c3c9 UI: Restore AS Numbers and IPv4 Subnets menus (#10580)
     add d32065fd38a backport #10500 framework/cluster: fix NPE for ms-host status when mgr stops (#10653)
     add 4ac8861f5ee Merge branch '4.19' of https://github.com/apache/cloudstack into 4.20
     add 4d572fa6d38 Merge branch '4.20' of https://github.com/apache/cloudstack
     add b2b2218a8ab Launch RESIZE event on volume snapshot revert (#10482)
     add 41e881ea01c added: rosi as a contributor (#10724)
     add 55c811547a8 Update Mockito to 5.16.1 (#10686)
     add 53700809ed3 fix conflict - logger
     add dd1c32cd262 undo removal of accessLogger and deal with some warnings (#10567)
     add 53001417a04 UI: Fix column name in Usage view (#10700)
     add 6de084ca976 Add download link of volumes, templates and ISOs to the download event details (#10564)
     add ac6b1b382cf Migrate public templates that have URLs on data migration across secondary storages (#10364)
     add 40d549b0752 backport 10273 (#10702)
     add a09354ddf5f Fix volume migration failure response (#10707)
     add 207a2c1da35 Support ConfigDrive with VPC (#10495)
     add 99ea77dc839 Usage server: remove logging of prameters including secret keys (#10649)
     add f13cf597a2e 4.19 fix saml account selector (#10311)
     add 53d3d19606b server: check startip and endip of shared network (#10704)
     add 8db248e4b40 UI: Move templates creation date to the Zones tab (#10709)
     add 7b68615bd97 HA: set correct hostId of HA work for vm migration (#10591)
     add 8c9216d11b6 only clean details and annotations when this tamplate no longer exists on any zone (#10728)
     add d7765343efe Merge branch '4.19' into 4.20
     add 3c75d9363b7 Merge branch '4.20'
     add aa4718a3010 Fix merge error: use new method of getting scoped vars (#10751)
     add 199170be433 utils: fix extra slash in Redfish default systems url path (#10630)
     add 190f8b8ab57 Merge release branch 4.20 to main
     add 29e58e906f9 plugin/shutdown: use mgmt server uuid in the shutdown response (#10717)
     add 2771586b87f Merge release branch 4.19 to 4.20
     add 55ca1145251 Merge branch '4.20'
     add f2e688af260 VR: add bind-interfaces to /etc/dnsmasq.d/cloud.conf (#10739)
     add f055268fe2c .github: fix simulator CI caused by imcompatibility between python3.10 and nosetests (#10753)
     add a95e9d7f77d Merge branch '4.19' of https://github.com/apache/cloudstack into 4.20
     add 193d6ef52f5 Merge branch '4.20' of https://github.com/apache/cloudstack
     add 0af887bce12 UI: Update message of load balancer for autoscaling group (#10750)
     add 0da243d6604 Fix issue with allocator not considering subsequent clusters (#10603)
     add 45bac89b831 Fix NPE on updating security groups for an instance (#10493)
     add 4a1d80ddc8e Remove the validation of the amount of acquired public IPs when enabling static NAT, adding PF and LB rules on VPC public IPs (#10568)
     add 255a45c4a62 Merge branch '4.19' of https://github.com/apache/cloudstack into 4.20
     add ffc0d516161 Merge branch '4.20' of https://github.com/apache/cloudstack
     add f6f33c6add3 Fix the size of a template downloaded from secondary storage (#10662)
     add 431e4f9e1dd ui: confirm on reset configurations (#10745)
     add 992c4b3d4a0 Merge branch '4.19' of https://github.com/apache/cloudstack into 4.20
     add 576b97ba221 Merge branch '4.20' of https://github.com/apache/cloudstack
     add 603cd84b494 server: fix available hypervisors listing for a zone (#10738)
     add 1adfaf90ade Smoke tests: Xenserver - Fix consistent failure noticed on scale VM test (#10741)
     add 12c077d7045 api,ui: multi arch improvements (#10289)
     add 5d28e66b521 vTPM: support KVM and VMware (#10543)
     add 5a5c8651332 Revert "Add the option to filter by host when retrieving of unregistered VMs (#9925)" (#10647)
     add 422264f0055 server: Don't specify ipv6 ranges for shared network (#10746)
     add 55c8138a1a7 test: fix test_certauthority_root.py (#10762)
     add 07f4fc2e51d Fix smoke tests due to change in behavior of restore VM (#10583)
     add 9d263cd71b5 Network Usage event model adjustments (#10755)
     add 9d9737ae040 smoke tests: Fix cluster DRS & non-strict host affinity smoke test failures on XenServer / XCP-ng (#10761)
     add 0785ba046e9 Merge branch '4.19' of https://github.com/apache/cloudstack into 4.20
     add 2df1ac51068 Merge branch '4.20' of https://github.com/apache/cloudstack
     add c2259cef5d2 docs: correct outdated Maven link in install.md (#10800)
     add 9f229600e6a Add new config (non-dynamic) for  agent connections monitor thread, and keep timeunit to secs (in sync with the earlier Wait config) (#10525)
     add 0e0ae226bd2 Xenserver smoke-test: Allow emojis to be accepted in volume name during volume creation (#10774)
     add 030ed55f36c server/test: ResourceCleanupService test fix for daylight saving time (#10749)
     add 02d1c61cf77 add amount of system VMs that are allocated to each host in the hosts ListView (#10791)
     add dfd64b1a672 Ceph object store: Fix LocationConstraint error  (#10772)
     add fe77f5f2856 server: apply network ACL even if there is no network ACLs in the ACL list (#9374) (#10241)
     add 7f16a207e0a cloudutils: use ip command instead of route in networkConfig.py (#10726)
     add 0c4ed1e5b72 UI: Allow editing VM name of a Running VM in an Advanced zone with security groups (#10714)
     add 4c072b5bf97 UI: show checksum field when register or upload template/isos (#10725)
     add 01d87b77479 Merge branch '4.19' into 4.20
     add d7d9d131b2d Merge branch '4.20'
     add fd74895ad05 New feature: Reconcile commands (CopyCommand, MigrateCommand, MigrateVolumeCommand) (#10514)
     add 32cc45e8405 [UI] Allow quiescevm and asyncbackup flags while taking volume snapshot from UI when these are supported for the volume (#10265)
     add 91c11688618 Merge branch '4.19' of https://github.com/apache/cloudstack into 4.20
     add 83c3ea2e67f smoke tests / CI : Fix test_vm_stric_host_tags (#10806)
     add 39c5641cbe6 Merge branch '4.20' of https://github.com/apache/cloudstack
     add 74e9146cfb4 check for custom offering and trim size (#10629)
     add d697cff8987 Update dependency required for test_outofbandmanagement.py (#10805)
     add 1f8442eb69a Extra checks in UI when deleting accounts (#10760)
     add f6d05904243 Merge branch '4.19' of https://github.com/apache/cloudstack into 4.20
     add c1923a2dcb3 test: cleanup test_guest_os.py for multiple execution (#10818)
     add c45ed060982 test: fix test_hostha_simulator.py and test_outofbandmanagement.py (#10815)
     add 2674da2ee9e Nas BnR: Fix for restore not working correctly  (#10785)
     add f4ca7064b70 Add search bar on rules of roles (#10822)
     add 7e2aa0efe42 engine/schema: create default network offering for vpc tier with conserve_mode=1 for fresh installation (#10744)
     add c453aaea2cf ui: improve metrics api use in list views (#9825)
     add 17e062a3813 StorPool notify libvirt when volume is resized (#10775)
     add 919c9797cc8 server: prevent duplicate HA works and alerts (#10624)
     add f0838cdd309 [VMware] Update vlans with proper range before creating port group for dvSwitch (#10708)
     add 696bc50f3ba Backport #9888 to 4.19: Fix Usage inconsistencies (#10712)
     add 751a0ad5598 UI workaround for the inconsistent formatting of listVirtualMachinesUsageHistory (#10824)
     add ea32a1a71aa server: fetch IP of VMs on L2 networks (#10431)
     add 0a090f48533 cleanup call on super (#10807)
     add e68abcd85de xenserver: destroy halted vm on expunge (#10833)
     add a21f912be3d Merge branch '4.19' of https://github.com/apache/cloudstack into 4.20
     add 04731b06182 fix logger
     add 1e5d1330336 Merge branch '4.20' of https://github.com/apache/cloudstack
     add 6fdaf51ddc0 KVM incremental snapshot feature (#9270)
     add 265f4cdc288 core: support chunked transfer for image files (#10820)
     add 011fced91ed ehancement: add password to configdrive vendor_data.json (#10061)
     add bcd23ebb8ac server: check if redundant router is supported when restart network with makeredundant = true (#10612)
     add 3959dbdbe63 refactor create duplicate alert check (#10544)
     add 47a268202bc [VMware] Sync the disk path or datastore changes for IDE disks, and before any volume resize during start vm (for the volumes on datastore cluster) (#10748)
     add 88ce639255d Linstor:  implement volume and storage stats (#10850)
     add dd84c74e822 Merge branch '4.19' into 4.20
     add 0648d000b24 Support XenServer 8.4 / XCP 8.3 - make scripts python3 compatible (#10684)
     add 64828f66e81 Merge branch '4.20'
     add 572fc11a64a [PowerFlex] Add & Remove PowerFlex/ScaleIO MDMs for the storage SDC connections (#9903)
     add 7bab40db6f5 disabled create and add volume button for VMs in Error state (#10859)
     add d5ba23c8482 Introduce volume allocation algorithm global configuration (#10696)
     add b17808bfba1 Introducing Storage Access Groups for better management for host and storage connections (#10381)
     add 95489b8bddf Direct agents rebalance improvements with multiple management server nodes (#10674)
     add 52d986081b3 Updated Endpoint Selector to pick the Cluster in Enabled state (in addition to Host state) (#10757)
     add d55aa70f7ef Restore single backed-up volume on a live instance attaches the volume as a Raw image making it unreadable (#10844)
     add 3df83da86c7 Get backup offering details from listVirtualMachinesMetrics in UI (#10867)
     add 4259e0b51bf linstor: fix host connect recursion regression (#10878)
     add 8d3ae3e0574 [Vmware] Improve listing of Vmware Datacenter VMs for migration to KVM (#10770)
     add a4cce70e284 List usage records for network offering (usage type 13) when offering id is specified in usage id (#10852)
     add 005afde24ec ssvm: reset fields on destroy (#10253)
     add f199783c751 VMware import - logs sanitation (#10433)
     add 1507a5633e7 Correct typo in exception (#10876)
     add 13ab8a04d13 Fix for Vlan doesn't match issue while adding IP range for the shared network without any IP range (#10837)
     add c183fc9859e Prevent data corruption for StorPool volumes (#10799)
     add 112dfddd40b Reset the pool id when create volume fails on the allocated pool, and update the resize error when no endpoint exists (#10777)
     add 951863c3fe9 ui: add an infinite scroll select component (#10840)
     add 39a0ba96704 Fix issue with security group selection box display (#10849)
     add 8f8c685d178 Merge branch '4.19' into 4.20
     add 90316b2e90f VMware 80u2 and 80u3 updates/fixes (#10586)
     add badf3e18dae test: Update test ubuntu template for VMware to deployasis=False (#10881)
     add 538e35f8adb test: fix test_restore_vm failure on vmware (#10885)
     add 5444261902a test: fix several simulator CI failures (#10890)
     add 842b2f8c243 Merge remote-tracking branch 'apache/4.20'
     add 96b8e23767e kvm: fix vm deployment from RAW template (#10880)
     add 97c96a55ba9 .github: fix sonar checks (#10894)
     add 34896a1ada1 Address `assignVm` regression (#10875)
     add d0dc6d8093a mgmt: add back serviceip in ManagementServerResponse (#10891)
     add 4748c3fd4d2 test: cleanup acl in test_global_acls.py (#10893)
     add 6e19c07da10 Fixed typos (#10882)
     add f99fb3ecde3 Merge remote-tracking branch 'origin/4.19' into 4.20
     add f496ed6eaf1 Merge branch '4.20' of https://github.com/apache/cloudstack
     add 99863c2fa5a Imporve socketChannel closing in NioConnection (#10895)
     add f2a6a2ff131 .github: fix sonar checks (#10894)
     add 7e565d2524f Routed: support vxlan networks (#10861)
     add bb79f0b727e engine/schema: create default network offering for vpc tier with conserve_mode=1 for fresh installation (#10744) (#10843)
     add b760b0262f2 Fix issue with configdrive on XenServer (#10912)
     add 857ccb0a3b8 server: fix list diskoffering by domainid returns Inactive offerings (#10916)
     add 16fc2cd1f06 Merge branch '4.19' of https://github.com/apache/cloudstack into 4.20
     add 64d83ce9d12 Fix access to template/ISO list for domain/resource admins
     add c3c6d345893 Add access validation to Quota email APIs
     add 9cf9966dfea Keep same/consistent auth time for valid & invalid users
     add 19d6b979af6 cks: create separate service account in project
     add d5fbd07b9fb Adding privilege checks on user and account operations
     add 38f3107211b Fix aaccess to template/ISO list for domain/resource admins
     add ad9d9cd3f68 Keep same/consistent auth time for valid & invalid users
     add e2f187912cd cks: create separate service account in project
     add a0080a04fe6 Adding privilege checks on user and account operations
     add 6bb6fe7b41f Merge branch '4.19' into 4.20
     add 650b5ec3dab Merge branch '4.20'
     add 7632814cd20 Instance lease: Allow deployment of instances with lease duration and leaseexpiry action (#10560)
     add fa85a75bc88 Log previous and new value of configuration when reset/update API is called (#10769)
     add 41b4f0afd53 ui: missing changes from #10115 (#10949)
     add bce17b627d1 ui,api,server: template categorization based on os (#10773)
     add 62363c1f4b7 remove duplicate definitions
     add bef86aff82f Skip verification of privileges on project accounts
     add 864327b8365 Skip verification of privileges on project accounts
     add 5be6b7980df Skip verification of privileges on project accounts
     add dd066e0e0e0 Merge branch '4.19' of https://github.com/apache/cloudstack into 4.19
     add 3c949365be3 Merge branch '4.19' into 4.20
     add 823080cc9c3 systemvmtemplate: fix Debian 12.11.0 ISO url (#10927)
     add c61a5eb430a Updating pom.xml version numbers for release 4.20.1.0
     add b5e2c181f9c Updating pom.xml version numbers for release 4.20.2.0-SNAPSHOT
     add c86b2f1da24 update 4.20.2.0-SNAPSHOT version
     add 10fc1f3a1c5 update version
     add 0b841fefcb6 ui: show deploy/create button on right info pane (#10814)
     add 0c7d47138d4 Updating pom.xml version numbers for release 4.19.3.0
     add c4ba601a636 Merge branch '4.19.3.0-RC20250530T0908' into 4.19
     add 379ee07d88b Updating pom.xml version numbers for release 4.19.4.0-SNAPSHOT
     add 0d5a0ea6815 update 4.19.4.0-SNAPSHOT version
     add 41de0b9dffd Merge branch '4.19' of https://github.com/apache/cloudstack into 4.20
     add 875223c5b4f Merge branch '4.20' of https://github.com/apache/cloudstack
     add a13728360bc Fix issue with forward merge
     add 5c0346ea866 Adding device ID to a StorPool volume (#10587)
     add 40b0e7cd63c ui: fix build after forward merge (#11010)
     add 2d669dbe548 engine-schema: fix duplicate statements in upgrade path (#11001)
     add 4a672fd9b35 docs: fix outdated Maven subtitle in INSTALL.md (#11012)
     add 28e24111100 engine-schema: fix naming for AlmaLinux (#11011)
     add 675ee2ab398 Add parameter to not create additional users on `cloudstack-setup-databases` (#9969)
     add 380884ed500 Fix data being replicated on VM's metadata file in the VR (#10987)
     add 7f13beb36a7 Check Qcow2 version before using --bitmaps (#10896)
     add 685ee9e78f6 StorPool: support for direct download (#9833)
     add 28ff19b7516 enabled discard option (#10077)
     add e83a347ace0 Improves StoragePoolAllocators' logs (#10475)
     add ea7919b0c1c Remove test/selenium/ test/src-not-used/ (#11013)
     add 6aaaa838b25 docs: revise INSTALL.md with updated Maven setup (#11025)
     add f8c4121ea34 Add access modifiers to `VirtualMachineTO` (#9277)
     add 4662ffc4243 Changes baseurl for downloading kubectl (#11040)
     add 6adfda2818e CKS Enhancements (#9102)
     add 5b7c3b475e3 docs: Update INSTALL.md for frontend build instructions (#11057)
     add 0bd35a54031 ui: fix missing changes from #10814 (#11060)
     add 16c60c7528a Support Direct Download on Ceph (#11069)
     add be22bfe2c9d Management Server - Prepare for Maintenance and Cancel Maintenance improvements (#10995)
     add 8f2735ab462 Accept case insensitive values in boolean settings (#10663)
     add 5790091b25d [Vmware to KVM Migration] Improve the Force MS option text (#11035)
     add 75147b78116 [Vmware to KVM Migration] Display virt-v2v and ovftool versions for supported hosts for migration (#11019)
     add ba0204f8edd Block volume shrink on Xen (#11004)
     add 544028ca8e6 Do not rely on Memory engine even transiently in DB setup scripts (#11106)
     add 3b54194aef1 Correct quota type indexes (#11085)
     add c24e4eea855 server: fix orphan db transaction issue (#11095)
     add cbd2b5a0224 Add check for ldap truststore password (#11055)
     add 7cad65d310d Merge release branch 4.19 to 4.20
     add 1a251c8b789 merge forward fix
     add 3e3a0c06781 Merge branch '4.20'
     add d5fd3ec36ea Add API command remove management server (#10325)
     add 749ddb975f1 Support ApiServer to enforce POST requests for state changing APIs and requests with timestamps (#10899)
     add 8e4fe1c370e Allow configuring Announcement banner by admin (#10951)
     add 51126a7c105 iteration optimized (#10576)
     add f9588960d43 Refactor: Replace sleep() with wait() (#10504)
     add 4d46bece4a7 fix priority for volume copy operation (#11109)
     add ed7bd5e5804 ui: fix handler for deploy button menu (#11116)
     add 80f46ad55d6 [VMware to KVM Migration] Fix for converted instance npe issue when source vmware instance ovf is exported from management server (#11003)
     add 1cbf1cd2cd8 fix volumes search filter (#11168)
     add 49c6fbdfaf3 schema: fix missing columns index (#11171)
     add 39c8c4dbae9 Normalize naming of Kubernetes clusters (#10778)
     add e47b78b2bbb directdownload: fix keytool importcert (#11113)
     add c782835f012 [Vmware to KVM Migration] Fix issue with vCenter Standalone hosts for VM listing (#11091)
     add 67a1ea35f4e .github: restrict codecov in UI build to apache/cloudstack repo (#11158)
     add 7715b3dc298 Improve the error throws when a template to owned by a non root-admin is registered for all zones. (#11170)
     add 61e74e086b5 Merge branch '4.19' into 4.20
     add 0dbd761fbbd Merge branch '4.20'
     add 54b44cc316e KVM: Option to deploy a VM with existing volume/snapshot (#10503)
     add 60597241897 Hide CloudStack version from XML response when unauthenticated (#10575)
     add fb6adacc512 GUI whitelabel runtime system (#8942)
     add e8ab0ae70a7 CPU to Memory weight based algorithm to order cluster  (#10997)
     add f52e05863e6 UI fix api in project view (#11191)
     add 84b807eeee1 [CKS] Simplify logic for scaling CKS cluster service offerings (#11063)
     add 3220eb442a5 PowerFlex/ScaleIO - MDM and host SDC connection enhancements (#11047)
     add bb75abcffa2 Usage parsers refactoring (#11097)
     add 53eb2c5b9b7 File-based disk-only VM snapshot with KVM as hypervisor (#10632)
     add 65d359228dc Allow populating generic templates during Zone Deployment (#10947)
     add 9688cbb0953 systemvm: build 4.20.2 template with 'depmod -a' (#11128)
     add c94f75c7ea7 PowerFlex/ScaleIO - Wait after SDC service start/restart/stop, and retry to fetch SDC id/guid (#11099)
     add 06c80cdbe91 Remove unfinished usage job entries of the host (#10848)
     add 0d65c8c4543 Merge branch '4.19' into 4.20
     add b57994eeb0d Merge branch '4.20'
     add 15c09af5cc7 UI: Fix traffic Label on Zone creation wizard for VMware (#11101)
     add a849b822c21 Update .asf.yaml: remove new committer Bernardo (#11231)
     add 3687032ed68 Update .asf.yaml re-add rosi
     add 1003c8034c1 Update .asf.yaml remove sudo87
     add c5da9e6188c Update .asf.yaml re-add sudo87
     add 6ad92964120 Fix KVM incremental snapshot removal when using multiple secondary storages (#11180)
     add e7172161dd2 Guard OS type update for iso/template with existing vms (#11215)
     add 9d049707d5e Fix deletion of backup schedules (#11222)
     add a710ff8c6db UI: Fix ISO Hypervisor selection (#11261)
     add 666784f4e57 ovm deprecation (#11196)
     add d63899fc8a4 Set Content-Type from the file type (#11093)
     add 6d5cefdfe94 add since parameter to BackupScheduleResponse (#11265)
     add fb3bb3fd568 pre-commit: upgrade markdownlint to the latest version (#11066)
     add 165ab0aabe2 Fix HTML license; standardize HTML code (#11067)
     add 1fbe1d76827 pre-commit: add gitleaks to detect hardcoded secrets (#11064)
     add 071e612f404 UI: Fix OS Type displayed for a VM (#11075)
     add 7da5f9002b2 misc: fix typo `sercurity` -> `security` (#10966)
     add 83bccead3db schema, refactor: rename cloud.user_vm_details to cloud.vm_instance_details (#10736)
     add 22b753e9302 [UI] Deploy VM: Preselect first available template (#11207)
     add 11455f6d49c UI: Add option to Login to a specific Project view via setting on config.json (#10935)
     add 935c568082c Merge fix for UI
     add 074f75838e4 Fix pre-commit warnings for deprecated stage names (#11276)
     add 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)
     add 0d4147f3f63 Netris Network Plugin Integration with CloudStack (#10458)
     add 13892e2ff06 [CKS] Create Kubernetes ISO support for ARCH optional parameter (#10986)
     add 407072ffd43 schema,framework/db,server: fix user_vm_details usage (#11292)
     add 217ff27650f ui: fix compute offering edit (#11232)
     add cca8b2fef90  Extensions Framework & Orchestrate Anything (#9752)
     add 21dde2b9a28 [DB] Add force recreate parameter to cloudstack-setup-databases script (#11239)
     add 1a9efe8de3c Add unit tests for getConfigResources in ModuleDefinitionSet and improve context readability (#11042)
     add 45edf82efaf [UI] Fix for local storage enable/disable toggle in edit zone (#11309)
     add 524f0d80db0 server: fix NaN values for external resource metrics (#11302)
     add d693736ee82 ui: fix NAN% used memory for vm (#11307)
     add 9fee6dae34c Fix local storage pool disconnect issue (#11200)
     add 4aed972e78c api,server,extensions: allow updating extension resource map details (#11303)
     add b92c1965b97 README: add `Contributors Avatars` and `Star History` (#11311)
     add f6ad184ea2d Feature: Add support for GPU with KVM hosts (#11143)
     add 86827f871d2 Update CIDR/Gateway of the Shared Networks from Guest IP ranges (#11249)
     add f2bda464193 Upgrade noVNC from 1.4.0 to 1.6.0 (#11119)
     add 30deec89e6b kvm: consider Debian same as Ubuntu (#10917)
     add 23de6c7db4d Fix update resource count failure for domains (#11138)
     add d5f6b7cd1d1 Fix to create instances with smaller templates (< 1 GB) on PowerFlex/ScaleIO storage (#11211)
     add d72a05aa5ad Add special Icon to Shared FileSystem Instances (#10857)
     add 0ebf72df0f1 Handle nas backup and restore on Shared mount point. (#11204)
     add 1b74c2dd3f9 Fix restore from NAS backup when datadisk is older than the root disk. (#11258)
     add 4111061d295 list only own zones for resource admin (#11087)
     add 948ecda785e UI: Fix missing labels (#11102)
     add 111d87b845a console: optimise buffer sizes for faster console performance (#11221)
     add eeb4d55e890 polish: Fix some inconsistencies in object names and messages (#10856)
     add a51a04efc2b [Vmware to KVM Migration] Preserve boot type and boot mode of instances to be migrated (#10975)
     add 890386e9499 Allow custom NTP servers for CPVM (#11210)
     add ed6ee6b704f Mark LDAP user query timeout as incorrect login instead of disabling user immediately (#11220)
     add bf464585785 List templates and ISOs by domain (#11179)
     add 714b04e3a5f npe guard for get host info on vmware (#11054)
     add 9c6dfd2b264 Handle IllegalReferenceCountException for decoder, while uploading ISO from local (#10879)
     add 3fc02ddd45e Add format and physicalsize in listIsoOs api response (#11214)
     add 264e404108a Fix for dynamic scaling toggle for instance (#11086)
     add 75a2b3cc54c Validate qcow2 file during import operation (#11264)
     add a4263da8aea linstor: Use template's uuid if pool's downloadPath is null as resource-name (#11053)
     add 609efcc231a Merge branch '4.19' into 4.20
     add 40035f54d0f [UI] Add dedicated account field dropdown on zone creation (#11195)
     add 82396b621ed appliance: bump systemvmtemplate version to 4.20.2
     add 8756be5c187 [Multi-Arch] Select Template Arch when creating template from volume (#11068)
     add e9918ba15de ui: fix volume size not showing (#11328)
     add ca6d2dc57ec Prevent multi-select dropdown menu from floating on scrolling through the form (#11237)
     add a32738c52ed Prevent infinite autoscaling (#11244)
     add 1961aea7706 Merge branch '4.19' into 4.20
     add 4b1a605e597 server: fix IllegalMonitorStateException on cluster managedstate change (#11310)
     add be08fff32b7 Merge branch '4.19' into 4.20
     add 0b3959221b5 Merge branch '4.20'
     add 8429223782d missing imports from merge forward
     add 2bffabba7b1 Fix unit tests after merge forward
     add da3ba17884e Fix build and ui build errors in main (#11332)
     add 8497f70b46c ui: make events tab selected columns persistent using cache (#11317)
     add fd4223295a0 ui: fix advance setting behaviour in autoscale form (#11306)
     add 7506a547afc kvm, ui: fix interface when using vlan subnet for storage traffic type (#11245)
     add 96ed9d47bc1 Merge branch '4.19' into 4.20
     add 76cfcb48fbf Merge branch '4.20'
     add f73cb5621df Refactoring retention of backup schedules (#11223)
     add 4d2beea7773 logger fix
     add 2d025bd0749 kvm: fix regression 5a52ca78ae5e165211c618525613c3d62cfd1b28 (#11342)
     add 1dc134a3ecf UI: Display NSX Provider only when NSX is the selected Isolation method (#11142)
     add 294aef5ecff Fix listCapacity sort by usage (#11316)
     add 7e0414354a9 Merge branch '4.19' into 4.20
     add 70468a62584 Merge branch '4.20'
     add 712492230ae Shutdown MS maintenance jobs when finished (#11330)
     add 1f1e38f3a85 Support to list templates in ready state (new API parameter 'isready', similar to list ISOs) (#11343)
     add f58372e97b5 [UI] Use GET request method for list API calls (#11354)
     add 6b9615b2f9e Selected type on update traffic type is based on chosen type in traffic types tab (#10902)
     add 2944bd1eda1 API: Set Object name when expunging VM (#11352)
     add 3850445b505 ui: fix delete traffic type (#11337)
     add 6589235b718 Merge branch '4.19' into 4.20
     add b9febe4b4fc Merge branch '4.20'
     add a87c5c2b3a5 Create new Instance from VM backup (#10140)
     add f62b85dffee fix fsvm-init.yml to detect virtio-scsi in kvm (#11070)
     add 5ea1ada59a4 Allow full clone volumes with thin provisioning in KVM (#11177)
     add ed0d606e983 Find system VM templates for CKS clusters and SharedFS honouring the preferred architecture (#10946)
     add 8ac8a221630 Merge branch '4.20'
     add 9f5828a0270 UI: Fix cpu & memory details on list view for unmanaged k8s clusters (CAPC) (#11353)
     add e805e45342a Show chain size in snapshot response for incremental snapshots (#11313)
     add bcd738caa60 Fix GPU discovery script to make it run with mdev for SR-IOV enabled devices (#11340)
     add 5aa15187b66 Refactoring StorPool tests (#11107)
     add adccdf2c7be UI support for deploy a VM from volume/snapshot (#11164)
     add a60c8cab144 api,server,ui: allow listing events by state (#11355)
     add b479d37b870 ui: fix api type in InfiniteScrollSelect (#11370)
     add 44f80648a9e agent: increase timeout for host arch retrieval (#11254)
     add b2ce1fb9c3c ui: fix initial pagination for images in deploy forms (#11349)
     add d4229d3105c Fix failing simulator vgpu test (#11374)
     add 742e131283a Update System VM template Guest OS version (#11291)
     add 1bfebd550ce ui: update project menu on projects change (#11369)
     add 14feb259f61 Merge branch '4.19' into 4.20
     add 5c1bf4a4ce8 Merge branch '4.20'
     add 9de77e1cc13 API to list console sessions (#11016)
     add db63d2428bd Netris: Fix Netris provider parameter name and response (#11377)
     add 58484fb44dd cloud.spec: provide option between tzdata-java and timezone-java (#11372)
     add a84c4cb3512 Merge branch '4.20'
     add ccd86d96d90 ceph: fix SignatureDoesNotMatch by using correct secret key (#11115)
     add 4a4b5a5e5fb Improve volume backup restoration log (#11181)
     add 5cac4f6c448 added online/offline copy method for Primera storage adapter (#11298)
     add e5f61164b34 Support of snapshot copy to primary storage in different zones. (#9478)
     add 9712b4d322a custom AccessLogger (#9733)
     add 626f3de69ad Handle project delete in detailsview. (#11197)
     add cda3640be15 juniper-contrail: publish events only for the module (#11373)
     add 3134efb971d plugin-swift: handle null cache store (#11380)
     add a0fd37f4955 ui: pass validated storagepolicy for swift store (#11315)
     add de5188e50c8 fix storage pool capacity threshold flag (#11366)
     add 7acd5a38756 Merge branch '4.19' into 4.20
     add ca8ce8c8853 Merge branch '4.20'
     add a2d35c8ac21 Fix imports
     add d601c176f16 Merge branch '4.20'
     add 80f837b5e71 remove volume size check in restoreBackupToVM (#11384)
     add 53bc435bdb1 Fix create statement for safer upgrades (#11388)
     add 15740136dc0 Merge branch '4.20'
     add d7b7bd53adf Fix infrastructure leak on exception while attaching/detaching volumes in VMware (#10860)
     add 4c3f29de1e1 Agent manager connection handling improvements (#11376)
     add f020b5b5df9 cleanup: remove com.cloud.user.MockAccountManagerImpl (#11392)
     add fe8f3c8eeb5 get forward header for proxies and apply it in Jetty (#11386)
     add b9864cb1e1c server: fix vm deployment without networkid in a zone with shared networks (#11242)
     add 56b97f8255b Merge branch '4.19' into 4.20
     add ae95be3702f Merge branch '4.20'
     add dc5e475bd2d Fix of deployment VM from a copied snapshot in another zone (#11351)
     add 7d59bfe2b59 [UI] Fix zone creation wizard stuck on configuring public traffic (#11404)
     add 26218b093ea Fix edit of compute offering in UI (#11417)
     add 53b026487fb UI: Fix duplicate edit zone button on Basic zones (#11427)
     add 78e146278b3 api: fix scale or upgrade systemvm (#11062)
     add bd252b59836 Merge branch '4.19' into 4.20
     add 99919fda7f0 Merge branch '4.20'
     add 1994511f0c9 noVNC: Show a dot cursor when the cursor is not visible (#11418)
     add e57e8cf4189 Network rate must be multiplied by 125 not 128 (#10645)
     add f5b4858012b ui: make vpc cidr required when not showing cidrsize (#11393)
     add 96728c5a17d Merge branch '4.20'
     add 9fd2b90b80d Fix ConfigurationVO load exception after schema change (#10485)
     add 2c493d19336 Add support for nvidia vGPU support with vendor specific framework (#11432)
     add 0b381d4270e Exclude External hypervisor type during upgrade for System VM template checks (#11435)
     add 03da8cbd3e0 server: fix conserve_mode of DefaultIsolatedNetworkOfferingForVpcNetworks (#11133)
     add 93d6ff3a7d0 Proxmox: fix restore snapshot with memory (#11450)
     add d4bd5872313 UI: fix addHost in zone wizard (#11401)
     add 25f93b1d6b8 linstor: fix getVolumeStats if multiple Linstor primary storages are used (#11397)
     add 9111bbd8da6 Merge branch '4.19' into 4.20
     add c6daeb4f78d fix snapshot physical size for primary storage (#11448)
     add 2c34f5e4954 Merge branch '4.20'
     add ba2d70ab214 [KVM] CPU Features for System VMs (#10964)
     add f671461d4c9 Fix for create template from snapshot (for snapshots on primary storage and storage doesn't support create snapshot to template directly) (#11452)
     add 5a90da32760 Fix for PowerFlex MDM configuration on host while preparing the SDC connection (#11458)
     add f2d635683bf Update error message when no snapshot strategy is found while creating snapshot (#11455)
     add df5efa5d0dc Remove non-existant network service provider from UI (#11463)
     add 6e59f4f4cc2 Fix deployment of CKS clusters in Basic zone (#11457)
     add e0bc8c3b1a5 Merge branch '4.20'
     add 1272b130878 Fix of create a template from a StorPool snapshot on another zone (#11490)
     add f9513b47bf8 Updating pom.xml version numbers for release 4.21.0.0
     add 1033be4b31f Updating pom.xml version numbers for release 4.22.0.0-SNAPSHOT
     add e5e902a3208 tools: fix 4.22.0.0-SNAPSHOT
     add 5da7d2d01ef scripts: fix external provision to use correct power state & hyperv powersync (#11504)
     add cbc614d8e33 Add logs to keystore-setup and fix password regex (#10723)
     add 2105794f61d UI: Hide User Card from config.userCard.enabled option (#10545)
     add 0f0155c6530 Fix live migration of VM with config drive on KVM (#11516)
     add f80a9ca4823 UI: Prevent restriction of changeOfferingForVolume API to Admin role (#11466)
     add 05e7a257ca5 VPC VR: return UNKNOWN redundant state if no guest nics (#11518)
     add ba7ec886504 SG: Apply rules for both ipv4/ipv6 of VMs with associated account/SG (#11243)
     add 3109e0080e5 Add response object required by go SDK for parsing response (#10152)
     add ca62a7dd504 Merge branch '4.19' into 4.20
     add 2eb80e0361f Merge branch '4.20'
     add 889fc62b605 schema: Add upgrade path from 4.21.0.0 to 4.22.0.0 (#11469)
     add 762f75c041d kvm: fix vm deployment with direct-download iso (#11532)
     add d161dc76699 api: use single quote instead of double quote in StatsResponse (#11537)
     add 5837c4f29e2 Merge remote-tracking branch 'apache/4.19' into 4.20
     add 3c4f4588192 Merge remote-tracking branch 'apache/4.20'
     add 9184170b01d Remove Domain/IP from Password Reset Link to custom Global Setting (#11379)
     add ba42d251624 packaging: add pre-check.sh (#11135)
     add ca0c3530ad0 utils: add UuidUtils.nameUUIDFromBytes (#11136)
     add 574ed7857b3 .github: Update to JDK 17 in ci.yml and build.yml (#11030)
     add 92e75932967 Use update offering APIs to disable compute and disk offerings (#11550)
     add 48648d4c45b test: fix test_04_rvpc_network_garbage_collector_nics failure (#11542)
     add 973b333e401 Merge remote-tracking branch 'apache/4.19' into 4.20
     add abe41add86d Merge remote-tracking branch 'apache/4.20'
     add 76ef8d31f8a make server threads configurable with server.properties file (#11540)
     add 3ddd8023d0a ui: fix extension path with name having special characters (#11489)
     add 66a584624f7 Update md5sum to sha512sum (#11134)
     add 3d6ec29c9bb Don't show backup in list_capacity for dummy plugin or if backup_framework is disabled (#11485)
     add f24b1757a0b ui: donot filter edge zones while registering directdownload iso (#10865)
     add 25f1d203403 ui: show multiple domains as links in list view (#11536)
     add db5b6a54a1e systemvm template: update URLs of debian ISOs (#11543)
     add adec5f439df kvm: add ssvm storage nic null uri check during plug (#11557)
     add af2a911f1b7 UI: Make logout function more robust to prevent session issues (#11361)
     add 90681df1b5b Primera: Delete session after key expiration (#11487)
     add fd46e61032f Added events for snapshots, vmsnapshots, internalLB operations (#11230)
     add a4cf47a9b80 server: remove extra chars when template status is error string (#11329)
     add f4802f30ed6 UI: fix display of disk size and IOPS fields in the scale VM form (#11553)
     add f99942cf9a2 Merge remote-tracking branch 'apache/4.19' into 4.20
     add 6868f052de4 2fa: log error on totp mismatch (#10734)
     add 9349b69b7e6 server,kvm: detect boot options for vm import (#11218)
     add 3ffd4442946 ui: donot remove account, domain from query on public ip filter change (#11575)
     add 4f5f7d46d28 CKS: Validate network offering from network if provided rather than global setting (#11528)
     add f26f8cce178 server: allow adding non-overlapping ipv6 ranges in same vlan (#11556)
     add fe120b64e70 server: prevent vm schedule update failure for time when not changed (#11314)
     add 7044564bab1 Merge remote-tracking branch 'apache/4.19' into 4.20
     add 8089d327403 Merge remote-tracking branch 'apache/4.20'
     add b46e29dc677 Improvement: SSL offloading with Virtual Router (#11468)
     add e3681a04bb8 server: allow migration of vm with snapshots for vmware (#9305)
     add 5d32492676a IPv6 firewall: accept packets from related and established connections (#10970)
     add e64e94ad3f7 Import KVM VM: Autodetect vlan id from bridge name (#11507)
     add 036fd001705 kvm: Fix NPE in case host UEFI detail is not set on agent connection (#11610)
     add 7c727a34406 CKS: Fix transition exception when scaling Stopped k8s clusters (#11598)
     add 38006b2e03d ssvm: use mgmt network if no storage network (#10735)
     add 70a4503ea16 Merge remote-tracking branch 'apache/4.20'
     add 9317a465134 Add all workflow buttons to README (#11406)
     add 23a53e213eb Add LB service to Custom Netris VPC/Network offerings (#11410)
     add 96cabf7e436 [KVM] Allow passing the OS type machine for KVM XML domains through VM setting (#11569)
     add 96ccd7e6c5b Filter netris vNets only by VPC ID as filter by site isn't working as expected on netris end (#11617)
     add 253ac036214 Management server: fix qemu-img path in cloudstack sudoers (#11614)
     add 6d16ac2113a ScaleIO/PowerFlex smoke tests improvements, and some fixes (#11554)
     add 2cd7d8a315e server: check limit on correct store during snapshot allocation (#11558)
     add 7c76a3c12a8 ui: searchview change should only remove related query params (#11576)
     add cd69f2ce16d server: Fix NPE during VM IP fetch for shared networks (#11389)
     add 2e113e5ed70 Change log level of AgentHandler#processRequest() (#10869)
     add 7c7497c6248 Merge remote-tracking branch 'apache/4.19' into 4.20
     add 6a145358a92 ui: fix tab name in query params (#11590)
     add 1948f90c2c7 [UI] Fix group disable action for  compute and disk offering (#11602)
     add 0cbebbdddda kvm: Fix for No VMs start after Renew Host Security Keys due to wrong qemu group reading (#11632)
     add ada750e391b Merge branch '4.20'
     add 0d9c5065de6 Add CodeQL Analysis for GitHub Actions (#11300)
     add 57309314a1a pre-commit: clean up Python flake8 excludes with black (#9793)
     add 273ae032743 Allow updating of Load Balancer source CIDR list (#11568)
     add e7015cbc4c7 Move console proxy related global settings to Zone level (#11415)
     add f9a72de5004 misc: pre-commit auto remove unneeded trailing whitespace (#11289)
     add 33cfedee46d pre-commit add hook `check-shebang-scripts-are-executable` for Shell (#10150)
     add 6eb27da5e4d Fix spelling in Java and Python files; update the ignored words list `codespell.txt` (#11285)
     add 0108ffd1b00 java: fix one typo in many files (#11284)
     add 0526ec0d82a PULL_REQUEST_TEMPLATE standardize case of types of changes (#11663)
     add 8eb6ddd9203 Fix inactive VPCs deletion (#11618)
     add a452dc6543f chore(markdown): use https on links (#11676)
     add a466750d3b4 Add cleanup for tiers dropdown on assignVIrtualMachine API form (#11464)
     add e6c7a71d40e Add yamllint pre-commit hook for YAML file standardization (#11017)
     add 3ef25569000 Fix scaleKubernetesCluster API (#11652)
     add aca8732102f [router] make a distinction between fatal errors, warnings and unknown as healthcheck result (#10710)
     add 69998f7c40f api,server: support templatetype when upload template from local (#11682)
     add 9167cd3b722 server: use /prod/stat to get uptime instead of the uptime command (#11670)
     add 393b5d2b779 VR: consider NICs for remote access VPN when apply dhcp entry (#11681)
     add 12513e18fa3 server: Update gson date format for serializing/deserializing Date in MS stats (#11506)
     add 22bf8fd5d14 Merge remote-tracking branch 'apache/4.20'
     add d9abc078cfd ui: fix build on latest Ubuntu and macOS (#11259)
     add 4884f52c908 ui: allow provisioning backups during instance deploy (#11612)
     add 40dec996591 server: Cleanup allocated snapshots / vm snapshots, and update pending ones to Error on MS start (#8452)
     add 1a223fd2bac server: Fix VM import DB sequence issue on import failure (#11659)
     add a749206eb8e storage: Mount disabled pools by default when host is booted (#11666)
     add a18b5514e67 kvm: honor templateId passed in importVM API (#11640)
     add 98b9af29040 server: set VirtualMachineTO arch from template if present (#11530)
     add e78b5cc3cc9 Merge remote-tracking branch 'apache/4.20'
     add b0c77190066 ui: do not show admin only options to users while registering template (#11702)
     add 23c9e830473 Create Instance from backup on another Zone (DRaaS use case) (#11560)
     add ec533cd24d9 Add support EL10 (#11546)
     add 928972f7676 extension/proxmox: add console access for instances (#11601)
     add 96992d3d640 server: Fix vpclimit count for listAcccount API response (#11686)
     add c24d2b88f6b LDAP: honour nested groups for MSAD (#11696)
     add 36cfd76ce19 KVM: fix delete vm snapshot if it does not exist with a Stopped vm (#11687)
     add 318a4f2b6ec server: set download volume format to qcow2 for KVM volumes (#11198)
     add 5dfeb79c63c systemvm: fix failed to get script version when patch system vm or router (#10962)
     add 2c1aad4db8c Merge remote-tracking branch 'apache/4.20'
     add 9cc88b8dccc CKS: fix control plane endpoint IP (#11720)
     add 3159fa7d84e noVNC: make show dot configurable (#11741)
     add d60f455b00e Fix detection of Mi3xx GPUs (#11715)
     add 2a802a31435 Extensions: use home directory of cloud user instead of /var/lib/cloudstack/management/ (#11732)
     add 7dd0d6e9377 add ConfigDrive to datasource_list in SharedfsVM (#11726)
     add cd12fa58482 Add UUID field for LDAP configuration (#11462)
     add 1efa46cb4d1 fix removeUsage for backups (#11522)
     add b09f3e8ff7e ui: fix overflow for value in DetailInput (#11771)
     add 5a8a1e27e10 Fixed and enhanced vlan field validation in the UI (#10983)
     add 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)
     add 9bcd98876d6 Make kvm domain persistent when unmanaged from CS (#11541)
     add 30cb8c7a820 Fix importing unmanaged instances due to incorrect internal name (#11753)
     add 70af55e8489 UI support for extraconfig in deploy and update instance  (#11719)
     add c631d6a480d CKS: generate a random UUID as password of CKS user in project (#11639)
     add ca7138b3bdf server: Consider Instance in Starting state as well for allocation algorithm (#11751)
     add e12813de497 CKS: fix CKS creation on an existing Shared and Routed network (#11735)
     add 8e4dc0a66d2 VMware: match nic mac for ip address fetch (#10641)
     add 963a67b8167 server: add user.password.reset.smtp.useStartTLS and enabledSecurityProtocols for password reset (#11228)
     add 823cb00a0a0 server: do not enable the disabled local storage(s) on host connection during mgmt server / agent start (#11722)
     add a208db54ea8 linstor: use sparse/discard qemu-img convert on thin devices (#11787)
     add aca82359606 Merge branch '4.19' into 4.20
     add 5f63e8493c5 Merge branch '4.20'
     add 858663fcf7c UI: fix missing comma at end of line
     add d2615bb142c Add support for providing userdata to system VMs (#11654)
     add 09b63bc2e82 Storage pool response improvements (#10740)
     add a15fbd9bcc8 refactor: remove use of term entry-point from extensions code base (#11488)
     add cc3170577c1 Add `Hypervisor default` as cache mode for disk offerings (#10282)
     add 314c4591ecb systemvmtemplate: Bump Debian version to 12.12.0 (#11778)
     add 270d3f9a2da UI: Deal with crosssite api call after login (#10533)
     add 9f20979bcee UI: Fix primary storage for datastore cluster and retain traffic labels during zone deployment (#11760)
     add b143ddc4058 Sanitize the rbd file cmd parameter logs during qemu-img convert (through Script) (#11801)
     add 89d2b17461f storage: change storage pool to Up state when cancel storage migration (#11773)
     add 6089c161a6c Merge remote-tracking branch 'apache/4.20'
     add a6ef24d1679 server: consistent domainpath in api responses (#11589)
     add f67b738eb3d Migrate volume improvements, to bypass secondary storage when copy volume between pools is allowed directly (#11625)
     add 973819dad61 API: Add support to list all snapshot policies & backup schedules (#11587)
     add 2b1f0bbbdbd UI: Fix for cluster addition in VMware (#11812)
     add 67250d99d44 ui: fix add host form state on submit (#11815)
     add df49c4f14bf UI: Move Backup Repository to Infrastructure (from Configuration) (#11738)
     add b99a03092f2 Added Extension for MaaS integration in CloudStack (#11613)
     add b106d6e190b VMware to KVM Migrations improvements (#11594)
     add cc6ee906d51 Markdown: add documentation on pre-commit usage (#11680)
     add 0b9afe77cac Enforce distinct hostnames network (#10212)
     add 162c45f8fa9 api/server: list networks by name (#11470)
     add 1e23d6bc205 server: enable KVM volume and VM snapshot by default (#11446)
     add 136ea3eafac UI: Removal of UI blockage to access the `changeOfferingForVolume` API (#10135)
     add a5a934dac14 pre-commit: add hooks `check-illegal-windows-names` and `file-contents-sorter` (#11662)
     add 0e93ae3bdf5 UI: Add validator for CIDR being passed (#11465)
     add 8464e46b53f PR #11778 with changes for main branch (#11781)
     add 0ca267f5166  Allow uploading of ISO for creating kubernetes supported versions  (#9561)
     add 22ba8dd504d Remove misspelled file not found from rat excludes (#11665)
     add e27528f8b2a Update GitHub Actions (#11664)
     add cdb0604e7b6 pre-commit: enforce mixed-line-ending for all files (#11667)
     add 349feebd151 Standardize Markdown headings; enforce MD003 with markdownlint (#11688)
     add 0ca63f36a52 api,server,ui: allow cleaning up external details for host and serviceoffering (#11548)
     add 5e7ae227d3a UI: Prevent exceptions when network service provider that's disabled is viewed (#11413)
     add c9ce6e305c1 ui: Allow edit source CIDR on load balancer rule (#11766)
     add a574f7ac99c Add logs for host removal (#10423)
     add dfcbd2e9772 server: consistent behaviour for list apis with project=-1 (#11767)
     add 9e535e35d27 Support xz format for template registration (#11786)
     add f71d3a8e9fe update the developers guide link on the API page (#11832)
     add c0a4392b053 Fix volume copy from primary to primary in simulator (#11836)
     add 046014b4c55 NAS BnR: Create Instance from Backup issues (#11754)
     add f4b6a74a94a Add support for CSI driver in CKS (#11419)
     add 0e8b0b8e406 Allow counters to be created with same name, provider and source as a deleted one (#10223)
     add 309b444205a pom.xml: update jetty version (#11793)
     add 4d95f08a3ab Delete template from storage pool instantly if no volume is using it (#11782)
     add 86cad79c156 importvm: fix IP address allocation on Shared networks (#11811)
     add 6f931dbd005 agent: increase timeout for host arch retrieval (#11254) (#11822)
     add 43278710362 Routed: fix create network exception when auto-allocation is disabled (#11624)
     add b82369c2415 systemvm: fix duplicated "en_US.UTF-8 UTF-8" in /etc/locale.gen (#11823)
     add eee43e534fa cloudutils: fix warning, error during kvm agent installation (#11318)
     add c8d44d92a76 api,server: fix entity access
     add 03a4b9f4fd3 server,utils: improve js interpretation functionality
     add 8b9f5fd8f96 Merge branch '4.20'
     add e7a55a766c5 Fixes for Import VM Tasks listing (#11841)
     add d8766418e01 extensions: custom action entity access
     add 4cdcde2fe7a server: do not return extension path to non root admins (#11856)
     add f63118c011e Add erikbocks as a collaborator (#11863)
     add a6068a850cd Update CI workflow to use Ubuntu 24.04 (#11873)
     add 8bbe253b009 Merge release branch 4.20 to main
     add 2fcf96267dd UI: Fix duplicate memory values on InfoCard view conditions (#11896)
     add 4b74a99a57c Fix: NPE thrown on VMware to KVM migration tasks listing for removed VMs (#11892)
     add a839e25d559 Fix OOB test failures in ci.yml github actions (#11887)
     add b1851ba18a3 Merge release branch 4.20 to main
     add a2fcbd608aa Avoid html escaping while saving vmsettings in backup_details (#11900)
     add 7ef5db21532 UI: Fix upgrade router template operation failure (#11901)
     add 024f89dc7d0 pre-commit: add oxipng a lossless PNG compression optimizer (#11065)
     add e7b83260580 pre-commit auto add license for all Markdown files (#11870)
     add 941227ec8cd pre-commit add `chmod 644` manual hook for Markdown (#11651)
     add 4dc3931233b Updating pom.xml version numbers for release 4.20.2.0
     add 15d2137800b Merge tag '4.20.2.0' into 4.20
     add e333ce9782d Updating pom.xml version numbers for release 4.20.3.0-SNAPSHOT
     add 255c4615dd9 Fix VMScheduler unit test for daylight saving time (#11907)
     add c2c1e11580e Merge branch '4.20'
     add bfc4f60e1da [VMware to KVM migration] Check source VM against the selected offering (#11908)
     add e20d57f33e0 Fix checking resources before power state check of the VM
     add f52a27cce6d UI: Minor fix for extra params display for VMware to KVM migration (#11909)
     add 2dbc86abfae Fix CKS cluster creation not honoring the CKS ISO arch (#11902)
     add 15c61acedfe Fix the config 'powerflex.connect.on.demand' description (#11926)
     add 3d6cafe1936 Handle null mountTimeout in RestoreBackupCommand (#11944)
     add 15c2e50338a UI: fix typo Upload SSL certificate (#11869)
     add 71f47d61304 Updating pom.xml version numbers for release 4.22.0.0
     add d160731b9fb Updating pom.xml version numbers for release 4.22.1.0-SNAPSHOT
     add e66926e6a4e Merge branch '4.22'
     add dbda673e1fa Updating pom.xml version numbers for release 4.23.0.0-SNAPSHOT
     add e90e436ef87 UI: Enable listall (for Affinity Groups, SSH Keypairs, User Data) in deploy instance wizard for admin, and lists SSH Keypairs, User Data by domain/account (#11906)
     add d53b6dbda42 api/test: fix storage pool update with only id (#11897)
     add 5504b053e44 Merge branch '4.20' into 4.22
     add ac8c200790f merge fix
     add 81b2c38be9a Merge branch '4.22'
     add a50de029bf1 Add empty Provider value in Network/VPC Offering form (#11982)
     add 8c86f24261c enhancement: add instance info as Libvirt metadata (#11061)
     add 40c8bc528d3 Keeping consistency with other error messages. (#11649)
     add 23fb0e2ccb4 Update GUI Kubernetes logo (#11895)
     add 5f9e1311989 Svgs (#12051)
     add f985a67f4d6 Fixes:#7837: Add isolationMethods and vlan to TrafficTypeResponse (#8151)
     add dc8f4655278 engine-schema: upgrade path for 4.23.0 (#12048)
     add 8b034dc439d chore: rename workflow `linter.yml` to `pre-commit.yml` (#11647)
     add a5b455ff3a8 pre-commit: auto add table of contents with `doctoc` (#11679)
     add fff4cafdca2 ui(locales): remove duplicates and fix typos (#11872)
     add ac3b18095af pre-commit use colored text in the CI for `pass / fail / skipped` (#11977)
     add 86ae1fee7ff Standardize and auto add license headers for SQL files with pre-commit (#12071)
     add 4ed86a2627a pre-commit upgrade codespell; fix spelling; (#10144)
     add aa18188d305 pre-commit: auto add license headers for all YAML files (#12069)
     add 39126a43392 Standardize and auto add license headers for Shell files with pre-commit (#12070)
     add 6dc259c7dab Rename and standardize issue templates to `.yml` (#12082)
     add 8171d9568c9 Block use of internal and external snapshots on KVM (#11039)
     add b8ec941ec12 uefi property typo (#11929)
     add 9c0efb70723 DB setup: support db schema creation (with --schema-only) without force recreate option (#12004)
     add 2dd1e6d786f Enable UEFI on KVM hosts (by default), and configure with some default settings (#11740)
     add 8230f04a790 CKS: update cloud.kubernetes.cluster.network.offering to dynamic (#11847)
     add c5c3cc40c1e consider Instance in Starting state for listPodsByUserConcentration (#11845)
     add 2954e969475 Veeam: get templateId from vm instance if vm is created from ISO (#10705)
     add d26122bf22b Veeam: use pre-defined object mapper (#10715)
     add 50fe265017c Merge remote-tracking branch 'apache/4.20' into 4.22
     add 15439ede7d4 UI: Update and reset domain level configuration (#11571)
     add 671d8ad704b Track volume usage data at a vm granularity as well (#11531)
     add e90e31d3861 add isPerson check to query for AD (#11843)
     add 21d844ba1c2 ui: fix zone options for image instance deploy button (#12060)
     add dba889ea3ef UI: fix list of zones if zone has icon (#12083)
     add 9ec8cc4186f api,server,ui: improve listing public ip for associate (#11591)
     add e33f4754f53 Fix DB upgrade script for 4.22 (#12111)
     add 81787b310ee fix API Request Parameters Logged Credential Masking in ApiServer (#12020)
     add f0a0936675c server: fix volume offering not updated after offering change (#12003)
     add 028dd869456 fixed Password Exposure in IPMI Tool Command Execution (#12028)
     add e23c7ef7017 Merge release branch 4.20 to 4.22
     add 9032fe3fb53 merge LTS branch 4.22 into main
     add 4e61ddd1bcf import
     add 5798fb43a3a Fix upgrade files (#12155)
     add db6147060b5 Rename PRE-COMMIT.md to PRE_COMMIT.md and fix link (#12157)
     add f3a112fd9e7 use upstream method for creating enums from strings (#12158)
     add 516012a0b49 ceph: fix offline volume migration between ceph pools (#12103)
     add f379d789635 ui: fix section search filter (#12146)
     add 44119cf34fc ui: fix dsiple managementservermetricsresponse - agentcount (#12148)
     add 243f566a603 refactor: add null check for BroadcastDomainType retrievals (#11572)
     add 2941b518ba1 Merge remote-tracking branch 'apache/4.20' into 4.22
     add 26009659f9b Merge remote-tracking branch 'apache/4.22'
     add 4379666fb62 Proxmox Extension : Make settings such as storage, disk_size,... (#12174)
     add e4414d1c449 Fix agent wait before reconnect (#12153)
     add a0ba2aaf3f9 Merge branch '4.20' into 4.22
     add b0d74fe00c0 Merge branch '4.22'
     add c81295439f8 removed code in comments (#11145)
     add 5151f8dc6a9 java dependabot file (#11409)
     add 51910cd2606 Add license information to dependabot.yaml
     add 3c6484792d8 UI: Create Account form to set proper domain and role based on route (#12200)
     add cfe96026dc4 Standardize and auto add license headers to all Vue files with pre-commit (#12081)
     add 78f9e6584b9 UI(vue) + extras: fix bugs/spelling and standardize (#12073)
     add f417c6b0a1d yamllint use `extends: default` (#12066)
     add 1919dcfb7ce pre-commit trailing-whitespace cleanup LICENSE/NOTICE (#12242)
     add f570e168364 .github: initial version of Code Owners (#12253)
     add 39d0d62fddd api,server: normalize string empty value on config update (#11770)
     add da1c7cebf94 server: trim autoscale Windows VM hostname (#11327)
     add 12f43219528 Changes error message when using invalid `endpoint.url` (#8603)
     add 223fc2512ce Enhance NFS mount option check for empty response (#11839)
     add 0a13fb27f58 Prevent scaling of cluster if count / resources exceed account resource limits (#12167)
     add 951649c420a Support iprange while creating remote access vpn (#12063)
     add ba52db9b3e9 ui: allow macaddress input for add nic to vm (#12145)
     add 43483869705 Optimize drs plan generation (#12014)
     add 79ebf6959e1 refactor storapool automation (#11789)
     add e1c48c3adca server,ui: prevent role change for default accounts (#11761)
     add 494c56a499f check for active MSses before starting DB upgrade (#12140)
     add 67217d4d2ea UI: Option to choose the isolation method when creating the public IP range (#12000)
     add 7aba434dc42 merge forward 4.20 to 4.22 LTS
     add f06ac512fa9 merge forward 4.22 to main
     add 53a39d3ff79 .github: Move `dependabot.yml` to the correct directory (#12243)
     add 124fcde59c4 unlink an ldap domain (#11962)
     add 2ac2e5ba33f Github Action: Add action to auto close issues/PRs after a certain time (#8667)
     add 10d76d3384a Bump cs.aws.sdk.version from 1.12.439 to 1.12.795 (#12267)
     add c65d0633011 build(deps): bump spring-web from 5.3.23 to 6.0.0

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   (2d1b673946b)
            \
             N -- N -- N   refs/heads/dependabot/maven/org.springframework-spring-web-6.0.0 (c65d0633011)

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                                          |    23 +-
 .github/CODEOWNERS                                 |    22 +
 .github/ISSUE_TEMPLATE/bug.yml                     |    46 +
 .github/ISSUE_TEMPLATE/feature_request.yml         |    25 +
 .github/boring-cyborg.yml                          |     4 +-
 .github/dependabot.yml                             |    28 +
 .github/linters/.flake8                            |    21 +-
 .github/linters/.markdown-lint.yml                 |    88 +
 .github/linters/.yamllint.yml                      |    32 +
 .github/linters/codespell.txt                      |   492 +
 .github/workflows/build.yml                        |    68 +
 .github/workflows/ci.yml                           |   350 +
 .github/workflows/codecov.yml                      |    23 +-
 .github/workflows/codeql-analysis.yml              |    48 +
 .github/workflows/coverage-check.yml               |    94 -
 .github/workflows/docker-cloudstack-simulator.yml  |    65 +
 .../workflows/license-templates/LICENSE.txt        |     0
 .github/workflows/linter.yml                       |    44 -
 .github/workflows/main-coverage.yml                |    63 -
 .github/workflows/main-sonar-check.yml             |    68 +
 .github/workflows/merge-conflict-checker.yml       |     6 +-
 .github/workflows/pre-commit.yml                   |    49 +
 .github/workflows/rat.yml                          |    50 +
 .github/workflows/sonar-check.yml                  |    73 +
 .github/workflows/stale.yml                        |    41 +
 .github/workflows/ui.yml                           |    67 +
 .gitignore                                         |   138 +-
 .markdownlintignore                                |     1 +
 .pre-commit-config.yaml                            |   178 +
 .python-version                                    |     2 +-
 .travis.yml                                        |   228 -
 CHANGES.md                                         |    28 +-
 CONTRIBUTING.md                                    |   120 +-
 INSTALL.md                                         |    88 +-
 ISSUE_TEMPLATE.md                                  |     3 -
 LICENSE                                            |   243 +-
 NOTICE                                             |    52 +-
 PRE_COMMIT.md                                      |    62 +
 PULL_REQUEST_TEMPLATE.md                           |    15 +-
 README.md                                          |    97 +-
 agent/bindir/cloud-setup-agent.in                  |    75 +-
 agent/bindir/cloud-ssh.in                          |     4 +-
 agent/bindir/libvirtqemuhook.in                    |    43 +-
 agent/conf/agent.properties                        |   550 +-
 agent/conf/cloudstack-agent.logrotate.in           |     4 +-
 agent/conf/developer.properties.template           |     4 +-
 agent/conf/environment.properties.in               |     4 +-
 agent/conf/log4j-cloud.xml.in                      |   145 +-
 agent/conf/uefi.properties.in                      |    24 +
 agent/pom.xml                                      |     2 +-
 agent/src/main/java/com/cloud/agent/Agent.java     |  1090 +-
 .../src/main/java/com/cloud/agent/AgentShell.java  |   258 +-
 .../src/main/java/com/cloud/agent/IAgentShell.java |    14 +-
 .../cloud/agent/dao/impl/PropertiesStorage.java    |    18 +-
 .../cloud/agent/dhcp/DhcpProtocolParserServer.java |     8 +-
 .../java/com/cloud/agent/dhcp/DhcpSnooper.java     |    41 -
 .../java/com/cloud/agent/dhcp/FakeDhcpSnooper.java |   161 -
 .../direct/download/DirectTemplateDownloader.java  |    37 -
 .../download/DirectTemplateDownloaderImpl.java     |   163 -
 .../download/HttpDirectTemplateDownloader.java     |   110 -
 .../download/HttpsDirectTemplateDownloader.java    |   131 -
 .../download/MetalinkDirectTemplateDownloader.java |   101 -
 .../download/NfsDirectTemplateDownloader.java      |    71 -
 .../java/com/cloud/agent/mockvm/MockVmMgr.java     |    22 +-
 .../cloud/agent/properties/AgentProperties.java    |   877 +-
 .../properties/AgentPropertiesFileHandler.java     |    45 +-
 .../com/cloud/agent/resource/DummyResource.java    |     4 +-
 .../consoleproxy/ConsoleProxyResource.java         |   163 +-
 .../test/java/com/cloud/agent/AgentShellTest.java  |   310 +
 agent/src/test/java/com/cloud/agent/AgentTest.java |   257 +
 .../properties/AgentPropertiesFileHandlerTest.java |   106 +-
 .../agent/properties/AgentPropertiesTest.java      |    43 +
 api/pom.xml                                        |     7 +-
 api/src/main/java/com/cloud/agent/api/Answer.java  |     2 +-
 api/src/main/java/com/cloud/agent/api/Command.java |    55 +
 .../main/java/com/cloud/agent/api/LogLevel.java    |     6 +-
 .../java/com/cloud/agent/api/StoragePoolInfo.java  |     7 +
 .../java/com/cloud/agent/api/VgpuTypesInfo.java    |   164 +-
 .../com/cloud/agent/api/storage/OVFHelper.java     |    65 +-
 .../com/cloud/agent/api/storage/OVFParser.java     |     9 +-
 .../main/java/com/cloud/agent/api/to/BucketTO.java |    50 +
 .../java/com/cloud/agent/api/to/DatadiskTO.java    |     2 +-
 .../main/java/com/cloud/agent/api/to/DiskTO.java   |     6 +-
 .../main/java/com/cloud/agent/api/to/DpdkTO.java   |     2 +-
 .../com/cloud/agent/api/to/FirewallRuleTO.java     |     6 +-
 .../java/com/cloud/agent/api/to/GPUDeviceTO.java   |    33 +-
 .../main/java/com/cloud/agent/api/to/HostTO.java   |    12 +
 .../java/com/cloud/agent/api/to/IpAddressTO.java   |    18 +-
 .../com/cloud/agent/api/to/LoadBalancerTO.java     |    30 +-
 .../java/com/cloud/agent/api/to/NetworkTO.java     |     6 +-
 .../main/java/com/cloud/agent/api/to/NfsTO.java    |     8 +
 .../main/java/com/cloud/agent/api/to/NicTO.java    |    36 +
 .../cloud/agent/api/to/PortForwardingRuleTO.java   |     9 +
 .../com/cloud/agent/api/to/RemoteInstanceTO.java   |    85 +
 api/src/main/java/com/cloud/agent/api/to/S3TO.java |     8 +
 .../com/cloud/agent/api/to/StorageFilerTO.java     |     3 +-
 .../main/java/com/cloud/agent/api/to/SwiftTO.java  |     8 +
 .../agent/api/to/VirtualMachineMetadataTO.java     |   182 +
 .../com/cloud/agent/api/to/VirtualMachineTO.java   |   185 +-
 .../api/to/deployasis/OVFConfigurationTO.java      |     2 +-
 .../agent/api/to/deployasis/OVFNetworkTO.java      |     2 +-
 .../to/deployasis/OVFVirtualHardwareItemTO.java    |     2 +-
 .../to/deployasis/OVFVirtualHardwareSectionTO.java |     2 +-
 api/src/main/java/com/cloud/bgp/ASNumber.java      |    38 +
 api/src/main/java/com/cloud/bgp/ASNumberRange.java |    31 +
 api/src/main/java/com/cloud/bgp/BGPService.java    |    44 +
 api/src/main/java/com/cloud/capacity/Capacity.java |    13 +
 .../cloud/configuration/ConfigurationService.java  |    90 +-
 .../java/com/cloud/configuration/Resource.java     |    59 +-
 api/src/main/java/com/cloud/cpu/CPU.java           |    70 +
 api/src/main/java/com/cloud/dc/DataCenter.java     |     6 +
 .../main/java/com/cloud/dc/DedicatedResources.java |     4 +
 api/src/main/java/com/cloud/dc/Pod.java            |     2 +
 .../main/java/com/cloud/dc/VmwareDatacenter.java   |    37 +
 .../com/cloud/deploy/DataCenterDeployment.java     |    31 +
 .../java/com/cloud/deploy/DeployDestination.java   |     8 +-
 .../com/cloud/deploy/DeploymentClusterPlanner.java |    11 +
 .../main/java/com/cloud/deploy/DeploymentPlan.java |    19 +
 .../java/com/cloud/deploy/DeploymentPlanner.java   |    24 +-
 api/src/main/java/com/cloud/deploy/HAPlanner.java  |     2 +-
 api/src/main/java/com/cloud/event/EventTypes.java  |   317 +
 .../CloudTwoFactorAuthenticationException.java     |    32 +
 .../exception/OperationTimedoutException.java      |     2 +-
 .../cloud/exception/StorageAccessException.java    |     4 +-
 api/src/main/java/com/cloud/gpu/GPU.java           |   105 +-
 api/src/main/java/com/cloud/host/ControlState.java |    41 +
 api/src/main/java/com/cloud/host/Host.java         |    15 +-
 .../main/java/com/cloud/host/HostEnvironment.java  |     1 -
 api/src/main/java/com/cloud/host/HostStats.java    |     1 -
 api/src/main/java/com/cloud/host/Status.java       |     1 +
 .../main/java/com/cloud/hypervisor/Hypervisor.java |   170 +-
 .../java/com/cloud/hypervisor/HypervisorGuru.java  |    46 +-
 .../kubernetes/cluster/KubernetesCluster.java      |   176 +
 .../cluster/KubernetesClusterHelper.java           |    25 -
 .../cluster/KubernetesServiceHelper.java           |    40 +
 api/src/main/java/com/cloud/network/IpAddress.java |     3 +
 .../main/java/com/cloud/network/Ipv6Service.java   |     2 +-
 api/src/main/java/com/cloud/network/Network.java   |    21 +-
 .../main/java/com/cloud/network/NetworkModel.java  |    30 +-
 .../java/com/cloud/network/NetworkProfile.java     |    39 +-
 .../java/com/cloud/network/NetworkRuleApplier.java |     2 +-
 .../java/com/cloud/network/NetworkService.java     |    50 +
 api/src/main/java/com/cloud/network/Networks.java  |    17 +-
 .../cloud/network/PhysicalNetworkTrafficType.java  |     2 +
 .../java/com/cloud/network/PublicIpQuarantine.java |    38 +
 .../com/cloud/network/RouterHealthCheckResult.java |     2 +-
 .../com/cloud/network/SDNProviderNetworkRule.java  |   358 +
 .../com/cloud/network/Site2SiteVpnConnection.java  |     2 +-
 .../java/com/cloud/network/TungstenProvider.java   |    31 +
 api/src/main/java/com/cloud/network/VNF.java       |   111 +
 .../network/VirtualNetworkApplianceService.java    |    13 +
 .../com/cloud/network/VirtualRouterProvider.java   |     2 +-
 .../network/VpcVirtualNetworkApplianceService.java |    22 +-
 .../com/cloud/network/as/AutoScaleService.java     |     2 +
 .../com/cloud/network/as/AutoScaleVmProfile.java   |     4 +
 .../cloud/network/element/BgpServiceProvider.java  |    31 +
 .../element/LoadBalancingServiceProvider.java      |     3 +
 .../network/element/NetworkACLServiceProvider.java |     3 +
 .../com/cloud/network/element/NetworkElement.java  |     9 +
 .../element/PortForwardingServiceProvider.java     |    28 +
 .../com/cloud/network/element/VpcProvider.java     |     7 +
 .../java/com/cloud/network/guru/NetworkGuru.java   |    23 +-
 .../com/cloud/network/lb/LoadBalancingRule.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/NsxProvider.java    |    34 +
 .../java/com/cloud/network/nsx/NsxService.java     |    38 +
 .../cloud/network/rules/LbStickinessMethod.java    |     4 +-
 .../java/com/cloud/network/rules/RulesService.java |     5 +-
 .../com/cloud/network/rules/StaticNatRule.java     |     2 +-
 .../network/security/SecurityGroupService.java     |     5 +
 .../security/TungstenSecurityGroupRule.java        |    23 +
 .../com/cloud/network/vpc/NetworkACLService.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   |     4 +
 .../java/com/cloud/network/vpc/VpcOffering.java    |    11 +
 .../cloud/network/vpc/VpcProvisioningService.java  |     6 +-
 .../java/com/cloud/network/vpc/VpcService.java     |   142 +-
 .../cloud/network/vpn/RemoteAccessVpnService.java  |     2 +-
 .../main/java/com/cloud/offering/DiskOffering.java |     7 +-
 .../java/com/cloud/offering/DiskOfferingInfo.java  |     9 +-
 .../java/com/cloud/offering/NetworkOffering.java   |    23 +
 .../java/com/cloud/offering/ServiceOffering.java   |     9 +-
 api/src/main/java/com/cloud/org/Cluster.java       |     5 +
 .../java/com/cloud/projects/ProjectService.java    |     4 +-
 .../region/ha/GlobalLoadBalancingRulesService.java |     3 +-
 .../java/com/cloud/resource/ResourceService.java   |    17 +-
 .../java/com/cloud/resource/ResourceState.java     |     7 +-
 .../cloud/resource/RollingMaintenanceManager.java  |     2 +-
 .../cloud/server/ManagementServerHostStats.java    |     7 +
 .../java/com/cloud/server/ManagementService.java   |    86 +-
 .../java/com/cloud/server/ResourceIconManager.java |     6 +
 .../java/com/cloud/server/ResourceManagerUtil.java |     1 +
 .../main/java/com/cloud/server/ResourceTag.java    |    20 +-
 .../main/java/com/cloud/storage/DataStoreRole.java |     5 +-
 api/src/main/java/com/cloud/storage/GuestOS.java   |     2 +
 .../java/com/cloud/storage/GuestOsCategory.java    |     5 +
 .../java/com/cloud/storage/MigrationOptions.java   |    11 +-
 api/src/main/java/com/cloud/storage/ScopeType.java |    15 +
 api/src/main/java/com/cloud/storage/Snapshot.java  |     4 +-
 api/src/main/java/com/cloud/storage/Storage.java   |    98 +-
 .../java/com/cloud/storage/StoragePoolStatus.java  |    15 +
 .../java/com/cloud/storage/StorageService.java     |    32 +
 .../main/java/com/cloud/storage/StorageStats.java  |     3 +
 api/src/main/java/com/cloud/storage/Upload.java    |     2 +-
 .../storage/VMTemplateStorageResourceAssoc.java    |     3 +
 api/src/main/java/com/cloud/storage/Volume.java    |    75 +-
 .../java/com/cloud/storage/VolumeApiService.java   |    62 +-
 .../cloud/storage/snapshot/SnapshotApiService.java |    23 +-
 .../com/cloud/storage/snapshot/SnapshotPolicy.java |     3 +-
 .../com/cloud/template/TemplateApiService.java     |    19 +-
 .../com/cloud/template/VirtualMachineTemplate.java |     7 +
 api/src/main/java/com/cloud/user/Account.java      |     7 +-
 .../main/java/com/cloud/user/AccountService.java   |    27 +-
 .../main/java/com/cloud/user/DomainService.java    |     3 +
 .../java/com/cloud/user/ResourceLimitService.java  |   126 +-
 api/src/main/java/com/cloud/user/User.java         |    11 +-
 api/src/main/java/com/cloud/user/UserAccount.java  |    18 +
 api/src/main/java/com/cloud/user/UserData.java     |     1 +
 api/src/main/java/com/cloud/uservm/UserVm.java     |     2 +
 api/src/main/java/com/cloud/vm/Nic.java            |     2 +
 api/src/main/java/com/cloud/vm/NicIpAlias.java     |     2 +-
 api/src/main/java/com/cloud/vm/NicProfile.java     |    24 +-
 api/src/main/java/com/cloud/vm/UserVmService.java  |   134 +-
 api/src/main/java/com/cloud/vm/VirtualMachine.java |    15 +-
 .../java/com/cloud/vm/VirtualMachineProfile.java   |     8 +
 .../main/java/com/cloud/vm/VmDetailConstants.java  |    50 +
 api/src/main/java/com/cloud/vm/VmDiskInfo.java     |    39 +
 .../java/com/cloud/vm/snapshot/VMSnapshot.java     |     7 +-
 .../com/cloud/vm/snapshot/VMSnapshotService.java   |     3 +
 .../main/java/org/apache/cloudstack/acl/Role.java  |    12 +
 .../org/apache/cloudstack/acl/RoleService.java     |    27 +-
 .../java/org/apache/cloudstack/acl/RoleType.java   |    36 +-
 .../affinity/AffinityGroupProcessor.java           |    10 +-
 .../cloudstack/affinity/AffinityGroupResponse.java |    22 +
 .../cloudstack/affinity/AffinityProcessorBase.java |     9 +
 .../org/apache/cloudstack/alert/AlertService.java  |    11 +-
 .../cloudstack/annotation/AnnotationService.java   |     4 +-
 .../cloudstack/api/AbstractGetUploadParamsCmd.java |    40 +-
 .../org/apache/cloudstack/api/ApiArgValidator.java |     5 +
 .../cloudstack/api/ApiCommandResourceType.java     |    23 +-
 .../org/apache/cloudstack/api/ApiConstants.java    |   507 +-
 .../org/apache/cloudstack/api/ApiErrorCode.java    |     3 +
 .../apache/cloudstack/api/ApiServerService.java    |     8 +
 .../org/apache/cloudstack/api/BaseAsyncCmd.java    |     2 -
 .../java/org/apache/cloudstack/api/BaseCmd.java    |    96 +-
 .../api/BaseListRetrieveOnlyResourceCountCmd.java  |    28 +
 .../api/BaseListTemplateOrIsoPermissionsCmd.java   |     5 -
 .../cloudstack/api/BaseUpdateTemplateOrIsoCmd.java |    24 +-
 .../api/BaseUpdateTemplateOrIsoPermissionsCmd.java |     5 -
 .../apache/cloudstack/api/InternalIdentity.java    |    14 +
 .../apache/cloudstack/api/ResponseGenerator.java   |    79 +-
 .../cloudstack/api/auth/APIAuthenticationType.java |     2 +-
 .../api/auth/PluggableAPIAuthenticator.java        |     2 +-
 .../command/admin/account/CreateAccountCmd.java    |     8 -
 .../command/admin/account/DeleteAccountCmd.java    |    19 +-
 .../command/admin/account/DisableAccountCmd.java   |     8 -
 .../command/admin/account/EnableAccountCmd.java    |     8 -
 .../api/command/admin/account/LockAccountCmd.java  |     8 -
 .../command/admin/account/UpdateAccountCmd.java    |    23 +-
 .../api/command/admin/acl/CreateRoleCmd.java       |    19 +-
 .../command/admin/acl/CreateRolePermissionCmd.java |     9 +-
 .../api/command/admin/acl/DeleteRoleCmd.java       |     8 +-
 .../command/admin/acl/DeleteRolePermissionCmd.java |     8 +-
 .../api/command/admin/acl/DisableRoleCmd.java      |    69 +
 .../api/command/admin/acl/EnableRoleCmd.java       |    69 +
 .../api/command/admin/acl/ImportRoleCmd.java       |    19 +-
 .../command/admin/acl/ListRolePermissionsCmd.java  |     8 +-
 .../api/command/admin/acl/ListRolesCmd.java        |    37 +-
 .../cloudstack/api/command/admin/acl/RoleCmd.java  |     2 +
 .../api/command/admin/acl/UpdateRoleCmd.java       |    17 +-
 .../command/admin/acl/UpdateRolePermissionCmd.java |    10 +-
 .../admin/acl/project/CreateProjectRoleCmd.java    |    16 +-
 .../project/CreateProjectRolePermissionCmd.java    |    19 +-
 .../admin/acl/project/DeleteProjectRoleCmd.java    |    17 +-
 .../project/DeleteProjectRolePermissionCmd.java    |    17 +-
 .../acl/project/ListProjectRolePermissionsCmd.java |     8 +-
 .../admin/acl/project/ListProjectRolesCmd.java     |    10 +-
 .../admin/acl/project/UpdateProjectRoleCmd.java    |    17 +-
 .../project/UpdateProjectRolePermissionCmd.java    |    17 +-
 .../admin/address/AcquirePodIpCmdByAdmin.java      |     4 +-
 .../admin/address/AssociateIPAddrCmdByAdmin.java   |     2 -
 .../admin/address/ReleasePodIpCmdByAdmin.java      |     4 +-
 .../UpdateVMAffinityGroupCmdByAdmin.java           |     2 -
 .../api/command/admin/alert/GenerateAlertCmd.java  |    10 +-
 .../command/admin/annotation/AddAnnotationCmd.java |    12 +-
 .../admin/annotation/ListAnnotationsCmd.java       |    11 +-
 .../admin/annotation/RemoveAnnotationCmd.java      |     8 +-
 .../annotation/UpdateAnnotationVisibilityCmd.java  |     8 +-
 .../command/admin/autoscale/CreateCounterCmd.java  |    11 +-
 .../command/admin/autoscale/DeleteCounterCmd.java  |    12 +-
 .../admin/backup/DeleteBackupOfferingCmd.java      |     8 +-
 .../admin/backup/ImportBackupOfferingCmd.java      |     8 +-
 .../backup/ListBackupProviderOfferingsCmd.java     |     7 +-
 .../admin/backup/ListBackupProvidersCmd.java       |     8 +-
 .../admin/backup/UpdateBackupOfferingCmd.java      |    12 +-
 .../api/command/admin/bgp/CreateASNRangeCmd.java   |    83 +
 .../api/command/admin/bgp/DeleteASNRangeCmd.java   |    79 +
 .../api/command/admin/bgp/ListASNRangesCmd.java    |    79 +
 .../api/command/admin/bgp/ReleaseASNumberCmd.java  |    83 +
 .../api/command/admin/ca/IssueCertificateCmd.java  |    12 +-
 .../api/command/admin/ca/ListCAProvidersCmd.java   |     8 +-
 .../api/command/admin/ca/ListCaCertificateCmd.java |     8 +-
 .../command/admin/ca/ProvisionCertificateCmd.java  |     9 +-
 .../api/command/admin/ca/RevokeCertificateCmd.java |     8 +-
 .../api/command/admin/cluster/AddClusterCmd.java   |    58 +-
 .../command/admin/cluster/DeleteClusterCmd.java    |     8 -
 .../admin/cluster/ExecuteClusterDrsPlanCmd.java    |   147 +
 .../admin/cluster/GenerateClusterDrsPlanCmd.java   |    85 +
 .../admin/cluster/ListClusterDrsPlanCmd.java       |    62 +
 .../api/command/admin/cluster/ListClustersCmd.java |    70 +-
 .../command/admin/cluster/UpdateClusterCmd.java    |    36 +-
 .../command/admin/config/ListCfgGroupsByCmd.java   |    77 +
 .../api/command/admin/config/ListCfgsByCmd.java    |   129 +-
 .../admin/config/ListDeploymentPlannersCmd.java    |     8 -
 .../config/ListHypervisorCapabilitiesCmd.java      |     8 -
 .../api/command/admin/config/ResetCfgCmd.java      |     8 -
 .../api/command/admin/config/UpdateCfgCmd.java     |    64 +-
 .../config/UpdateHypervisorCapabilitiesCmd.java    |    22 +-
 .../admin/diagnostics/GetDiagnosticsDataCmd.java   |     8 +-
 .../admin/diagnostics/RunDiagnosticsCmd.java       |    13 +-
 .../ListTemplateDirectDownloadCertificatesCmd.java |    11 +-
 ...visionTemplateDirectDownloadCertificateCmd.java |     8 +-
 ...RevokeTemplateDirectDownloadCertificateCmd.java |    12 +-
 ...UploadTemplateDirectDownloadCertificateCmd.java |   236 +-
 .../api/command/admin/domain/CreateDomainCmd.java  |    10 +-
 .../api/command/admin/domain/DeleteDomainCmd.java  |     8 -
 .../admin/domain/ListDomainChildrenCmd.java        |     8 -
 .../api/command/admin/domain/ListDomainsCmd.java   |    37 +-
 .../api/command/admin/domain/MoveDomainCmd.java    |    73 +
 .../api/command/admin/domain/UpdateDomainCmd.java  |     8 -
 .../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 +
 .../api/command/admin/guest/AddGuestOsCmd.java     |    21 +-
 .../command/admin/guest/AddGuestOsMappingCmd.java  |    25 +-
 .../admin/guest/DeleteGuestOsCategoryCmd.java      |    89 +
 .../admin/guest/GetHypervisorGuestOsNamesCmd.java  |   103 +
 .../command/admin/guest/ListGuestOsMappingCmd.java |    24 +-
 .../api/command/admin/guest/RemoveGuestOsCmd.java  |     8 -
 .../admin/guest/RemoveGuestOsMappingCmd.java       |     8 -
 .../admin/guest/UpdateGuestOsCategoryCmd.java      |   113 +
 .../api/command/admin/guest/UpdateGuestOsCmd.java  |    48 +-
 .../admin/guest/UpdateGuestOsMappingCmd.java       |    16 +-
 .../command/admin/ha/ConfigureHAForHostCmd.java    |     9 +-
 .../command/admin/ha/DisableHAForClusterCmd.java   |     8 +-
 .../api/command/admin/ha/DisableHAForHostCmd.java  |     9 +-
 .../api/command/admin/ha/DisableHAForZoneCmd.java  |     8 +-
 .../command/admin/ha/EnableHAForClusterCmd.java    |     8 +-
 .../api/command/admin/ha/EnableHAForHostCmd.java   |     9 +-
 .../api/command/admin/ha/EnableHAForZoneCmd.java   |     8 +-
 .../command/admin/ha/ListHostHAProvidersCmd.java   |     8 +-
 .../command/admin/ha/ListHostHAResourcesCmd.java   |     8 +-
 .../api/command/admin/host/AddHostCmd.java         |    32 +-
 .../command/admin/host/AddSecondaryStorageCmd.java |    10 +-
 .../admin/host/CancelHostAsDegradedCmd.java        |     5 -
 .../admin/host/CancelHostMaintenanceCmd.java       |   103 +
 .../command/admin/host/CancelMaintenanceCmd.java   |   111 -
 .../admin/host/DeclareHostAsDegradedCmd.java       |     5 -
 .../api/command/admin/host/DeleteHostCmd.java      |    12 +-
 .../admin/host/FindHostsForMigrationCmd.java       |     8 -
 .../api/command/admin/host/ListHostTagsCmd.java    |    10 +-
 .../api/command/admin/host/ListHostsCmd.java       |    47 +-
 .../admin/host/PrepareForHostMaintenanceCmd.java   |   111 +
 .../admin/host/PrepareForMaintenanceCmd.java       |   119 -
 .../api/command/admin/host/ReconnectHostCmd.java   |     8 -
 .../admin/host/ReleaseHostReservationCmd.java      |     8 -
 .../api/command/admin/host/UpdateHostCmd.java      |    51 +-
 .../command/admin/host/UpdateHostPasswordCmd.java  |    11 +-
 .../ConfigureInternalLoadBalancerElementCmd.java   |    19 +-
 .../CreateInternalLoadBalancerElementCmd.java      |    22 +-
 .../admin/internallb/ListInternalLBVMsCmd.java     |     2 -
 .../ListInternalLoadBalancerElementsCmd.java       |    32 +-
 .../admin/internallb/StartInternalLBVMCmd.java     |     2 -
 .../admin/internallb/StopInternalLBVMCmd.java      |     4 +-
 .../admin/iso/ListIsoPermissionsCmdByAdmin.java    |     2 +-
 .../api/command/admin/iso/ListIsosCmdByAdmin.java  |    21 +
 .../api/command/admin/management/ListMgmtsCmd.java |    21 +-
 .../management/RemoveManagementServerCmd.java      |    61 +
 .../command/admin/network/AddNetworkDeviceCmd.java |     8 -
 .../network/AddNetworkServiceProviderCmd.java      |     8 -
 .../network/CreateGuestNetworkIpv6PrefixCmd.java   |    10 +-
 .../CreateIpv4SubnetForGuestNetworkCmd.java        |   108 +
 .../admin/network/CreateIpv4SubnetForZoneCmd.java  |   125 +
 .../network/CreateManagementNetworkIpRangeCmd.java |    15 +-
 .../admin/network/CreateNetworkCmdByAdmin.java     |    17 +-
 .../admin/network/CreateNetworkOfferingCmd.java    |   184 +-
 .../admin/network/CreatePhysicalNetworkCmd.java    |     8 -
 .../network/CreateStorageNetworkIpRangeCmd.java    |    12 +-
 .../admin/network/DedicateGuestVlanRangeCmd.java   |     8 -
 .../network/DedicateIpv4SubnetForZoneCmd.java      |   111 +
 .../network/DeleteGuestNetworkIpv6PrefixCmd.java   |    10 +-
 .../DeleteIpv4SubnetForGuestNetworkCmd.java        |    88 +
 .../admin/network/DeleteIpv4SubnetForZoneCmd.java  |    88 +
 .../network/DeleteManagementNetworkIpRangeCmd.java |    18 +-
 .../admin/network/DeleteNetworkDeviceCmd.java      |     8 -
 .../admin/network/DeleteNetworkOfferingCmd.java    |     8 -
 .../network/DeleteNetworkServiceProviderCmd.java   |    12 +-
 .../admin/network/DeletePhysicalNetworkCmd.java    |     8 -
 .../network/DeleteStorageNetworkIpRangeCmd.java    |    10 +-
 .../network/ListDedicatedGuestVlanRangesCmd.java   |     8 -
 .../network/ListGuestNetworkIpv6PrefixesCmd.java   |     8 +-
 .../command/admin/network/ListGuestVlansCmd.java   |    10 +-
 .../network/ListIpv4SubnetsForGuestNetworkCmd.java |   123 +
 .../admin/network/ListIpv4SubnetsForZoneCmd.java   |   120 +
 .../admin/network/ListNetworkDeviceCmd.java        |     2 -
 .../network/ListNetworkIsolationMethodsCmd.java    |     6 -
 .../network/ListNetworkServiceProvidersCmd.java    |     8 -
 .../admin/network/ListPhysicalNetworksCmd.java     |     8 -
 .../network/ListStorageNetworkIpRangeCmd.java      |     9 +-
 .../network/ListSupportedNetworkServicesCmd.java   |     8 -
 .../command/admin/network/MigrateNetworkCmd.java   |    11 +-
 .../api/command/admin/network/MigrateVPCCmd.java   |    11 +-
 .../network/ReleaseDedicatedGuestVlanRangeCmd.java |     8 -
 .../ReleaseDedicatedIpv4SubnetForZoneCmd.java      |    88 +
 .../admin/network/UpdateIpv4SubnetForZoneCmd.java  |    98 +
 .../admin/network/UpdateNetworkOfferingCmd.java    |    10 +-
 .../network/UpdateNetworkServiceProviderCmd.java   |     8 -
 .../admin/network/UpdatePhysicalNetworkCmd.java    |     8 -
 .../UpdatePodManagementNetworkIpRangeCmd.java      |    14 +-
 .../network/UpdateStorageNetworkIpRangeCmd.java    |    10 +-
 .../network/bgp/ChangeBgpPeersForNetworkCmd.java   |   109 +
 .../admin/network/bgp/ChangeBgpPeersForVpcCmd.java |   109 +
 .../admin/network/bgp/CreateBgpPeerCmd.java        |   168 +
 .../admin/network/bgp/DedicateBgpPeerCmd.java      |   111 +
 .../admin/network/bgp/DeleteBgpPeerCmd.java        |    88 +
 .../command/admin/network/bgp/ListBgpPeersCmd.java |   130 +
 .../network/bgp/ReleaseDedicatedBgpPeerCmd.java    |    88 +
 .../admin/network/bgp/UpdateBgpPeerCmd.java        |   149 +
 .../admin/offering/CreateDiskOfferingCmd.java      |    15 +-
 .../admin/offering/CreateServiceOfferingCmd.java   |   111 +-
 .../admin/offering/DeleteDiskOfferingCmd.java      |     8 -
 .../admin/offering/DeleteServiceOfferingCmd.java   |     8 -
 ...AccountAllowedToCreateOfferingsWithTagsCmd.java |    56 +
 .../admin/offering/UpdateDiskOfferingCmd.java      |    22 +-
 .../admin/offering/UpdateServiceOfferingCmd.java   |    58 +-
 .../ChangeOutOfBandManagementPasswordCmd.java      |    20 +-
 .../ConfigureOutOfBandManagementCmd.java           |    19 +-
 .../DisableOutOfBandManagementForClusterCmd.java   |    19 +-
 .../DisableOutOfBandManagementForHostCmd.java      |    19 +-
 .../DisableOutOfBandManagementForZoneCmd.java      |    19 +-
 .../EnableOutOfBandManagementForClusterCmd.java    |    19 +-
 .../EnableOutOfBandManagementForHostCmd.java       |    19 +-
 .../EnableOutOfBandManagementForZoneCmd.java       |    19 +-
 .../IssueOutOfBandManagementPowerActionCmd.java    |    14 +-
 .../api/command/admin/pod/CreatePodCmd.java        |    30 +-
 .../api/command/admin/pod/DeletePodCmd.java        |     8 -
 .../api/command/admin/pod/ListPodsByCmd.java       |    29 +-
 .../api/command/admin/pod/UpdatePodCmd.java        |     8 -
 .../api/command/admin/region/AddRegionCmd.java     |     8 -
 .../admin/region/CreatePortableIpRangeCmd.java     |    10 +-
 .../admin/region/DeletePortableIpRangeCmd.java     |     2 -
 .../admin/region/ListPortableIpRangesCmd.java      |     2 -
 .../api/command/admin/region/RemoveRegionCmd.java  |     8 -
 .../api/command/admin/region/UpdateRegionCmd.java  |     8 -
 .../command/admin/resource/ArchiveAlertsCmd.java   |     8 -
 .../admin/resource/CleanVMReservationsCmd.java     |     2 -
 .../command/admin/resource/DeleteAlertsCmd.java    |     8 -
 .../command/admin/resource/ListAlertTypesCmd.java  |    54 +
 .../api/command/admin/resource/ListAlertsCmd.java  |     8 -
 .../command/admin/resource/ListCapacityCmd.java    |    20 +-
 .../admin/resource/PurgeExpungedResourcesCmd.java  |   131 +
 .../admin/resource/StartRollingMaintenanceCmd.java |    13 +-
 .../admin/resource/UploadCustomCertificateCmd.java |     8 -
 .../admin/resource/icon/DeleteResourceIconCmd.java |     8 -
 .../admin/resource/icon/ListResourceIconCmd.java   |     8 -
 .../admin/resource/icon/UploadResourceIconCmd.java |    10 +-
 .../admin/router/ConfigureOvsElementCmd.java       |     9 -
 .../router/ConfigureVirtualRouterElementCmd.java   |     8 -
 .../router/CreateVirtualRouterElementCmd.java      |     8 -
 .../api/command/admin/router/DestroyRouterCmd.java |     8 -
 .../router/GetRouterHealthCheckResultsCmd.java     |    10 +-
 .../command/admin/router/ListOvsElementsCmd.java   |    11 +-
 .../api/command/admin/router/ListRoutersCmd.java   |    22 +-
 .../admin/router/ListVirtualRouterElementsCmd.java |     8 -
 .../api/command/admin/router/RebootRouterCmd.java  |     8 -
 .../api/command/admin/router/StartRouterCmd.java   |     8 -
 .../api/command/admin/router/StopRouterCmd.java    |    10 +-
 .../api/command/admin/router/UpgradeRouterCmd.java |     8 -
 .../admin/router/UpgradeRouterTemplateCmd.java     |     8 -
 .../admin/snapshot/ListSnapshotsCmdByAdmin.java    |    50 +
 .../command/admin/storage/AddImageStoreCmd.java    |    10 +-
 .../command/admin/storage/AddImageStoreS3CMD.java  |     4 +-
 .../admin/storage/AddObjectStoragePoolCmd.java     |   137 +
 .../CancelPrimaryStorageMaintenanceCmd.java        |     2 -
 .../admin/storage/ChangeStoragePoolScopeCmd.java   |    98 +
 .../admin/storage/ConfigureStorageAccessCmd.java   |   135 +
 .../storage/CreateSecondaryStagingStoreCmd.java    |    10 +-
 .../admin/storage/CreateStoragePoolCmd.java        |    25 +-
 .../command/admin/storage/DeleteImageStoreCmd.java |     8 -
 .../admin/storage/DeleteObjectStoragePoolCmd.java  |    67 +
 .../api/command/admin/storage/DeletePoolCmd.java   |     8 -
 .../storage/DeleteSecondaryStagingStoreCmd.java    |     8 -
 .../admin/storage/DownloadImageStoreObjectCmd.java |    99 +
 .../storage/FindStoragePoolsForMigrationCmd.java   |    13 +-
 .../admin/storage/ListImageStoreObjectsCmd.java    |    77 +
 .../command/admin/storage/ListImageStoresCmd.java  |     8 -
 .../admin/storage/ListObjectStoragePoolsCmd.java   |    77 +
 .../storage/ListSecondaryStagingStoresCmd.java     |     2 -
 .../admin/storage/ListStorageAccessGroupsCmd.java  |    65 +
 .../admin/storage/ListStoragePoolObjectsCmd.java   |    78 +
 .../command/admin/storage/ListStoragePoolsCmd.java |    68 +-
 .../admin/storage/ListStorageProvidersCmd.java     |     8 -
 .../command/admin/storage/ListStorageTagsCmd.java  |     8 -
 ...grateResourcesToAnotherSecondaryStorageCmd.java |   140 +
 .../storage/MigrateSecondaryStorageDataCmd.java    |    12 +-
 .../PreparePrimaryStorageForMaintenanceCmd.java    |     2 -
 .../command/admin/storage/SyncStoragePoolCmd.java  |    10 +-
 .../storage/UpdateCloudToUseObjectStoreCmd.java    |    10 +-
 .../command/admin/storage/UpdateImageStoreCmd.java |    23 +-
 .../admin/storage/UpdateObjectStoragePoolCmd.java  |    99 +
 .../storage/UpdateStorageCapabilitiesCmd.java      |    11 +-
 .../admin/storage/UpdateStoragePoolCmd.java        |    63 +-
 .../CreateSecondaryStorageSelectorCmd.java         |    93 +
 .../ListSecondaryStorageSelectorsCmd.java          |    63 +
 .../RemoveSecondaryStorageSelectorCmd.java         |    54 +
 .../UpdateSecondaryStorageSelectorCmd.java         |    67 +
 .../api/command/admin/swift/AddSwiftCmd.java       |    10 +-
 .../api/command/admin/swift/ListSwiftsCmd.java     |     8 -
 .../command/admin/systemvm/DestroySystemVmCmd.java |    10 +-
 .../command/admin/systemvm/ListSystemVMsCmd.java   |    20 +-
 .../command/admin/systemvm/MigrateSystemVMCmd.java |    16 +-
 .../command/admin/systemvm/PatchSystemVMCmd.java   |    15 +-
 .../command/admin/systemvm/RebootSystemVmCmd.java  |     8 -
 .../command/admin/systemvm/ScaleSystemVMCmd.java   |    12 +-
 .../command/admin/systemvm/StartSystemVMCmd.java   |     8 -
 .../command/admin/systemvm/StopSystemVmCmd.java    |    10 +-
 .../command/admin/systemvm/UpgradeSystemVMCmd.java |    10 +-
 .../admin/template/CopyTemplateCmdByAdmin.java     |     1 -
 .../ListTemplatePermissionsCmdByAdmin.java         |     2 +-
 .../admin/template/ListTemplatesCmdByAdmin.java    |    25 +-
 .../admin/template/ListVnfTemplatesCmdByAdmin.java |    32 +
 .../command/admin/template/PrepareTemplateCmd.java |     8 -
 .../admin/template/RegisterTemplateCmdByAdmin.java |     4 +-
 .../template/RegisterVnfTemplateCmdByAdmin.java    |    31 +
 .../admin/template/UpdateTemplateCmdByAdmin.java   |     3 +-
 .../template/UpdateVnfTemplateCmdByAdmin.java      |    31 +
 .../command/admin/usage/AddTrafficMonitorCmd.java  |     8 -
 .../api/command/admin/usage/AddTrafficTypeCmd.java |     8 -
 .../admin/usage/DeleteTrafficMonitorCmd.java       |     8 -
 .../command/admin/usage/DeleteTrafficTypeCmd.java  |     8 -
 .../admin/usage/GenerateUsageRecordsCmd.java       |    12 +-
 .../admin/usage/ListTrafficMonitorsCmd.java        |     8 -
 .../usage/ListTrafficTypeImplementorsCmd.java      |     7 -
 .../command/admin/usage/ListTrafficTypesCmd.java   |    11 +-
 .../command/admin/usage/ListUsageRecordsCmd.java   |    29 +-
 .../api/command/admin/usage/ListUsageTypesCmd.java |    13 +-
 .../admin/usage/RemoveRawUsageRecordsCmd.java      |     8 -
 .../command/admin/usage/UpdateTrafficTypeCmd.java  |     8 -
 .../api/command/admin/user/CreateUserCmd.java      |     8 -
 .../api/command/admin/user/DeleteUserCmd.java      |    15 +-
 .../api/command/admin/user/DisableUserCmd.java     |     8 -
 .../api/command/admin/user/EnableUserCmd.java      |     8 -
 .../api/command/admin/user/GetUserCmd.java         |     8 -
 .../api/command/admin/user/GetUserKeysCmd.java     |    22 +-
 .../api/command/admin/user/ListUsersCmd.java       |    48 +-
 .../api/command/admin/user/LockUserCmd.java        |     8 -
 .../api/command/admin/user/MoveUserCmd.java        |    16 +-
 .../api/command/admin/user/RegisterCmd.java        |     8 -
 .../api/command/admin/user/UpdateUserCmd.java      |    26 +-
 .../command/admin/vlan/CreateVlanIpRangeCmd.java   |    29 +-
 .../admin/vlan/DedicatePublicIpRangeCmd.java       |     8 -
 .../command/admin/vlan/DeleteVlanIpRangeCmd.java   |    10 +-
 .../command/admin/vlan/ListVlanIpRangesCmd.java    |     8 -
 .../admin/vlan/ReleasePublicIpRangeCmd.java        |     8 -
 .../command/admin/vlan/UpdateVlanIpRangeCmd.java   |    14 +-
 .../api/command/admin/vm/AssignVMCmd.java          |    29 +-
 .../admin/vm/CreateVMFromBackupCmdByAdmin.java     |    55 +
 .../api/command/admin/vm/DeployVMCmdByAdmin.java   |     2 -
 .../admin/vm/DeployVnfApplianceCmdByAdmin.java     |    34 +
 .../api/command/admin/vm/ExpungeVMCmd.java         |     8 -
 .../api/command/admin/vm/GetVMUserDataCmd.java     |     7 -
 .../admin/vm/ImportUnmanagedInstanceCmd.java       |    31 +-
 .../api/command/admin/vm/ImportVmCmd.java          |   293 +
 .../ListAffectedVmsForStorageScopeChangeCmd.java   |    77 +
 .../api/command/admin/vm/ListImportVMTasksCmd.java |   116 +
 .../admin/vm/ListUnmanagedInstancesCmd.java        |    11 +-
 .../api/command/admin/vm/ListVMsCmdByAdmin.java    |     2 -
 .../api/command/admin/vm/ListVmsForImportCmd.java  |   132 +
 .../admin/vm/ListVnfAppliancesCmdByAdmin.java      |    36 +
 .../api/command/admin/vm/MigrateVMCmd.java         |    17 +-
 .../vm/MigrateVirtualMachineWithVolumeCmd.java     |    52 +-
 .../api/command/admin/vm/RecoverVMCmd.java         |     8 -
 .../command/admin/vm/UnmanageVMInstanceCmd.java    |    49 +-
 .../admin/volume/DestroyVolumeCmdByAdmin.java      |     2 -
 .../api/command/admin/volume/ImportVolumeCmd.java  |   165 +
 .../admin/volume/ListVolumesForImportCmd.java      |    93 +
 .../admin/volume/RecoverVolumeCmdByAdmin.java      |     2 -
 .../command/admin/volume/UnmanageVolumeCmd.java    |   127 +
 .../admin/vpc/CreatePrivateGatewayByAdminCmd.java  |     4 +-
 .../api/command/admin/vpc/CreateVPCCmdByAdmin.java |    20 +-
 .../command/admin/vpc/CreateVPCOfferingCmd.java    |   154 +-
 .../command/admin/vpc/DeletePrivateGatewayCmd.java |     8 -
 .../command/admin/vpc/DeleteVPCOfferingCmd.java    |     8 -
 .../vpc/ListPrivateGatewaysCmdByAdminCmd.java      |    33 +
 .../command/admin/vpc/UpdateVPCOfferingCmd.java    |     8 -
 .../api/command/admin/zone/CreateZoneCmd.java      |    30 +-
 .../api/command/admin/zone/DeleteZoneCmd.java      |     8 -
 .../admin/zone/MarkDefaultZoneForAccountCmd.java   |     8 -
 .../api/command/admin/zone/UpdateZoneCmd.java      |     8 -
 .../user/account/AddAccountToProjectCmd.java       |     8 -
 .../command/user/account/AddUserToProjectCmd.java  |    10 +-
 .../user/account/DeleteAccountFromProjectCmd.java  |     8 -
 .../user/account/DeleteUserFromProjectCmd.java     |    11 +-
 .../api/command/user/account/ListAccountsCmd.java  |    36 +-
 .../user/account/ListProjectAccountsCmd.java       |     8 -
 .../command/user/address/AssociateIPAddrCmd.java   |     8 +-
 .../user/address/DisassociateIPAddrCmd.java        |    76 +-
 .../user/address/ListPublicIpAddressesCmd.java     |    42 +-
 .../user/address/ListQuarantinedIpsCmd.java        |    51 +
 .../api/command/user/address/ReleaseIPAddrCmd.java |     8 -
 .../user/address/RemoveQuarantinedIpCmd.java       |    72 +
 .../api/command/user/address/ReserveIPAddrCmd.java |     8 -
 .../api/command/user/address/UpdateIPAddrCmd.java  |    10 +-
 .../user/address/UpdateQuarantinedIpCmd.java       |    75 +
 .../user/affinitygroup/CreateAffinityGroupCmd.java |     8 -
 .../user/affinitygroup/DeleteAffinityGroupCmd.java |     8 -
 .../affinitygroup/ListAffinityGroupTypesCmd.java   |     8 -
 .../user/affinitygroup/ListAffinityGroupsCmd.java  |     8 -
 .../affinitygroup/UpdateVMAffinityGroupCmd.java    |     2 -
 .../user/autoscale/CreateAutoScalePolicyCmd.java   |     2 -
 .../user/autoscale/CreateAutoScaleVmGroupCmd.java  |     6 +-
 .../autoscale/CreateAutoScaleVmProfileCmd.java     |    19 +-
 .../command/user/autoscale/CreateConditionCmd.java |     2 -
 .../user/autoscale/DeleteAutoScalePolicyCmd.java   |    10 +-
 .../user/autoscale/DeleteAutoScaleVmGroupCmd.java  |    10 +-
 .../autoscale/DeleteAutoScaleVmProfileCmd.java     |    10 +-
 .../command/user/autoscale/DeleteConditionCmd.java |    12 +-
 .../user/autoscale/DisableAutoScaleVmGroupCmd.java |     2 -
 .../user/autoscale/EnableAutoScaleVmGroupCmd.java  |     2 -
 .../user/autoscale/ListAutoScalePoliciesCmd.java   |     8 -
 .../user/autoscale/ListAutoScaleVmGroupsCmd.java   |     8 -
 .../user/autoscale/ListAutoScaleVmProfilesCmd.java |     8 -
 .../command/user/autoscale/ListConditionsCmd.java  |     8 -
 .../command/user/autoscale/ListCountersCmd.java    |     2 -
 .../user/autoscale/UpdateAutoScalePolicyCmd.java   |     8 -
 .../user/autoscale/UpdateAutoScaleVmGroupCmd.java  |     8 -
 .../autoscale/UpdateAutoScaleVmProfileCmd.java     |    27 +-
 .../command/user/autoscale/UpdateConditionCmd.java |    13 +-
 .../AssignVirtualMachineToBackupOfferingCmd.java   |    11 +-
 .../api/command/user/backup/CreateBackupCmd.java   |    44 +-
 .../user/backup/CreateBackupScheduleCmd.java       |    29 +-
 .../api/command/user/backup/DeleteBackupCmd.java   |     9 +-
 .../user/backup/DeleteBackupScheduleCmd.java       |    28 +-
 .../user/backup/ListBackupOfferingsCmd.java        |     7 +-
 .../command/user/backup/ListBackupScheduleCmd.java |    52 +-
 .../api/command/user/backup/ListBackupsCmd.java    |    44 +-
 .../RemoveVirtualMachineFromBackupOfferingCmd.java |    11 +-
 .../api/command/user/backup/RestoreBackupCmd.java  |     9 +-
 .../RestoreVolumeFromBackupAndAttachToVMCmd.java   |     9 +-
 .../user/backup/UpdateBackupScheduleCmd.java       |     3 +-
 .../backup/repository/AddBackupRepositoryCmd.java  |   143 +
 .../repository/DeleteBackupRepositoryCmd.java      |    76 +
 .../repository/ListBackupRepositoriesCmd.java      |   110 +
 .../repository/UpdateBackupRepositoryCmd.java      |   116 +
 .../api/command/user/bgp/ListASNumbersCmd.java     |   134 +
 .../api/command/user/bucket/CreateBucketCmd.java   |   200 +
 .../api/command/user/bucket/DeleteBucketCmd.java   |    92 +
 .../api/command/user/bucket/ListBucketsCmd.java    |    98 +
 .../api/command/user/bucket/UpdateBucketCmd.java   |   130 +
 .../command/user/config/ListCapabilitiesCmd.java   |    21 +-
 .../consoleproxy/CreateConsoleEndpointCmd.java     |    15 +-
 .../user/consoleproxy/ListConsoleSessionsCmd.java  |   182 +
 .../api/command/user/event/ArchiveEventsCmd.java   |     8 -
 .../api/command/user/event/DeleteEventsCmd.java    |     8 -
 .../api/command/user/event/ListEventTypesCmd.java  |     8 -
 .../api/command/user/event/ListEventsCmd.java      |    22 +-
 .../user/firewall/CreateEgressFirewallRuleCmd.java |    14 +-
 .../user/firewall/CreateFirewallRuleCmd.java       |    41 +-
 .../user/firewall/CreatePortForwardingRuleCmd.java |    32 +-
 .../user/firewall/DeleteEgressFirewallRuleCmd.java |     8 -
 .../user/firewall/DeleteFirewallRuleCmd.java       |     8 -
 .../user/firewall/DeletePortForwardingRuleCmd.java |     8 -
 .../user/firewall/IListFirewallRulesCmd.java       |     2 +-
 .../user/firewall/ListEgressFirewallRulesCmd.java  |     8 -
 .../user/firewall/ListFirewallRulesCmd.java        |     8 -
 .../user/firewall/ListPortForwardingRulesCmd.java  |     8 -
 .../user/firewall/UpdateEgressFirewallRuleCmd.java |     8 -
 .../user/firewall/UpdateFirewallRuleCmd.java       |    10 +-
 .../user/firewall/UpdatePortForwardingRuleCmd.java |    23 +-
 .../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       |    85 +-
 .../api/command/user/guest/ListGuestOsCmd.java     |    22 +-
 .../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 +
 .../user/ipv6/CreateIpv6FirewallRuleCmd.java       |    14 +-
 .../user/ipv6/DeleteIpv6FirewallRuleCmd.java       |    10 +-
 .../user/ipv6/ListIpv6FirewallRulesCmd.java        |    10 +-
 .../user/ipv6/UpdateIpv6FirewallRuleCmd.java       |    10 +-
 .../api/command/user/iso/AttachIsoCmd.java         |     2 -
 .../api/command/user/iso/CopyIsoCmd.java           |     2 -
 .../api/command/user/iso/DeleteIsoCmd.java         |    12 -
 .../api/command/user/iso/DetachIsoCmd.java         |     4 +-
 .../api/command/user/iso/ExtractIsoCmd.java        |    25 +-
 .../command/user/iso/GetUploadParamsForIsoCmd.java |    48 +-
 .../command/user/iso/ListIsoPermissionsCmd.java    |     7 +-
 .../api/command/user/iso/ListIsosCmd.java          |    57 +-
 .../api/command/user/iso/RegisterIsoCmd.java       |    29 +-
 .../api/command/user/iso/UpdateIsoCmd.java         |     2 -
 .../command/user/iso/UpdateIsoPermissionsCmd.java  |     5 -
 .../api/command/user/job/ListAsyncJobsCmd.java     |    16 +-
 .../command/user/job/QueryAsyncJobResultCmd.java   |     8 -
 .../loadbalancer/AssignCertToLoadBalancerCmd.java  |    32 +-
 .../loadbalancer/AssignToLoadBalancerRuleCmd.java  |    12 +-
 .../CreateApplicationLoadBalancerCmd.java          |    16 +-
 .../loadbalancer/CreateLBHealthCheckPolicyCmd.java |    10 +-
 .../loadbalancer/CreateLBStickinessPolicyCmd.java  |     6 +-
 .../loadbalancer/CreateLoadBalancerRuleCmd.java    |    23 +-
 .../DeleteApplicationLoadBalancerCmd.java          |     8 -
 .../loadbalancer/DeleteLBHealthCheckPolicyCmd.java |     8 -
 .../loadbalancer/DeleteLBStickinessPolicyCmd.java  |     2 -
 .../loadbalancer/DeleteLoadBalancerRuleCmd.java    |     8 -
 .../user/loadbalancer/DeleteSslCertCmd.java        |    10 +-
 .../ListApplicationLoadBalancersCmd.java           |     8 -
 .../loadbalancer/ListLBHealthCheckPoliciesCmd.java |     8 -
 .../loadbalancer/ListLBStickinessPoliciesCmd.java  |     8 -
 .../ListLoadBalancerRuleInstancesCmd.java          |    62 +-
 .../loadbalancer/ListLoadBalancerRulesCmd.java     |     8 -
 .../command/user/loadbalancer/ListSslCertsCmd.java |     8 -
 .../RemoveCertFromLoadBalancerCmd.java             |    19 +-
 .../RemoveFromLoadBalancerRuleCmd.java             |     8 -
 .../UpdateApplicationLoadBalancerCmd.java          |     8 -
 .../loadbalancer/UpdateLBHealthCheckPolicyCmd.java |    10 +-
 .../loadbalancer/UpdateLBStickinessPolicyCmd.java  |    10 +-
 .../loadbalancer/UpdateLoadBalancerRuleCmd.java    |    15 +-
 .../user/loadbalancer/UploadSslCertCmd.java        |     8 -
 .../user/nat/CreateIpForwardingRuleCmd.java        |    10 +-
 .../user/nat/DeleteIpForwardingRuleCmd.java        |     8 -
 .../api/command/user/nat/DisableStaticNatCmd.java  |     8 -
 .../api/command/user/nat/EnableStaticNatCmd.java   |    12 +-
 .../command/user/nat/ListIpForwardingRulesCmd.java |     8 -
 .../command/user/network/CreateNetworkACLCmd.java  |    39 +-
 .../user/network/CreateNetworkACLListCmd.java      |    44 +-
 .../api/command/user/network/CreateNetworkCmd.java |    69 +-
 .../user/network/CreateNetworkPermissionsCmd.java  |    10 +-
 .../command/user/network/DeleteNetworkACLCmd.java  |     8 -
 .../user/network/DeleteNetworkACLListCmd.java      |     8 -
 .../api/command/user/network/DeleteNetworkCmd.java |     8 -
 .../user/network/ListNetworkACLListsCmd.java       |     8 -
 .../command/user/network/ListNetworkACLsCmd.java   |     8 -
 .../user/network/ListNetworkOfferingsCmd.java      |    16 +-
 .../user/network/ListNetworkPermissionsCmd.java    |    10 +-
 .../user/network/ListNetworkProtocolsCmd.java      |   107 +
 .../api/command/user/network/ListNetworksCmd.java  |    46 +-
 .../user/network/MoveNetworkAclItemCmd.java        |     4 +-
 .../user/network/RemoveNetworkPermissionsCmd.java  |    10 +-
 .../user/network/ReplaceNetworkACLListCmd.java     |     8 -
 .../user/network/ResetNetworkPermissionsCmd.java   |    10 +-
 .../command/user/network/RestartNetworkCmd.java    |     8 -
 .../user/network/UpdateNetworkACLItemCmd.java      |     2 -
 .../user/network/UpdateNetworkACLListCmd.java      |     8 -
 .../api/command/user/network/UpdateNetworkCmd.java |    27 +-
 .../routing/CreateRoutingFirewallRuleCmd.java      |   271 +
 .../routing/DeleteRoutingFirewallRuleCmd.java      |   109 +
 .../routing/ListRoutingFirewallRulesCmd.java       |   115 +
 .../routing/UpdateRoutingFirewallRuleCmd.java      |   125 +
 .../user/offering/ListDiskOfferingsCmd.java        |    62 +-
 .../user/offering/ListServiceOfferingsCmd.java     |    79 +-
 .../command/user/project/ActivateProjectCmd.java   |     2 -
 .../api/command/user/project/CreateProjectCmd.java |    13 +-
 .../api/command/user/project/DeleteProjectCmd.java |     8 -
 .../user/project/DeleteProjectInvitationCmd.java   |     8 -
 .../user/project/ListProjectInvitationsCmd.java    |     8 -
 .../api/command/user/project/ListProjectsCmd.java  |     8 -
 .../command/user/project/SuspendProjectCmd.java    |     8 -
 .../api/command/user/project/UpdateProjectCmd.java |    21 +-
 .../user/project/UpdateProjectInvitationCmd.java   |     8 -
 .../api/command/user/region/ListRegionsCmd.java    |     8 -
 .../ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java |     8 -
 .../ha/gslb/CreateGlobalLoadBalancerRuleCmd.java   |    10 +-
 .../ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java   |     8 -
 .../ha/gslb/ListGlobalLoadBalancerRuleCmd.java     |     8 -
 .../gslb/RemoveFromGlobalLoadBalancerRuleCmd.java  |     2 -
 .../ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java   |     8 -
 .../user/resource/GetCloudIdentifierCmd.java       |     8 -
 .../user/resource/ListDetailOptionsCmd.java        |     8 +-
 .../command/user/resource/ListHypervisorsCmd.java  |     8 -
 .../user/resource/ListResourceLimitsCmd.java       |    22 +-
 .../user/resource/UpdateResourceCountCmd.java      |    25 +-
 .../user/resource/UpdateResourceLimitCmd.java      |    18 +-
 .../AuthorizeSecurityGroupEgressCmd.java           |     8 -
 .../AuthorizeSecurityGroupIngressCmd.java          |     8 -
 .../user/securitygroup/CreateSecurityGroupCmd.java |     8 -
 .../user/securitygroup/DeleteSecurityGroupCmd.java |    10 +-
 .../user/securitygroup/ListSecurityGroupsCmd.java  |     8 -
 .../RevokeSecurityGroupEgressCmd.java              |     8 -
 .../RevokeSecurityGroupIngressCmd.java             |     8 -
 .../user/securitygroup/UpdateSecurityGroupCmd.java |    11 +-
 .../command/user/snapshot/ArchiveSnapshotCmd.java  |     2 -
 .../api/command/user/snapshot/CopySnapshotCmd.java |   213 +
 .../command/user/snapshot/CreateSnapshotCmd.java   |    62 +-
 .../snapshot/CreateSnapshotFromVMSnapshotCmd.java  |    34 +-
 .../user/snapshot/CreateSnapshotPolicyCmd.java     |    63 +-
 .../command/user/snapshot/DeleteSnapshotCmd.java   |    19 +-
 .../user/snapshot/DeleteSnapshotPoliciesCmd.java   |     8 -
 .../command/user/snapshot/ExtractSnapshotCmd.java  |   115 +
 .../user/snapshot/ListSnapshotPoliciesCmd.java     |    15 +-
 .../command/user/snapshot/ListSnapshotsCmd.java    |    53 +-
 .../command/user/snapshot/RevertSnapshotCmd.java   |     8 -
 .../user/snapshot/UpdateSnapshotPolicyCmd.java     |    10 +-
 .../api/command/user/ssh/CreateSSHKeyPairCmd.java  |     8 -
 .../api/command/user/ssh/DeleteSSHKeyPairCmd.java  |     8 -
 .../api/command/user/ssh/ListSSHKeyPairsCmd.java   |     8 -
 .../command/user/ssh/RegisterSSHKeyPairCmd.java    |     8 -
 .../sharedfs/ChangeSharedFSDiskOfferingCmd.java    |   145 +
 .../sharedfs/ChangeSharedFSServiceOfferingCmd.java |   147 +
 .../user/storage/sharedfs/CreateSharedFSCmd.java   |   304 +
 .../user/storage/sharedfs/DestroySharedFSCmd.java  |   116 +
 .../user/storage/sharedfs/ExpungeSharedFSCmd.java  |    96 +
 .../user/storage/sharedfs/ListSharedFSCmd.java     |   114 +
 .../storage/sharedfs/ListSharedFSProvidersCmd.java |    60 +
 .../user/storage/sharedfs/RecoverSharedFSCmd.java  |    83 +
 .../user/storage/sharedfs/RestartSharedFSCmd.java  |   145 +
 .../user/storage/sharedfs/StartSharedFSCmd.java    |   135 +
 .../user/storage/sharedfs/StopSharedFSCmd.java     |   115 +
 .../user/storage/sharedfs/UpdateSharedFSCmd.java   |   113 +
 .../api/command/user/tag/CreateTagsCmd.java        |     8 -
 .../api/command/user/tag/DeleteTagsCmd.java        |     8 -
 .../api/command/user/tag/ListTagsCmd.java          |     6 -
 .../api/command/user/template/CopyTemplateCmd.java |     4 +-
 .../command/user/template/CreateTemplateCmd.java   |   149 +-
 .../command/user/template/DeleteTemplateCmd.java   |    24 +-
 .../user/template/DeleteVnfTemplateCmd.java        |    47 +
 .../command/user/template/ExtractTemplateCmd.java  |    27 +-
 .../template/GetUploadParamsForTemplateCmd.java    |    37 +-
 .../user/template/ListTemplatePermissionsCmd.java  |     8 +-
 .../command/user/template/ListTemplatesCmd.java    |   110 +-
 .../command/user/template/ListVnfTemplatesCmd.java |    33 +
 .../command/user/template/RegisterTemplateCmd.java |    71 +-
 .../user/template/RegisterVnfTemplateCmd.java      |    79 +
 .../command/user/template/UpdateTemplateCmd.java   |    25 +-
 .../template/UpdateTemplatePermissionsCmd.java     |     7 +-
 .../user/template/UpdateVnfTemplateCmd.java        |    87 +
 .../user/userdata/BaseRegisterUserDataCmd.java     |    87 +
 .../user/userdata/DeleteCniConfigurationCmd.java   |    74 +
 .../command/user/userdata/DeleteUserDataCmd.java   |    24 +-
 .../user/userdata/LinkUserDataToTemplateCmd.java   |    21 +-
 .../user/userdata/ListCniConfigurationCmd.java     |    59 +
 .../api/command/user/userdata/ListUserDataCmd.java |    20 +-
 .../user/userdata/RegisterCniConfigurationCmd.java |    77 +
 .../command/user/userdata/RegisterUserDataCmd.java |    98 +-
 .../api/command/user/vm/AddIpToVmNicCmd.java       |     4 +-
 .../api/command/user/vm/AddNicToVMCmd.java         |     2 -
 .../api/command/user/vm/BaseDeployVMCmd.java       |   848 +
 .../api/command/user/vm/CreateVMFromBackupCmd.java |   153 +
 .../api/command/user/vm/CreateVMScheduleCmd.java   |   152 +
 .../api/command/user/vm/DeleteVMScheduleCmd.java   |   112 +
 .../api/command/user/vm/DeployVMCmd.java           |   707 +-
 .../api/command/user/vm/DeployVnfApplianceCmd.java |    74 +
 .../api/command/user/vm/DestroyVMCmd.java          |     5 +-
 .../api/command/user/vm/GetVMPasswordCmd.java      |    13 +-
 .../api/command/user/vm/ListNicsCmd.java           |    12 +-
 .../api/command/user/vm/ListVMScheduleCmd.java     |    97 +
 .../cloudstack/api/command/user/vm/ListVMsCmd.java |   208 +-
 .../api/command/user/vm/ListVnfAppliancesCmd.java  |    39 +
 .../api/command/user/vm/RebootVMCmd.java           |     5 +-
 .../api/command/user/vm/RemoveIpFromVmNicCmd.java  |    10 +-
 .../api/command/user/vm/RemoveNicFromVMCmd.java    |     2 -
 .../api/command/user/vm/ResetVMPasswordCmd.java    |    15 +-
 .../api/command/user/vm/ResetVMSSHKeyCmd.java      |     2 -
 .../api/command/user/vm/ResetVMUserDataCmd.java    |    20 +-
 .../api/command/user/vm/RestoreVMCmd.java          |    47 +-
 .../cloudstack/api/command/user/vm/ScaleVMCmd.java |    25 +-
 .../cloudstack/api/command/user/vm/StartVMCmd.java |    32 +-
 .../cloudstack/api/command/user/vm/StopVMCmd.java  |     5 +-
 .../command/user/vm/UpdateDefaultNicForVMCmd.java  |     2 -
 .../api/command/user/vm/UpdateVMCmd.java           |    88 +-
 .../api/command/user/vm/UpdateVMScheduleCmd.java   |   139 +
 .../api/command/user/vm/UpdateVmNicIpCmd.java      |     8 -
 .../api/command/user/vm/UpgradeVMCmd.java          |    17 +-
 .../api/command/user/vmgroup/CreateVMGroupCmd.java |     8 -
 .../api/command/user/vmgroup/DeleteVMGroupCmd.java |     8 -
 .../api/command/user/vmgroup/ListVMGroupsCmd.java  |     8 -
 .../api/command/user/vmgroup/UpdateVMGroupCmd.java |     8 -
 .../user/vmsnapshot/CreateVMSnapshotCmd.java       |    14 +-
 .../user/vmsnapshot/DeleteVMSnapshotCmd.java       |     8 -
 .../command/user/vmsnapshot/ListVMSnapshotCmd.java |     6 -
 .../user/vmsnapshot/RevertToVMSnapshotCmd.java     |     2 -
 .../command/user/volume/AddResourceDetailCmd.java  |     8 -
 .../api/command/user/volume/AssignVolumeCmd.java   |   117 +
 .../api/command/user/volume/AttachVolumeCmd.java   |     2 -
 .../user/volume/ChangeOfferingForVolumeCmd.java    |     8 +-
 .../user/volume/CheckAndRepairVolumeCmd.java       |   138 +
 .../api/command/user/volume/CreateVolumeCmd.java   |     5 +-
 .../api/command/user/volume/DeleteVolumeCmd.java   |     8 -
 .../api/command/user/volume/DestroyVolumeCmd.java  |     2 -
 .../api/command/user/volume/DetachVolumeCmd.java   |     2 -
 .../api/command/user/volume/ExtractVolumeCmd.java  |    36 +-
 .../user/volume/GetUploadParamsForVolumeCmd.java   |     4 +-
 .../user/volume/ListResourceDetailsCmd.java        |     6 -
 .../api/command/user/volume/ListVolumesCmd.java    |    31 +-
 .../api/command/user/volume/RecoverVolumeCmd.java  |     2 -
 .../user/volume/RemoveResourceDetailCmd.java       |     8 -
 .../api/command/user/volume/ResizeVolumeCmd.java   |    25 +-
 .../api/command/user/volume/UpdateVolumeCmd.java   |    16 +-
 .../api/command/user/volume/UploadVolumeCmd.java   |     4 +-
 .../command/user/vpc/CreatePrivateGatewayCmd.java  |    10 +-
 .../api/command/user/vpc/CreateStaticRouteCmd.java |    65 +-
 .../api/command/user/vpc/CreateVPCCmd.java         |    76 +-
 .../api/command/user/vpc/DeleteStaticRouteCmd.java |     8 -
 .../api/command/user/vpc/DeleteVPCCmd.java         |    12 +-
 .../command/user/vpc/ListPrivateGatewaysCmd.java   |    15 +-
 .../api/command/user/vpc/ListStaticRoutesCmd.java  |     6 -
 .../api/command/user/vpc/ListVPCOfferingsCmd.java  |    22 +-
 .../api/command/user/vpc/ListVPCsCmd.java          |     6 +-
 .../api/command/user/vpc/RestartVPCCmd.java        |    16 +-
 .../api/command/user/vpc/UpdateVPCCmd.java         |    45 +-
 .../api/command/user/vpn/AddVpnUserCmd.java        |    26 +-
 .../command/user/vpn/CreateRemoteAccessVpnCmd.java |    16 +-
 .../command/user/vpn/CreateVpnConnectionCmd.java   |    14 +-
 .../user/vpn/CreateVpnCustomerGatewayCmd.java      |     8 -
 .../api/command/user/vpn/CreateVpnGatewayCmd.java  |    22 +-
 .../command/user/vpn/DeleteRemoteAccessVpnCmd.java |     8 -
 .../command/user/vpn/DeleteVpnConnectionCmd.java   |    10 +-
 .../user/vpn/DeleteVpnCustomerGatewayCmd.java      |     8 -
 .../api/command/user/vpn/DeleteVpnGatewayCmd.java  |     8 -
 .../command/user/vpn/ListRemoteAccessVpnsCmd.java  |     8 -
 .../command/user/vpn/ListVpnConnectionsCmd.java    |     8 -
 .../user/vpn/ListVpnCustomerGatewaysCmd.java       |     8 -
 .../api/command/user/vpn/ListVpnGatewaysCmd.java   |     8 -
 .../api/command/user/vpn/ListVpnUsersCmd.java      |     8 -
 .../api/command/user/vpn/RemoveVpnUserCmd.java     |    16 +-
 .../command/user/vpn/ResetVpnConnectionCmd.java    |    10 +-
 .../command/user/vpn/UpdateRemoteAccessVpnCmd.java |    10 +-
 .../command/user/vpn/UpdateVpnConnectionCmd.java   |    10 +-
 .../user/vpn/UpdateVpnCustomerGatewayCmd.java      |     8 -
 .../api/command/user/vpn/UpdateVpnGatewayCmd.java  |    10 +-
 .../api/command/user/zone/ListZonesCmd.java        |    35 +-
 .../api/command/utils/OfferingUtils.java           |    38 +
 .../cloudstack/api/response/ASNRangeResponse.java  |    93 +
 .../cloudstack/api/response/ASNumberResponse.java  |   237 +
 .../cloudstack/api/response/AccountResponse.java   |   154 +-
 .../api/response/AcquireIPAddressResponse.java     |    11 +-
 .../api/response/AcquirePodIpCmdResponse.java      |    12 +-
 .../cloudstack/api/response/AlertTypeResponse.java |    55 +
 .../api/response/AnnotationResponse.java           |     4 +-
 .../response/ApplicationLoadBalancerResponse.java  |     9 +
 .../cloudstack/api/response/AsyncJobResponse.java  |    51 +-
 .../api/response/AutoScalePolicyResponse.java      |     9 +
 .../api/response/AutoScaleVmGroupResponse.java     |     9 +
 .../api/response/AutoScaleVmProfileResponse.java   |    58 +-
 .../api/response/BackupOfferingResponse.java       |    16 +
 .../api/response/BackupRepositoryResponse.java     |   154 +
 .../cloudstack/api/response/BackupResponse.java    |    79 +-
 .../api/response/BackupRestorePointResponse.java   |    10 +-
 .../api/response/BackupScheduleResponse.java       |    29 +-
 .../cloudstack/api/response/BaseRoleResponse.java  |     9 +
 .../cloudstack/api/response/BgpPeerResponse.java   |   200 +
 .../cloudstack/api/response/BucketResponse.java    |   302 +
 .../api/response/CapabilitiesResponse.java         |    97 +
 .../cloudstack/api/response/CapacityResponse.java  |    11 +-
 .../api/response/ChildTemplateResponse.java        |     2 +-
 .../response/ClusterDrsPlanMigrationResponse.java  |    75 +
 .../api/response/ClusterDrsPlanResponse.java       |    83 +
 .../cloudstack/api/response/ClusterResponse.java   |   120 +-
 .../cloudstack/api/response/ConditionResponse.java |     9 +
 .../api/response/ConfigurationGroupResponse.java   |    76 +
 .../api/response/ConfigurationResponse.java        |    96 +
 .../response/ConfigurationSubGroupResponse.java    |    50 +
 .../api/response/ConsoleSessionResponse.java       |   236 +
 .../api/response/ControlledEntityResponse.java     |     2 +
 .../api/response/ControlledViewEntityResponse.java |     2 +
 .../response/CreateConsoleEndpointResponse.java    |     2 +-
 .../api/response/DataCenterIpv4SubnetResponse.java |   151 +
 .../api/response/DiskOfferingResponse.java         |    20 +
 .../cloudstack/api/response/DomainResponse.java    |   142 +
 .../api/response/DomainRouterResponse.java         |    24 +
 .../cloudstack/api/response/EventResponse.java     |    17 +
 .../ExtensionCustomActionParameterResponse.java    |    58 +
 .../response/ExtensionCustomActionResponse.java    |   184 +
 .../api/response/ExtensionResourceResponse.java    |    95 +
 .../cloudstack/api/response/ExtensionResponse.java |   182 +
 .../api/response/GetUploadParamsResponse.java      |     4 +
 .../api/response/GlobalLoadBalancerResponse.java   |     9 +
 .../cloudstack/api/response/GpuCardResponse.java   |   109 +
 .../cloudstack/api/response/GpuDeviceResponse.java |   227 +
 .../api/response/GuestOSCategoryResponse.java      |    29 +-
 .../cloudstack/api/response/GuestOSResponse.java   |    40 +
 .../api/response/GuestVlanRangeResponse.java       |     8 +
 .../cloudstack/api/response/GuestVlanResponse.java |     8 +
 .../cloudstack/api/response/GuiThemeResponse.java  |   179 +
 .../api/response/HostForMigrationResponse.java     |   432 +-
 .../cloudstack/api/response/HostResponse.java      |   290 +-
 .../cloudstack/api/response/HostTagResponse.java   |    15 +-
 .../response/HypervisorCapabilitiesResponse.java   |     7 +-
 .../response/HypervisorGuestOsNamesResponse.java   |    76 +
 .../api/response/HypervisorGuestOsResponse.java    |    51 +
 .../cloudstack/api/response/IPAddressResponse.java |    49 +-
 .../api/response/ImageStoreResponse.java           |    16 +-
 .../api/response/ImportVMTaskResponse.java         |   257 +
 .../api/response/InstanceGroupResponse.java        |     9 +
 .../api/response/IpQuarantineResponse.java         |   142 +
 .../cloudstack/api/response/Ipv4RouteResponse.java |    59 +
 .../Ipv4SubnetForGuestNetworkResponse.java         |   199 +
 ...ntAllowedToCreateOfferingsWithTagsResponse.java |    34 +
 .../api/response/KubernetesUserVmResponse.java     |    51 +
 .../api/response/LBStickinessPolicyResponse.java   |     4 +-
 .../api/response/LoadBalancerResponse.java         |     9 +
 .../cloudstack/api/response/LoginCmdResponse.java  |    60 +
 .../api/response/ManagementServerResponse.java     |    98 +
 .../api/response/NetworkOfferingResponse.java      |    56 +
 .../api/response/NetworkProtocolResponse.java      |    89 +
 .../cloudstack/api/response/NetworkResponse.java   |   124 +-
 .../cloudstack/api/response/NicResponse.java       |    32 +-
 .../api/response/ObjectStoreResponse.java          |   120 +
 .../api/response/OvsProviderResponse.java          |     8 +
 .../response/PeerManagementServerNodeResponse.java |   100 +
 .../cloudstack/api/response/PodResponse.java       |    24 +
 .../api/response/PortableIpResponse.java           |     2 +-
 .../api/response/PrivateGatewayResponse.java       |    10 +-
 .../api/response/ProjectAccountResponse.java       |     9 +
 .../api/response/ProjectInvitationResponse.java    |     9 +
 .../cloudstack/api/response/ProjectResponse.java   |   144 +
 .../response/PurgeExpungedResourcesResponse.java   |    39 +
 .../cloudstack/api/response/RegisterResponse.java  |    13 +-
 .../api/response/RemoteAccessVpnResponse.java      |     8 +
 .../api/response/ResourceCountResponse.java        |    25 +-
 .../response/ResourceLimitAndCountResponse.java    |    34 +
 .../api/response/ResourceLimitResponse.java        |    21 +-
 .../api/response/ResourceTagResponse.java          |     9 +
 .../api/response/RolePermissionResponse.java       |     2 +-
 .../cloudstack/api/response/RoleResponse.java      |     8 +
 .../api/response/RollingMaintenanceResponse.java   |     2 +-
 .../response/RouterHealthCheckResultResponse.java  |    21 +-
 .../api/response/SSHKeyPairResponse.java           |    16 +
 .../SecondaryStorageHeuristicsResponse.java        |   141 +
 .../api/response/SecurityGroupResponse.java        |     9 +
 .../api/response/ServiceOfferingResponse.java      |   168 +-
 .../api/response/SharedFSProviderResponse.java     |    38 +
 .../cloudstack/api/response/SharedFSResponse.java  |   369 +
 .../response/Site2SiteCustomerGatewayResponse.java |     9 +
 .../response/Site2SiteVpnConnectionResponse.java   |     9 +
 .../api/response/Site2SiteVpnGatewayResponse.java  |     8 +
 .../api/response/SnapshotPolicyResponse.java       |    35 +-
 .../cloudstack/api/response/SnapshotResponse.java  |    88 +-
 .../cloudstack/api/response/SslCertResponse.java   |     2 -
 .../api/response/StaticRouteResponse.java          |    32 +-
 .../cloudstack/api/response/StatsResponse.java     |     4 +-
 .../api/response/StorageAccessGroupResponse.java   |   108 +
 .../api/response/StoragePoolResponse.java          |   115 +-
 .../cloudstack/api/response/SystemVmResponse.java  |    52 +-
 .../TaggedResourceLimitAndCountResponse.java       |    86 +
 .../cloudstack/api/response/TemplateResponse.java  |    60 +-
 .../api/response/TrafficTypeResponse.java          |    24 +
 .../api/response/UnmanageVMInstanceResponse.java   |    16 +-
 .../api/response/UnmanagedInstanceResponse.java    |    36 +
 .../response/UpgradeRouterTemplateResponse.java    |    17 -
 .../api/response/UsageRecordResponse.java          |    19 +-
 .../cloudstack/api/response/UsageTypeResponse.java |    14 +-
 .../cloudstack/api/response/UserDataResponse.java  |    45 +-
 .../cloudstack/api/response/UserResponse.java      |    34 +-
 .../UserTwoFactorAuthenticationSetupResponse.java  |    63 +
 ...UserTwoFactorAuthenticatorProviderResponse.java |    52 +
 .../cloudstack/api/response/UserVmResponse.java    |   301 +-
 .../api/response/VMScheduleResponse.java           |   109 +
 .../api/response/VMSnapshotResponse.java           |    18 +-
 .../api/response/VMUserDataResponse.java           |     2 +-
 .../api/response/VgpuProfileResponse.java          |   135 +
 .../api/response/VirtualMachineResponse.java       |   124 +
 .../response/VirtualRouterProviderResponse.java    |     8 +
 .../api/response/VlanIpRangeResponse.java          |    17 +
 .../api/response/VmwareDatacenterResponse.java     |    78 +
 .../cloudstack/api/response/VnfNicResponse.java    |   119 +
 .../api/response/VnfTemplateResponse.java          |    60 +
 .../api/response/VolumeForImportResponse.java      |   176 +
 .../cloudstack/api/response/VolumeResponse.java    |    78 +-
 .../api/response/VpcOfferingResponse.java          |    42 +-
 .../cloudstack/api/response/VpcResponse.java       |    69 +
 .../cloudstack/api/response/VpnUsersResponse.java  |    11 +-
 .../cloudstack/api/response/ZoneResponse.java      |   180 +-
 .../cloudstack/auth/UserOAuth2Authenticator.java   |    53 +
 .../auth/UserTwoFactorAuthenticator.java           |    45 +
 .../java/org/apache/cloudstack/backup/Backup.java  |    78 +-
 .../apache/cloudstack/backup/BackupManager.java    |   119 +-
 .../apache/cloudstack/backup/BackupProvider.java   |    78 +-
 .../apache/cloudstack/backup/BackupRepository.java |    39 +
 .../cloudstack/backup/BackupRepositoryService.java |    36 +
 .../apache/cloudstack/backup/BackupSchedule.java   |     6 +-
 .../apache/cloudstack/backup/BackupService.java    |     7 +
 .../java/org/apache/cloudstack/ca/CAManager.java   |    19 +-
 .../cloudstack/cluster/ClusterDrsAlgorithm.java    |   296 +
 .../apache/cloudstack/cluster/ClusterDrsPlan.java  |    48 +
 .../cluster/ClusterDrsPlanMigration.java           |    25 +
 .../cloudstack/cluster/ClusterDrsService.java      |   131 +
 .../command/ReconcileCommandService.java           |    65 +
 .../cloudstack/config/ApiServiceConfiguration.java |    25 +-
 .../consoleproxy/ConsoleAccessManager.java         |    29 +-
 .../cloudstack/consoleproxy/ConsoleSession.java    |    45 +
 .../org/apache/cloudstack/context/CallContext.java |    30 +-
 .../org/apache/cloudstack/context/LogContext.java  |    23 +-
 .../datacenter/DataCenterIpv4GuestSubnet.java      |    36 +
 .../dedicated/DedicatedResourceResponse.java       |    44 +
 .../cloudstack/diagnostics/DiagnosticsService.java |     2 +-
 .../cloudstack/diagnostics/DiagnosticsType.java    |     2 +-
 .../direct/download/DirectDownloadCertificate.java |     2 +-
 .../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           |     5 +-
 .../management/ManagementServerHostPeer.java       |     2 +-
 .../org/apache/cloudstack/network/BgpPeer.java     |    50 +
 .../org/apache/cloudstack/network/BgpPeerTO.java   |    91 +
 .../network/Ipv4GuestSubnetNetworkMap.java         |    47 +
 .../cloudstack/network/RoutedIpv4Manager.java      |   208 +
 .../InternalLoadBalancerElementService.java        |     2 +
 .../apache/cloudstack/network/tls/CertService.java |     2 +-
 .../OutOfBandManagementService.java                |     2 +-
 .../org/apache/cloudstack/query/QueryService.java  |    61 +-
 .../org/apache/cloudstack/quota/QuotaTariff.java   |    25 +
 .../apache/cloudstack/region/RegionService.java    |     2 +-
 .../resource/ResourceCleanupService.java           |    74 +
 .../secstorage/heuristics/Heuristic.java           |    40 +
 .../secstorage/heuristics/HeuristicType.java       |    25 +
 .../storage/ImageStoreObjectDownload.java          |    34 +
 .../cloudstack/storage/ImageStoreService.java      |     2 +
 .../storage/browser/DataStoreObjectResponse.java   |   156 +
 .../cloudstack/storage/browser/StorageBrowser.java |    35 +
 .../apache/cloudstack/storage/object/Bucket.java   |    64 +
 .../storage/object/BucketApiService.java           |   103 +
 .../cloudstack/storage/object/ObjectStore.java     |    40 +
 .../cloudstack/storage/sharedfs/SharedFS.java      |   189 +
 .../storage/sharedfs/SharedFSLifeCycle.java        |    43 +
 .../storage/sharedfs/SharedFSProvider.java         |    30 +
 .../storage/sharedfs/SharedFSService.java          |    72 +
 .../storage/template/VnfTemplateManager.java       |    52 +
 .../storage/template/VnfTemplateUtils.java         |   152 +
 .../volume/VolumeImportUnmanageService.java        |    46 +
 .../storage/volume/VolumeOnStorageTO.java          |   130 +
 .../org/apache/cloudstack/usage/UsageService.java  |     3 -
 .../org/apache/cloudstack/usage/UsageTypes.java    |    50 +-
 .../apache/cloudstack/usage/UsageUnitTypes.java    |     4 +-
 .../cloudstack/user/ResourceReservation.java       |    11 +-
 .../cloudstack/userdata/UserDataManager.java       |    44 +
 .../org/apache/cloudstack/vm/ImportVmTask.java     |    41 +
 .../apache/cloudstack/vm/ImportVmTasksManager.java |    38 +
 .../apache/cloudstack/vm/UnmanageVMService.java    |     9 +-
 .../apache/cloudstack/vm/UnmanagedInstanceTO.java  |   102 +
 .../apache/cloudstack/vm/UnmanagedVMsManager.java  |    49 +-
 .../org/apache/cloudstack/vm/VmImportService.java  |    16 +
 .../apache/cloudstack/vm/lease/VMLeaseManager.java |    61 +
 .../apache/cloudstack/vm/schedule/VMSchedule.java  |    51 +
 .../cloudstack/vm/schedule/VMScheduleManager.java  |    40 +
 .../cloudstack/vm/schedule/VMScheduledJob.java     |    38 +
 .../api-config/spring-api-config-context.xml       |     2 +-
 .../cloudstack/api-planner/module.properties       |     2 +-
 .../api-planner/spring-api-planner-context.xml     |     2 +-
 .../com/cloud/agent/api/storage/OVFHelperTest.java |   133 +-
 .../com/cloud/agent/api/to/LoadBalancerTOTest.java |    22 +-
 api/src/test/java/com/cloud/cpu/CPUTest.java       |    67 +
 .../com/cloud/deploy/DataCenterDeploymentTest.java |    57 +
 .../test/java/com/cloud/host/ControlStateTest.java |   109 +
 .../test/java/com/cloud/network/NetworksTest.java  |    18 +
 api/src/test/java/com/cloud/network/VNFTest.java   |    58 +
 .../com/cloud/network/as/AutoScalePolicyTest.java  |     2 +-
 .../com/cloud/network/as/AutoScaleVmGroupTest.java |     2 +-
 .../test/java/com/cloud/storage/StorageTest.java   |    13 +-
 .../org/apache/cloudstack/acl/RoleTypeTest.java    |     2 +-
 .../java/org/apache/cloudstack/acl/RuleTest.java   |     2 +-
 .../admin/account/CreateAccountCmdTest.java        |    10 +-
 .../admin/annotation/AddAnnotationCmdTest.java     |    10 +-
 .../command/admin/bgp/CreateASNRangeCmdTest.java   |    69 +
 .../command/admin/bgp/DeleteASNRangeCmdTest.java   |    55 +
 .../command/admin/bgp/ListASNRangesCmdTest.java    |    75 +
 .../command/admin/bgp/ReleaseASNumberCmdTest.java  |    61 +
 .../command/admin/cluster/ListClustersCmdTest.java |    83 +
 .../api/command/admin/config/UpdateCfgCmdTest.java |    81 +
 .../command/admin/domain/ListDomainsCmdTest.java   |    88 +
 .../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 +
 .../command/admin/iso/ListIsosCmdByAdminTest.java  |   128 +
 .../CreateIpv4SubnetForGuestNetworkCmdTest.java    |    69 +
 .../network/CreateIpv4SubnetForZoneCmdTest.java    |    75 +
 .../network/DedicateIpv4SubnetForZoneCmdTest.java  |    72 +
 .../DeleteIpv4SubnetForGuestNetworkCmdTest.java    |    58 +
 .../network/DeleteIpv4SubnetForZoneCmdTest.java    |    58 +
 .../ListIpv4SubnetsForGuestNetworkCmdTest.java     |    83 +
 .../network/ListIpv4SubnetsForZoneCmdTest.java     |    83 +
 .../ReleaseDedicatedIpv4SubnetForZoneCmdTest.java  |    62 +
 .../network/UpdateIpv4SubnetForZoneCmdTest.java    |    66 +
 .../bgp/ChangeBgpPeersForNetworkCmdTest.java       |    74 +
 .../network/bgp/ChangeBgpPeersForVpcCmdTest.java   |    74 +
 .../admin/network/bgp/CreateBgpPeerCmdTest.java    |    85 +
 .../admin/network/bgp/DedicateBgpPeerCmdTest.java  |    72 +
 .../admin/network/bgp/DeleteBgpPeerCmdTest.java    |    58 +
 .../admin/network/bgp/ListBgpPeersCmdTest.java     |    96 +
 .../bgp/ReleaseDedicatedBgpPeerCmdTest.java        |    62 +
 .../admin/network/bgp/UpdateBgpPeerCmdTest.java    |    87 +
 .../admin/offering/CreateDiskOfferingCmdTest.java  |    37 +
 .../offering/CreateNetworkOfferingCmdTest.java     |    39 +
 .../offering/CreateServiceOfferingCmdTest.java     |   100 +
 .../offering/UpdateServiceOfferingCmdTest.java     |    51 +
 .../admin/resource/ListCapacityCmdTest.java        |    34 +
 .../resource/PurgeExpungedResourcesCmdTest.java    |   104 +
 .../admin/storage/AddObjectStoragePoolCmdTest.java |   101 +
 .../storage/DeleteObjectStoragePoolCmdTest.java    |    60 +
 .../storage/DownloadImageStoreObjectCmdTest.java   |   104 +
 .../FindStoragePoolsForMigrationCmdTest.java       |     4 +-
 .../storage/ListImageStoreObjectsCmdTest.java      |    98 +
 .../storage/ListStoragePoolObjectsCmdTest.java     |    96 +
 ...eResourcesToAnotherSecondaryStorageCmdTest.java |    90 +
 .../storage/UpdateObjectStoragePoolCmdTest.java    |    86 +
 .../admin/systemvm/PatchSystemVMCmdTest.java       |    43 +-
 .../template/ListTemplatesCmdByAdminTest.java      |    94 +
 .../api/command/admin/user/CreateUserCmdTest.java  |    10 +-
 .../admin/vlan/UpdateVlanIpRangeCmdTest.java       |     2 +-
 .../vm/MigrateVirtualMachineWithVolumeCmdTest.java |    99 +-
 .../command/admin/volume/ImportVolumeCmdTest.java  |    83 +
 .../admin/volume/ListVolumesForImportCmdTest.java  |    58 +
 .../admin/volume/UnmanageVolumeCmdTest.java        |    70 +
 .../command/admin/vpc/CreateVPCCmdByAdminTest.java |    56 +
 .../admin/vpc/CreateVPCOfferingCmdTest.java        |    16 +-
 .../api/command/admin/zone/CreateZoneCmdTest.java  |    35 +
 .../api/command/test/ActivateProjectCmdTest.java   |     8 +-
 .../command/test/AddAccountToProjectCmdTest.java   |     6 +-
 .../api/command/test/AddHostCmdTest.java           |     3 +-
 .../api/command/test/AddIpToVmNicTest.java         |    10 +-
 .../test/AddNetworkServiceProviderCmdTest.java     |     6 +-
 .../command/test/AddSecondaryStorageCmdTest.java   |     7 +-
 .../api/command/test/CreateRoleCmdTest.java        |     6 +-
 .../api/command/test/CreateSnapshotCmdTest.java    |    23 +-
 .../api/command/test/ImportRoleCmdTest.java        |     9 +-
 .../api/command/test/ResetVMUserDataCmdTest.java   |    56 +-
 .../api/command/test/ScaleVMCmdTest.java           |     4 -
 .../command/test/UpdateHostPasswordCmdTest.java    |    14 +-
 .../api/command/test/UpdateRoleCmdTest.java        |     3 +-
 .../command/user/account/ListAccountsCmdTest.java  |    87 +
 .../user/backup/ListBackupScheduleCmdTest.java     |    98 +
 .../api/command/user/bgp/ListASNumbersCmdTest.java |    97 +
 .../consoleproxy/ListConsoleSessionsCmdTest.java   |   124 +
 .../firewall/CreateEgressFirewallRuleCmdTest.java  |   149 +-
 .../user/firewall/CreateFirewallRuleCmdTest.java   |    91 +
 .../api/command/user/gpu/ListGpuCardsCmdTest.java  |    82 +
 .../command/user/gpu/ListGpuDevicesCmdTest.java    |    36 +
 .../command/user/gpu/ListVgpuProfilesCmdTest.java  |    63 +
 .../user/guest/ListGuestOsCategoriesCmdTest.java   |    87 +
 .../api/command/user/iso/ListIsosCmdTest.java      |   128 +
 .../api/command/user/iso/RegisterIsoCmdTest.java   |    40 +
 .../command/user/network/CreateNetworkCmdTest.java |   353 +
 .../user/network/ListNetworkProtocolsCmdTest.java  |    95 +
 .../command/user/network/UpdateNetworkCmdTest.java |   193 +
 .../routing/CreateRoutingFirewallRuleCmdTest.java  |   251 +
 .../routing/DeleteRoutingFirewallRuleCmdTest.java  |    83 +
 .../routing/ListRoutingFirewallRulesCmdTest.java   |   115 +
 .../routing/UpdateRoutingFirewallRuleCmdTest.java  |   106 +
 .../user/offering/ListDiskOfferingsCmdTest.java    |    37 +
 .../user/offering/ListServiceOfferingsCmdTest.java |    38 +
 .../command/user/project/CreateProjectCmdTest.java |    40 +
 .../user/resource/ListResourceLimitsCmdTest.java   |    37 +
 .../user/resource/UpdateResourceCountCmdTest.java  |    37 +
 .../user/resource/UpdateResourceLimitCmdTest.java  |    37 +
 .../command/user/snapshot/CopySnapshotCmdTest.java |   138 +
 .../user/snapshot/CreateSnapshotPolicyCmdTest.java |    13 +-
 .../user/snapshot/DeleteSnapshotCmdTest.java       |    32 +
 .../user/snapshot/ListSnapshotPoliciesCmdTest.java |    79 +
 .../user/snapshot/ListSnapshotsCmdTest.java        |    60 +
 .../user/template/CopyTemplateCmdByAdminTest.java  |     3 +-
 .../command/user/template/CopyTemplateCmdTest.java |     3 +-
 .../user/template/CreateTemplateCmdTest.java       |    48 +
 .../user/template/ListTemplatesCmdTest.java        |    94 +
 .../template/RegisterTemplateCmdByAdminTest.java   |     2 +-
 .../user/template/RegisterTemplateCmdTest.java     |    12 +-
 .../user/template/UpdateTemplateCmdTest.java       |    49 +
 .../user/userdata/DeleteUserDataCmdTest.java       |    42 +-
 .../userdata/LinkUserDataToTemplateCmdTest.java    |    49 +-
 .../command/user/userdata/ListUserDataCmdTest.java |    23 +-
 .../user/userdata/RegisterUserDataCmdTest.java     |    48 +-
 .../command/user/vm/CreateVMScheduleCmdTest.java   |   102 +
 .../command/user/vm/DeleteVMScheduleCmdTest.java   |   121 +
 .../api/command/user/vm/DeployVMCmdTest.java       |   483 +
 .../api/command/user/vm/ListVMScheduleCmdTest.java |    99 +
 .../api/command/user/vm/ListVMsCmdTest.java        |   223 +
 .../command/user/vm/UpdateVMScheduleCmdTest.java   |   108 +
 .../user/volume/CheckAndRepairVolumeCmdTest.java   |    63 +
 .../api/command/user/vpc/CreateVPCCmdTest.java     |   197 +
 .../api/command/user/vpc/UpdateVPCCmdTest.java     |    99 +
 .../api/response/ASNRangeResponseTest.java         |    51 +
 .../api/response/ASNumberResponseTest.java         |    92 +
 .../api/response/BgpPeerResponseTest.java          |    81 +
 .../response/DataCenterIpv4SubnetResponseTest.java |    66 +
 .../cloudstack/api/response/HostResponseTest.java  |     8 +-
 .../api/response/Ipv4RouteResponseTest.java        |    48 +
 .../Ipv4SubnetForGuestNetworkResponseTest.java     |    81 +
 .../cloudstack/api/response/StatsResponseTest.java |     2 +-
 .../api/response/VnfNicResponseTest.java           |    54 +
 .../api/response/VnfTemplateResponseTest.java      |    47 +
 .../api/response/VolumeForImportResponseTest.java  |    77 +
 .../cluster/ClusterDrsAlgorithmTest.java           |    97 +
 .../config/ApiServiceConfigurationTest.java        |    95 +
 .../apache/cloudstack/context/CallContextTest.java |     4 +-
 .../extension/ExtensionCustomActionTest.java       |   484 +
 .../apache/cloudstack/network/BgpPeerTOTest.java   |    67 +
 .../storage/template/VnfTemplateUtilsTest.java     |   261 +
 .../storage/volume/VolumeOnStorageTOTest.java      |    84 +
 build/replace.properties                           |     5 +-
 client/bindir/cloud-setup-management.in            |    14 +
 client/bindir/cloud-update-xenserver-licenses.in   |   278 +-
 client/conf/db.properties.in                       |    32 +-
 client/conf/ehcache.xml.in                         |     4 +-
 client/conf/log4j-cloud.xml.in                     |   295 +-
 client/conf/server.properties.in                   |    25 +-
 client/pom.xml                                     |   260 +-
 .../java/org/apache/cloudstack/ACSRequestLog.java  |    84 +
 .../java/org/apache/cloudstack/ServerDaemon.java   |    92 +-
 .../META-INF/cloudstack/webApplicationContext.xml  |     2 +-
 client/src/main/webapp/WEB-INF/web.xml             |     2 +-
 cloud-cli/bindir/cloud-tool                        |     7 +-
 core/pom.xml                                       |     2 +-
 .../agent/api/CheckConvertInstanceAnswer.java      |    43 +
 .../agent/api/CheckConvertInstanceCommand.java     |    37 +
 .../cloud/agent/api/CheckGuestOsMappingAnswer.java |    38 +
 .../agent/api/CheckGuestOsMappingCommand.java      |    65 +
 .../com/cloud/agent/api/CheckOnHostCommand.java    |    10 +
 .../com/cloud/agent/api/CheckRouterAnswer.java     |     2 +-
 .../agent/api/CheckS2SVpnConnectionsAnswer.java    |     1 -
 .../com/cloud/agent/api/CheckVolumeAnswer.java     |    50 +
 .../com/cloud/agent/api/CheckVolumeCommand.java    |    58 +
 .../CleanupPersistentNetworkResourceAnswer.java    |     2 +-
 .../CleanupPersistentNetworkResourceCommand.java   |     2 +-
 .../java/com/cloud/agent/api/CleanupVMCommand.java |    46 +
 .../api/ConsoleAccessAuthenticationCommand.java    |    12 +-
 .../com/cloud/agent/api/ConvertInstanceAnswer.java |    35 +
 .../cloud/agent/api/ConvertInstanceCommand.java    |    97 +
 .../com/cloud/agent/api/ConvertSnapshotAnswer.java |    36 +
 .../cloud/agent/api/ConvertSnapshotCommand.java    |    42 +
 .../cloud/agent/api/CopyRemoteVolumeAnswer.java    |    71 +
 .../cloud/agent/api/CopyRemoteVolumeCommand.java   |    98 +
 .../cloud/agent/api/DeleteStoragePoolCommand.java  |     4 +-
 .../java/com/cloud/agent/api/FenceCommand.java     |    16 +
 .../cloud/agent/api/GetExternalConsoleAnswer.java  |    68 +
 .../cloud/agent/api/GetExternalConsoleCommand.java |    53 +
 .../com/cloud/agent/api/GetGPUStatsAnswer.java     |    19 +-
 .../agent/api/GetHypervisorGuestOsNamesAnswer.java |    58 +
 .../api/GetHypervisorGuestOsNamesCommand.java      |    53 +
 .../com/cloud/agent/api/GetRemoteVmsAnswer.java    |    75 +
 .../com/cloud/agent/api/GetRemoteVmsCommand.java   |    70 +
 .../com/cloud/agent/api/GetStorageStatsAnswer.java |    36 +-
 .../agent/api/GetUnmanagedInstancesAnswer.java     |     6 +-
 .../agent/api/GetUnmanagedInstancesCommand.java    |     6 +-
 .../com/cloud/agent/api/GetVmConfigAnswer.java     |     2 +-
 .../com/cloud/agent/api/GetVmIpAddressCommand.java |     8 +-
 .../com/cloud/agent/api/GetVolumeStatAnswer.java   |    85 +
 .../com/cloud/agent/api/GetVolumeStatCommand.java  |    72 +
 .../com/cloud/agent/api/GetVolumeStatsCommand.java |     2 +-
 .../cloud/agent/api/GetVolumesOnStorageAnswer.java |    42 +
 .../agent/api/GetVolumesOnStorageCommand.java      |    55 +
 .../com/cloud/agent/api/HandleCksIsoCommand.java   |    34 +
 .../agent/api/ImportConvertedInstanceAnswer.java   |    40 +
 .../agent/api/ImportConvertedInstanceCommand.java  |    70 +
 .../agent/api/MigrateAgentConnectionAnswer.java    |    38 +
 .../agent/api/MigrateAgentConnectionCommand.java   |    61 +
 .../java/com/cloud/agent/api/MigrateCommand.java   |    49 +-
 .../cloud/agent/api/ModifyStoragePoolAnswer.java   |     4 +
 .../cloud/agent/api/ModifyStoragePoolCommand.java  |     8 +-
 .../main/java/com/cloud/agent/api/PingAnswer.java  |    36 +-
 .../main/java/com/cloud/agent/api/PingCommand.java |    22 +
 .../com/cloud/agent/api/PingRoutingCommand.java    |     9 +
 .../api/PrepareExternalProvisioningAnswer.java     |    51 +
 .../api/PrepareExternalProvisioningCommand.java    |    39 +
 .../cloud/agent/api/PrepareForMigrationAnswer.java |    10 +
 .../agent/api/PrepareStorageClientAnswer.java      |    43 +
 .../agent/api/PrepareStorageClientCommand.java     |    56 +
 .../agent/api/PrepareUnmanageVMInstanceAnswer.java |     2 +-
 .../api/PrepareUnmanageVMInstanceCommand.java      |     2 +-
 .../java/com/cloud/agent/api/ReadyCommand.java     |    46 +-
 .../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 +
 .../com/cloud/agent/api/SecurityGroupRulesCmd.java |     4 +-
 .../cloud/agent/api/SetupGuestNetworkCommand.java  |    18 +
 .../java/com/cloud/agent/api/StartupAnswer.java    |    14 +-
 .../java/com/cloud/agent/api/StartupCommand.java   |    18 +
 .../com/cloud/agent/api/StartupRoutingCommand.java |    33 +-
 .../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/UnprepareStorageClientAnswer.java    |    34 +
 .../agent/api/UnprepareStorageClientCommand.java   |    56 +
 .../com/cloud/agent/api/UnregisterNicCommand.java  |     2 +-
 .../cloud/agent/api/UpdateHostPasswordCommand.java |     2 +-
 .../java/com/cloud/agent/api/VmDiskStatsEntry.java |    37 +
 .../java/com/cloud/agent/api/VmStatsEntry.java     |    12 +-
 .../java/com/cloud/agent/api/VmStatsEntryBase.java |     2 +-
 .../api/routing/GetAutoScaleMetricsCommand.java    |     2 +-
 .../routing/GetRouterMonitorResultsCommand.java    |     2 +-
 .../cloud/agent/api/routing/IpAssocCommand.java    |     5 -
 .../cloud/agent/api/routing/IpAssocVpcCommand.java |     6 -
 .../agent/api/routing/NetworkElementCommand.java   |     3 +-
 .../cloud/agent/api/routing/SetBgpPeersAnswer.java |    46 +
 .../agent/api/routing/SetBgpPeersCommand.java      |    39 +
 .../agent/api/routing/SetFirewallRulesCommand.java |     5 -
 .../api/routing/SetIpv6FirewallRulesCommand.java   |     5 -
 .../api/routing/SetMonitorServiceCommand.java      |     5 +
 .../agent/api/routing/SetNetworkACLCommand.java    |     5 -
 .../api/routing/SetPortForwardingRulesCommand.java |     6 -
 .../api/routing/SetStaticNatRulesCommand.java      |     5 -
 .../agent/api/routing/SetStaticRouteCommand.java   |     5 -
 .../agent/api/routing/SiteLoadBalancerConfig.java  |     4 +-
 .../agent/api/routing/UpdateNetworkCommand.java    |    59 +
 .../api/storage/CheckAndRepairVolumeAnswer.java    |    57 +
 .../api/storage/CheckAndRepairVolumeCommand.java   |    77 +
 .../api/storage/CreateDatadiskTemplateAnswer.java  |     2 +-
 .../api/storage/CreateDatadiskTemplateCommand.java |     2 +-
 .../storage/CreateDiskOnlyVmSnapshotAnswer.java    |    39 +
 .../storage/CreateDiskOnlyVmSnapshotCommand.java   |    41 +
 .../api/storage/CreateEntityDownloadURLAnswer.java |     7 +-
 .../storage/CreateEntityDownloadURLCommand.java    |    27 +-
 .../storage/DeleteDiskOnlyVmSnapshotCommand.java   |    44 +
 .../agent/api/storage/GetDatadisksAnswer.java      |     2 +-
 .../agent/api/storage/GetDatadisksCommand.java     |     2 +-
 .../storage/MergeDiskOnlyVmSnapshotCommand.java    |    55 +
 .../agent/api/storage/MigrateVolumeAnswer.java     |     2 +-
 .../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   |     9 +-
 .../virtualnetwork/VirtualRoutingResource.java     |   140 +-
 .../facade/AbstractConfigItemFacade.java           |    11 +-
 .../facade/BumpUpPriorityConfigItem.java           |     2 +-
 .../facade/CreateIpAliasConfigItem.java            |     2 +-
 .../facade/DeleteIpAliasConfigItem.java            |     2 +-
 .../virtualnetwork/facade/DhcpEntryConfigItem.java |     2 +-
 .../virtualnetwork/facade/DnsMasqConfigItem.java   |     2 +-
 .../facade/IpAssociationConfigItem.java            |     1 +
 .../facade/LoadBalancerConfigItem.java             |     4 +-
 .../facade/RemoteAccessVpnConfigItem.java          |     2 +-
 .../facade/SavePasswordConfigItem.java             |     2 +-
 .../facade/SetBgpPeersConfigItem.java              |    46 +
 .../facade/SetFirewallRulesConfigItem.java         |     2 +-
 .../facade/SetGuestNetworkConfigItem.java          |     8 +-
 .../facade/SetIpv6FirewallRulesConfigItem.java     |     2 +-
 .../facade/SetMonitorServiceConfigItem.java        |     8 +-
 .../facade/SetNetworkAclConfigItem.java            |     4 +-
 .../facade/SetPortForwardingRulesConfigItem.java   |     4 +-
 .../SetPortForwardingRulesVpcConfigItem.java       |     2 +-
 .../facade/SetSourceNatConfigItem.java             |     2 +-
 .../facade/SetStaticNatRulesConfigItem.java        |     2 +-
 .../facade/SetStaticRouteConfigItem.java           |     2 +-
 .../facade/Site2SiteVpnConfigItem.java             |     2 +-
 .../virtualnetwork/facade/VmDataConfigItem.java    |     2 +-
 .../virtualnetwork/facade/VpnUsersConfigItem.java  |     2 +-
 .../resource/virtualnetwork/model/AclRule.java     |     2 +-
 .../resource/virtualnetwork/model/BgpPeers.java    |    45 +
 .../resource/virtualnetwork/model/ConfigBase.java  |     1 +
 .../virtualnetwork/model/FirewallRules.java        |     2 +-
 .../virtualnetwork/model/ForwardingRule.java       |     9 +-
 .../virtualnetwork/model/GuestNetwork.java         |    30 +-
 .../resource/virtualnetwork/model/IpAddress.java   |     9 +-
 .../virtualnetwork/model/LoadBalancerRule.java     |    58 +-
 .../virtualnetwork/model/LoadBalancerRules.java    |     2 +-
 .../resource/virtualnetwork/model/TcpAclRule.java  |     2 +-
 .../resource/virtualnetwork/model/UdpAclRule.java  |     2 +-
 .../cloud/agent/transport/ArrayTypeAdaptor.java    |    14 +-
 .../agent/transport/InterfaceTypeAdaptor.java      |     2 +-
 .../agent/transport/LoggingExclusionStrategy.java  |    17 +-
 .../java/com/cloud/agent/transport/Request.java    |    52 +-
 .../agent/transport/StoragePoolTypeAdaptor.java    |    53 +
 core/src/main/java/com/cloud/host/HostInfo.java    |     1 -
 .../com/cloud/network/HAProxyConfigurator.java     |   168 +-
 .../cloud/network/LoadBalancerConfigurator.java    |     3 +
 .../network/resource/TrafficSentinelResource.java  |    15 +-
 .../com/cloud/resource/AgentStatusUpdater.java     |    27 +
 .../java/com/cloud/resource/CommandWrapper.java    |    32 +-
 .../java/com/cloud/resource/RequestWrapper.java    |    11 +-
 .../com/cloud/resource/ResourceStatusUpdater.java  |    29 +
 .../java/com/cloud/resource/ResourceWrapper.java   |     2 +-
 .../java/com/cloud/resource/ServerResource.java    |    14 +
 .../com/cloud/resource/ServerResourceBase.java     |   255 +-
 .../main/java/com/cloud/serializer/GsonHelper.java |    27 +-
 .../java/com/cloud/storage/JavaStorageLayer.java   |    18 +-
 .../cloud/storage/resource/StorageProcessor.java   |     4 +-
 .../StorageSubsystemCommandHandlerBase.java        |    30 +-
 .../storage/template/FtpTemplateUploader.java      |    15 +-
 .../storage/template/HttpTemplateDownloader.java   |   152 +-
 .../com/cloud/storage/template/IsoProcessor.java   |     6 +-
 .../storage/template/LocalTemplateDownloader.java  |    18 +-
 .../template/MetalinkTemplateDownloader.java       |    24 +-
 .../com/cloud/storage/template/OVAProcessor.java   |    66 +-
 .../java/com/cloud/storage/template/Processor.java |     2 +-
 .../com/cloud/storage/template/QCOW2Processor.java |    10 +-
 .../cloud/storage/template/RawImageProcessor.java  |     8 +-
 .../storage/template/S3TemplateDownloader.java     |    51 +-
 .../storage/template/ScpTemplateDownloader.java    |     8 +-
 .../template/SimpleHttpMultiFileDownloader.java    |   495 +
 .../com/cloud/storage/template/TARProcessor.java   |     6 +-
 .../cloud/storage/template/TemplateConstants.java  |     6 +-
 .../cloud/storage/template/TemplateDownloader.java |     2 +
 .../storage/template/TemplateDownloaderBase.java   |    10 +-
 .../cloud/storage/template/TemplateLocation.java   |    53 +-
 .../com/cloud/storage/template/VhdProcessor.java   |    18 +-
 .../com/cloud/storage/template/VmdkProcessor.java  |    20 +-
 .../agent/directdownload/CheckUrlCommand.java      |    27 +-
 .../directdownload/DirectDownloadCommand.java      |    15 +-
 .../directdownload/HttpDirectDownloadCommand.java  |     6 +-
 .../directdownload/HttpsDirectDownloadCommand.java |     9 +-
 .../MetalinkDirectDownloadCommand.java             |     5 +-
 .../directdownload/NfsDirectDownloadCommand.java   |     5 +-
 .../RevokeDirectDownloadCertificateCommand.java    |     2 +-
 .../cloudstack/agent/lb/SetupMSListAnswer.java     |     2 +-
 .../cloudstack/agent/lb/SetupMSListCommand.java    |    17 +-
 .../agent/routing/ManageServiceCommand.java        |    49 +
 .../org/apache/cloudstack/backup/BackupAnswer.java |    71 +
 .../backup/BackupStorageStatsAnswer.java           |    50 +
 .../cloudstack/backup/DeleteBackupCommand.java     |    76 +
 .../backup/GetBackupStorageStatsCommand.java       |    66 +
 .../backup/PrepareForBackupRestorationCommand.java |    43 +
 .../cloudstack/backup/RestoreBackupCommand.java    |   158 +
 .../cloudstack/backup/TakeBackupCommand.java       |   113 +
 .../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 +
 .../cloudstack/diagnostics/DiagnosticsAnswer.java  |     4 +-
 .../cloudstack/diagnostics/DiagnosticsCommand.java |     2 +-
 .../direct/download/DirectDownloadHelper.java      |   102 +
 .../direct/download/DirectTemplateDownloader.java  |    61 +
 .../download/DirectTemplateDownloaderImpl.java     |   207 +
 .../download/HttpDirectTemplateDownloader.java     |   178 +
 .../download/HttpsDirectTemplateDownloader.java    |   262 +
 .../download/MetalinkDirectTemplateDownloader.java |   174 +
 .../download/NfsDirectTemplateDownloader.java      |   103 +
 ...eckDataStoreStoragePolicyComplainceCommand.java |    61 -
 ...eckDataStoreStoragePolicyComplianceCommand.java |    61 +
 .../cloudstack/storage/command/CopyCommand.java    |     5 +
 .../cloudstack/storage/command/DettachCommand.java |     9 +
 .../storage/command/DownloadCommand.java           |    28 +-
 .../storage/command/MoveVolumeCommand.java         |    65 +
 .../command/QuerySnapshotZoneCopyAnswer.java       |    39 +
 .../command/QuerySnapshotZoneCopyCommand.java      |    50 +
 .../storage/command/StorageSubSystemCommand.java   |     2 +-
 .../browser/ListDataStoreObjectsAnswer.java        |   113 +
 .../browser/ListDataStoreObjectsCommand.java       |    66 +
 .../storage/to/DownloadableObjectTO.java           |    30 +
 .../apache/cloudstack/storage/to/ImageStoreTO.java |    13 +-
 .../cloudstack/storage/to/PrimaryDataStoreTO.java  |    13 +-
 .../cloudstack/storage/to/SnapshotObjectTO.java    |    86 +-
 .../cloudstack/storage/to/TemplateObjectTO.java    |     9 +-
 .../cloudstack/storage/to/VolumeObjectTO.java      |    46 +-
 .../transport/HypervisorTypeAdaptor.java           |    53 +
 .../allocator/spring-core-allocator-context.xml    |     4 +-
 ...ore-lifecycle-allocator-context-inheritable.xml |     4 +-
 ...ring-core-lifecycle-api-context-inheritable.xml |    14 +-
 .../cloudstack/direct-download/module.properties   |     2 +-
 .../META-INF/cloudstack/cluster/module.properties  |    21 +
 ...-core-lifecycle-cluster-context-inheritable.xml |    31 +
 ...ing-core-lifecycle-core-context-inheritable.xml |     9 +-
 .../core/spring-core-registry-core-context.xml     |    49 +-
 .../META-INF/cloudstack/event/module.properties    |    21 +
 ...ng-core-lifecycle-event-context-inheritable.xml |    31 +
 .../cloudstack/kubernetes/module.properties        |     2 +-
 ...re-lifecycle-kubernetes-context-inheritable.xml |     4 +-
 ...-core-lifecycle-network-context-inheritable.xml |     7 +-
 .../META-INF/cloudstack/planner/module.properties  |     2 +-
 ...pring-lifecycle-storage-context-inheritable.xml |    10 +-
 .../spring-core-system-context-inheritable.xml     |    10 +-
 .../system/spring-core-system-context.xml          |     6 +-
 .../api/GetHypervisorGuestOsNamesAnswerTest.java   |    66 +
 .../api/GetHypervisorGuestOsNamesCommandTest.java  |    40 +
 .../cloud/agent/api/GetStorageStatsAnswerTest.java |    81 +
 .../agent/api/GetVolumesOnStorageAnswerTest.java   |    73 +
 .../agent/api/GetVolumesOnStorageCommandTest.java  |    41 +
 .../cloud/agent/api/SecurityGroupRulesCmdTest.java |     2 +-
 .../agent/api/routing/SetBgpPeersAnswerTest.java   |    54 +
 .../agent/api/routing/SetBgpPeersCommandTest.java  |    47 +
 .../agent/api/storage/DownloadAnswerTest.java      |     4 +-
 .../resource/virtualnetwork/ConfigHelperTest.java  |     8 +-
 .../virtualnetwork/VirtualRoutingResourceTest.java |     8 +-
 .../facade/SetBgpPeersConfigItemTest.java          |    56 +
 .../virtualnetwork/model/BgpPeersTest.java         |    56 +
 .../virtualnetwork/model/LoadBalancerRuleTest.java |    63 +
 .../transport/LoggingExclusionStrategyTest.java    |    83 +
 .../com/cloud/agent/transport/RequestTest.java     |    95 +-
 .../com/cloud/agent/transport/ResponseTest.java    |    46 +
 .../java/com/cloud/info/ConsoleProxyInfoTest.java  |     2 +-
 .../com/cloud/network/HAProxyConfiguratorTest.java |    18 +-
 .../com/cloud/resource/ServerResourceBaseTest.java |   274 +
 .../java/com/cloud/serializer/GsonHelperTest.java  |    81 +
 .../com/cloud/storage/JavaStorageLayerTest.java    |    45 +
 .../StorageSubsystemCommandHandlerBaseTest.java    |    43 +
 .../cloud/storage/template/OVAProcessorTest.java   |    73 +-
 .../cloud/storage/template/QCOW2ProcessorTest.java |    10 +-
 .../cloud/storage/template/VhdProcessorTest.java   |     8 +-
 .../agent/test/CheckGuestOsMappingAnswerTest.java  |    66 +
 .../agent/test/CheckGuestOsMappingCommandTest.java |    44 +
 .../api/agent/test/CheckOnHostCommandTest.java     |    18 +-
 .../command/ReconcileCommandUtilsTest.java         |    69 +
 .../download/BaseDirectTemplateDownloaderTest.java |    80 +
 .../HttpsDirectTemplateDownloaderTest.java         |    36 +
 .../MetalinkDirectTemplateDownloaderTest.java      |    35 +
 .../storage/command/DownloadCommandTest.java       |    36 +
 .../command/QuerySnapshotZoneCopyAnswerTest.java   |    46 +
 .../browser/ListDataStoreObjectsAnswerTest.java    |    63 +
 .../browser/ListDataStoreObjectsCommandTest.java   |    42 +
 .../storage/to/SnapshotObjectTOTest.java           |    43 +
 debian/changelog                                   |    50 +-
 debian/cloudstack-agent.install                    |     1 +
 debian/cloudstack-agent.postinst                   |     2 +-
 debian/cloudstack-cli.install                      |     6 +-
 debian/cloudstack-common.install                   |     1 +
 debian/cloudstack-common.postinst                  |     2 +-
 debian/cloudstack-docs.install                     |     6 +-
 debian/cloudstack-management.install               |     4 +
 debian/cloudstack-management.postinst              |     7 +-
 debian/cloudstack-usage.postinst                   |    14 +-
 debian/control                                     |    14 +-
 debian/rules                                       |    23 +-
 deps/install-non-oss.sh                            |    46 +-
 developer/pom.xml                                  |    67 +-
 engine/api/pom.xml                                 |     4 +-
 .../main/java/com/cloud/vm/VirtualMachineGuru.java |     4 +
 .../java/com/cloud/vm/VirtualMachineManager.java   |    68 +-
 .../cloud/entity/api/VirtualMachineEntity.java     |     4 +-
 .../service/NetworkOrchestrationService.java       |    70 +-
 .../service/StorageOrchestrationService.java       |     2 +
 .../service/VolumeOrchestrationService.java        |    39 +-
 .../engine/service/api/DirectoryService.java       |    37 -
 .../engine/service/api/EntityService.java          |    57 -
 .../engine/service/api/OperationsServices.java     |    56 -
 .../engine/service/api/OrchestrationService.java   |    27 +-
 .../subsystem/api/network/NetworkSubsystem.java    |     2 +-
 .../engine/subsystem/api/storage/BucketInfo.java   |    30 +
 .../engine/subsystem/api/storage/ClusterScope.java |     6 +
 .../engine/subsystem/api/storage/DataObject.java   |     2 +
 .../api/storage/DataStoreCapabilities.java         |    10 +-
 .../subsystem/api/storage/DataStoreDriver.java     |     4 +
 .../subsystem/api/storage/DataStoreManager.java    |     6 +
 .../subsystem/api/storage/DataStoreProvider.java   |     2 +-
 .../api/storage/DataStoreProviderManager.java      |     2 +
 .../api/storage/DownloadableDataInfo.java          |    24 +
 .../engine/subsystem/api/storage/EndPoint.java     |     2 +
 .../subsystem/api/storage/EndPointSelector.java    |     6 +
 .../engine/subsystem/api/storage/HostScope.java    |    10 +-
 .../api/storage/HypervisorHostListener.java        |    10 +
 .../api/storage/ObjectInDataStoreStateMachine.java |     3 +-
 .../api/storage/ObjectStorageService.java          |    22 +
 .../subsystem/api/storage/ObjectStoreProvider.java |    23 +
 .../api/storage/PrimaryDataStoreDriver.java        |    89 +
 .../api/storage/PrimaryDataStoreLifeCycle.java     |     7 +-
 .../api/storage/PrimaryDataStoreParameters.java    |    26 +
 .../subsystem/api/storage/SnapshotDataFactory.java |    15 +-
 .../engine/subsystem/api/storage/SnapshotInfo.java |    14 +
 .../subsystem/api/storage/SnapshotService.java     |    13 +
 .../subsystem/api/storage/SnapshotStrategy.java    |    11 +-
 .../subsystem/api/storage/StorageAction.java       |     2 +
 .../api/storage/StoragePoolAllocator.java          |     4 +
 .../api/storage/StorageStrategyFactory.java        |     2 +
 .../engine/subsystem/api/storage/TemplateInfo.java |     4 +-
 .../subsystem/api/storage/TemplateService.java     |     3 +-
 .../subsystem/api/storage/VMSnapshotStrategy.java  |     3 +
 .../engine/subsystem/api/storage/VolumeInfo.java   |     9 +-
 .../subsystem/api/storage/VolumeService.java       |    19 +-
 .../engine/subsystem/api/storage/ZoneScope.java    |     6 +
 .../subsystem/api/storage/type/VolumeTypeBase.java |     2 +-
 .../api/storage/type/VolumeTypeHelper.java         |     2 +-
 .../storage/object/ObjectStoreEntity.java          |    49 +
 .../core/spring-engine-api-core-context.xml        |     2 +-
 .../api/storage/type/VolumeTypeHelperTest.java     |     2 +-
 engine/components-api/pom.xml                      |     2 +-
 .../main/java/com/cloud/agent/AgentManager.java    |    22 +-
 .../src/main/java/com/cloud/agent/Listener.java    |     8 +
 .../main/java/com/cloud/alert/AlertManager.java    |     6 +-
 .../java/com/cloud/capacity/CapacityManager.java   |    33 +-
 .../cloud/configuration/ConfigurationManager.java  |   175 +-
 .../cloud/deploy/DeploymentPlanningManager.java    |     6 +
 .../main/java/com/cloud/event/UsageEventUtils.java |    49 +-
 .../java/com/cloud/ha/HighAvailabilityManager.java |    31 +-
 .../com/cloud/hypervisor/ExternalProvisioner.java  |    65 +
 .../java/com/cloud/network/IpAddressManager.java   |    71 +-
 .../com/cloud/network/NetworkStateListener.java    |    35 +-
 .../main/java/com/cloud/network/addr/PublicIp.java |    11 +
 .../network/lb/LoadBalancingRulesManager.java      |     4 +-
 .../com/cloud/network/rules/FirewallManager.java   |     8 +-
 .../java/com/cloud/network/rules/RulesManager.java |     7 +-
 .../network/security/SecurityGroupManager.java     |     5 +-
 .../com/cloud/network/vpc/NetworkACLManager.java   |     3 +
 .../java/com/cloud/network/vpc/VpcManager.java     |    46 +-
 .../main/java/com/cloud/resource/Discoverer.java   |     1 -
 .../java/com/cloud/resource/ResourceManager.java   |    83 +-
 .../java/com/cloud/storage/StorageManager.java     |   119 +-
 .../main/java/com/cloud/storage/StorageUtil.java   |     4 +-
 .../java/com/cloud/template/TemplateManager.java   |    30 +-
 .../com/cloud/vm/VirtualMachineProfileImpl.java    |     8 +-
 .../src/main/java/com/cloud/vm/VmWork.java         |    43 +
 .../com/cloud/vm/VmWorkCheckAndRepairVolume.java   |    42 +
 .../java/com/cloud/vm/VmWorkJobHandlerProxy.java   |    27 +-
 .../main/java/com/cloud/vm/VmWorkSerializer.java   |     2 -
 .../com/cloud/vm/VmWorkTakeVolumeSnapshot.java     |    17 +-
 .../com/cloud/vm/snapshot/VMSnapshotManager.java   |     5 +-
 .../cloud/network/NetworkStateListenerTest.java    |    40 +
 .../com/cloud/vm/VmWorkTakeVolumeSnapshotTest.java |    37 +
 engine/network/pom.xml                             |    47 -
 .../cloudstack/network/NetworkOrchestrator.java    |    40 -
 engine/orchestration/pom.xml                       |    15 +-
 .../java/com/cloud/agent/manager/AgentAttache.java |   188 +-
 .../com/cloud/agent/manager/AgentManagerImpl.java  |  1153 +-
 .../cloud/agent/manager/ClusteredAgentAttache.java |    51 +-
 .../agent/manager/ClusteredAgentManagerImpl.java   |   776 +-
 .../agent/manager/ClusteredDirectAgentAttache.java |     9 +-
 .../cloud/agent/manager/ConnectedAgentAttache.java |    13 +-
 .../cloud/agent/manager/DirectAgentAttache.java    |    91 +-
 .../java/com/cloud/agent/manager/DummyAttache.java |     5 +-
 .../java/com/cloud/agent/manager/Routable.java     |     2 +-
 .../cloud/agent/manager/SynchronousListener.java   |    14 +-
 .../cluster/ClusteredAgentRebalanceService.java    |     1 +
 .../cluster/agentlb/AgentLoadBalancerPlanner.java  |     3 +-
 .../ClusterBasedAgentLoadBalancerPlanner.java      |    29 +-
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |  2209 ++-
 .../com/cloud/vm/VirtualMachinePowerStateSync.java |     7 +-
 .../cloud/vm/VirtualMachinePowerStateSyncImpl.java |   243 +-
 .../java/com/cloud/vm/VmWorkJobDispatcher.java     |    24 +-
 .../com/cloud/vm/VmWorkJobWakeupDispatcher.java    |    19 +-
 .../src/main/java/com/cloud/vm/VmWorkReboot.java   |     9 +
 .../src/main/java/com/cloud/vm/VmWorkRestore.java  |    27 +-
 .../src/main/java/com/cloud/vm/VmWorkStart.java    |    13 +-
 .../cloud/entity/api/VMEntityManagerImpl.java      |    12 +-
 .../cloud/entity/api/VirtualMachineEntityImpl.java |     2 +-
 .../entity/api/DataCenterResourceManagerImpl.java  |     2 +-
 .../datacenter/entity/api/db/EngineClusterVO.java  |    34 +
 .../entity/api/db/EngineDataCenterVO.java          |    18 +
 .../datacenter/entity/api/db/EngineHostPodVO.java  |    16 +
 .../datacenter/entity/api/db/EngineHostVO.java     |    50 +-
 .../datacenter/entity/api/db/dao/DcDetailsDao.java |     2 +-
 .../entity/api/db/dao/EngineClusterDaoImpl.java    |     6 +-
 .../entity/api/db/dao/EngineDataCenterDao.java     |     8 -
 .../entity/api/db/dao/EngineDataCenterDaoImpl.java |    34 +-
 .../entity/api/db/dao/EngineHostDaoImpl.java       |     7 +-
 .../entity/api/db/dao/EngineHostPodDaoImpl.java    |     8 +-
 .../engine/orchestration/CloudOrchestrator.java    |    58 +-
 .../engine/orchestration/DataMigrationUtility.java |    96 +-
 .../engine/orchestration/NetworkOrchestrator.java  |  1650 +-
 .../engine/orchestration/StorageOrchestrator.java  |   114 +-
 .../engine/orchestration/VolumeOrchestrator.java   |   777 +-
 .../service/api/ProvisioningServiceImpl.java       |     8 -
 .../spring-engine-orchestration-core-context.xml   |    14 +-
 .../cloud/agent/manager/AgentManagerImplTest.java  |    25 +-
 .../manager/ClusteredAgentManagerImplTest.java     |   150 +
 .../agent/manager/ConnectedAgentAttacheTest.java   |    19 +-
 .../agent/manager/DirectAgentAttacheTest.java      |     9 +-
 .../cloud/vm/VirtualMachineManagerImplTest.java    |  1451 +-
 .../vm/VirtualMachinePowerStateSyncImplTest.java   |   107 +
 .../test/java/com/cloud/vm/VmWorkRebootTest.java   |    42 +
 .../test/java/com/cloud/vm/VmWorkStartTest.java    |    57 +
 .../orchestration/DataMigrationUtilityTest.java    |    88 +
 .../orchestration/NetworkOrchestratorTest.java     |   501 +-
 .../orchestration/VolumeOrchestratorTest.java      |   643 +
 .../engine/provisioning/test/ProvisioningTest.java |    66 +-
 .../src/test/resources/provisioningContext.xml     |    47 -
 engine/pom.xml                                     |     6 +-
 engine/schema/pom.xml                              |   106 +-
 .../main/java/com/cloud/capacity/CapacityVO.java   |    22 +-
 .../java/com/cloud/capacity/dao/CapacityDao.java   |    19 +-
 .../com/cloud/capacity/dao/CapacityDaoImpl.java    |   167 +-
 .../cloud/certificate/dao/CertificateDaoImpl.java  |     4 +-
 .../java/com/cloud/certificate/dao/CrlDao.java     |     2 +-
 .../agentlb/dao/HostTransferMapDaoImpl.java        |     2 -
 .../ManagementServiceConfiguration.java            |     2 +-
 .../com/cloud/configuration/ResourceCountVO.java   |    23 +-
 .../com/cloud/configuration/ResourceLimitVO.java   |    18 +-
 .../cloud/configuration/dao/ResourceCountDao.java  |    37 +-
 .../configuration/dao/ResourceCountDaoImpl.java    |   202 +-
 .../cloud/configuration/dao/ResourceLimitDao.java  |     4 +-
 .../configuration/dao/ResourceLimitDaoImpl.java    |    61 +-
 .../main/java/com/cloud/dc/ASNumberRangeVO.java    |   104 +
 .../src/main/java/com/cloud/dc/ASNumberVO.java     |   178 +
 .../main/java/com/cloud/dc/ClusterDetailsDao.java  |     6 +-
 .../java/com/cloud/dc/ClusterDetailsDaoImpl.java   |    54 +-
 .../main/java/com/cloud/dc/ClusterDetailsVO.java   |    18 +-
 .../src/main/java/com/cloud/dc/ClusterVO.java      |    30 +
 .../java/com/cloud/dc/DataCenterIpAddressVO.java   |    10 +-
 .../src/main/java/com/cloud/dc/DataCenterVO.java   |    24 +
 .../src/main/java/com/cloud/dc/HostPodVO.java      |    19 +
 .../schema/src/main/java/com/cloud/dc/VlanVO.java  |    24 +-
 .../main/java/com/cloud/dc/VmwareDatacenterVO.java |   166 +
 .../main/java/com/cloud/dc/dao/ASNumberDao.java    |    41 +
 .../java/com/cloud/dc/dao/ASNumberDaoImpl.java     |   141 +
 .../java/com/cloud/dc/dao/ASNumberRangeDao.java    |    27 +
 .../com/cloud/dc/dao/ASNumberRangeDaoImpl.java     |    42 +
 .../src/main/java/com/cloud/dc/dao/ClusterDao.java |    27 +-
 .../main/java/com/cloud/dc/dao/ClusterDaoImpl.java |   182 +-
 .../java/com/cloud/dc/dao/ClusterVSMMapDao.java    |     2 +-
 .../com/cloud/dc/dao/ClusterVSMMapDaoImpl.java     |     5 +-
 .../main/java/com/cloud/dc/dao/DataCenterDao.java  |    14 +-
 .../java/com/cloud/dc/dao/DataCenterDaoImpl.java   |   113 +-
 .../com/cloud/dc/dao/DataCenterDetailsDao.java     |     2 +-
 .../com/cloud/dc/dao/DataCenterDetailsDaoImpl.java |     4 +-
 .../cloud/dc/dao/DataCenterIpAddressDaoImpl.java   |    43 +-
 .../dao/DataCenterLinkLocalIpAddressDaoImpl.java   |     6 +-
 .../com/cloud/dc/dao/DataCenterVnetDaoImpl.java    |     2 +-
 .../com/cloud/dc/dao/DomainVlanMapDaoImpl.java     |     2 +-
 .../src/main/java/com/cloud/dc/dao/HostPodDao.java |     2 +
 .../main/java/com/cloud/dc/dao/HostPodDaoImpl.java |    36 +-
 .../src/main/java/com/cloud/dc/dao/VlanDao.java    |     2 +
 .../main/java/com/cloud/dc/dao/VlanDaoImpl.java    |    27 +
 .../main/java/com/cloud/dc/dao/VlanDetailsDao.java |     2 +-
 .../java/com/cloud/dc/dao/VlanDetailsDaoImpl.java  |     2 +-
 .../java/com/cloud/dc/dao/VmwareDatacenterDao.java |    65 +
 .../cloud/dc/dao/VsphereStoragePolicyDaoImpl.java  |     2 -
 .../main/java/com/cloud/domain/DomainDetailVO.java |    20 +-
 .../src/main/java/com/cloud/domain/DomainVO.java   |    10 +-
 .../main/java/com/cloud/domain/dao/DomainDao.java  |     5 +
 .../java/com/cloud/domain/dao/DomainDaoImpl.java   |    55 +-
 .../com/cloud/domain/dao/DomainDetailsDao.java     |     3 +-
 .../com/cloud/domain/dao/DomainDetailsDaoImpl.java |    33 +-
 .../main/java/com/cloud/event/UsageEventVO.java    |    22 +
 .../java/com/cloud/event/dao/EventDaoImpl.java     |     2 -
 .../java/com/cloud/event/dao/UsageEventDao.java    |     2 +-
 .../com/cloud/event/dao/UsageEventDaoImpl.java     |    28 +-
 .../cloud/event/dao/UsageEventDetailsDaoImpl.java  |     2 -
 .../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    |    80 +-
 .../java/com/cloud/gpu/dao/VGPUTypesDaoImpl.java   |    61 +-
 .../java/com/cloud/gpu/dao/VgpuProfileDao.java     |    33 +
 .../java/com/cloud/gpu/dao/VgpuProfileDaoImpl.java |   110 +
 .../src/main/java/com/cloud/host/HostTagVO.java    |    26 +
 .../src/main/java/com/cloud/host/HostVO.java       |   126 +-
 .../src/main/java/com/cloud/host/dao/HostDao.java  |   120 +-
 .../main/java/com/cloud/host/dao/HostDaoImpl.java  |   986 +-
 .../java/com/cloud/host/dao/HostDetailsDao.java    |     8 +
 .../com/cloud/host/dao/HostDetailsDaoImpl.java     |    58 +-
 .../main/java/com/cloud/host/dao/HostTagsDao.java  |    18 +-
 .../java/com/cloud/host/dao/HostTagsDaoImpl.java   |   162 +-
 .../cloud/hypervisor/HypervisorCapabilitiesVO.java |    18 +-
 .../dao/HypervisorCapabilitiesDaoImpl.java         |    15 +-
 .../vmware/dao/VmwareDatacenterDaoImpl.java        |   103 +
 .../com/cloud/network/LBHealthCheckPolicyVO.java   |     8 +
 .../network/TungstenGuestNetworkIpAddressVO.java   |   104 +
 .../com/cloud/network/as/AutoScalePolicyVO.java    |     5 +-
 .../com/cloud/network/as/AutoScaleVmGroupVO.java   |     9 +-
 .../com/cloud/network/as/AutoScaleVmProfileVO.java |    29 +-
 .../java/com/cloud/network/as/ConditionVO.java     |     5 +-
 .../main/java/com/cloud/network/as/CounterVO.java  |     5 +-
 .../network/as/dao/AutoScaleVmGroupVmMapDao.java   |     4 +
 .../as/dao/AutoScaleVmGroupVmMapDaoImpl.java       |    27 +-
 .../java/com/cloud/network/as/dao/CounterDao.java  |     1 +
 .../com/cloud/network/as/dao/CounterDaoImpl.java   |    16 +
 .../network/dao/ExternalFirewallDeviceDao.java     |     6 +-
 .../network/dao/ExternalLoadBalancerDeviceDao.java |     8 +-
 .../network/dao/ExternalLoadBalancerDeviceVO.java  |     8 +
 .../cloud/network/dao/FirewallRulesCidrsDao.java   |     2 +
 .../network/dao/FirewallRulesCidrsDaoImpl.java     |    23 +-
 .../com/cloud/network/dao/FirewallRulesDao.java    |    14 +-
 .../cloud/network/dao/FirewallRulesDaoImpl.java    |    57 +-
 .../cloud/network/dao/FirewallRulesDcidrsDao.java  |     2 +-
 .../network/dao/FirewallRulesDestCidrsVO.java      |     2 +-
 .../java/com/cloud/network/dao/IPAddressDao.java   |    17 +-
 .../com/cloud/network/dao/IPAddressDaoImpl.java    |    89 +-
 .../java/com/cloud/network/dao/IPAddressVO.java    |    26 +-
 .../network/dao/InlineLoadBalancerNicMapDao.java   |     4 +
 .../dao/InlineLoadBalancerNicMapDaoImpl.java       |    15 +
 .../cloud/network/dao/LBStickinessPolicyVO.java    |     8 +
 .../cloud/network/dao/LoadBalancerVMMapDao.java    |     1 +
 .../network/dao/LoadBalancerVMMapDaoImpl.java      |    15 +-
 .../java/com/cloud/network/dao/LoadBalancerVO.java |    17 +
 .../network/dao/MonitoringServiceDaoImpl.java      |     2 +-
 .../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 |    38 +-
 .../com/cloud/network/dao/NetworkDetailsDao.java   |     2 +-
 .../com/cloud/network/dao/NetworkDomainDao.java    |     3 +
 .../cloud/network/dao/NetworkDomainDaoImpl.java    |    54 +-
 .../cloud/network/dao/NetworkServiceMapDao.java    |     2 +
 .../network/dao/NetworkServiceMapDaoImpl.java      |    22 +
 .../main/java/com/cloud/network/dao/NetworkVO.java |    42 +
 .../java/com/cloud/network/dao/NsxProviderDao.java |    30 +
 .../com/cloud/network/dao/NsxProviderDaoImpl.java  |    65 +
 .../network/dao/OpRouterMonitorServiceDao.java     |     4 +
 .../network/dao/OpRouterMonitorServiceDaoImpl.java |    19 +-
 .../dao/PhysicalNetworkServiceProviderVO.java      |     8 +
 .../dao/PhysicalNetworkTrafficTypeDaoImpl.java     |     2 +-
 .../com/cloud/network/dao/PhysicalNetworkVO.java   |     8 +
 .../java/com/cloud/network/dao/PortProfileDao.java |     2 +-
 .../com/cloud/network/dao/PortProfileDaoImpl.java  |     4 +-
 .../cloud/network/dao/PublicIpQuarantineDao.java   |    27 +
 .../network/dao/PublicIpQuarantineDaoImpl.java     |    71 +
 .../com/cloud/network/dao/RemoteAccessVpnDao.java  |     2 +
 .../cloud/network/dao/RemoteAccessVpnDaoImpl.java  |     9 +-
 .../com/cloud/network/dao/RemoteAccessVpnVO.java   |     6 +
 .../dao/RouterHealthCheckResultDaoImpl.java        |     4 +-
 .../network/dao/RouterHealthCheckResultVO.java     |     7 +-
 .../network/dao/Site2SiteCustomerGatewayVO.java    |     8 +
 .../network/dao/Site2SiteVpnConnectionDaoImpl.java |     2 -
 .../network/dao/Site2SiteVpnConnectionVO.java      |     8 +
 .../cloud/network/dao/Site2SiteVpnGatewayDao.java  |     2 +
 .../network/dao/Site2SiteVpnGatewayDaoImpl.java    |    10 +-
 .../cloud/network/dao/Site2SiteVpnGatewayVO.java   |     8 +
 .../java/com/cloud/network/dao/SslCertDao.java     |     4 +-
 .../java/com/cloud/network/dao/SslCertDaoImpl.java |     6 +
 .../main/java/com/cloud/network/dao/SslCertVO.java |     2 +-
 .../dao/TungstenGuestNetworkIpAddressDao.java      |    34 +
 .../dao/TungstenGuestNetworkIpAddressDaoImpl.java  |    93 +
 .../com/cloud/network/dao/TungstenProviderDao.java |    32 +
 .../cloud/network/dao/TungstenProviderDaoImpl.java |    84 +
 .../cloud/network/dao/UserIpv6AddressDaoImpl.java  |     2 -
 .../cloud/network/element/NetrisProviderVO.java    |   265 +
 .../com/cloud/network/element/NsxProviderVO.java   |   285 +
 .../cloud/network/element/TungstenProviderVO.java  |   169 +
 .../com/cloud/network/rules/FirewallRuleVO.java    |     5 +-
 .../cloud/network/rules/PortForwardingRuleVO.java  |    29 +-
 .../network/rules/dao/PortForwardingRulesDao.java  |     3 +
 .../rules/dao/PortForwardingRulesDaoImpl.java      |    68 +-
 .../network/security/SecurityGroupRuleVO.java      |     9 +
 .../network/security/SecurityGroupVMMapVO.java     |     7 +
 .../cloud/network/security/SecurityGroupVO.java    |     9 +
 .../security/TungstenSecurityGroupRuleVO.java      |   129 +
 .../security/dao/SecurityGroupVMMapDaoImpl.java    |     2 +-
 .../security/dao/SecurityGroupWorkDaoImpl.java     |    10 +-
 .../security/dao/TungstenSecurityGroupRuleDao.java |    31 +
 .../dao/TungstenSecurityGroupRuleDaoImpl.java      |    78 +
 .../network/security/dao/VmRulesetLogDaoImpl.java  |    27 +-
 .../com/cloud/network/vo/PublicIpQuarantineVO.java |   143 +
 .../com/cloud/network/vpc/NetworkACLItemVO.java    |     5 +-
 .../java/com/cloud/network/vpc/NetworkACLVO.java   |     7 +
 .../java/com/cloud/network/vpc/StaticRouteVO.java  |    37 +-
 .../java/com/cloud/network/vpc/VpcGatewayVO.java   |     7 +-
 .../java/com/cloud/network/vpc/VpcOfferingVO.java  |    42 +-
 .../src/main/java/com/cloud/network/vpc/VpcVO.java |    33 +-
 .../vpc/dao/NetworkACLItemCidrsDaoImpl.java        |     2 -
 .../network/vpc/dao/NetworkACLItemDaoImpl.java     |     2 +-
 .../cloud/network/vpc/dao/PrivateIpDaoImpl.java    |     6 +-
 .../com/cloud/network/vpc/dao/VpcOfferingDao.java  |     2 +
 .../cloud/network/vpc/dao/VpcOfferingDaoImpl.java  |     6 +
 .../network/vpc/dao/VpcOfferingDetailsDaoImpl.java |     2 +-
 .../network/vpc/dao/VpcOfferingServiceMapDao.java  |     5 +
 .../vpc/dao/VpcOfferingServiceMapDaoImpl.java      |    19 +
 .../cloud/network/vpc/dao/VpcServiceMapDao.java    |     2 +-
 .../network/vpc/dao/VpcServiceMapDaoImpl.java      |    11 +-
 .../com/cloud/offerings/NetworkOfferingVO.java     |    41 +-
 .../cloud/offerings/dao/NetworkOfferingDao.java    |     2 +
 .../offerings/dao/NetworkOfferingDaoImpl.java      |     7 +-
 .../com/cloud/projects/ProjectInvitationVO.java    |     7 +-
 .../main/java/com/cloud/projects/ProjectVO.java    |     4 +-
 .../com/cloud/projects/dao/ProjectAccountDao.java  |     2 +
 .../cloud/projects/dao/ProjectAccountDaoImpl.java  |    15 +-
 .../com/cloud/projects/dao/ProjectDaoImpl.java     |    19 +-
 .../projects/dao/ProjectInvitationDaoImpl.java     |     8 +-
 .../cloud/resource/icon/dao/ResourceIconDao.java   |     3 +
 .../resource/icon/dao/ResourceIconDaoImpl.java     |    33 +-
 .../com/cloud/secstorage/CommandExecLogDao.java    |     2 +
 .../cloud/secstorage/CommandExecLogDaoImpl.java    |    16 +-
 .../cloud/service/ServiceOfferingDetailsVO.java    |     2 +-
 .../java/com/cloud/service/ServiceOfferingVO.java  |    57 +-
 .../com/cloud/service/dao/ServiceOfferingDao.java  |     7 +-
 .../cloud/service/dao/ServiceOfferingDaoImpl.java  |    46 +-
 .../service/dao/ServiceOfferingDetailsDao.java     |     1 -
 .../src/main/java/com/cloud/storage/BucketVO.java  |   263 +
 .../java/com/cloud/storage/DiskOfferingVO.java     |    10 +-
 .../java/com/cloud/storage/GuestOSCategoryVO.java  |    45 +-
 .../com/cloud/storage/GuestOSHypervisorVO.java     |     6 +-
 .../src/main/java/com/cloud/storage/GuestOSVO.java |    14 +
 .../java/com/cloud/storage/SnapshotPolicyVO.java   |    46 +-
 .../java/com/cloud/storage/SnapshotScheduleVO.java |     8 +
 .../main/java/com/cloud/storage/SnapshotVO.java    |    22 +-
 .../java/com/cloud/storage/SnapshotZoneVO.java     |   118 +
 .../storage/StoragePoolAndAccessGroupMapVO.java    |    64 +
 .../java/com/cloud/storage/StoragePoolHostVO.java  |     6 +
 .../java/com/cloud/storage/StoragePoolTagVO.java   |    28 +
 .../main/java/com/cloud/storage/VMTemplateVO.java  |    51 +-
 .../com/cloud/storage/VnfTemplateDetailVO.java     |   101 +
 .../java/com/cloud/storage/VnfTemplateNicVO.java   |   101 +
 .../java/com/cloud/storage/VolumeDetailVO.java     |     3 +
 .../main/java/com/cloud/storage/VolumeStatsVO.java |    86 +
 .../src/main/java/com/cloud/storage/VolumeVO.java  |    94 +-
 .../main/java/com/cloud/storage/dao/BucketDao.java |    34 +
 .../java/com/cloud/storage/dao/BucketDaoImpl.java  |   117 +
 .../com/cloud/storage/dao/DiskOfferingDao.java     |     3 +
 .../com/cloud/storage/dao/DiskOfferingDaoImpl.java |    45 +-
 .../cloud/storage/dao/GuestOSCategoryDaoImpl.java  |     1 -
 .../java/com/cloud/storage/dao/GuestOSDao.java     |    16 +-
 .../java/com/cloud/storage/dao/GuestOSDaoImpl.java |   109 +-
 .../cloud/storage/dao/GuestOSHypervisorDao.java    |    10 +-
 .../storage/dao/GuestOSHypervisorDaoImpl.java      |    64 +-
 .../cloud/storage/dao/LaunchPermissionDaoImpl.java |     6 +-
 .../java/com/cloud/storage/dao/SnapshotDao.java    |     3 +
 .../com/cloud/storage/dao/SnapshotDaoImpl.java     |    41 +-
 .../com/cloud/storage/dao/SnapshotDetailsDao.java  |     3 +
 .../cloud/storage/dao/SnapshotDetailsDaoImpl.java  |    33 +
 .../cloud/storage/dao/SnapshotPolicyDaoImpl.java   |     2 +-
 .../com/cloud/storage/dao/SnapshotScheduleDao.java |     6 +-
 .../cloud/storage/dao/SnapshotScheduleDaoImpl.java |    37 +-
 .../com/cloud/storage/dao/SnapshotZoneDao.java     |    31 +
 .../com/cloud/storage/dao/SnapshotZoneDaoImpl.java |    82 +
 .../dao/StoragePoolAndAccessGroupMapDao.java       |    31 +
 .../dao/StoragePoolAndAccessGroupMapDaoImpl.java   |   105 +
 .../storage/dao/StoragePoolDetailsDaoImpl.java     |    26 +-
 .../com/cloud/storage/dao/StoragePoolHostDao.java  |     6 +-
 .../cloud/storage/dao/StoragePoolHostDaoImpl.java  |    75 +-
 .../com/cloud/storage/dao/StoragePoolTagsDao.java  |     7 +-
 .../cloud/storage/dao/StoragePoolTagsDaoImpl.java  |    37 +-
 .../java/com/cloud/storage/dao/UploadDaoImpl.java  |     4 +-
 .../java/com/cloud/storage/dao/VMTemplateDao.java  |    21 +-
 .../com/cloud/storage/dao/VMTemplateDaoImpl.java   |   266 +-
 .../storage/dao/VMTemplateDetailsDaoImpl.java      |     2 +-
 .../com/cloud/storage/dao/VMTemplatePoolDao.java   |     6 +
 .../cloud/storage/dao/VMTemplatePoolDaoImpl.java   |    56 +-
 .../cloud/storage/dao/VMTemplateZoneDaoImpl.java   |     2 -
 .../cloud/storage/dao/VnfTemplateDetailsDao.java   |    26 +
 .../storage/dao/VnfTemplateDetailsDaoImpl.java     |    31 +
 .../com/cloud/storage/dao/VnfTemplateNicDao.java   |    29 +
 .../cloud/storage/dao/VnfTemplateNicDaoImpl.java   |    53 +
 .../main/java/com/cloud/storage/dao/VolumeDao.java |    19 +-
 .../java/com/cloud/storage/dao/VolumeDaoImpl.java  |   221 +-
 .../java/com/cloud/storage/dao/VolumeStatsDao.java |    84 +
 .../com/cloud/storage/dao/VolumeStatsDaoImpl.java  |   133 +
 .../upgrade/ConfigurationGroupsAggregator.java     |   107 +
 .../java/com/cloud/upgrade/DatabaseCreator.java    |    12 +-
 .../cloud/upgrade/DatabaseIntegrityChecker.java    |    44 +-
 .../com/cloud/upgrade/DatabaseUpgradeChecker.java  |   404 +-
 .../cloud/upgrade/DatabaseVersionHierarchy.java    |    20 +-
 .../main/java/com/cloud/upgrade/GuestOsMapper.java |   210 +-
 .../com/cloud/upgrade/RolePermissionChecker.java   |     9 +-
 .../upgrade/SystemVmTemplateRegistration.java      |   787 +-
 .../upgrade/dao/BasicTemplateDataStoreDaoImpl.java |    10 +
 .../cloud/upgrade/dao/DatabaseAccessObject.java    |   105 +-
 .../main/java/com/cloud/upgrade/dao/DbUpgrade.java |    37 +-
 .../cloud/upgrade/dao/DbUpgradeAbstractImpl.java   |    24 +
 .../upgrade/dao/DbUpgradeSystemVmTemplate.java     |    16 +-
 .../java/com/cloud/upgrade/dao/DbUpgradeUtils.java |    35 +-
 .../com/cloud/upgrade/dao/LegacyDbUpgrade.java     |     8 +-
 .../com/cloud/upgrade/dao/Upgrade217to218.java     |     2 +-
 .../java/com/cloud/upgrade/dao/Upgrade218to22.java |   134 +-
 .../upgrade/dao/Upgrade218to224DomainVlans.java    |    12 +-
 .../cloud/upgrade/dao/Upgrade218to22Premium.java   |     6 +-
 .../com/cloud/upgrade/dao/Upgrade2210to2211.java   |     2 +-
 .../com/cloud/upgrade/dao/Upgrade2211to2212.java   |    10 +-
 .../upgrade/dao/Upgrade2211to2212Premium.java      |     2 -
 .../com/cloud/upgrade/dao/Upgrade2212to2213.java   |     8 +-
 .../com/cloud/upgrade/dao/Upgrade2213to2214.java   |     4 +-
 .../com/cloud/upgrade/dao/Upgrade2214to30.java     |    98 +-
 .../com/cloud/upgrade/dao/Upgrade221to222.java     |     2 +-
 .../com/cloud/upgrade/dao/Upgrade222to224.java     |    46 +-
 .../cloud/upgrade/dao/Upgrade222to224Premium.java  |     6 +-
 .../com/cloud/upgrade/dao/Upgrade224to225.java     |    28 +-
 .../com/cloud/upgrade/dao/Upgrade225to226.java     |     8 +-
 .../com/cloud/upgrade/dao/Upgrade227to228.java     |    20 +-
 .../cloud/upgrade/dao/Upgrade227to228Premium.java  |    16 +-
 .../com/cloud/upgrade/dao/Upgrade228to229.java     |     6 +-
 .../com/cloud/upgrade/dao/Upgrade229to2210.java    |    12 +-
 .../com/cloud/upgrade/dao/Upgrade301to302.java     |    14 +-
 .../com/cloud/upgrade/dao/Upgrade302to303.java     |    14 +-
 .../java/com/cloud/upgrade/dao/Upgrade302to40.java |    65 +-
 .../com/cloud/upgrade/dao/Upgrade303to304.java     |    22 +-
 .../com/cloud/upgrade/dao/Upgrade304to305.java     |    85 +-
 .../com/cloud/upgrade/dao/Upgrade305to306.java     |    26 +-
 .../com/cloud/upgrade/dao/Upgrade306to307.java     |     4 +-
 .../com/cloud/upgrade/dao/Upgrade307to410.java     |     6 +-
 .../java/com/cloud/upgrade/dao/Upgrade30to301.java |     4 +-
 .../java/com/cloud/upgrade/dao/Upgrade30xBase.java |    14 +-
 .../java/com/cloud/upgrade/dao/Upgrade40to41.java  |    17 +-
 .../com/cloud/upgrade/dao/Upgrade41000to41100.java |    24 +-
 .../com/cloud/upgrade/dao/Upgrade410to420.java     |   254 +-
 .../com/cloud/upgrade/dao/Upgrade41100to41110.java |    16 +-
 .../com/cloud/upgrade/dao/Upgrade41110to41120.java |     4 +-
 .../com/cloud/upgrade/dao/Upgrade41120to41130.java |     2 +-
 .../com/cloud/upgrade/dao/Upgrade41120to41200.java |     6 +-
 .../com/cloud/upgrade/dao/Upgrade41200to41300.java |     2 +-
 .../com/cloud/upgrade/dao/Upgrade41300to41310.java |     2 +-
 .../com/cloud/upgrade/dao/Upgrade41310to41400.java |     4 +-
 .../com/cloud/upgrade/dao/Upgrade41400to41500.java |   267 +-
 .../com/cloud/upgrade/dao/Upgrade41500to41510.java |   256 +-
 .../com/cloud/upgrade/dao/Upgrade41510to41520.java |    15 +-
 .../com/cloud/upgrade/dao/Upgrade41520to41600.java |    29 +-
 .../com/cloud/upgrade/dao/Upgrade41600to41610.java |    16 +-
 .../com/cloud/upgrade/dao/Upgrade41610to41700.java |    18 +-
 .../com/cloud/upgrade/dao/Upgrade41700to41710.java |    74 +-
 .../com/cloud/upgrade/dao/Upgrade41700to41800.java |   233 -
 .../com/cloud/upgrade/dao/Upgrade41710to41720.java |    73 +
 .../com/cloud/upgrade/dao/Upgrade41710to41800.java |    86 -
 .../com/cloud/upgrade/dao/Upgrade41720to41800.java |   716 +
 .../com/cloud/upgrade/dao/Upgrade41800to41810.java |   248 +
 .../com/cloud/upgrade/dao/Upgrade41810to41900.java |   267 +
 .../com/cloud/upgrade/dao/Upgrade41900to41910.java |    88 +
 .../com/cloud/upgrade/dao/Upgrade41910to41920.java |    66 +
 .../com/cloud/upgrade/dao/Upgrade41910to42000.java |   116 +
 .../com/cloud/upgrade/dao/Upgrade42000to42010.java |   120 +
 .../com/cloud/upgrade/dao/Upgrade42010to42100.java |   220 +
 .../com/cloud/upgrade/dao/Upgrade420to421.java     |    12 +-
 .../com/cloud/upgrade/dao/Upgrade42100to42200.java |   103 +
 .../com/cloud/upgrade/dao/Upgrade421to430.java     |    10 +-
 .../com/cloud/upgrade/dao/Upgrade42200to42210.java |    30 +
 .../com/cloud/upgrade/dao/Upgrade42210to42300.java |    30 +
 .../com/cloud/upgrade/dao/Upgrade430to440.java     |    16 +-
 .../com/cloud/upgrade/dao/Upgrade431to440.java     |     4 +-
 .../com/cloud/upgrade/dao/Upgrade432to440.java     |     4 +-
 .../com/cloud/upgrade/dao/Upgrade440to441.java     |     2 +-
 .../com/cloud/upgrade/dao/Upgrade441to442.java     |     2 +-
 .../com/cloud/upgrade/dao/Upgrade442to450.java     |    14 +-
 .../com/cloud/upgrade/dao/Upgrade443to444.java     |     2 +-
 .../com/cloud/upgrade/dao/Upgrade443to450.java     |     2 +-
 .../com/cloud/upgrade/dao/Upgrade444to450.java     |     2 +-
 .../com/cloud/upgrade/dao/Upgrade450to451.java     |    19 +-
 .../com/cloud/upgrade/dao/Upgrade451to452.java     |     2 +-
 .../com/cloud/upgrade/dao/Upgrade452to453.java     |     2 +-
 .../com/cloud/upgrade/dao/Upgrade452to460.java     |    12 +-
 .../com/cloud/upgrade/dao/Upgrade453to460.java     |     2 +-
 .../com/cloud/upgrade/dao/Upgrade460to461.java     |     2 +-
 .../com/cloud/upgrade/dao/Upgrade461to470.java     |     8 +-
 .../com/cloud/upgrade/dao/Upgrade470to471.java     |     2 +-
 .../com/cloud/upgrade/dao/Upgrade471to480.java     |     2 +-
 .../com/cloud/upgrade/dao/Upgrade480to481.java     |     2 +-
 .../com/cloud/upgrade/dao/Upgrade481to490.java     |    20 +-
 .../com/cloud/upgrade/dao/Upgrade490to4910.java    |     2 +-
 .../com/cloud/upgrade/dao/Upgrade4910to4920.java   |     2 +-
 .../com/cloud/upgrade/dao/Upgrade4920to4930.java   |     2 +-
 .../com/cloud/upgrade/dao/Upgrade4930to41000.java  |     4 +-
 .../cloud/upgrade/dao/UpgradeSnapshot217to224.java |     2 +-
 .../cloud/upgrade/dao/UpgradeSnapshot223to224.java |     2 +-
 .../java/com/cloud/upgrade/dao/VersionDaoImpl.java |    14 +-
 .../java/com/cloud/usage/BucketStatisticsVO.java   |    74 +
 .../main/java/com/cloud/usage/UsageNetworksVO.java |   143 +
 .../src/main/java/com/cloud/usage/UsageVO.java     |    22 +-
 .../main/java/com/cloud/usage/UsageVolumeVO.java   |    14 +-
 .../src/main/java/com/cloud/usage/UsageVpcVO.java  |   130 +
 .../com/cloud/usage/dao/BucketStatisticsDao.java   |    30 +
 .../cloud/usage/dao/BucketStatisticsDaoImpl.java   |    65 +
 .../java/com/cloud/usage/dao/UsageBackupDao.java   |     4 +-
 .../com/cloud/usage/dao/UsageBackupDaoImpl.java    |    18 +-
 .../main/java/com/cloud/usage/dao/UsageDao.java    |     7 +
 .../java/com/cloud/usage/dao/UsageDaoImpl.java     |   133 +-
 .../com/cloud/usage/dao/UsageIPAddressDaoImpl.java |     6 +-
 .../main/java/com/cloud/usage/dao/UsageJobDao.java |     2 +
 .../java/com/cloud/usage/dao/UsageJobDaoImpl.java  |    43 +-
 .../usage/dao/UsageLoadBalancerPolicyDaoImpl.java  |     8 +-
 .../com/cloud/usage/dao/UsageNetworkDaoImpl.java   |     8 +-
 .../usage/dao/UsageNetworkOfferingDaoImpl.java     |     6 +-
 .../java/com/cloud/usage/dao/UsageNetworksDao.java |    33 +
 .../com/cloud/usage/dao/UsageNetworksDaoImpl.java  |   151 +
 .../usage/dao/UsagePortForwardingRuleDaoImpl.java  |     8 +-
 .../cloud/usage/dao/UsageSecurityGroupDaoImpl.java |     6 +-
 .../com/cloud/usage/dao/UsageStorageDaoImpl.java   |    10 +-
 .../cloud/usage/dao/UsageVMInstanceDaoImpl.java    |     8 +-
 .../cloud/usage/dao/UsageVMSnapshotDaoImpl.java    |     8 +-
 .../usage/dao/UsageVMSnapshotOnPrimaryDaoImpl.java |     8 +-
 .../com/cloud/usage/dao/UsageVPNUserDaoImpl.java   |     6 +-
 .../com/cloud/usage/dao/UsageVmDiskDaoImpl.java    |     8 +-
 .../java/com/cloud/usage/dao/UsageVolumeDao.java   |     6 +-
 .../com/cloud/usage/dao/UsageVolumeDaoImpl.java    |    90 +-
 .../main/java/com/cloud/usage/dao/UsageVpcDao.java |    33 +
 .../java/com/cloud/usage/dao/UsageVpcDaoImpl.java  |   145 +
 .../main/java/com/cloud/user/AccountDetailVO.java  |    21 +-
 .../java/com/cloud/user/AccountDetailsDao.java     |     3 +-
 .../java/com/cloud/user/AccountDetailsDaoImpl.java |    42 +-
 .../src/main/java/com/cloud/user/AccountVO.java    |    13 +
 .../main/java/com/cloud/user/UserAccountVO.java    |    74 +-
 .../src/main/java/com/cloud/user/UserDataVO.java   |    25 +
 .../src/main/java/com/cloud/user/UserVO.java       |    48 +-
 .../main/java/com/cloud/user/dao/AccountDao.java   |     8 +-
 .../java/com/cloud/user/dao/AccountDaoImpl.java    |    63 +-
 .../java/com/cloud/user/dao/UserAccountDao.java    |     2 +
 .../com/cloud/user/dao/UserAccountDaoImpl.java     |    12 +
 .../main/java/com/cloud/user/dao/UserDataDao.java  |     2 +
 .../java/com/cloud/user/dao/UserDataDaoImpl.java   |     7 +
 .../com/cloud/user/dao/UserStatisticsDaoImpl.java  |     6 +-
 .../cloud/user/dao/VmDiskStatisticsDaoImpl.java    |     6 +-
 .../com/cloud/util/StoragePoolTypeConverter.java   |    40 +
 .../main/java/com/cloud/vm/ConsoleSessionVO.java   |   183 +
 .../src/main/java/com/cloud/vm/ImportVMTaskVO.java |   270 +
 .../java/com/cloud/vm/InstanceGroupVMMapVO.java    |     2 +-
 .../main/java/com/cloud/vm/InstanceGroupVO.java    |     7 +
 .../src/main/java/com/cloud/vm/ItWorkDao.java      |     1 +
 .../src/main/java/com/cloud/vm/ItWorkDaoImpl.java  |    14 +-
 .../schema/src/main/java/com/cloud/vm/NicVO.java   |    38 +-
 .../src/main/java/com/cloud/vm/UserVmDetailVO.java |    90 -
 .../src/main/java/com/cloud/vm/UserVmVO.java       |     1 +
 .../main/java/com/cloud/vm/VMInstanceDetailVO.java |    90 +
 .../src/main/java/com/cloud/vm/VMInstanceVO.java   |    27 +-
 .../src/main/java/com/cloud/vm/VmStatsVO.java      |     2 +-
 .../java/com/cloud/vm/dao/ConsoleProxyDao.java     |     2 +-
 .../java/com/cloud/vm/dao/ConsoleProxyDaoImpl.java |    50 +-
 .../java/com/cloud/vm/dao/ConsoleSessionDao.java   |    45 +
 .../com/cloud/vm/dao/ConsoleSessionDaoImpl.java    |   157 +
 .../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     |    19 +-
 .../src/main/java/com/cloud/vm/dao/NicDaoImpl.java |   107 +-
 .../com/cloud/vm/dao/NicExtraDhcpOptionDao.java    |     1 +
 .../cloud/vm/dao/NicExtraDhcpOptionDaoImpl.java    |    17 +-
 .../main/java/com/cloud/vm/dao/NicIpAliasDao.java  |     2 +-
 .../java/com/cloud/vm/dao/NicIpAliasDaoImpl.java   |     3 +-
 .../java/com/cloud/vm/dao/NicSecondaryIpDao.java   |     1 +
 .../com/cloud/vm/dao/NicSecondaryIpDaoImpl.java    |    13 +
 .../java/com/cloud/vm/dao/NicSecondaryIpVO.java    |     9 +
 .../cloud/vm/dao/SecondaryStorageVmDaoImpl.java    |     6 +-
 .../cloud/vm/dao/UserVmCloneSettingDaoImpl.java    |     2 -
 .../src/main/java/com/cloud/vm/dao/UserVmDao.java  |     7 +-
 .../main/java/com/cloud/vm/dao/UserVmDaoImpl.java  |    93 +-
 .../java/com/cloud/vm/dao/UserVmDetailsDao.java    |    25 -
 .../com/cloud/vm/dao/UserVmDetailsDaoImpl.java     |    34 -
 .../main/java/com/cloud/vm/dao/VMInstanceDao.java  |    31 +-
 .../java/com/cloud/vm/dao/VMInstanceDaoImpl.java   |   387 +-
 .../com/cloud/vm/dao/VMInstanceDetailsDao.java     |    25 +
 .../com/cloud/vm/dao/VMInstanceDetailsDaoImpl.java |    34 +
 .../src/main/java/com/cloud/vm/dao/VmStatsDao.java |     8 +-
 .../main/java/com/cloud/vm/dao/VmStatsDaoImpl.java |    17 +-
 .../java/com/cloud/vm/snapshot/VMSnapshotVO.java   |     8 +
 .../com/cloud/vm/snapshot/dao/VMSnapshotDao.java   |     8 +
 .../cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java   |    62 +-
 .../apache/cloudstack/acl/RolePermissionVO.java    |     2 +-
 .../java/org/apache/cloudstack/acl/RoleVO.java     |    27 +-
 .../acl/dao/ProjectRolePermissionsDaoImpl.java     |     4 +-
 .../org/apache/cloudstack/acl/dao/RoleDao.java     |    16 +-
 .../org/apache/cloudstack/acl/dao/RoleDaoImpl.java |    79 +-
 .../cloudstack/acl/dao/RolePermissionsDaoImpl.java |     4 +-
 .../cloudstack/affinity/AffinityGroupVO.java       |     6 +-
 .../cloudstack/affinity/dao/AffinityGroupDao.java  |     3 +
 .../affinity/dao/AffinityGroupDaoImpl.java         |    12 +
 .../affinity/dao/AffinityGroupDomainMapDao.java    |     3 +
 .../dao/AffinityGroupDomainMapDaoImpl.java         |    54 +
 .../apache/cloudstack/backup/BackupDetailVO.java   |    98 +
 .../cloudstack/backup/BackupRepositoryVO.java      |   184 +
 .../apache/cloudstack/backup/BackupScheduleVO.java |    78 +-
 .../org/apache/cloudstack/backup/BackupVO.java     |   112 +-
 .../apache/cloudstack/backup/dao/BackupDao.java    |    13 +-
 .../cloudstack/backup/dao/BackupDaoImpl.java       |   185 +-
 .../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 |    33 +
 .../backup/dao/BackupRepositoryDaoImpl.java        |    75 +
 .../cloudstack/backup/dao/BackupScheduleDao.java   |     5 +
 .../backup/dao/BackupScheduleDaoImpl.java          |    22 +
 .../cluster/ClusterDrsPlanMigrationVO.java         |   113 +
 .../cloudstack/cluster/ClusterDrsPlanVO.java       |   111 +
 .../cloudstack/cluster/dao/ClusterDrsPlanDao.java  |    41 +
 .../cluster/dao/ClusterDrsPlanDaoImpl.java         |   107 +
 .../cluster/dao/ClusterDrsPlanMigrationDao.java    |    33 +
 .../dao/ClusterDrsPlanMigrationDaoImpl.java        |    70 +
 .../cloudstack/command/ReconcileCommandVO.java     |   216 +
 .../command/dao/ReconcileCommandDao.java           |    45 +
 .../command/dao/ReconcileCommandDaoImpl.java       |   134 +
 .../datacenter/DataCenterIpv4GuestSubnetVO.java    |   123 +
 .../dao/DataCenterIpv4GuestSubnetDao.java          |    33 +
 .../dao/DataCenterIpv4GuestSubnetDaoImpl.java      |    83 +
 .../download/DirectDownloadCertificateDao.java     |     2 +-
 .../download/DirectDownloadCertificateDaoImpl.java |     2 +-
 .../DirectDownloadCertificateHostMapDao.java       |     2 +-
 .../DirectDownloadCertificateHostMapDaoImpl.java   |     2 +-
 .../DirectDownloadCertificateHostMapVO.java        |     2 +-
 .../download/DirectDownloadCertificateVO.java      |    13 +-
 .../engine/cloud/entity/api/db/VMEntityVO.java     |     7 +-
 .../cloud/entity/api/db/dao/VMEntityDaoImpl.java   |     2 -
 .../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 +
 .../org/apache/cloudstack/ha/dao/HAConfigDao.java  |     2 +-
 .../apache/cloudstack/ha/dao/HAConfigDaoImpl.java  |    12 +-
 .../lb/ApplicationLoadBalancerRuleVO.java          |     8 +
 .../cloudstack/network/BgpPeerDetailsVO.java       |   103 +
 .../cloudstack/network/BgpPeerNetworkMapVO.java    |   104 +
 .../org/apache/cloudstack/network/BgpPeerVO.java   |   173 +
 .../network/Ipv4GuestSubnetNetworkMapVO.java       |   143 +
 .../apache/cloudstack/network/dao/BgpPeerDao.java  |    40 +
 .../cloudstack/network/dao/BgpPeerDaoImpl.java     |   193 +
 .../cloudstack/network/dao/BgpPeerDetailsDao.java  |    33 +
 .../network/dao/BgpPeerDetailsDaoImpl.java         |   123 +
 .../network/dao/BgpPeerNetworkMapDao.java          |    48 +
 .../network/dao/BgpPeerNetworkMapDaoImpl.java      |   185 +
 .../network/dao/Ipv4GuestSubnetNetworkMapDao.java  |    38 +
 .../dao/Ipv4GuestSubnetNetworkMapDaoImpl.java      |   170 +
 .../network/dao/NetworkPermissionDao.java          |     7 +
 .../network/dao/NetworkPermissionDaoImpl.java      |    17 +-
 .../dao/OutOfBandManagementDaoImpl.java            |    16 +-
 .../cloudstack/region/dao/RegionDaoImpl.java       |     2 -
 .../region/gslb/GlobalLoadBalancerRuleVO.java      |    10 +
 .../cloudstack/reservation/ReservationVO.java      |    68 +-
 .../cloudstack/reservation/dao/ReservationDao.java |    17 +-
 .../reservation/dao/ReservationDaoImpl.java        |   150 +-
 .../resourcedetail/AutoScaleVmGroupDetailVO.java   |     2 +-
 .../resourcedetail/AutoScaleVmProfileDetailVO.java |     2 +-
 .../resourcedetail/DiskOfferingDetailVO.java       |     6 +-
 .../resourcedetail/FirewallRuleDetailVO.java       |     4 +
 .../resourcedetail/ResourceDetailsDao.java         |    32 +-
 .../resourcedetail/ResourceDetailsDaoBase.java     |    85 +-
 .../Site2SiteVpnGatewayDetailVO.java               |     3 -
 .../cloudstack/resourcedetail/UserDetailVO.java    |    10 +-
 .../dao/AutoScaleVmGroupDetailsDaoImpl.java        |     2 +-
 .../dao/AutoScaleVmProfileDetailsDaoImpl.java      |     2 +-
 .../resourcedetail/dao/DiskOfferingDetailsDao.java |     1 -
 .../dao/DiskOfferingDetailsDaoImpl.java            |     1 -
 .../dao/LBHealthCheckPolicyDetailsDaoImpl.java     |     2 +-
 .../dao/LBStickinessPolicyDetailsDaoImpl.java      |     2 +-
 .../dao/NetworkACLItemDetailsDao.java              |     2 +-
 .../dao/NetworkACLItemDetailsDaoImpl.java          |     2 +-
 .../dao/NetworkACLListDetailsDao.java              |     2 +-
 .../dao/Site2SiteCustomerGatewayDetailsDao.java    |     2 +-
 .../dao/Site2SiteVpnGatewayDetailsDao.java         |     1 -
 .../dao/SnapshotPolicyDetailsDaoImpl.java          |     2 +-
 .../resourcedetail/dao/UserDetailsDao.java         |     2 +-
 .../resourcedetail/dao/UserDetailsDaoImpl.java     |     2 +-
 .../dao/VpcGatewayDetailsDaoImpl.java              |     2 +-
 .../org/apache/cloudstack/secret/PassphraseVO.java |    39 +-
 .../cloudstack/secret/dao/PassphraseDao.java       |     2 +-
 .../apache/cloudstack/secstorage/HeuristicVO.java  |   127 +
 .../dao/SecondaryStorageHeuristicDao.java          |    26 +
 .../dao/SecondaryStorageHeuristicDaoImpl.java      |    50 +
 .../storage/datastore/db/ImageStoreDao.java        |     6 +-
 .../storage/datastore/db/ImageStoreDaoImpl.java    |    49 +-
 .../datastore/db/ImageStoreDetailsDaoImpl.java     |    36 +-
 .../datastore/db/ImageStoreObjectDownloadDao.java  |    30 +
 .../db/ImageStoreObjectDownloadDaoImpl.java        |    69 +
 .../datastore/db/ImageStoreObjectDownloadVO.java   |    81 +
 .../storage/datastore/db/ImageStoreVO.java         |     8 +
 .../storage/datastore/db/ObjectStoreDao.java       |    44 +
 .../storage/datastore/db/ObjectStoreDaoImpl.java   |   194 +
 .../storage/datastore/db/ObjectStoreDetailVO.java  |    77 +
 .../datastore/db/ObjectStoreDetailsDao.java        |    31 +
 .../datastore/db/ObjectStoreDetailsDaoImpl.java    |   104 +
 .../storage/datastore/db/ObjectStoreVO.java        |   162 +
 .../storage/datastore/db/PrimaryDataStoreDao.java  |    51 +-
 .../datastore/db/PrimaryDataStoreDaoImpl.java      |   446 +-
 .../datastore/db/PrimaryDataStoreDetailsDao.java   |     2 +-
 .../storage/datastore/db/SnapshotDataStoreDao.java |    47 +-
 .../datastore/db/SnapshotDataStoreDaoImpl.java     |   360 +-
 .../storage/datastore/db/SnapshotDataStoreVO.java  |   120 +-
 .../storage/datastore/db/StoragePoolVO.java        |    27 +-
 .../storage/datastore/db/TemplateDataStoreDao.java |     4 +
 .../storage/datastore/db/TemplateDataStoreVO.java  |     9 +-
 .../storage/datastore/db/VolumeDataStoreDao.java   |     4 +
 .../storage/datastore/db/VolumeDataStoreVO.java    |     9 +-
 .../cloudstack/storage/sharedfs/SharedFSVO.java    |   246 +
 .../storage/sharedfs/dao/SharedFSDao.java          |    32 +
 .../storage/sharedfs/dao/SharedFSDaoImpl.java      |   117 +
 .../apache/cloudstack/util/CPUArchConverter.java   |    36 +
 .../cloudstack/util/HypervisorTypeConverter.java   |    38 +
 .../cloudstack/vm/schedule/VMScheduleVO.java       |   189 +
 .../cloudstack/vm/schedule/VMScheduledJobVO.java   |   123 +
 .../cloudstack/vm/schedule/dao/VMScheduleDao.java  |    37 +
 .../vm/schedule/dao/VMScheduleDaoImpl.java         |   108 +
 .../vm/schedule/dao/VMScheduledJobDao.java         |    34 +
 .../vm/schedule/dao/VMScheduledJobDaoImpl.java     |    95 +
 ...n-daos-between-management-and-usage-context.xml |     8 +-
 .../spring-engine-schema-core-daos-context.xml     |    46 +-
 .../main/resources/META-INF/db/data-217to218.sql   |     5 +-
 .../cloud.add_guest_os_and_hypervisor_mapping.sql  |    49 +
 .../db/procedures/cloud.idempotent_add_column.sql  |    27 +
 .../cloud.idempotent_add_foreign_key.sql           |    28 +
 .../db/procedures/cloud.idempotent_add_key.sql     |    27 +
 .../cloud.idempotent_add_unique_index.sql          |    26 +
 .../procedures/cloud.idempotent_add_unique_key.sql |    26 +
 .../procedures/cloud.idempotent_change_column.sql  |    27 +
 .../cloud.idempotent_create_unique_index.sql       |    27 +
 .../cloud.idempotent_drop_foreign_key.sql          |    25 +
 .../db/procedures/cloud.idempotent_drop_index.sql  |    27 +
 .../cloud.idempotent_drop_unique_key.sql           |    26 +
 ...dempotent_insert_guestos_hypervisor_mapping.sql |    48 +
 .../cloud.idempotent_update_api_permission.sql     |    52 +
 .../db/procedures/usage.idempotent_add_column.sql  |    26 +
 .../procedures/usage.idempotent_change_column.sql  |    27 +
 .../db/procedures/usage.idempotent_drop_index.sql  |    25 +
 .../main/resources/META-INF/db/schema-20to21.sql   |    13 +-
 .../main/resources/META-INF/db/schema-217to218.sql |     4 +-
 .../META-INF/db/schema-21to22-cleanup.sql          |     6 +-
 .../META-INF/db/schema-21to22-premium.sql          |     9 +-
 .../main/resources/META-INF/db/schema-21to22.sql   |    35 +-
 .../resources/META-INF/db/schema-2210to2211.sql    |     5 +-
 .../META-INF/db/schema-2211to2212-premium.sql      |     4 +-
 .../resources/META-INF/db/schema-2211to2212.sql    |     5 +-
 .../resources/META-INF/db/schema-2212to2213.sql    |     7 +-
 .../resources/META-INF/db/schema-2213to2214.sql    |     7 +-
 .../META-INF/db/schema-2214to30-cleanup.sql        |     7 +-
 .../main/resources/META-INF/db/schema-2214to30.sql |    80 +-
 .../META-INF/db/schema-221to222-cleanup.sql        |     5 +-
 .../META-INF/db/schema-221to222-premium.sql        |     4 +-
 .../main/resources/META-INF/db/schema-221to222.sql |     8 +-
 .../META-INF/db/schema-222to224-cleanup.sql        |     4 +-
 .../META-INF/db/schema-222to224-premium.sql        |     5 +-
 .../main/resources/META-INF/db/schema-222to224.sql |    11 +-
 .../META-INF/db/schema-224to225-cleanup.sql        |     4 +-
 .../main/resources/META-INF/db/schema-224to225.sql |     5 +-
 .../main/resources/META-INF/db/schema-225to226.sql |     7 +-
 .../META-INF/db/schema-227to228-premium.sql        |     5 +-
 .../main/resources/META-INF/db/schema-227to228.sql |    12 +-
 .../main/resources/META-INF/db/schema-228to229.sql |     8 +-
 .../resources/META-INF/db/schema-229to2210.sql     |     6 +-
 .../META-INF/db/schema-22beta1to22beta2.sql        |     4 +-
 .../META-INF/db/schema-22beta3to22beta4.sql        |    14 +-
 .../META-INF/db/schema-301to302-cleanup.sql        |     4 +-
 .../main/resources/META-INF/db/schema-301to302.sql |     8 +-
 .../main/resources/META-INF/db/schema-302to303.sql |   392 +-
 .../META-INF/db/schema-302to40-cleanup.sql         |     4 +-
 .../main/resources/META-INF/db/schema-302to40.sql  |    20 +-
 .../META-INF/db/schema-304to305-cleanup.sql        |     5 +-
 .../main/resources/META-INF/db/schema-304to305.sql |   778 +-
 .../META-INF/db/schema-305to306-cleanup.sql        |     6 +-
 .../main/resources/META-INF/db/schema-305to306.sql |     4 +-
 .../main/resources/META-INF/db/schema-306to307.sql |     6 +-
 .../META-INF/db/schema-307to410-cleanup.sql        |     6 -
 .../main/resources/META-INF/db/schema-307to410.sql |    16 +-
 .../main/resources/META-INF/db/schema-30to301.sql  |     4 +-
 .../META-INF/db/schema-40to410-cleanup.sql         |     1 -
 .../main/resources/META-INF/db/schema-40to410.sql  |    57 +-
 .../META-INF/db/schema-41000to41100-cleanup.sql    |     2 +-
 .../resources/META-INF/db/schema-41000to41100.sql  |    47 +-
 .../META-INF/db/schema-410to420-cleanup.sql        |     2 -
 .../main/resources/META-INF/db/schema-410to420.sql |   100 +-
 .../resources/META-INF/db/schema-41110to41120.sql  |     2 +-
 .../resources/META-INF/db/schema-41310to41400.sql  |     4 +-
 .../META-INF/db/schema-41500to41510-cleanup.sql    |     1 -
 .../resources/META-INF/db/schema-41500to41510.sql  |     1 -
 .../META-INF/db/schema-41510to41520-cleanup.sql    |     1 -
 .../resources/META-INF/db/schema-41520to41600.sql  |    47 -
 .../META-INF/db/schema-41600to41610-cleanup.sql    |     2 +-
 .../resources/META-INF/db/schema-41600to41610.sql  |    54 -
 .../META-INF/db/schema-41610to41700-cleanup.sql    |     2 +-
 .../resources/META-INF/db/schema-41610to41700.sql  |    49 +-
 .../META-INF/db/schema-41700to41710-cleanup.sql    |     2 +-
 .../resources/META-INF/db/schema-41700to41710.sql  |     2 +-
 .../resources/META-INF/db/schema-41700to41800.sql  |    88 -
 .../META-INF/db/schema-41710to41800-cleanup.sql    |    20 -
 .../resources/META-INF/db/schema-41710to41800.sql  |   798 -
 .../META-INF/db/schema-41720to41800-cleanup.sql    |    20 +
 .../resources/META-INF/db/schema-41720to41800.sql  |  1514 ++
 .../META-INF/db/schema-41800to41810-cleanup.sql    |    20 +
 .../resources/META-INF/db/schema-41800to41810.sql  |    49 +
 .../META-INF/db/schema-41810to41900-cleanup.sql    |    20 +
 .../resources/META-INF/db/schema-41810to41900.sql  |   325 +
 .../META-INF/db/schema-41900to41910-cleanup.sql    |    24 +
 .../resources/META-INF/db/schema-41900to41910.sql  |    72 +
 .../META-INF/db/schema-41910to41920-cleanup.sql    |    23 +
 .../resources/META-INF/db/schema-41910to41920.sql  |    45 +
 .../META-INF/db/schema-41910to42000-cleanup.sql    |    20 +
 .../resources/META-INF/db/schema-41910to42000.sql  |   427 +
 .../META-INF/db/schema-42000to42010-cleanup.sql    |    23 +
 .../resources/META-INF/db/schema-42000to42010.sql  |   133 +
 .../META-INF/db/schema-42010to42100-cleanup.sql    |    20 +
 .../resources/META-INF/db/schema-42010to42100.sql  |   759 +
 .../main/resources/META-INF/db/schema-420to421.sql |     6 +-
 .../META-INF/db/schema-42100to42200-cleanup.sql    |    20 +
 .../resources/META-INF/db/schema-42100to42200.sql  |    89 +
 .../META-INF/db/schema-421to430-cleanup.sql        |     1 -
 .../META-INF/db/schema-42200to42210-cleanup.sql    |    20 +
 .../resources/META-INF/db/schema-42200to42210.sql  |    27 +
 .../META-INF/db/schema-42210to42300-cleanup.sql    |    20 +
 .../resources/META-INF/db/schema-42210to42300.sql  |    20 +
 .../main/resources/META-INF/db/schema-441to442.sql |     1 -
 .../META-INF/db/schema-442to450-cleanup.sql        |     2 +-
 .../main/resources/META-INF/db/schema-442to450.sql |     6 +-
 .../META-INF/db/schema-452to460-cleanup.sql        |     1 -
 .../main/resources/META-INF/db/schema-452to460.sql |     2 -
 .../main/resources/META-INF/db/schema-461to470.sql |     1 -
 .../main/resources/META-INF/db/schema-480to481.sql |     1 -
 .../META-INF/db/schema-481to490-cleanup.sql        |     3 +-
 .../main/resources/META-INF/db/schema-481to490.sql |    16 +-
 .../META-INF/db/schema-490to4910-cleanup.sql       |     1 -
 .../META-INF/db/schema-4910to4920-cleanup.sql      |     1 -
 .../resources/META-INF/db/schema-4910to4920.sql    |    38 -
 .../resources/META-INF/db/schema-4930to41000.sql   |     4 +-
 .../main/resources/META-INF/db/schema-level.sql    |     4 +-
 .../META-INF/db/schema-snapshot-217to224.sql       |     4 +-
 .../META-INF/db/schema-snapshot-223to224.sql       |     4 +-
 .../db/views/cloud.account_netstats_view.sql       |    31 +
 .../META-INF/db/views/cloud.account_view.sql       |   205 +
 .../db/views/cloud.account_vmstats_view.sql        |    35 +
 .../db/views/cloud.affinity_group_view.sql         |    60 +
 .../META-INF/db/views/cloud.async_job_view.sql     |   129 +
 .../META-INF/db/views/cloud.data_center_view.sql   |    60 +
 .../META-INF/db/views/cloud.disk_offering_view.sql |    80 +
 .../META-INF/db/views/cloud.domain_router_view.sql |   127 +
 .../META-INF/db/views/cloud.domain_view.sql        |   175 +
 .../META-INF/db/views/cloud.event_view.sql         |    63 +
 .../META-INF/db/views/cloud.free_ip_view.sql       |    32 +
 .../META-INF/db/views/cloud.gui_themes_view.sql    |    38 +
 .../META-INF/db/views/cloud.host_view.sql          |   122 +
 .../META-INF/db/views/cloud.image_store_view.sql   |    45 +
 .../db/views/cloud.instance_group_view.sql         |    48 +
 .../db/views/cloud.last_annotation_view.sql        |    43 +
 .../META-INF/db/views/cloud.mshost_peer_view.sql   |    44 +
 .../META-INF/db/views/cloud.mshost_view.sql        |    46 +
 .../db/views/cloud.network_offering_view.sql       |    83 +
 .../db/views/cloud.project_account_view.sql        |    54 +
 .../db/views/cloud.project_invitation_view.sql     |    52 +
 .../META-INF/db/views/cloud.project_view.sql       |    50 +
 .../META-INF/db/views/cloud.resource_tag_view.sql  |    51 +
 .../db/views/cloud.security_group_view.sql         |    79 +
 .../db/views/cloud.service_offering_view.sql       |   137 +
 .../db/views/cloud.shared_filesystem_view.sql      |    83 +
 .../META-INF/db/views/cloud.snapshot_view.sql      |   108 +
 .../META-INF/db/views/cloud.storage_pool_view.sql  |    74 +
 .../META-INF/db/views/cloud.template_view.sql      |   138 +
 .../META-INF/db/views/cloud.user_view.sql          |    66 +
 .../META-INF/db/views/cloud.user_vm_view.sql       |   241 +
 .../META-INF/db/views/cloud.volume_view.sql        |   158 +
 .../META-INF/db/views/cloud.vpc_offering_view.sql  |    65 +
 .../db/views/cloud.webhook_delivery_view.sql       |    48 +
 .../META-INF/db/views/cloud.webhook_view.sql       |    52 +
 .../cloud/capacity/dao/CapacityDaoImplTest.java    |   553 +
 .../java/com/cloud/dc/dao/ClusterDaoImplTest.java  |   118 +
 .../java/com/cloud/gpu/dao/GpuCardDaoImplTest.java |    57 +
 .../com/cloud/gpu/dao/GpuDeviceDaoImplTest.java    |   277 +
 .../com/cloud/gpu/dao/VgpuProfileDaoImplTest.java  |    70 +
 .../src/test/java/com/cloud/host/HostVOTest.java   |   210 +-
 .../java/com/cloud/host/dao/HostDaoImplTest.java   |   252 +
 .../cloud/network/as/AutoScaleVmProfileVOTest.java |    57 +-
 .../as/dao/AutoScaleVmGroupDaoImplTest.java        |    19 +-
 .../dao/AutoScaleVmGroupStatisticsDaoImplTest.java |    31 +-
 .../as/dao/AutoScaleVmGroupVmMapDaoImplTest.java   |    72 +-
 .../cloud/network/dao/IPAddressDaoImplTest.java    |    67 +
 .../dao/InlineLoadBalancerNicMapDaoImplTest.java   |    67 +
 .../network/dao/LoadBalancerVMMapDaoImplTest.java  |    67 +
 .../com/cloud/network/dao/LoadBalancerVOTest.java  |    45 +
 .../com/cloud/network/dao/NetworkDaoImplTest.java  |    35 +-
 .../dao/OpRouterMonitorServiceDaoImplTest.java     |    67 +
 .../rules/dao/PortForwardingRulesDaoImplTest.java  |    68 +
 .../offerings/dao/NetworkOfferingDaoImplTest.java  |    10 +-
 .../secstorage/CommandExecLogDaoImplTest.java      |    67 +
 .../com/cloud/storage/VnfTemplateDetailVOTest.java |    38 +
 .../com/cloud/storage/VnfTemplateNicVOTest.java    |    46 +
 .../storage/dao/StoragePoolTagsDaoImplTest.java    |    24 +-
 .../cloud/storage/dao/VMTemplateDaoImplTest.java   |   340 +
 .../storage/dao/VnfTemplateNicDaoImplTest.java     |    88 +
 .../com/cloud/storage/dao/VolumeDaoImplTest.java   |   145 +
 .../upgrade/ConfigurationGroupsAggregatorTest.java |    76 +
 .../DatabaseUpgradeCheckerDoUpgradesTest.java      |   173 +
 .../cloud/upgrade/DatabaseUpgradeCheckerTest.java  |   228 +-
 .../upgrade/DatabaseVersionHierarchyTest.java      |   117 +
 .../java/com/cloud/upgrade/GuestOsMapperTest.java  |    90 +
 .../upgrade/SystemVmTemplateRegistrationTest.java  |   427 +
 .../upgrade/dao/DatabaseAccessObjectTest.java      |   130 +-
 .../com/cloud/upgrade/dao/DbUpgradeUtilsTest.java  |    43 +-
 .../cloud/upgrade/dao/Upgrade41700to41710Test.java |   123 +
 .../cloud/upgrade/dao/Upgrade42010to42100Test.java |    81 +
 .../cloud/upgrade/dao/Upgrade42100to42200Test.java |   242 +
 .../cloud/usage/dao/UsageStorageDaoImplTest.java   |    55 +-
 .../test/java/com/cloud/vm/ItWorkDaoImplTest.java  |    67 +
 .../cloud/vm/dao/ConsoleSessionDaoImplTest.java    |    68 +
 .../test/java/com/cloud/vm/dao/NicDaoImplTest.java |    69 +
 .../vm/dao/NicExtraDhcpOptionDaoImplTest.java      |    68 +
 .../cloud/vm/dao/NicSecondaryIpDaoImplTest.java    |    67 +
 .../com/cloud/vm/dao/VMInstanceDaoImplTest.java    |   201 +-
 .../vm/snapshot/dao/VMSnapshotDaoImplTest.java     |    69 +
 .../cloudstack/backup/dao/BackupDaoImplTest.java   |    73 +
 .../resourcedetail/ResourceDetailsDaoBaseTest.java |   181 +
 .../datastore/db/PrimaryDataStoreDaoImplTest.java  |    52 +-
 .../datastore/db/SnapshotDataStoreDaoImplTest.java |    67 +
 engine/schema/templateConfig.sh                    |    35 +-
 engine/service/pom.xml                             |    12 +-
 engine/service/src/main/webapp/WEB-INF/beans.xml   |   106 +-
 engine/service/src/main/webapp/WEB-INF/log4j.xml   |    59 +-
 engine/service/src/main/webapp/WEB-INF/web.xml     |    54 +-
 engine/service/src/main/webapp/index.jsp           |    46 +-
 engine/storage/cache/pom.xml                       |     2 +-
 .../allocator/StorageCacheRandomAllocator.java     |    15 +-
 .../cache/manager/StorageCacheManagerImpl.java     |    35 +-
 .../StorageCacheReplacementAlgorithmLRU.java       |     1 -
 .../spring-engine-storage-cache-core-context.xml   |     2 +-
 engine/storage/configdrive/pom.xml                 |     2 +-
 .../storage/configdrive/ConfigDrive.java           |     2 +-
 .../storage/configdrive/ConfigDriveBuilder.java    |   261 +-
 .../storage/configdrive/ConfigDriveUtils.java      |    54 +
 .../configdrive/ConfigDriveBuilderTest.java        |   767 +-
 .../storage/configdrive/ConfigDriveTest.java       |     2 +-
 .../storage/configdrive/ConfigDriveUtilsTest.java  |   108 +
 engine/storage/datamotion/pom.xml                  |     2 +-
 .../storage/motion/AncientDataMotionStrategy.java  |   175 +-
 .../storage/motion/DataMotionServiceImpl.java      |     5 +-
 .../KvmNonManagedStorageDataMotionStrategy.java    |    37 +-
 .../motion/StorageSystemDataMotionStrategy.java    |   876 +-
 .../motion/AncientDataMotionStrategyTest.java      |   231 +-
 .../KvmNonManagedStorageSystemDataMotionTest.java  |    26 +-
 .../StorageSystemDataMotionStrategyTest.java       |    90 +-
 engine/storage/image/pom.xml                       |     2 +-
 .../storage/image/SecondaryStorageServiceImpl.java |   114 +-
 .../storage/image/TemplateDataFactoryImpl.java     |    69 +-
 .../storage/image/TemplateServiceImpl.java         |   167 +-
 .../manager/ImageStoreProviderManagerImpl.java     |    82 +-
 .../storage/image/store/ImageStoreImpl.java        |    14 +-
 .../storage/image/store/TemplateObject.java        |    52 +-
 .../image/SecondaryStorageServiceImplTest.java     |   138 +
 .../storage/image/TemplateServiceImplTest.java     |    84 +
 .../manager/ImageStoreProviderManagerImplTest.java |   110 +
 engine/storage/integration-test/pom.xml            |     2 +-
 .../storage/test/ChildTestConfiguration.java       |    16 +-
 .../storage/test/DirectAgentManagerSimpleImpl.java |     2 -
 .../cloudstack/storage/test/MockRpcCallBack.java   |     7 +-
 .../cloudstack/storage/test/SnapshotTest.java      |     3 +-
 .../storage/test/SnapshotTestWithFakeData.java     |     2 +-
 .../apache/cloudstack/storage/test/TestHttp.java   |     4 +-
 .../cloudstack/storage/test/VolumeServiceTest.java |    48 +-
 .../cloudstack/storage/test/VolumeTestVmware.java  |     3 +-
 .../src/test/resources/component.xml               |    39 +-
 .../src/test/resources/s3_testng.xml               |     6 +-
 .../src/test/resources/storageContext.xml          |    36 +-
 .../integration-test/src/test/resources/testng.xml |     8 +-
 engine/storage/object/pom.xml                      |    37 +
 .../cloudstack/storage/object/BucketObject.java    |   196 +
 .../storage/object/ObjectStorageServiceImpl.java   |    25 +
 .../manager/ObjectStoreProviderManagerImpl.java    |   109 +
 .../storage/object/store/ObjectStoreImpl.java      |   191 +
 .../store/lifecycle/ObjectStoreLifeCycle.java      |    24 +
 .../spring-engine-storage-object-core-context.xml  |    36 +
 .../ObjectStoreProviderManagerImplTest.java        |   117 +
 .../object/src/test/resource/testContext.xml       |    79 +
 engine/storage/pom.xml                             |     2 +-
 engine/storage/snapshot/pom.xml                    |     7 +-
 .../storage/snapshot/CephSnapshotStrategy.java     |    27 +-
 .../storage/snapshot/DefaultSnapshotStrategy.java  |   372 +-
 .../storage/snapshot/ScaleIOSnapshotStrategy.java  |    24 +-
 .../storage/snapshot/SnapshotDataFactoryImpl.java  |   101 +-
 .../storage/snapshot/SnapshotObject.java           |   125 +-
 .../storage/snapshot/SnapshotServiceImpl.java      |   475 +-
 .../storage/snapshot/SnapshotStrategyBase.java     |     3 +
 .../snapshot/StorageSystemSnapshotStrategy.java    |    66 +-
 .../vmsnapshot/DefaultVMSnapshotStrategy.java      |   114 +-
 .../KvmFileBasedStorageVmSnapshotStrategy.java     |   689 +
 .../vmsnapshot/ScaleIOVMSnapshotStrategy.java      |    72 +-
 .../vmsnapshot/StorageVMSnapshotStrategy.java      |    89 +-
 ...spring-engine-storage-snapshot-core-context.xml |     4 +-
 ...ing-engine-storage-snapshot-storage-context.xml |     5 +-
 .../storage/snapshot/CephSnapshotStrategyTest.java |     6 +-
 .../snapshot/DefaultSnapshotStrategyTest.java      |   230 +-
 .../snapshot/SnapshotDataFactoryImplTest.java      |    59 +-
 .../storage/snapshot/SnapshotServiceImplTest.java  |   218 +-
 .../vmsnapshot/VMSnapshotStrategyKVMTest.java      |    58 +-
 .../storage/vmsnapshot/VMSnapshotStrategyTest.java |    95 +-
 .../test/resources/SnapshotManagerTestContext.xml  |    20 +-
 .../cloudstack/storage/LocalHostEndpoint.java      |     5 +
 .../cloudstack/storage/RemoteHostEndPoint.java     |    20 +-
 .../allocator/AbstractStoragePoolAllocator.java    |   199 +-
 .../ClusterScopeStoragePoolAllocator.java          |    57 +-
 .../GarbageCollectingStoragePoolAllocator.java     |     6 +-
 .../allocator/LocalStoragePoolAllocator.java       |    20 +-
 .../allocator/ZoneWideStoragePoolAllocator.java    |    42 +-
 .../storage/datastore/DataObjectManagerImpl.java   |    55 +-
 .../storage/datastore/DataStoreManagerImpl.java    |    29 +
 .../datastore/ObjectInDataStoreManager.java        |     2 -
 .../datastore/ObjectInDataStoreManagerImpl.java    |   108 +-
 .../datastore/PrimaryDataStoreProviderManager.java |     2 +
 .../provider/DataStoreProviderManagerImpl.java     |    37 +-
 .../storage/db/ObjectInDataStoreDaoImpl.java       |     6 +-
 .../storage/endpoint/DefaultEndPointSelector.java  |   146 +-
 .../storage/helper/HypervisorHelperImpl.java       |    11 +-
 .../storage/helper/StorageStrategyFactoryImpl.java |     7 +-
 .../storage/helper/VMSnapshotHelperImpl.java       |    15 +-
 .../storage/image/BaseImageStoreDriverImpl.java    |   166 +-
 .../image/datastore/ImageStoreProviderManager.java |     4 +
 .../storage/image/db/TemplateDataStoreDaoImpl.java |    84 +-
 .../storage/image/db/VolumeDataStoreDaoImpl.java   |    48 +-
 .../image/deployasis/DeployAsIsHelperImpl.java     |    45 +-
 .../cloudstack/storage/image/format/RAW.java       |     2 +-
 .../storage/object/BaseObjectStoreDriverImpl.java  |    82 +
 .../storage/object/ObjectStoreDriver.java          |    60 +
 .../object/datastore/ObjectStoreHelper.java        |    74 +
 .../datastore/ObjectStoreProviderManager.java      |    38 +
 .../storage/vmsnapshot/VMSnapshotHelper.java       |     4 +-
 .../volume/datastore/PrimaryDataStoreHelper.java   |   105 +-
 .../core/spring-engine-storage-core-context.xml    |     6 +-
 .../cloudstack/storage-allocator/module.properties |     2 +-
 ...ng-engine-storage-storage-allocator-context.xml |     4 +-
 .../api/storage/StrategyPriorityTest.java          |    29 +-
 .../apache/cloudstack/storage/BaseTypeTest.java    |     4 +-
 .../AbstractStoragePoolAllocatorTest.java          |    84 +-
 .../ZoneWideStoragePoolAllocatorTest.java          |    71 +
 .../datastore/db/SnapshotDataStoreDaoImplTest.java |    42 +-
 .../endpoint/DefaultEndPointSelectorTest.java      |   200 +
 .../image/db/TemplateDataStoreDaoImplTest.java     |    78 +
 .../image/db/VolumeDataStoreDaoImplTest.java       |    68 +
 .../datastore/PrimaryDataStoreHelperTest.java      |   114 +
 engine/storage/storage.ucls                        |   672 +-
 engine/storage/volume/pom.xml                      |     2 +-
 .../storage/datastore/PrimaryDataStoreImpl.java    |    27 +-
 .../BasePrimaryDataStoreLifeCycleImpl.java         |   159 +
 .../PrimaryDataStoreProviderManagerImpl.java       |     9 +
 .../storage/datastore/manager/data model.ucls      |   110 +-
 .../datastore/provider/DefaultHostListener.java    |   105 +-
 .../storage/volume/VolumeDataFactoryImpl.java      |     8 +
 .../cloudstack/storage/volume/VolumeObject.java    |    65 +-
 .../storage/volume/VolumeServiceImpl.java          |   677 +-
 .../spring-engine-storage-volume-core-context.xml  |     4 +-
 .../BasePrimaryDataStoreLifeCycleImplTest.java     |   127 +
 .../PrimaryDataStoreProviderManagerImplTest.java   |    48 +
 .../storage/volume/VolumeObjectTest.java           |    17 +-
 .../storage/volume/VolumeServiceTest.java          |   165 +-
 .../volume/src/test/resource/testContext.xml       |    14 +-
 engine/userdata/cloud-init/pom.xml                 |    36 +
 .../userdata/CloudInitUserDataProvider.java        |   293 +
 .../core/spring-userdata-cloud-init-context.xml    |    27 +
 .../userdata/CloudInitUserDataProviderTest.java    |   239 +
 engine/userdata/pom.xml                            |    52 +
 .../cloudstack/userdata/UserDataManagerImpl.java   |   173 +
 .../cloudstack/userdata/UserDataProvider.java      |    28 +
 .../core/spring-engine-userdata-core-context.xml   |    34 +
 .../userdata/UserDataManagerImplTest.java          |   149 +
 extensions/HyperV/hyperv.py                        |   308 +
 extensions/MaaS/maas.py                            |   263 +
 extensions/Proxmox/proxmox.sh                      |   516 +
 framework/agent-lb/pom.xml                         |     2 +-
 .../cloudstack/agent/lb/IndirectAgentLB.java       |    33 +-
 .../agent/lb/IndirectAgentLBAlgorithm.java         |     6 +-
 framework/ca/pom.xml                               |     2 +-
 .../apache/cloudstack/framework/ca/CAProvider.java |     4 +
 .../apache/cloudstack/framework/ca/CAService.java  |     3 +
 framework/cluster/pom.xml                          |     2 +-
 .../com/cloud/cluster/ClusterFenceManagerImpl.java |     4 +-
 .../java/com/cloud/cluster/ClusterManager.java     |     8 +-
 .../java/com/cloud/cluster/ClusterManagerImpl.java |   400 +-
 .../com/cloud/cluster/ClusterServiceAdapter.java   |     2 -
 .../cluster/ClusterServiceServletAdapter.java      |    26 +-
 .../cluster/ClusterServiceServletContainer.java    |   146 +-
 .../cluster/ClusterServiceServletHttpHandler.java  |    41 +-
 .../cloud/cluster/ClusterServiceServletImpl.java   |   173 +-
 .../cluster/ManagementServerHostPeerJoinVO.java    |   177 +
 .../com/cloud/cluster/ManagementServerHostVO.java  |    20 +-
 .../cloud/cluster/dao/ManagementServerHostDao.java |     8 +-
 .../cluster/dao/ManagementServerHostDaoImpl.java   |    68 +-
 .../cluster/dao/ManagementServerHostPeerDao.java   |    12 +-
 .../dao/ManagementServerHostPeerDaoImpl.java       |    82 +-
 .../dao/ManagementServerHostPeerJoinDao.java       |    27 +
 .../dao/ManagementServerHostPeerJoinDaoImpl.java   |    42 +
 .../core/spring-framework-cluster-core-context.xml |     6 +-
 .../com/cloud/cluster/ClusterManagerImplTest.java  |    38 +
 .../cluster/ClusterServiceServletAdapterTest.java  |     4 +-
 .../ClusterServiceServletContainerTest.java        |    87 +
 .../cluster/ClusterServiceServletImplTest.java     |    64 +
 framework/config/pom.xml                           |     2 +-
 .../apache/cloudstack/config/Configuration.java    |    36 +-
 .../cloudstack/config/ConfigurationGroup.java      |    28 +
 .../cloudstack/config/ConfigurationSubGroup.java   |    30 +
 .../cloudstack/framework/config/ConfigDepot.java   |     6 +
 .../framework/config/ConfigDepotAdmin.java         |     4 +
 .../cloudstack/framework/config/ConfigKey.java     |   332 +-
 .../config/ConfigKeyScheduledExecutionWrapper.java |   114 +
 .../framework/config/ScopedConfigStorage.java      |    11 +-
 .../framework/config/dao/ConfigurationDao.java     |     3 +
 .../framework/config/dao/ConfigurationDaoImpl.java |    19 +-
 .../config/dao/ConfigurationGroupDao.java          |    25 +
 .../config/dao/ConfigurationGroupDaoImpl.java      |    44 +
 .../config/dao/ConfigurationSubGroupDao.java       |    31 +
 .../config/dao/ConfigurationSubGroupDaoImpl.java   |   131 +
 .../framework/config/impl/ConfigDepotImpl.java     |   204 +-
 .../config/impl/ConfigurationGroupVO.java          |    91 +
 .../config/impl/ConfigurationSubGroupVO.java       |   103 +
 .../framework/config/impl/ConfigurationVO.java     |   129 +-
 ...framework-config-system-context-inheritable.xml |     4 +-
 .../spring-framework-config-system-context.xml     |     6 +
 .../ConfigKeyScheduledExecutionWrapperTest.java    |   177 +
 .../cloudstack/framework/config/ConfigKeyTest.java |    33 +-
 .../config/impl/ConfigDepotAdminTest.java          |    78 +-
 .../framework/config/impl/ConfigDepotImplTest.java |   152 +
 framework/db/pom.xml                               |    15 +-
 .../main/java/com/cloud/dao/EntityManagerImpl.java |    10 +-
 .../cloud/utils/crypt/DBEncryptionFinderCLI.java   |    30 +
 .../utils/crypt/EncryptionSecretKeyChanger.java    |   777 +-
 .../java/com/cloud/utils/crypt/OVFPropertyTO.java  |   130 +
 .../main/java/com/cloud/utils/db/Attribute.java    |     9 +
 .../com/cloud/utils/db/ConnectionConcierge.java    |    33 +-
 .../src/main/java/com/cloud/utils/db/DbUtil.java   |     9 +-
 .../main/java/com/cloud/utils/db/DriverLoader.java |    13 +-
 .../src/main/java/com/cloud/utils/db/EcInfo.java   |     4 +-
 .../src/main/java/com/cloud/utils/db/Filter.java   |    18 +-
 .../main/java/com/cloud/utils/db/GenericDao.java   |    33 +
 .../java/com/cloud/utils/db/GenericDaoBase.java    |   470 +-
 .../com/cloud/utils/db/GenericSearchBuilder.java   |    22 +
 .../main/java/com/cloud/utils/db/GlobalLock.java   |    70 +-
 .../main/java/com/cloud/utils/db/JoinBuilder.java  |    62 +-
 .../main/java/com/cloud/utils/db/Merovingian2.java |    77 +-
 .../main/java/com/cloud/utils/db/ScriptRunner.java |    13 +-
 .../main/java/com/cloud/utils/db/SearchBase.java   |   122 +-
 .../java/com/cloud/utils/db/SearchCriteria.java    |    25 +-
 .../java/com/cloud/utils/db/SequenceFetcher.java   |    17 +-
 .../main/java/com/cloud/utils/db/Transaction.java  |     2 -
 .../java/com/cloud/utils/db/TransactionLegacy.java |   582 +-
 .../system/spring-framework-db-system-context.xml  |     2 +-
 .../src/test/java/com/cloud/utils/DbUtilTest.java  |    14 +-
 .../crypt/EncryptionSecretKeyChangerTest.java      |    87 +
 .../java/com/cloud/utils/db/DbAnnotatedBase.java   |     7 +-
 .../com/cloud/utils/db/ElementCollectionTest.java  |     2 -
 .../com/cloud/utils/db/GenericDaoBaseTest.java     |    49 +
 .../java/com/cloud/utils/db/GlobalLockTest.java    |     9 +-
 .../java/com/cloud/utils/db/Merovingian2Test.java  |    15 +-
 .../utils/db/TransactionContextBuilderTest.java    |     3 -
 .../com/cloud/utils/db/TransactionLegacyTest.java  |   117 +
 framework/db/src/test/resources/db.properties      |     2 +-
 framework/direct-download/pom.xml                  |     6 +-
 framework/events/pom.xml                           |     2 +-
 .../apache/cloudstack/framework/events/Event.java  |    73 +-
 .../cloudstack/framework/events/EventBus.java      |     2 +
 .../framework/events/EventDistributor.java         |    35 +
 .../framework/events/EventDistributorImpl.java     |    68 +
 .../framework/events/EventDistributorImplTest.java |    67 +
 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/async/AsyncCallbackDispatcher.java   |     7 +-
 .../framework/client/ClientTransportProvider.java  |     7 +-
 .../framework/messagebus/MessageBusBase.java       |    33 +-
 .../framework/messagebus/MessageDetector.java      |    17 +-
 .../framework/messagebus/MessageDispatcher.java    |    33 +-
 .../framework/serializer/OnwireClassRegistry.java  |    23 +-
 .../framework/server/ServerTransportProvider.java  |     7 +-
 .../core/spring-framework-ipc-core-context.xml     |     8 +-
 .../AsyncSampleEventDrivenStyleCaller.java         |    15 +-
 .../sampleserver/SampleManagementServer.java       |     7 +-
 .../sampleserver/SampleManagementServerApp.java    |     4 +-
 .../sampleserver/SampleManagerComponent.java       |     9 +-
 .../sampleserver/SampleManagerComponent2.java      |     9 +-
 .../cloudstack/messagebus/TestMessageBus.java      |     4 -
 .../src/test/resources/MessageBusTestContext.xml   |    10 +-
 .../resources/SampleManagementServerAppContext.xml |    12 +-
 framework/ipc/src/test/resources/log4j-cloud.xml   |   129 +-
 framework/jobs/pom.xml                             |     2 +-
 .../apache/cloudstack/framework/jobs/AsyncJob.java |     2 +
 .../framework/jobs/AsyncJobExecutionContext.java   |    17 +-
 .../cloudstack/framework/jobs/AsyncJobManager.java |    14 +-
 .../cloudstack/framework/jobs/dao/AsyncJobDao.java |     4 +
 .../framework/jobs/dao/AsyncJobDaoImpl.java        |    28 +-
 .../framework/jobs/dao/AsyncJobJoinMapDaoImpl.java |    66 -
 .../framework/jobs/dao/SyncQueueDaoImpl.java       |     6 +-
 .../framework/jobs/dao/SyncQueueItemDaoImpl.java   |     6 +-
 .../framework/jobs/dao/VmWorkJobDao.java           |     2 +
 .../framework/jobs/dao/VmWorkJobDaoImpl.java       |    44 +-
 .../framework/jobs/impl/AsyncJobManagerImpl.java   |   479 +-
 .../framework/jobs/impl/AsyncJobMonitor.java       |    10 +-
 .../cloudstack/framework/jobs/impl/AsyncJobVO.java |    28 +-
 .../framework/jobs/impl/JobSerializerHelper.java   |     8 +-
 .../framework/jobs/impl/SyncQueueManagerImpl.java  |    32 +-
 .../jobs/AsyncJobManagerTestConfiguration.java     |    19 +-
 .../framework/jobs/AsyncJobTestDispatcher.java     |     7 +-
 .../framework/jobs/dao/VmWorkJobDaoImplTest.java   |   140 +
 .../jobs/impl/AsyncJobManagerImplTest.java         |    96 +
 .../test/resources/AsyncJobManagerTestContext.xml  |     4 +-
 .../jobs/src/test/resources/commonContext.xml      |    20 +-
 framework/jobs/src/test/resources/log4j.properties |     1 -
 framework/managed-context/pom.xml                  |    11 +-
 .../context/AbstractManagedContextListener.java    |     2 +-
 .../cloudstack/managed/context/ManagedContext.java |     2 +-
 .../managed/context/ManagedContextRunnable.java    |     9 +-
 .../context/impl/DefaultManagedContext.java        |     9 +-
 .../managed/threadlocal/ManagedThreadLocal.java    |     7 +-
 framework/pom.xml                                  |     3 +-
 framework/quota/pom.xml                            |     2 +-
 .../apache/cloudstack/quota/QuotaAlertManager.java |     3 +
 .../cloudstack/quota/QuotaAlertManagerImpl.java    |   215 +-
 .../apache/cloudstack/quota/QuotaManagerImpl.java  |   255 +-
 .../cloudstack/quota/QuotaStatementImpl.java       |    57 +-
 .../activationrule/presetvariables/Account.java    |    22 +-
 .../presetvariables/BackupOffering.java            |     1 +
 .../presetvariables/ComputeOffering.java           |    15 +
 .../presetvariables/ComputingResources.java        |     5 +
 .../presetvariables/Configuration.java             |    35 +
 .../DiskOfferingPresetVariables.java               |   165 +
 .../activationrule/presetvariables/Domain.java     |     1 +
 .../presetvariables/GenericPresetVariable.java     |    10 +-
 .../quota/activationrule/presetvariables/Host.java |    12 +
 .../presetvariables/PresetVariableDefinition.java  |    42 +
 .../presetvariables/PresetVariableHelper.java      |   197 +-
 .../presetvariables/PresetVariables.java           |    37 +-
 .../activationrule/presetvariables/Resource.java   |     6 +-
 .../quota/activationrule/presetvariables/Role.java |     1 +
 .../activationrule/presetvariables/Storage.java    |    17 +-
 .../activationrule/presetvariables/Tariff.java     |    33 +
 .../activationrule/presetvariables/Value.java      |   100 +-
 .../cloudstack/quota/constant/QuotaConfig.java     |    20 +-
 .../cloudstack/quota/constant/QuotaTypes.java      |    37 +-
 .../apache/cloudstack/quota/dao/NetworkDao.java    |    23 +
 .../cloudstack/quota/dao/NetworkDaoImpl.java       |    27 +
 .../cloudstack/quota/dao/QuotaAccountDaoImpl.java  |     4 +-
 .../cloudstack/quota/dao/QuotaBalanceDaoImpl.java  |    12 +-
 .../cloudstack/quota/dao/QuotaCreditsDao.java      |     2 +-
 .../cloudstack/quota/dao/QuotaCreditsDaoImpl.java  |    54 +-
 .../quota/dao/QuotaEmailConfigurationDao.java      |    36 +
 .../quota/dao/QuotaEmailConfigurationDaoImpl.java  |   105 +
 .../quota/dao/QuotaEmailTemplatesDao.java          |     2 +
 .../quota/dao/QuotaEmailTemplatesDaoImpl.java      |     7 +-
 .../cloudstack/quota/dao/QuotaTariffDao.java       |    12 +-
 .../cloudstack/quota/dao/QuotaTariffDaoImpl.java   |   166 +-
 .../cloudstack/quota/dao/QuotaUsageDaoImpl.java    |     2 -
 .../cloudstack/quota/dao/ServiceOfferingDao.java   |    25 -
 .../quota/dao/ServiceOfferingDaoImpl.java          |    83 -
 .../cloudstack/quota/dao/UserVmDetailsDao.java     |    27 -
 .../cloudstack/quota/dao/UserVmDetailsDaoImpl.java |    56 -
 .../cloudstack/quota/dao/VMInstanceDetailsDao.java |    27 +
 .../quota/dao/VMInstanceDetailsDaoImpl.java        |    56 +
 .../org/apache/cloudstack/quota/dao/VpcDao.java    |    23 +
 .../apache/cloudstack/quota/dao/VpcDaoImpl.java    |    23 +
 .../apache/cloudstack/quota/vo/QuotaCreditsVO.java |     6 +
 .../quota/vo/QuotaEmailConfigurationVO.java        |    68 +
 .../apache/cloudstack/quota/vo/QuotaTariffVO.java  |    34 +-
 .../cloudstack/quota/vo/ServiceOfferingVO.java     |   387 -
 .../apache/cloudstack/quota/vo/UserVmDetailVO.java |    83 -
 .../cloudstack/quota/vo/VMInstanceDetailVO.java    |    83 +
 .../quota/spring-framework-quota-context.xml       |     4 +-
 .../quota/QuotaAlertManagerImplTest.java           |   194 +-
 .../cloudstack/quota/QuotaManagerImplTest.java     |    61 +-
 .../cloudstack/quota/QuotaStatementTest.java       |    69 +-
 .../presetvariables/PresetVariableHelperTest.java  |   441 +-
 .../activationrule/presetvariables/ValueTest.java  |    36 +
 .../cloudstack/quota/constant/QuotaTypesTest.java  |     4 +-
 framework/rest/pom.xml                             |     4 +-
 framework/security/pom.xml                         |     2 +-
 .../framework/security/keys/KeysManagerImpl.java   |     9 +-
 .../security/keystore/KeystoreManager.java         |     3 +-
 .../security/keystore/KeystoreManagerImpl.java     |    31 +-
 framework/spring/lifecycle/pom.xml                 |     2 +-
 .../spring/lifecycle/AbstractSmartLifeCycle.java   |     3 +
 .../lifecycle/CloudStackExtendedLifeCycle.java     |    61 +-
 .../CloudStackExtendedLifeCycleStart.java          |     1 -
 .../spring/lifecycle/CloudStackLog4jSetup.java     |     2 +-
 .../spring/lifecycle/registry/DumpRegistry.java    |     4 +-
 .../lifecycle/registry/ExtensionRegistry.java      |    11 +-
 .../lifecycle/registry/RegistryLifecycle.java      |    24 +-
 framework/spring/module/pom.xml                    |     2 +-
 .../module/factory/CloudStackSpringContext.java    |    11 +-
 .../model/impl/DefaultModuleDefinitionSet.java     |    58 +-
 .../web/CloudStackContextLoaderListener.java       |    11 +-
 .../factory/ModuleBasedContextFactoryTest.java     |    79 +-
 .../testfiles/all/test2-defaults.properties        |     1 -
 .../testfiles/missingname/module.properties        |     1 -
 .../base/base-context-inheritable.xml              |    28 +
 .../resources/testhierarchy/base/base-context.xml  |    34 +
 .../base/test-context-inheritable.xml              |    28 -
 .../resources/testhierarchy/base/test-context.xml  |    34 -
 .../testhierarchy/child1-1/child1-1-context.xml    |    34 +
 .../testhierarchy/child1-1/test-context.xml        |    34 -
 .../child1/child1-context-inheritable.xml          |    24 +
 .../child1/child1-context-override.xml             |    30 +
 .../testhierarchy/child1/child1-context.xml        |    38 +
 .../testhierarchy/child1/test-context-override.xml |    30 -
 .../testhierarchy/child1/test-context.xml          |    38 -
 .../testhierarchy/child2/child2-context.xml        |    33 +
 .../testhierarchy/child2/test-context.xml          |    33 -
 .../testhierarchy/excluded/module.properties       |     2 +-
 .../testhierarchy/excluded/test-context.xml        |     2 +-
 .../testhierarchy/excluded2/module.properties      |     2 +-
 .../testhierarchy/excluded2/test-context.xml       |     2 +-
 .../orphan-of-excluded/defaults.properties         |     2 +-
 .../orphan-of-excluded/module.properties           |     2 +-
 .../orphan-of-excluded/test-context.xml            |     2 +-
 .../testhierarchy/orphan1/test-context.xml         |     2 +-
 packaging/README.md                                |    31 +-
 packaging/centos7/cloud-ipallocator.rc             |    96 -
 packaging/centos7/cloud.spec                       |   703 -
 packaging/centos7/cloudstack-agent.te              |    33 -
 packaging/centos7/replace.properties               |    59 -
 packaging/centos8                                  |     1 +
 packaging/centos8/cloud-ipallocator.rc             |    96 -
 packaging/centos8/cloud.limits                     |    19 -
 packaging/centos8/cloud.spec                       |   691 -
 packaging/centos8/cloudstack-agent.te              |    33 -
 packaging/centos8/cloudstack-sccs                  |    20 -
 packaging/centos8/replace.properties               |    59 -
 packaging/debian/replace.properties                |    10 +-
 packaging/el10                                     |     1 +
 packaging/el8/cloud-ipallocator.rc                 |    95 +
 packaging/{centos7 => el8}/cloud.limits            |     0
 packaging/el8/cloud.spec                           |   744 +
 packaging/el8/cloudstack-agent.te                  |    33 +
 packaging/{centos7 => el8}/cloudstack-sccs         |     0
 packaging/el8/filelimit.conf                       |    20 +
 packaging/el8/replace.properties                   |    65 +
 packaging/el9                                      |     1 +
 packaging/package.sh                               |    16 +-
 packaging/suse15                                   |     1 +
 packaging/suse15/cloud-ipallocator.rc              |    96 -
 packaging/suse15/cloud.limits                      |    19 -
 packaging/suse15/cloud.spec                        |   687 -
 packaging/suse15/cloudstack-agent.te               |    33 -
 packaging/suse15/cloudstack-sccs                   |    20 -
 packaging/suse15/replace.properties                |    59 -
 packaging/systemd/cloudstack-agent.service         |     3 +
 packaging/systemd/cloudstack-management.default    |     4 +-
 packaging/systemd/cloudstack-management.service    |     3 +
 packaging/systemd/cloudstack-usage.default         |     2 +-
 packaging/systemd/cloudstack-usage.service         |     3 +
 plugins/acl/dynamic-role-based/pom.xml             |     2 +-
 .../acl/DynamicRoleBasedAPIAccessChecker.java      |    82 +-
 .../acl/DynamicRoleBasedAPIAccessCheckerTest.java  |     2 +-
 plugins/acl/project-role-based/pom.xml             |     2 +-
 .../acl/ProjectRoleBasedApiAccessChecker.java      |    22 +-
 .../acl-project-role-based/module.properties       |     2 +-
 .../acl/ProjectRoleBasedApiAccessCheckerTest.java  |   154 -
 .../acl/ProjectRoleBasedApiAccessCheckerTest.java  |   152 +
 plugins/acl/static-role-based/pom.xml              |     2 +-
 .../acl/StaticRoleBasedAPIAccessChecker.java       |    16 +-
 .../acl-static-role-based/module.properties        |     2 +-
 .../spring-acl-static-role-based-context.xml       |     2 +-
 .../explicit-dedication/pom.xml                    |     2 +-
 .../affinity/ExplicitDedicationProcessor.java      |    50 +-
 .../explicit-dedication/module.properties          |     2 +-
 .../spring-explicit-dedication-context.xml         |     2 +-
 .../host-affinity/pom.xml                          |     2 +-
 .../cloudstack/affinity/HostAffinityProcessor.java |    90 +-
 .../cloudstack/host-affinity/module.properties     |     2 +-
 .../host-affinity/spring-host-affinity-context.xml |     2 +-
 .../affinity/HostAffinityProcessorTest.java        |    19 +-
 .../host-anti-affinity/pom.xml                     |     2 +-
 .../affinity/HostAntiAffinityProcessor.java        |   114 +-
 .../host-anti-affinity/module.properties           |     2 +-
 .../spring-host-anti-affinity-context.xml          |     2 +-
 .../non-strict-host-affinity/pom.xml               |    30 +
 .../affinity/NonStrictHostAffinityProcessor.java   |   131 +
 .../non-strict-host-affinity/module.properties     |    18 +
 .../spring-non-strict-host-affinity-context.xml    |    37 +
 .../NonStrictHostAffinityProcessorTest.java        |   173 +
 .../non-strict-host-anti-affinity/pom.xml          |    38 +
 .../NonStrictHostAntiAffinityProcessor.java        |    28 +
 .../module.properties                              |    18 +
 ...pring-non-strict-host-anti-affinity-context.xml |    37 +
 .../NonStrictHostAntiAffinityProcessorTest.java    |   172 +
 plugins/alert-handlers/snmp-alerts/CS-ROOT-MIB.mib |     4 +-
 plugins/alert-handlers/snmp-alerts/pom.xml         |    10 +-
 .../cloudstack/alert/snmp/CsSnmpConstants.java     |     2 +-
 .../alert/snmp/SnmpEnhancedPatternLayout.java      |    39 +-
 .../cloudstack/alert/snmp/SnmpTrapAppender.java    |   140 +-
 .../apache/cloudstack/alert/snmp/SnmpTrapInfo.java |     2 +-
 .../alert/snmp/SnmpEnhancedPatternLayoutTest.java  |    56 +-
 .../alert/snmp/SnmpTrapAppenderTest.java           |    13 +-
 plugins/alert-handlers/syslog-alerts/pom.xml       |    10 +-
 .../cloudstack/syslog/AlertsSyslogAppender.java    |   168 +-
 .../syslog/AlertsSyslogAppenderTest.java           |    23 +-
 plugins/api/discovery/pom.xml                      |     2 +-
 .../api/command/user/discovery/ListApisCmd.java    |     8 -
 .../api/response/ApiDiscoveryResponse.java         |    25 +-
 .../api/response/ApiParameterResponse.java         |    13 +-
 .../discovery/ApiDiscoveryServiceImpl.java         |    52 +-
 .../cloudstack/discovery/ApiDiscoveryTest.java     |     2 +-
 plugins/api/rate-limit/pom.xml                     |     4 +-
 .../command/admin/ratelimit/ResetApiLimitCmd.java  |    10 +-
 .../api/command/user/ratelimit/GetApiLimitCmd.java |     8 -
 .../ratelimit/ApiRateLimitServiceImpl.java         |    29 +-
 .../cloudstack/rate-limit/module.properties        |     2 +-
 .../rate-limit/spring-rate-limit-context.xml       |     2 +-
 .../cloudstack/ratelimit/ApiRateLimitTest.java     |    18 +-
 .../cloudstack/ratelimit/integration/APITest.java  |     1 -
 plugins/api/solidfire-intg-test/pom.xml            |     2 +-
 .../admin/solidfire/GetPathForVolumeCmd.java       |    10 +-
 .../admin/solidfire/GetSolidFireAccountIdCmd.java  |    10 +-
 .../GetSolidFireVolumeAccessGroupIdsCmd.java       |    12 +-
 .../admin/solidfire/GetSolidFireVolumeSizeCmd.java |    12 +-
 .../solidfire/GetVolumeSnapshotDetailsCmd.java     |    12 +-
 .../admin/solidfire/GetVolumeiScsiNameCmd.java     |    12 +-
 .../ApiSolidFireVolumeAccessGroupIdsResponse.java  |     2 +-
 .../solidfire/ApiSolidFireVolumeSizeResponse.java  |     2 +-
 .../ApiVolumeSnapshotDetailsResponse.java          |     2 +-
 .../ApiSolidFireIntegrationTestServiceImpl.java    |     1 -
 .../solidfire-intg-test/module.properties          |     2 +-
 plugins/api/vmware-sioc/pom.xml                    |     2 +-
 .../api/command/admin/sioc/UpdateSiocInfoCmd.java  |    12 +-
 .../apache/cloudstack/sioc/SiocManagerImpl.java    |    26 +-
 .../apache/cloudstack/util/vmware/VMwareUtil.java  |     7 +-
 .../cloudstack/vmware-sioc/module.properties       |     2 +-
 plugins/backup/dummy/pom.xml                       |     2 +-
 .../cloudstack/backup/DummyBackupProvider.java     |   137 +-
 plugins/backup/nas/pom.xml                         |    54 +
 .../cloudstack/backup/NASBackupProvider.java       |   611 +
 .../cloudstack/backup/NasBackupOffering.java       |    75 +
 .../META-INF/cloudstack/nas/module.properties      |    18 +
 .../cloudstack/nas/spring-backup-nas-context.xml   |    26 +
 .../cloudstack/backup/NASBackupProviderTest.java   |   356 +
 plugins/backup/networker/pom.xml                   |    54 +
 .../cloudstack/backup/NetworkerBackupProvider.java |   641 +
 .../backup/networker/NetworkerBackupOffering.java  |    76 +
 .../backup/networker/NetworkerClient.java          |   365 +
 .../backup/networker/NetworkerObject.java          |    27 +
 .../cloudstack/backup/networker/api/Action.java    |   350 +
 .../backup/networker/api/ActionSpecificData.java   |   107 +
 .../cloudstack/backup/networker/api/Attribute.java |    92 +
 .../backup/networker/api/BackupSpecificData.java   |    75 +
 .../networker/api/CompletionNotification.java      |    91 +
 .../cloudstack/backup/networker/api/Expire.java    |    47 +
 .../cloudstack/backup/networker/api/Instance.java  |   124 +
 .../cloudstack/backup/networker/api/Link.java      |    91 +
 .../backup/networker/api/NetworkerBackup.java      |   334 +
 .../backup/networker/api/NetworkerBackups.java     |    92 +
 .../backup/networker/api/ProtectionPolicies.java   |    92 +
 .../backup/networker/api/ProtectionPolicy.java     |   175 +
 .../backup/networker/api/ResourceId.java           |    91 +
 .../backup/networker/api/ServerBackup.java         |   140 +
 .../cloudstack/backup/networker/api/Size.java      |    90 +
 .../backup/networker/api/SummaryNotification.java  |    91 +
 .../backup/networker/api/Traditional.java          |   238 +
 .../cloudstack/networker/module.properties         |    18 +
 .../networker/spring-backup-networker-context.xml  |    26 +
 .../backup/networker/NetworkerClientTest.java      |   739 +
 plugins/backup/veeam/pom.xml                       |    17 +-
 .../cloudstack/backup/VeeamBackupProvider.java     |   248 +-
 .../cloudstack/backup/veeam/VeeamClient.java       |   506 +-
 .../cloudstack/backup/veeam/api/BackupFile.java    |   160 +
 .../cloudstack/backup/veeam/api/BackupFiles.java   |    39 +
 .../backup/veeam/api/VmRestorePoint.java           |   149 +
 .../backup/veeam/api/VmRestorePoints.java          |    39 +
 .../cloudstack/backup/VeeamBackupProviderTest.java |    13 +-
 .../cloudstack/backup/veeam/VeeamClientTest.java   |   410 +-
 plugins/ca/root-ca/pom.xml                         |     2 +-
 .../ca/provider/RootCACustomTrustManager.java      |    23 +-
 .../cloudstack/ca/provider/RootCAProvider.java     |   106 +-
 .../ca/provider/RootCACustomTrustManagerTest.java  |     4 +-
 .../cloudstack/ca/provider/RootCAProviderTest.java |    62 +-
 plugins/database/mysql-ha/pom.xml                  |     6 +-
 .../java/com/cloud/utils/db/StaticStrategy.java    |     9 +-
 plugins/database/quota/pom.xml                     |    11 +-
 .../cloudstack/api/command/QuotaBalanceCmd.java    |    28 +-
 .../api/command/QuotaConfigureEmailCmd.java        |    81 +
 .../cloudstack/api/command/QuotaCreditsCmd.java    |    14 +-
 .../api/command/QuotaCreditsListCmd.java           |   122 +
 .../api/command/QuotaEmailTemplateListCmd.java     |     7 -
 .../api/command/QuotaEmailTemplateUpdateCmd.java   |     8 -
 .../cloudstack/api/command/QuotaEnabledCmd.java    |     8 -
 .../command/QuotaListEmailConfigurationCmd.java    |    55 +
 .../api/command/QuotaPresetVariablesListCmd.java   |    66 +
 .../cloudstack/api/command/QuotaStatementCmd.java  |    20 +-
 .../cloudstack/api/command/QuotaSummaryCmd.java    |     8 -
 .../api/command/QuotaTariffCreateCmd.java          |    56 +-
 .../api/command/QuotaTariffDeleteCmd.java          |    39 +-
 .../cloudstack/api/command/QuotaTariffListCmd.java |    67 +-
 .../api/command/QuotaTariffUpdateCmd.java          |    55 +-
 .../cloudstack/api/command/QuotaUpdateCmd.java     |     8 -
 .../command/QuotaValidateActivationRuleCmd.java    |    70 +
 .../api/response/QuotaBalanceResponse.java         |     4 +-
 .../api/response/QuotaConfigureEmailResponse.java  |    78 +
 .../api/response/QuotaCreditsResponse.java         |    65 +-
 .../response/QuotaPresetVariablesItemResponse.java |    47 +
 .../api/response/QuotaResponseBuilder.java         |    27 +-
 .../api/response/QuotaResponseBuilderImpl.java     |   584 +-
 .../api/response/QuotaTariffResponse.java          |    61 +-
 .../api/response/QuotaUpdateResponse.java          |     2 +-
 .../QuotaValidateActivationRuleResponse.java       |    76 +
 .../org/apache/cloudstack/quota/QuotaService.java  |    14 +-
 .../apache/cloudstack/quota/QuotaServiceImpl.java  |   126 +-
 .../api/command/QuotaBalanceCmdTest.java           |     4 +-
 .../api/command/QuotaCreditsListCmdTest.java       |    79 +
 .../api/command/QuotaEmailTemplateListCmdTest.java |     4 +-
 .../command/QuotaEmailTemplateUpdateCmdTest.java   |     2 +-
 .../api/command/QuotaStatementCmdTest.java         |     2 +-
 .../api/command/QuotaTariffListCmdTest.java        |    28 +-
 .../api/command/QuotaTariffUpdateCmdTest.java      |     6 +-
 .../QuotaValidateActivationRuleCmdTest.java        |    41 +
 .../api/response/QuotaResponseBuilderImplTest.java |   593 +-
 .../cloudstack/quota/QuotaServiceImplTest.java     |    13 +-
 plugins/dedicated-resources/pom.xml                |     2 +-
 .../api/commands/DedicateClusterCmd.java           |     8 -
 .../cloudstack/api/commands/DedicateHostCmd.java   |     8 -
 .../cloudstack/api/commands/DedicatePodCmd.java    |     8 -
 .../cloudstack/api/commands/DedicateZoneCmd.java   |     8 -
 .../api/commands/ListDedicatedClustersCmd.java     |     8 -
 .../api/commands/ListDedicatedHostsCmd.java        |     8 -
 .../api/commands/ListDedicatedPodsCmd.java         |     8 -
 .../api/commands/ListDedicatedZonesCmd.java        |     8 -
 .../api/commands/ReleaseDedicatedClusterCmd.java   |     8 -
 .../api/commands/ReleaseDedicatedHostCmd.java      |     8 -
 .../api/commands/ReleaseDedicatedPodCmd.java       |     8 -
 .../api/commands/ReleaseDedicatedZoneCmd.java      |     8 -
 .../dedicated/DedicatedResourceManagerImpl.java    |   138 +-
 .../spring-dedicated-resources-core-context.xml    |     2 +-
 .../dedicated/manager/DedicatedApiUnitTest.java    |    12 +-
 .../implicit-dedication/pom.xml                    |     2 +-
 .../cloud/deploy/ImplicitDedicationPlanner.java    |    67 +-
 .../implicit-dedication/module.properties          |     2 +-
 .../spring-implicit-dedication-context.xml         |    18 +-
 .../implicitplanner/ImplicitPlannerTest.java       |    50 +-
 .../user-concentrated-pod/pom.xml                  |     2 +-
 .../cloud/deploy/UserConcentratedPodPlanner.java   |    22 +-
 .../user-concentrated-pod/module.properties        |     2 +-
 .../spring-user-concentrated-pod-context.xml       |     2 +-
 .../deployment-planners/user-dispersing/pom.xml    |     2 +-
 .../com/cloud/deploy/UserDispersingPlanner.java    |    38 +-
 plugins/drs/cluster/balanced/pom.xml               |    33 +
 .../org/apache/cloudstack/cluster/Balanced.java    |    93 +
 .../META-INF/cloudstack/balanced/module.properties |    18 +
 .../balanced/spring-balanced-context.xml           |    33 +
 .../apache/cloudstack/cluster/BalancedTest.java    |   263 +
 plugins/drs/cluster/condensed/pom.xml              |    33 +
 .../org/apache/cloudstack/cluster/Condensed.java   |    96 +
 .../cloudstack/condensed/module.properties         |    18 +
 .../condensed/spring-condensed-context.xml         |    33 +
 .../apache/cloudstack/cluster/CondensedTest.java   |   265 +
 plugins/event-bus/inmemory/pom.xml                 |     2 +-
 .../cloudstack/mom/inmemory/InMemoryEventBus.java  |     9 +-
 .../mom/inmemory/InMemoryEventBusTest.java         |     2 +-
 plugins/event-bus/kafka/pom.xml                    |     2 +-
 .../apache/cloudstack/mom/kafka/KafkaEventBus.java |    10 +-
 plugins/event-bus/rabbitmq/pom.xml                 |     2 +-
 .../cloudstack/mom/rabbitmq/RabbitMQEventBus.java  |    36 +-
 plugins/event-bus/webhook/pom.xml                  |    46 +
 .../org/apache/cloudstack/mom/webhook/Webhook.java |    48 +
 .../cloudstack/mom/webhook/WebhookApiService.java  |    44 +
 .../mom/webhook/WebhookApiServiceImpl.java         |   574 +
 .../cloudstack/mom/webhook/WebhookDelivery.java    |    39 +
 .../mom/webhook/WebhookDeliveryThread.java         |   287 +
 .../cloudstack/mom/webhook/WebhookEventBus.java    |    88 +
 .../cloudstack/mom/webhook/WebhookService.java     |    63 +
 .../cloudstack/mom/webhook/WebhookServiceImpl.java |   353 +
 .../webhook/api/command/user/CreateWebhookCmd.java |   167 +
 .../webhook/api/command/user/DeleteWebhookCmd.java |    84 +
 .../api/command/user/DeleteWebhookDeliveryCmd.java |   126 +
 .../command/user/ExecuteWebhookDeliveryCmd.java    |   132 +
 .../api/command/user/ListWebhookDeliveriesCmd.java |   125 +
 .../webhook/api/command/user/ListWebhooksCmd.java  |    95 +
 .../webhook/api/command/user/UpdateWebhookCmd.java |   136 +
 .../api/response/WebhookDeliveryResponse.java      |   136 +
 .../mom/webhook/api/response/WebhookResponse.java  |   158 +
 .../cloudstack/mom/webhook/dao/WebhookDao.java     |    31 +
 .../cloudstack/mom/webhook/dao/WebhookDaoImpl.java |    99 +
 .../mom/webhook/dao/WebhookDeliveryDao.java        |    29 +
 .../mom/webhook/dao/WebhookDeliveryDaoImpl.java    |    73 +
 .../mom/webhook/dao/WebhookDeliveryJoinDao.java    |    33 +
 .../webhook/dao/WebhookDeliveryJoinDaoImpl.java    |    71 +
 .../cloudstack/mom/webhook/dao/WebhookJoinDao.java |    28 +
 .../mom/webhook/dao/WebhookJoinDaoImpl.java        |    45 +
 .../mom/webhook/vo/WebhookDeliveryJoinVO.java      |   182 +
 .../mom/webhook/vo/WebhookDeliveryVO.java          |   174 +
 .../cloudstack/mom/webhook/vo/WebhookJoinVO.java   |   234 +
 .../cloudstack/mom/webhook/vo/WebhookVO.java       |   232 +
 .../META-INF/cloudstack/webhook/module.properties  |    18 +
 .../webhook/spring-event-webhook-context.xml       |    41 +
 .../mom/webhook/WebhookApiServiceImplTest.java     |   253 +
 .../mom/webhook/WebhookDeliveryThreadTest.java     |    62 +
 .../mom/webhook/WebhookEventBusTest.java           |   106 +
 .../api/command/user/CreateWebhookCmdTest.java     |   173 +
 .../api/command/user/DeleteWebhookCmdTest.java     |   106 +
 .../command/user/DeleteWebhookDeliveryCmdTest.java |   108 +
 .../user/ExecuteWebhookDeliveryCmdTest.java        |   153 +
 .../command/user/ListWebhookDeliveriesCmdTest.java |   141 +
 .../api/command/user/ListWebhooksCmdTest.java      |   105 +
 .../api/command/user/UpdateWebhookCmdTest.java     |   163 +
 plugins/ha-planners/skip-heurestics/pom.xml        |     2 +-
 .../com/cloud/deploy/SkipHeuresticsPlanner.java    |     8 +-
 .../spring-skip-heurestics-context.xml             |    19 +-
 plugins/host-allocators/random/pom.xml             |     2 +-
 .../manager/allocator/impl/RandomAllocator.java    |    93 +-
 .../host-allocator-random/module.properties        |     2 +-
 .../spring-host-allocator-random-context.xml       |     2 +-
 .../allocator/impl/RandomAllocatorTest.java        |    80 +
 plugins/hypervisors/baremetal/pom.xml              |   102 +-
 .../cloud/baremetal/database/BaremetalRctDao.java  |    52 +-
 .../baremetal/database/BaremetalRctDaoImpl.java    |    52 +-
 .../cloud/baremetal/database/BaremetalRctVO.java   |   164 +-
 .../baremetal/manager/BareMetalDiscoverer.java     |    25 +-
 .../com/cloud/baremetal/manager/BareMetalGuru.java |     2 -
 .../cloud/baremetal/manager/BareMetalPlanner.java  |    34 +-
 .../manager/BareMetalTemplateAdapter.java          |    12 +-
 .../baremetal/manager/BaremetalManagerImpl.java    |    14 +-
 .../com/cloud/baremetal/manager/BaremetalRct.java  |   250 +-
 .../baremetal/manager/BaremetalVlanManager.java    |    86 +-
 .../manager/BaremetalVlanManagerImpl.java          |   544 +-
 .../networkservice/BareMetalPingServiceImpl.java   |    14 +-
 .../networkservice/BareMetalResourceBase.java      |    54 +-
 .../networkservice/BaremetaNetworkGuru.java        |     6 +-
 .../networkservice/BaremetalDhcpElement.java       |     4 +-
 .../networkservice/BaremetalDhcpManagerImpl.java   |    13 +-
 .../networkservice/BaremetalDhcpResourceBase.java  |     4 +-
 .../networkservice/BaremetalDhcpdResource.java     |     8 +-
 .../networkservice/BaremetalDnsmasqResource.java   |     8 +-
 .../BaremetalKickStartPxeResource.java             |    16 +-
 .../BaremetalKickStartServiceImpl.java             |    16 +-
 .../networkservice/BaremetalPingPxeResource.java   |    24 +-
 .../networkservice/BaremetalPxeElement.java        |     4 +-
 .../networkservice/BaremetalPxeManagerImpl.java    |     6 +-
 .../networkservice/BaremetalPxeResourceBase.java   |     4 +-
 .../networkservice/BaremetalRctResponse.java       |   110 +-
 .../networkservice/BaremetalSwitchBackend.java     |    68 +-
 .../BaremetalVirtualRouterCommands.java            |   244 +-
 .../networkservice/BaremetalVlanStruct.java        |   184 +-
 .../Force10BaremetalSwitchBackend.java             |   333 +-
 .../networkservice/SecurityGroupHttpClient.java    |     5 +-
 .../apache/cloudstack/api/AddBaremetalDhcpCmd.java |    10 +-
 .../apache/cloudstack/api/AddBaremetalPxeCmd.java  |     4 +-
 .../apache/cloudstack/api/AddBaremetalRctCmd.java  |   164 +-
 .../api/BaremetalProvisionDoneNotificationCmd.java |     4 +-
 .../cloudstack/api/DeleteBaremetalRctCmd.java      |   162 +-
 .../cloudstack/api/ListBaremetalDhcpCmd.java       |    10 +-
 .../cloudstack/api/ListBaremetalPxeServersCmd.java |     9 +-
 .../apache/cloudstack/api/ListBaremetalRctCmd.java |    10 +-
 .../cloudstack/baremetal-compute/module.properties |     2 +-
 .../baremetal-discoverer/module.properties         |     2 +-
 .../cloudstack/baremetal-network/module.properties |     2 +-
 .../cloudstack/baremetal-planner/module.properties |     2 +-
 .../cloudstack/baremetal-storage/module.properties |     2 +-
 .../main/resources/security_group_agent/cs-sgagent |     2 +-
 .../security_group_agent/cs_sg_agent.py            |   472 +-
 .../security_group_agent/xmlobject.py              |   194 +-
 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 +
 .../hyperv/DotNet/ServerResource/.gitignore        |     1 -
 .../DotNet/ServerResource/.nuget/NuGet.Config      |    12 +-
 .../DotNet/ServerResource/.nuget/NuGet.targets     |   226 +-
 .../AgentShell/AgentService.Designer.cs            |     8 +-
 .../ServerResource/AgentShell/AgentService.cs      |     2 +-
 .../AgentShell/AgentSettings.Designer.cs           |    76 +-
 .../AgentShell/AgentSettings.settings              |     2 +-
 .../ServerResource/AgentShell/AgentShell.csproj    |     4 +-
 .../AgentShell/AgentShellException.cs              |     2 +-
 .../DotNet/ServerResource/AgentShell/App.config    |     4 +-
 .../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      |     4 +-
 .../ServerResource/HypervResource/App.config       |     2 +-
 .../HypervResource/CloudStackTypes.cs              |    26 +-
 .../HypervResource/HypervResource.csproj           |   208 +-
 .../HypervResource/HypervResourceController.cs     |    10 +-
 .../ServerResource/HypervResource/IWmiCallsV2.cs   |     2 +-
 .../HypervResource/Properties/AssemblyInfo.cs      |    12 +-
 .../ServerResource/HypervResource/WmiCallsV2.cs    |   148 +-
 .../ServerResource/HypervResource/heartbeat.bat    |     2 +-
 .../ServerResource/HypervResource/packages.config  |     4 +-
 .../ServerResource/ServerResource.Tests/App.config |     4 +-
 .../HypervResourceController1Test.cs               |   700 +-
 .../HypervResourceControllerTest.cs                |  2294 +--
 .../Properties/AssemblyInfo.cs                     |    12 +-
 .../ServerResource.Tests.csproj                    |   256 +-
 .../ServerResource.Tests/packages.config           |     4 +-
 .../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 |  4173 +++--
 ...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   |     6 +-
 .../ServerResource/WmiWrappers/WmiWrappers.csproj  |   374 +-
 ...fFormattedData_Counters_ProcessorInformation.cs |   404 +-
 plugins/hypervisors/hyperv/buildagent.sh           |    30 +-
 plugins/hypervisors/hyperv/conf/log4j-cloud.xml.in |    99 +-
 plugins/hypervisors/hyperv/pom.xml                 |     5 +-
 .../main/java/com/cloud/ha/HypervInvestigator.java |     4 +-
 .../hyperv/discoverer/HypervServerDiscoverer.java  |    56 +-
 .../cloud/hypervisor/hyperv/guru/HypervGuru.java   |     8 +-
 .../hyperv/manager/HypervManagerImpl.java          |    57 +-
 .../resource/HypervDirectConnectResource.java      |   630 +-
 .../motion/HypervStorageMotionStrategy.java        |    16 +-
 .../cloudstack/hyperv-compute/module.properties    |     2 +-
 .../spring-hyperv-compute-context.xml              |    18 +-
 .../cloudstack/hyperv-discoverer/module.properties |     2 +-
 .../spring-hyperv-discoverer-context.xml           |    18 +-
 .../test/HypervDirectConnectResourceTest.java      |    55 +-
 plugins/hypervisors/kvm/pom.xml                    |     6 +-
 .../main/java/com/cloud/ha/KVMInvestigator.java    |    68 +-
 .../cloud/hypervisor/kvm/dpdk/DpdkDriverImpl.java  |     6 +-
 .../kvm/resource/BlockCommitListener.java          |    77 +
 .../hypervisor/kvm/resource/BridgeVifDriver.java   |    86 +-
 .../hypervisor/kvm/resource/DirectVifDriver.java   |     6 +-
 .../hypervisor/kvm/resource/IvsVifDriver.java      |    30 +-
 .../hypervisor/kvm/resource/KVMGuestOsMapper.java  |    11 +-
 .../cloud/hypervisor/kvm/resource/KVMHABase.java   |   104 +-
 .../hypervisor/kvm/resource/KVMHAChecker.java      |    50 +-
 .../hypervisor/kvm/resource/KVMHAMonitor.java      |   130 +-
 .../kvm/resource/KVMHAVMActivityChecker.java       |    45 +-
 .../kvm/resource/LibvirtCapXMLParser.java          |     8 +-
 .../kvm/resource/LibvirtComputingResource.java     |  3427 ++--
 .../hypervisor/kvm/resource/LibvirtConnection.java |    78 +-
 .../kvm/resource/LibvirtDomainListener.java        |    66 +
 .../kvm/resource/LibvirtDomainXMLParser.java       |   213 +-
 .../kvm/resource/LibvirtExtendedVmStatsEntry.java  |    51 +
 .../hypervisor/kvm/resource/LibvirtGpuDef.java     |   107 +
 .../kvm/resource/LibvirtKvmAgentHook.java          |    98 +-
 .../kvm/resource/LibvirtStoragePoolDef.java        |   131 +-
 .../kvm/resource/LibvirtStoragePoolXMLParser.java  |    32 +-
 .../resource/LibvirtStorageVolumeXMLParser.java    |    11 +-
 .../hypervisor/kvm/resource/LibvirtVMDef.java      |   590 +-
 .../hypervisor/kvm/resource/LibvirtXMLParser.java  |    34 +-
 .../hypervisor/kvm/resource/MigrateKVMAsync.java   |    48 +-
 .../hypervisor/kvm/resource/OvsVifDriver.java      |    42 +-
 .../hypervisor/kvm/resource/VRouterVifDriver.java  |   119 +
 .../hypervisor/kvm/resource/VifDriverBase.java     |    20 +
 .../resource/disconnecthook/DisconnectHook.java    |    59 +
 .../disconnecthook/MigrationCancelHook.java        |    50 +
 .../disconnecthook/VolumeMigrationCancelHook.java  |    53 +
 .../RollingMaintenanceAgentExecutor.java           |    16 +-
 .../RollingMaintenanceExecutorBase.java            |     7 +-
 .../RollingMaintenanceServiceExecutor.java         |    12 +-
 .../wrapper/LibvirtAttachIsoCommandWrapper.java    |     2 +-
 .../LibvirtBackupSnapshotCommandWrapper.java       |    26 +-
 .../LibvirtCheckAndRepairVolumeCommandWrapper.java |   189 +
 ...LibvirtCheckConsoleProxyLoadCommandWrapper.java |     2 +-
 .../LibvirtCheckConvertInstanceCommandWrapper.java |    53 +
 .../wrapper/LibvirtCheckHealthCommandWrapper.java  |     2 +-
 .../wrapper/LibvirtCheckNetworkCommandWrapper.java |     2 +-
 .../wrapper/LibvirtCheckOnHostCommandWrapper.java  |    10 +-
 .../wrapper/LibvirtCheckSshCommandWrapper.java     |    12 +-
 .../LibvirtCheckStorageAvailabilityWrapper.java    |    10 +-
 .../resource/wrapper/LibvirtCheckUrlCommand.java   |    29 +-
 ...CheckVMActivityOnStoragePoolCommandWrapper.java |    15 +-
 .../LibvirtCheckVirtualMachineCommandWrapper.java  |     9 +-
 .../wrapper/LibvirtCheckVolumeCommandWrapper.java  |   133 +
 .../LibvirtCleanupNetworkRulesCommandWrapper.java  |     2 +-
 ...nupPersistentNetworkResourceCommandWrapper.java |     2 -
 .../LibvirtConsoleProxyLoadCommandWrapper.java     |     6 +-
 .../LibvirtConvertInstanceCommandWrapper.java      |   271 +
 .../LibvirtConvertSnapshotCommandWrapper.java      |   106 +
 .../LibvirtCopyRemoteVolumeCommandWrapper.java     |   141 +
 .../LibvirtCopyToSecondaryStorageWrapper.java      |     4 +-
 .../wrapper/LibvirtCopyVolumeCommandWrapper.java   |    14 +-
 .../wrapper/LibvirtCreateCommandWrapper.java       |     4 +-
 ...virtCreateDiskOnlyVMSnapshotCommandWrapper.java |   198 +
 ...ePrivateTemplateFromSnapshotCommandWrapper.java |     6 +-
 ...atePrivateTemplateFromVolumeCommandWrapper.java |    16 +-
 .../LibvirtCreateStoragePoolCommandWrapper.java    |     2 +-
 .../LibvirtCreateVMSnapshotCommandWrapper.java     |     6 +-
 ...virtCreateVolumeFromSnapshotCommandWrapper.java |     2 +-
 .../wrapper/LibvirtDeleteBackupCommandWrapper.java |    63 +
 ...virtDeleteDiskOnlyVMSnapshotCommandWrapper.java |    58 +
 .../LibvirtDeleteStoragePoolCommandWrapper.java    |    62 +-
 .../LibvirtDeleteVMSnapshotCommandWrapper.java     |    38 +-
 .../wrapper/LibvirtDestroyCommandWrapper.java      |     6 +-
 .../wrapper/LibvirtFenceCommandWrapper.java        |    16 +-
 .../wrapper/LibvirtFreezeThawVMCommandWrapper.java |     8 +-
 .../LibvirtGetBackupStatsCommandWrapper.java       |    71 +
 .../wrapper/LibvirtGetGPUStatsCommandWrapper.java  |    37 +
 .../wrapper/LibvirtGetHostStatsCommandWrapper.java |     4 +-
 .../wrapper/LibvirtGetRemoteVmsCommandWrapper.java |   190 +
 .../LibvirtGetStorageStatsCommandWrapper.java      |     5 +-
 ...LibvirtGetUnmanagedInstancesCommandWrapper.java |   262 +
 .../LibvirtGetVmDiskStatsCommandWrapper.java       |     6 +-
 .../LibvirtGetVmIpAddressCommandWrapper.java       |   194 +-
 .../LibvirtGetVmNetworkStatsCommandWrapper.java    |     6 +-
 .../wrapper/LibvirtGetVmStatsCommandWrapper.java   |     8 +-
 .../wrapper/LibvirtGetVncPortCommandWrapper.java   |     2 +-
 .../LibvirtGetVolumeStatCommandWrapper.java        |    63 +
 .../LibvirtGetVolumeStatsCommandWrapper.java       |     2 -
 .../LibvirtGetVolumesOnStorageCommandWrapper.java  |   193 +
 .../LibvirtHandleConfigDriveCommandWrapper.java    |    22 +-
 ...bvirtImportConvertedInstanceCommandWrapper.java |   305 +
 .../LibvirtListDataStoreObjectsCommandWrapper.java |    35 +
 .../wrapper/LibvirtMaintainCommandWrapper.java     |     2 +-
 .../LibvirtManageSnapshotCommandWrapper.java       |    22 +-
 ...bvirtMergeDiskOnlyVMSnapshotCommandWrapper.java |   150 +
 .../wrapper/LibvirtMigrateCommandWrapper.java      |   412 +-
 .../LibvirtMigrateVolumeCommandWrapper.java        |   299 +-
 .../LibvirtModifySshKeysCommandWrapper.java        |    22 +-
 .../LibvirtModifyStoragePoolCommandWrapper.java    |    30 +-
 .../LibvirtModifyTargetsCommandWrapper.java        |     2 -
 .../LibvirtNetworkElementCommandWrapper.java       |     2 +-
 .../LibvirtNetworkRulesSystemVmCommandWrapper.java |     6 +-
 ...irtNetworkRulesVmSecondaryIpCommandWrapper.java |     4 +-
 .../wrapper/LibvirtNetworkUsageCommandWrapper.java |     2 +-
 .../LibvirtOvsCreateTunnelCommandWrapper.java      |    10 +-
 .../LibvirtOvsDestroyBridgeCommandWrapper.java     |     6 +-
 .../LibvirtOvsDestroyTunnelCommandWrapper.java     |    10 +-
 .../LibvirtOvsFetchInterfaceCommandWrapper.java    |    82 +-
 .../LibvirtOvsSetupBridgeCommandWrapper.java       |     6 +-
 ...OvsVpcPhysicalTopologyConfigCommandWrapper.java |     8 +-
 ...irtOvsVpcRoutingPolicyConfigCommandWrapper.java |     8 +-
 .../LibvirtPatchSystemVmCommandWrapper.java        |    12 +-
 .../wrapper/LibvirtPingTestCommandWrapper.java     |     8 +-
 .../wrapper/LibvirtPlugNicCommandWrapper.java      |    13 +-
 ...ibvirtPostCertificateRenewalCommandWrapper.java |     6 +-
 .../LibvirtPrepareForMigrationCommandWrapper.java  |    42 +-
 .../LibvirtPrepareStorageClientCommandWrapper.java |    48 +
 ...irtPrepareUnmanageVMInstanceCommandWrapper.java |    49 +
 ...ibvirtPrimaryStorageDownloadCommandWrapper.java |     2 +-
 .../wrapper/LibvirtPvlanSetupCommandWrapper.java   |    16 +-
 .../wrapper/LibvirtReadyCommandWrapper.java        |    38 +-
 .../wrapper/LibvirtRebootCommandWrapper.java       |     4 +-
 .../wrapper/LibvirtRebootRouterCommandWrapper.java |     2 +-
 .../wrapper/LibvirtReconcileCommandWrapper.java    |   258 +
 .../LibvirtRecreateCheckpointsCommandWrapper.java  |    48 +
 .../wrapper/LibvirtRemoveBitmapCommandWrapper.java |   130 +
 .../wrapper/LibvirtReplugNicCommandWrapper.java    |    18 +-
 .../resource/wrapper/LibvirtRequestWrapper.java    |    11 +-
 .../wrapper/LibvirtResizeVolumeCommandWrapper.java |    49 +-
 .../LibvirtRestoreBackupCommandWrapper.java        |   344 +
 .../LibvirtRestoreVMSnapshotCommandWrapper.java    |    10 +-
 ...virtRevertDiskOnlyVMSnapshotCommandWrapper.java |   111 +
 .../LibvirtRevertSnapshotCommandWrapper.java       |    65 +-
 .../LibvirtRevertToVMSnapshotCommandWrapper.java   |     6 +-
 ...virtRevokeDirectDownloadCertificateWrapper.java |    39 +-
 .../LibvirtRollingMaintenanceCommandWrapper.java   |    12 +-
 .../wrapper/LibvirtScaleVmCommandWrapper.java      |    11 +-
 .../LibvirtSecurityGroupRulesCommandWrapper.java   |     8 +-
 .../wrapper/LibvirtSetTfRouteCommandWrapper.java   |    39 +
 ...tupDirectDownloadCertificateCommandWrapper.java |    66 +-
 ...ibvirtSetupPersistentNetworkCommandWrapper.java |     2 -
 .../LibvirtSetupTungstenVRouterCommandWrapper.java |    40 +
 .../wrapper/LibvirtStartCommandWrapper.java        |    34 +-
 .../wrapper/LibvirtStopCommandWrapper.java         |    36 +-
 .../LibvirtStorageSubSystemCommandWrapper.java     |     2 +-
 .../wrapper/LibvirtTakeBackupCommandWrapper.java   |   113 +
 .../wrapper/LibvirtUnPlugNicCommandWrapper.java    |     6 +-
 .../LibvirtUnmanageInstanceCommandWrapper.java     |   174 +
 ...ibvirtUnprepareStorageClientCommandWrapper.java |    45 +
 .../LibvirtUpdateHostPasswordCommandWrapper.java   |     2 +-
 ...pdateTungstenLoadbalancerSslCommandWrapper.java |    44 +
 ...ateTungstenLoadbalancerStatsCommandWrapper.java |    44 +
 .../LibvirtUpgradeSnapshotCommandWrapper.java      |     2 +-
 .../resource/wrapper/LibvirtUtilitiesHelper.java   |    23 +-
 ...LibvirtWatchConsoleProxyLoadCommandWrapper.java |     2 +-
 .../kvm/storage/FiberChannelAdapter.java           |   121 +
 .../kvm/storage/IscsiAdmStorageAdaptor.java        |    67 +-
 .../kvm/storage/IscsiAdmStoragePool.java           |    36 +-
 .../kvm/storage/IscsiStorageCleanupMonitor.java    |    27 +-
 .../hypervisor/kvm/storage/KVMPhysicalDisk.java    |    77 +-
 .../hypervisor/kvm/storage/KVMStoragePool.java     |    53 +
 .../kvm/storage/KVMStoragePoolManager.java         |   200 +-
 .../kvm/storage/KVMStorageProcessor.java           |  1649 +-
 .../kvm/storage/LibvirtStorageAdaptor.java         |   678 +-
 .../hypervisor/kvm/storage/LibvirtStoragePool.java |   147 +-
 .../kvm/storage/ManagedNfsStorageAdaptor.java      |    38 +-
 .../kvm/storage/MultipathSCSIAdapterBase.java      |   685 +
 .../hypervisor/kvm/storage/MultipathSCSIPool.java  |   241 +
 .../kvm/storage/ScaleIOStorageAdaptor.java         |   389 +-
 .../hypervisor/kvm/storage/ScaleIOStoragePool.java |    41 +-
 .../hypervisor/kvm/storage/StorageAdaptor.java     |    67 +-
 .../hypervisor/kvm/storage/StorageAdaptorInfo.java |     3 -
 .../kvm/storage/StoragePoolInformation.java        |    75 +
 .../apache/cloudstack/kvm/ha/KVMHAProvider.java    |    21 +-
 .../cloudstack/kvm/ha/KVMHostActivityChecker.java  |    52 +-
 .../tungsten/agent/api/SetupTfRouteCommand.java    |    64 +
 .../agent/api/SetupTungstenVRouterCommand.java     |    77 +
 .../api/UpdateTungstenLoadbalancerSslCommand.java  |    83 +
 .../UpdateTungstenLoadbalancerStatsCommand.java    |    71 +
 .../cloudstack/utils/cryptsetup/CryptSetup.java    |     2 +-
 .../org/apache/cloudstack/utils/linux/CPUStat.java |     9 +-
 .../apache/cloudstack/utils/linux/KVMHostInfo.java |    82 +-
 .../cloudstack/utils/qemu/QemuImageOptions.java    |    11 +-
 .../org/apache/cloudstack/utils/qemu/QemuImg.java  |   178 +-
 .../cloudstack/utils/qemu/QemuImgException.java    |     2 +-
 .../apache/cloudstack/utils/qemu/QemuImgFile.java  |     8 +-
 .../cloudstack/kvm-compute/module.properties       |     2 +-
 .../kvm-compute/spring-kvm-compute-context.xml     |     2 +-
 .../cloud/hypervisor/kvm/dpdk/DpdkDriverTest.java  |    36 +-
 .../kvm/resource/BridgeVifDriverTest.java          |    59 +-
 .../kvm/resource/DisconnectHooksTest.java          |   191 +
 .../kvm/resource/LibvirtComputingResourceTest.java |  2717 ++-
 .../kvm/resource/LibvirtCpuTopologyTest.java       |    94 +
 .../kvm/resource/LibvirtDomainXMLParserTest.java   |   222 +
 .../hypervisor/kvm/resource/LibvirtGpuDefTest.java |   141 +
 .../kvm/resource/LibvirtKvmAgentHookTest.java      |    62 +-
 .../kvm/resource/LibvirtSecretDefTest.java         |     8 +-
 .../kvm/resource/LibvirtStoragePoolDefTest.java    |    50 +-
 .../resource/LibvirtStoragePoolXMLParserTest.java  |    17 +-
 .../hypervisor/kvm/resource/LibvirtVMDefTest.java  |   181 +-
 .../kvm/resource/LibvirtVifDriverTest.java         |   110 +-
 .../kvm/resource/MigrateKVMAsyncTest.java          |    83 +
 ...virtCheckAndRepairVolumeCommandWrapperTest.java |    98 +
 ...virtCheckConvertInstanceCommandWrapperTest.java |    67 +
 .../LibvirtConvertInstanceCommandWrapperTest.java  |   192 +
 ...bvirtGetAutoScaleMetricsCommandWrapperTest.java |    14 +-
 ...irtGetUnmanagedInstancesCommandWrapperTest.java |    73 +
 .../LibvirtGetVmIpAddressCommandWrapperTest.java   |   323 +
 ...bvirtGetVolumesOnStorageCommandWrapperTest.java |   158 +
 ...tImportConvertedInstanceCommandWrapperTest.java |   245 +
 .../wrapper/LibvirtMigrateCommandWrapperTest.java  |   490 +-
 .../LibvirtMigrateVolumeCommandWrapperTest.java    |   388 +
 .../LibvirtNetworkElementCommandWrapperTest.java   |    27 +-
 ...LibvirtOvsFetchInterfaceCommandWrapperTest.java |   107 +
 ...bvirtPrepareForMigrationCommandWrapperTest.java |   100 +
 ...virtPrepareStorageClientCommandWrapperTest.java |    87 +
 .../LibvirtReplugNicCommandWrapperTest.java        |    42 +-
 .../LibvirtRestoreBackupCommandWrapperTest.java    |   526 +
 .../LibvirtRevertSnapshotCommandWrapperTest.java   |   114 +-
 .../wrapper/LibvirtScaleVmCommandWrapperTest.java  |    62 +-
 ...irectDownloadCertificateCommandWrapperTest.java |    91 +
 .../wrapper/LibvirtStopCommandWrapperTest.java     |    61 +
 .../LibvirtUnmanageInstanceCommandWrapperTest.java |   357 +
 ...rtUnprepareStorageClientCommandWrapperTest.java |    83 +
 .../wrapper/LibvirtUtilitiesHelperTest.java        |     6 +-
 .../kvm/storage/KVMPhysicalDiskTest.java           |    73 +-
 .../kvm/storage/KVMStorageProcessorTest.java       |   387 +-
 .../kvm/storage/LibvirtStorageAdaptorTest.java     |   179 +
 .../kvm/storage/LibvirtStoragePoolTest.java        |    12 +-
 .../kvm/storage/ScaleIOStorageAdaptorTest.java     |   184 +-
 .../kvm/storage/ScaleIOStoragePoolTest.java        |    96 +-
 .../kvm/storage/ScaleIOStoragePoolTest.java.bkp    |   202 +
 .../apache/cloudstack/kvm/ha/KVMHostHATest.java    |     4 +-
 .../utils/cryptsetup/CryptSetupTest.java           |     6 +-
 .../cloudstack/utils/cryptsetup/KeyFileTest.java   |     3 +
 .../cloudstack/utils/linux/KVMHostInfoTest.java    |    67 +-
 .../apache/cloudstack/utils/linux/MemStatTest.java |    33 +-
 .../cloudstack/utils/qemu/QemuImgFileTest.java     |     8 +-
 .../apache/cloudstack/utils/qemu/QemuImgTest.java  |    17 +
 plugins/hypervisors/ovm/pom.xml                    |     4 +-
 .../com/cloud/ovm/hypervisor/OvmDiscoverer.java    |    25 +-
 .../java/com/cloud/ovm/hypervisor/OvmFencer.java   |    16 +-
 .../com/cloud/ovm/hypervisor/OvmResourceBase.java  |   117 +-
 .../main/java/com/cloud/ovm/object/Connection.java |     9 +-
 .../src/main/java/com/cloud/ovm/object/Test.java   |    58 -
 .../cloudstack/ovm-compute/module.properties       |     2 +-
 .../ovm-compute/spring-ovm-compute-context.xml     |     2 +-
 .../cloudstack/ovm-discoverer/module.properties    |     2 +-
 .../spring-ovm-discoverer-context.xml              |     2 +-
 .../scripts/vm/hypervisor/ovm/ConfigFileOps.py     |     2 +-
 .../scripts/vm/hypervisor/ovm/OvmCommonModule.py   |     4 +-
 .../scripts/vm/hypervisor/ovm/OvmDiskModule.py     |     2 +-
 .../scripts/vm/hypervisor/ovm/OvmHostModule.py     |     2 +-
 .../main/scripts/vm/hypervisor/ovm/OvmVmModule.py  |     4 +-
 .../scripts/vm/hypervisor/ovm/OvmVolumeModule.py   |     2 +-
 .../main/scripts/vm/hypervisor/ovm/configureOvm.sh |     5 +-
 plugins/hypervisors/ovm3/pom.xml                   |    10 +-
 .../main/java/com/cloud/ha/Ovm3Investigator.java   |     8 +-
 .../hypervisor/ovm3/objects/CloudstackPlugin.java  |     9 +-
 .../cloud/hypervisor/ovm3/objects/Connection.java  |    21 +-
 .../com/cloud/hypervisor/ovm3/objects/Linux.java   |     5 +-
 .../com/cloud/hypervisor/ovm3/objects/Network.java |     8 +-
 .../cloud/hypervisor/ovm3/objects/OvmObject.java   |    13 +-
 .../com/cloud/hypervisor/ovm3/objects/Pool.java    |     3 -
 .../cloud/hypervisor/ovm3/objects/PoolOCFS2.java   |     5 +-
 .../cloud/hypervisor/ovm3/objects/Repository.java  |     2 -
 .../com/cloud/hypervisor/ovm3/objects/Xen.java     |    28 +-
 .../hypervisor/ovm3/resources/Ovm3Discoverer.java  |    57 +-
 .../ovm3/resources/Ovm3FenceBuilder.java           |    14 +-
 .../ovm3/resources/Ovm3HypervisorGuru.java         |     4 +-
 .../ovm3/resources/Ovm3HypervisorResource.java     |    62 +-
 .../ovm3/resources/Ovm3StorageProcessor.java       |   139 +-
 .../ovm3/resources/Ovm3VirtualRoutingResource.java |     6 +-
 .../ovm3/resources/helpers/Ovm3Configuration.java  |    12 +-
 .../resources/helpers/Ovm3HypervisorNetwork.java   |    40 +-
 .../resources/helpers/Ovm3HypervisorSupport.java   |   101 +-
 .../ovm3/resources/helpers/Ovm3StoragePool.java    |    94 +-
 .../helpers/Ovm3VirtualRoutingSupport.java         |    24 +-
 .../ovm3/resources/helpers/Ovm3VmSupport.java      |    65 +-
 .../hypervisor/ovm3/objects/ConnectionTest.java    |    10 +-
 .../com/cloud/hypervisor/ovm3/objects/XenTest.java |     5 +-
 .../test/resources/scripts/create_pool_cluster.py  |    89 +-
 .../ovm3/src/test/resources/scripts/socat.sh       |    30 +-
 .../ovm3/src/test/resources/scripts/tail.sh        |    30 +-
 plugins/hypervisors/simulator/pom.xml              |     2 +-
 .../com/cloud/agent/manager/MockAgentManager.java  |     8 +
 .../cloud/agent/manager/MockAgentManagerImpl.java  |   232 +-
 .../agent/manager/MockNetworkManagerImpl.java      |    16 +-
 .../cloud/agent/manager/MockStorageManager.java    |     3 +
 .../agent/manager/MockStorageManagerImpl.java      |    45 +-
 .../com/cloud/agent/manager/MockVmManagerImpl.java |   167 +-
 .../cloud/agent/manager/SimulatorManagerImpl.java  |    24 +-
 .../api/commands/CleanupSimulatorMockCmd.java      |     2 -
 .../cloud/api/commands/ConfigureSimulatorCmd.java  |     2 -
 .../ConfigureSimulatorHAProviderState.java         |     4 +-
 .../cloud/api/commands/QuerySimulatorMockCmd.java  |     2 -
 .../main/java/com/cloud/ha/SimulatorFencer.java    |    16 +-
 .../java/com/cloud/ha/SimulatorInvestigator.java   |    12 +-
 .../java/com/cloud/resource/AgentResourceBase.java |    21 +-
 .../com/cloud/resource/AgentRoutingResource.java   |    13 +-
 .../com/cloud/resource/AgentStorageResource.java   |     4 +-
 .../com/cloud/resource/SimulatorDiscoverer.java    |    34 +-
 .../resource/SimulatorSecondaryDiscoverer.java     |     4 +-
 .../cloud/resource/SimulatorStorageProcessor.java  |    19 +-
 .../java/com/cloud/simulator/MockGpuDevice.java    |    42 +
 .../java/com/cloud/simulator/MockGpuDeviceVO.java  |   313 +
 .../main/java/com/cloud/simulator/MockHost.java    |     2 +
 .../main/java/com/cloud/simulator/MockHostVO.java  |    11 +
 .../com/cloud/simulator/MockStoragePoolVO.java     |     6 +-
 .../java/com/cloud/simulator/SimulatorGuru.java    |    33 +-
 .../simulator/dao/MockConfigurationDaoImpl.java    |     4 +-
 .../com/cloud/simulator/dao/MockGpuDeviceDao.java  |    43 +
 .../cloud/simulator/dao/MockGpuDeviceDaoImpl.java  |    67 +
 .../simulator/dao/MockStoragePoolDaoImpl.java      |     2 +-
 .../com/cloud/simulator/dao/MockVolumeDao.java     |     2 +
 .../com/cloud/simulator/dao/MockVolumeDaoImpl.java |    12 +
 .../apache/cloudstack/ha/SimulatorHAProvider.java  |     6 +-
 .../driver/SimulatorImageStoreDriverImpl.java      |     6 +-
 .../SimulatorImageStoreLifeCycleImpl.java          |     7 +-
 .../core/spring-simulator-core-context.xml         |     1 +
 .../cloudstack/simulator-compute/module.properties |     2 +-
 .../simulator-discoverer/module.properties         |     2 +-
 .../spring-simulator-discover-context.xml          |     2 +-
 .../cloudstack/simulator-storage/module.properties |     2 +-
 plugins/hypervisors/ucs/pom.xml                    |     2 +-
 .../java/com/cloud/ucs/manager/UcsHttpClient.java  |     2 +-
 .../java/com/cloud/ucs/manager/UcsManagerImpl.java |    15 +-
 .../apache/cloudstack/api/AddUcsManagerCmd.java    |     4 +-
 .../api/AssociateUcsProfileToBladeCmd.java         |     9 +-
 .../apache/cloudstack/api/DeleteUcsManagerCmd.java |     2 -
 .../org/apache/cloudstack/api/ListUcsBladeCmd.java |     4 +-
 .../apache/cloudstack/api/ListUcsManagerCmd.java   |     6 +-
 .../apache/cloudstack/api/ListUcsProfileCmd.java   |     4 +-
 .../cloudstack/core/spring-ucs-core-context.xml    |     2 +-
 plugins/hypervisors/vmware/pom.xml                 |     2 +-
 .../cloud/api/commands/DeleteCiscoNexusVSMCmd.java |     8 -
 .../api/commands/DisableCiscoNexusVSMCmd.java      |     8 -
 .../cloud/api/commands/EnableCiscoNexusVSMCmd.java |     8 -
 .../cloud/api/commands/ListCiscoNexusVSMsCmd.java  |     2 -
 .../java/com/cloud/hypervisor/guru/VMwareGuru.java |   618 +-
 .../cloud/hypervisor/guru/VmwareVmImplementer.java |    49 +-
 .../cloud/hypervisor/vmware/VmwareCleanupMaid.java |    18 +-
 .../cloud/hypervisor/vmware/VmwareDatacenter.java  |    37 -
 .../hypervisor/vmware/VmwareDatacenterService.java |     6 +
 .../hypervisor/vmware/VmwareDatacenterVO.java      |   163 -
 .../hypervisor/vmware/VmwareServerDiscoverer.java  |    81 +-
 .../hypervisor/vmware/dao/LegacyZoneDaoImpl.java   |     2 -
 .../hypervisor/vmware/dao/VmwareDatacenterDao.java |    65 -
 .../vmware/dao/VmwareDatacenterDaoImpl.java        |   103 -
 .../manager/CleanupFullyClonedTemplatesTask.java   |    34 +-
 .../hypervisor/vmware/manager/VmwareManager.java   |     8 +
 .../vmware/manager/VmwareManagerImpl.java          |   397 +-
 .../vmware/manager/VmwareStorageManagerImpl.java   |   230 +-
 .../vmware/resource/VmwareContextFactory.java      |    11 +-
 .../hypervisor/vmware/resource/VmwareResource.java |  2049 +--
 .../network/CiscoNexusVSMDeviceManagerImpl.java    |    34 +-
 .../network/dao/CiscoNexusVSMDeviceDaoImpl.java    |     2 -
 .../network/element/CiscoNexusVSMElement.java      |    11 +-
 .../resource/PremiumSecondaryStorageResource.java  |    14 +-
 .../VmwareSecondaryStorageContextFactory.java      |     7 +-
 .../VmwareSecondaryStorageResourceHandler.java     |    43 +-
 .../resource/VmwareStorageLayoutHelper.java        |    94 +-
 .../storage/resource/VmwareStorageProcessor.java   |   404 +-
 .../VmwareStorageSubsystemCommandHandler.java      |    50 +-
 .../api/command/admin/zone/AddVmwareDcCmd.java     |    14 +-
 .../zone/ImportVsphereStoragePoliciesCmd.java      |    12 +-
 .../api/command/admin/zone/ListVmwareDcVmsCmd.java |   158 +
 .../api/command/admin/zone/ListVmwareDcsCmd.java   |    10 +-
 .../admin/zone/ListVsphereStoragePoliciesCmd.java  |    12 +-
 ...ListVsphereStoragePolicyCompatiblePoolsCmd.java |     8 +-
 .../api/command/admin/zone/RemoveVmwareDcCmd.java  |    10 +-
 .../api/command/admin/zone/UpdateVmwareDcCmd.java  |    15 +-
 .../api/response/VmwareDatacenterResponse.java     |    78 -
 .../motion/VmwareStorageMotionStrategy.java        |    65 +-
 .../cloudstack/core/spring-vmware-core-context.xml |     4 +-
 .../cloudstack/vmware-compute/module.properties    |     2 +-
 .../spring-vmware-compute-context.xml              |     2 +-
 .../cloudstack/vmware-discoverer/module.properties |     2 +-
 .../cloudstack/vmware-network/module.properties    |     2 +-
 .../spring-vmware-network-context.xml              |     2 +-
 .../cloudstack/vmware-storage/module.properties    |     2 +-
 .../com/cloud/hypervisor/guru/VMwareGuruTest.java  |   577 +-
 .../hypervisor/guru/VmwareVmImplementerTest.java   |    63 +-
 .../vmware/VmwareDatacenterApiUnitTest.java        |    27 +-
 .../vmware/manager/VmwareManagerImplTest.java      |    16 +-
 .../manager/VmwareStorageManagerImplTest.java      |    11 +
 .../vmware/resource/VmwareResourceTest.java        |   390 +-
 .../motion/VmwareStorageMotionStrategyTest.java    |     6 +-
 plugins/hypervisors/xenserver/pom.xml              |     4 +-
 .../main/java/com/cloud/ha/XenServerFencer.java    |    18 +-
 .../java/com/cloud/hypervisor/XenServerGuru.java   |    25 +-
 .../xenserver/discoverer/XcpServerDiscoverer.java  |    82 +-
 .../xenserver/resource/CitrixResourceBase.java     |  1380 +-
 .../xenserver/resource/XcpServer83Resource.java    |    25 +
 .../xenserver/resource/XcpServerResource.java      |     6 +-
 .../xenserver/resource/XenServer56Resource.java    |    23 +-
 .../xenserver/resource/XenServer610Resource.java   |     6 +-
 .../xenserver/resource/XenServer620Resource.java   |     4 +-
 .../resource/XenServer620SP1Resource.java          |    16 +-
 .../resource/XenServerConnectionPool.java          |    68 +-
 .../resource/XenServerStorageProcessor.java        |   167 +-
 .../xenserver/resource/Xenserver625Resource.java   |     6 +-
 .../resource/Xenserver625StorageProcessor.java     |   119 +-
 .../xenserver/resource/Xenserver84Resource.java    |    24 +
 .../hypervisor/xenserver/resource/XsHost.java      |     2 +-
 .../xenserver/resource/XsLocalNetwork.java         |    11 +-
 ...XcpServerGetAutoScaleMetricsCommandWrapper.java |     6 +-
 .../xcp/XcpServerNetworkUsageCommandWrapper.java   |     6 +-
 .../XenServer56CheckOnHostCommandWrapper.java      |     6 +-
 .../xen56/XenServer56FenceCommandWrapper.java      |    18 +-
 ...nServer56GetAutoScaleMetricsCommandWrapper.java |     6 +-
 .../XenServer56NetworkUsageCommandWrapper.java     |     8 +-
 .../xen56p1/XenServer56FP1FenceCommandWrapper.java |    18 +-
 .../XenServer610MigrateVolumeCommandWrapper.java   |     4 +-
 ...nServer610MigrateWithStorageCommandWrapper.java |    12 +-
 ...10MigrateWithStorageCompleteCommandWrapper.java |     8 +-
 ...610MigrateWithStorageReceiveCommandWrapper.java |     8 +-
 ...ver610MigrateWithStorageSendCommandWrapper.java |    14 +-
 .../XenServer620SP1GetGPUStatsCommandWrapper.java  |     6 +-
 .../xenbase/CitrixAttachIsoCommandWrapper.java     |     8 +-
 ...ixAttachOrDettachConfigDriveCommandWrapper.java |    14 +-
 .../CitrixCheckConsoleProxyLoadCommandWrapper.java |     2 +-
 .../CitrixCheckGuestOsMappingCommandWrapper.java   |    64 +
 .../xenbase/CitrixCheckHealthCommandWrapper.java   |     2 +-
 .../xenbase/CitrixCheckNetworkCommandWrapper.java  |    14 +-
 .../xenbase/CitrixCheckOnHostCommandWrapper.java   |     2 +-
 .../xenbase/CitrixCheckSshCommandWrapper.java      |    12 +-
 .../CitrixCheckVirtualMachineCommandWrapper.java   |     6 +-
 .../CitrixCleanupNetworkRulesCmdWrapper.java       |     8 +-
 ...nupPersistentNetworkResourceCommandWrapper.java |     4 +-
 .../xenbase/CitrixCleanupVMCommandWrapper.java     |    78 +
 .../CitrixClusterVMMetaDataSyncCommandWrapper.java |     6 +-
 .../CitrixConsoleProxyLoadCommandWrapper.java      |     6 +-
 ...itrixCoppyToSecondaryStorageCommandWrapper.java |     6 +-
 .../xenbase/CitrixCreateCommandWrapper.java        |     8 +-
 .../CitrixCreateStoragePoolCommandWrapper.java     |     6 +-
 .../CitrixCreateVMSnapshotCommandWrapper.java      |    27 +-
 .../CitrixDeleteStoragePoolCommandWrapper.java     |     6 +-
 .../CitrixDeleteVMSnapshotCommandWrapper.java      |    10 +-
 .../xenbase/CitrixDestroyCommandWrapper.java       |    10 +-
 .../xenbase/CitrixGetHostStatsCommandWrapper.java  |     6 +-
 ...rixGetHypervisorGuestOsNamesCommandWrapper.java |    73 +
 .../CitrixGetStorageStatsCommandWrapper.java       |    12 +-
 .../CitrixGetVmIpAddressCommandWrapper.java        |    19 +-
 .../CitrixGetVmNetworkStatsCommandWrapper.java     |     2 +-
 .../xenbase/CitrixGetVmStatsCommandWrapper.java    |     8 +-
 .../xenbase/CitrixGetVncPortCommandWrapper.java    |     6 +-
 .../CitrixGetVolumeStatsCommandWrapper.java        |     8 +-
 .../CitrixListDataStoreObjectsCommandWrapper.java  |    47 +
 .../xenbase/CitrixMaintainCommandWrapper.java      |    10 +-
 .../xenbase/CitrixMigrateCommandWrapper.java       |    14 +-
 .../xenbase/CitrixModifySshKeysCommandWrapper.java |     2 +-
 .../CitrixModifyStoragePoolCommandWrapper.java     |    14 +-
 .../CitrixNetworkElementCommandWrapper.java        |     4 +-
 .../CitrixNetworkRulesSystemVmCommandWrapper.java  |     2 +-
 ...rixNetworkRulesVmSecondaryIpCommandWrapper.java |     2 +-
 .../CitrixOvsCreateGreTunnelCommandWrapper.java    |    10 +-
 .../CitrixOvsCreateTunnelCommandWrapper.java       |    10 +-
 .../xenbase/CitrixOvsDeleteFlowCommandWrapper.java |    10 +-
 .../CitrixOvsDestroyBridgeCommandWrapper.java      |     8 +-
 .../CitrixOvsDestroyTunnelCommandWrapper.java      |     8 +-
 .../CitrixOvsFetchInterfaceCommandWrapper.java     |    16 +-
 .../CitrixOvsSetTagAndFlowCommandWrapper.java      |    12 +-
 .../CitrixOvsSetupBridgeCommandWrapper.java        |     6 +-
 ...OvsVpcPhysicalTopologyConfigCommandWrapper.java |     6 +-
 ...rixOvsVpcRoutingPolicyConfigCommandWrapper.java |     6 +-
 .../xenbase/CitrixPatchSystemVmCommandWrapper.java |    10 +-
 .../CitrixPerformanceMonitorCommandWrapper.java    |     2 +-
 .../xenbase/CitrixPingTestCommandWrapper.java      |     2 +-
 .../xenbase/CitrixPlugNicCommandWrapper.java       |    10 +-
 .../CitrixPrepareForMigrationCommandWrapper.java   |    12 +-
 ...CitrixPrimaryStorageDownloadCommandWrapper.java |     8 +-
 .../xenbase/CitrixPvlanSetupCommandWrapper.java    |    18 +-
 .../wrapper/xenbase/CitrixReadyCommandWrapper.java |     8 +-
 .../xenbase/CitrixRebootCommandWrapper.java        |    14 +-
 .../xenbase/CitrixRebootRouterCommandWrapper.java  |     2 +-
 .../xenbase/CitrixResizeVolumeCommandWrapper.java  |    13 +-
 .../CitrixRevertToVMSnapshotCommandWrapper.java    |    17 +-
 .../xenbase/CitrixScaleVmCommandWrapper.java       |    16 +-
 .../CitrixSecurityGroupRulesCommandWrapper.java    |    14 +-
 .../wrapper/xenbase/CitrixSetupCommandWrapper.java |    40 +-
 ...CitrixSetupPersistentNetworkCommandWrapper.java |     4 +-
 .../wrapper/xenbase/CitrixStartCommandWrapper.java |    66 +-
 .../wrapper/xenbase/CitrixStopCommandWrapper.java  |    32 +-
 .../CitrixStorageSubSystemCommandWrapper.java      |     2 +-
 .../xenbase/CitrixUnPlugNicCommandWrapper.java     |     6 +-
 .../CitrixUpdateHostPasswordCommandWrapper.java    |     6 +-
 .../CitrixUpgradeSnapshotCommandWrapper.java       |     6 +-
 .../CitrixWatchConsoleProxyLoadCommandWrapper.java |     2 +-
 .../java/com/xensource/xenapi/ConnectionNew.java   |   335 +
 .../xenserver/ExtraConfigurationUtility.java       |    84 +-
 .../xenserver/XenServerResourceNewBase.java        |    43 +-
 .../motion/XenServerStorageMotionStrategy.java     |    45 +-
 .../cloudstack/xenserver-compute/module.properties |     2 +-
 .../xenserver-discoverer/module.properties         |     2 +-
 .../com/cloud/hypervisor/XenServerGuruTest.java    |     2 +-
 .../discoverer/XcpServerDiscovererTest.java        |     2 +-
 .../xenserver/resource/CitrixHelperTest.java       |     2 +-
 .../xenserver/resource/CitrixResourceBaseTest.java |   213 +-
 .../xenserver/resource/XcpOssResourceTest.java     |     2 +-
 .../xenserver/resource/XcpServerResourceTest.java  |     4 +-
 .../resource/XenServer56FP1ResourceTest.java       |     2 +-
 .../resource/XenServer56ResourceTest.java          |     2 +-
 .../resource/XenServer56SP2ResourceTest.java       |     2 +-
 .../resource/XenServer600ResourceTest.java         |     2 +-
 .../resource/XenServer625ResourceTest.java         |     2 +-
 .../resource/XenServer650ResourceTest.java         |     2 +-
 .../resource/Xenserver625StorageProcessorTest.java |   165 +-
 .../xenbase/CitrixMigrateCommandWrapperTest.java   |     2 +-
 .../wrapper/xenbase/CitrixRequestWrapperTest.java  |   101 +-
 .../wrapper/xenbase/XcpServerWrapperTest.java      |     8 +-
 .../wrapper/xenbase/XenServer56FP1WrapperTest.java |     6 +-
 .../wrapper/xenbase/XenServer56WrapperTest.java    |    10 +-
 .../wrapper/xenbase/XenServer610WrapperTest.java   |    83 +-
 .../xenbase/XenServer620SP1WrapperTest.java        |     6 +-
 .../wrapper/xenbase/XenServer620WrapperTest.java   |     6 +-
 .../xenserver/ExtraConfigurationUtilityTest.java   |    52 +
 plugins/integrations/cloudian/pom.xml              |     2 +-
 .../cloudstack/cloudian/CloudianConnectorImpl.java |    46 +-
 .../cloudian/api/CloudianIsEnabledCmd.java         |    10 +-
 .../cloudian/api/CloudianSsoLoginCmd.java          |    10 +-
 .../cloudstack/cloudian/client/CloudianClient.java |   352 +-
 .../cloudian/client/CloudianCredential.java        |    88 +
 .../cloudian/client/CloudianUserBucketUsage.java   |   106 +
 .../cloudstack/cloudian/client/CloudianUtils.java  |    15 +-
 .../cloudstack/cloudian/CloudianClientTest.java    |   416 -
 .../cloudstack/cloudian/CloudianUtilsTest.java     |    87 +
 .../cloudian/client/CloudianClientTest.java        |   790 +
 plugins/integrations/kubernetes-service/pom.xml    |    11 +-
 .../kubernetes/cluster/KubernetesCluster.java      |   140 -
 .../cluster/KubernetesClusterEventTypes.java       |     2 +
 .../cluster/KubernetesClusterHelperImpl.java       |    48 -
 .../cluster/KubernetesClusterManagerImpl.java      |  1893 ++-
 .../cluster/KubernetesClusterService.java          |   114 +-
 .../kubernetes/cluster/KubernetesClusterVO.java    |   159 +-
 .../cluster/KubernetesClusterVmMapVO.java          |    44 +
 .../cluster/KubernetesServiceHelperImpl.java       |   270 +
 .../KubernetesClusterActionWorker.java             |   743 +-
 .../actionworkers/KubernetesClusterAddWorker.java  |   326 +
 .../KubernetesClusterDestroyWorker.java            |   163 +-
 .../KubernetesClusterRemoveWorker.java             |   183 +
 ...ernetesClusterResourceModifierActionWorker.java |   875 +-
 .../KubernetesClusterScaleWorker.java              |   385 +-
 .../KubernetesClusterStartWorker.java              |   590 +-
 .../actionworkers/KubernetesClusterStopWorker.java |    15 +-
 .../KubernetesClusterUpgradeWorker.java            |   103 +-
 .../cluster/dao/KubernetesClusterDao.java          |     6 +-
 .../cluster/dao/KubernetesClusterDaoImpl.java      |    49 +-
 .../cluster/dao/KubernetesClusterVmMapDao.java     |    11 +
 .../cluster/dao/KubernetesClusterVmMapDaoImpl.java |    60 +
 .../cluster/utils/KubernetesClusterUtil.java       |   135 +-
 .../version/KubernetesSupportedVersionVO.java      |     8 +
 .../version/KubernetesVersionManagerImpl.java      |   190 +-
 .../version/KubernetesVersionService.java          |     3 +
 .../version/AddKubernetesSupportedVersionCmd.java  |    32 +-
 .../DeleteKubernetesSupportedVersionCmd.java       |    16 +-
 ...loadParamsForKubernetesSupportedVersionCmd.java |   127 +
 .../UpdateKubernetesSupportedVersionCmd.java       |    20 +-
 .../cluster/AddNodesToKubernetesClusterCmd.java    |   133 +
 .../AddVirtualMachinesToKubernetesClusterCmd.java  |   104 +
 .../cluster/CreateKubernetesClusterCmd.java        |   198 +-
 .../cluster/DeleteKubernetesClusterCmd.java        |    46 +-
 .../cluster/GetKubernetesClusterConfigCmd.java     |    10 +-
 .../cluster/ListKubernetesClustersCmd.java         |    18 +-
 .../RemoveNodesFromKubernetesClusterCmd.java       |   125 +
 ...oveVirtualMachinesFromKubernetesClusterCmd.java |   107 +
 .../cluster/ScaleKubernetesClusterCmd.java         |    33 +-
 .../cluster/StartKubernetesClusterCmd.java         |    38 +-
 .../cluster/StopKubernetesClusterCmd.java          |    19 +-
 .../cluster/UpgradeKubernetesClusterCmd.java       |    17 +-
 .../ListKubernetesSupportedVersionsCmd.java        |    19 +-
 .../api/response/KubernetesClusterResponse.java    |   157 +-
 .../KubernetesSupportedVersionResponse.java        |    20 +
 ...rtualMachinesFromKubernetesClusterResponse.java |    34 +
 .../spring-kubernetes-service-context.xml          |     4 +-
 .../src/main/resources/conf/etcd-node.yml          |   134 +
 .../main/resources/conf/k8s-control-node-add.yml   |    27 +-
 .../src/main/resources/conf/k8s-control-node.yml   |    72 +-
 .../src/main/resources/conf/k8s-node.yml           |    38 +-
 .../script/delete-pv-reclaimpolicy-delete          |   156 +
 .../main/resources/script/deploy-cloudstack-secret |    14 +-
 .../src/main/resources/script/deploy-csi-driver    |    46 +
 .../main/resources/script/remove-node-from-cluster |    43 +
 .../main/resources/script/upgrade-kubernetes.sh    |    14 +-
 .../src/main/resources/script/validate-cks-node    |    45 +
 .../cluster/KubernetesClusterHelperImplTest.java   |   145 +
 .../cluster/KubernetesClusterManagerImplTest.java  |   444 +
 .../cluster/KubernetesServiceHelperImplTest.java   |    87 +
 .../KubernetesClusterActionWorkerTest.java         |   133 +
 ...tesClusterResourceModifierActionWorkerTest.java |   138 +
 .../KubernetesClusterScaleWorkerTest.java          |   128 +
 .../KubernetesClusterUpgradeWorkerTest.java        |    83 +
 .../cluster/utils/KubernetesClusterUtilTest.java   |    74 +-
 .../version/KubernetesVersionManagerImplTest.java  |    75 +
 .../version/KubernetesVersionServiceTest.java      |    77 +-
 plugins/integrations/prometheus/pom.xml            |     2 +-
 .../cloudstack/metrics/PrometheusExporterImpl.java |   155 +-
 .../metrics/PrometheusExporterServer.java          |     4 +-
 .../metrics/PrometheusExporterServerImpl.java      |    31 +-
 plugins/maintenance/pom.xml                        |    44 +
 .../api/command/BaseMSMaintenanceActionCmd.java    |    49 +
 .../api/command/CancelMaintenanceCmd.java          |    70 +
 .../cloudstack/api/command/CancelShutdownCmd.java  |    60 +
 .../api/command/PrepareForMaintenanceCmd.java      |    80 +
 .../api/command/PrepareForShutdownCmd.java         |    58 +
 .../api/command/ReadyForShutdownCmd.java           |    58 +
 .../cloudstack/api/command/TriggerShutdownCmd.java |    62 +
 .../ManagementServerMaintenanceResponse.java       |   135 +
 .../ManagementServerMaintenanceListener.java       |    28 +
 .../ManagementServerMaintenanceManager.java        |   121 +
 .../ManagementServerMaintenanceManagerImpl.java    |   732 +
 .../BaseShutdownManagementServerHostCommand.java   |    38 +
 ...ncelMaintenanceManagementServerHostCommand.java |    26 +
 .../CancelShutdownManagementServerHostCommand.java |    27 +
 ...eForMaintenanceManagementServerHostCommand.java |    42 +
 ...pareForShutdownManagementServerHostCommand.java |    26 +
 ...TriggerShutdownManagementServerHostCommand.java |    26 +
 .../cloudstack/maintenance/module.properties       |    18 +
 .../maintenance/spring-maintenance-context.xml     |    29 +
 ...ManagementServerMaintenanceManagerImplTest.java |   573 +
 plugins/metrics/pom.xml                            |     2 +-
 .../api/BaseResourceUsageHistoryCmd.java           |    54 +
 .../cloudstack/api/ListClustersMetricsCmd.java     |     8 +-
 .../apache/cloudstack/api/ListDbMetricsCmd.java    |     8 +-
 .../apache/cloudstack/api/ListHostsMetricsCmd.java |     8 +-
 .../cloudstack/api/ListInfrastructureCmd.java      |     8 +-
 .../apache/cloudstack/api/ListMgmtsMetricsCmd.java |     8 +-
 .../cloudstack/api/ListStoragePoolsMetricsCmd.java |     8 +-
 .../api/ListSystemVMsUsageHistoryCmd.java          |    71 +
 .../cloudstack/api/ListUsageServerMetricsCmd.java  |     8 +-
 .../apache/cloudstack/api/ListVMsMetricsCmd.java   |    28 +-
 .../cloudstack/api/ListVMsMetricsCmdByAdmin.java   |    73 +
 .../cloudstack/api/ListVMsUsageHistoryCmd.java     |    35 +-
 .../cloudstack/api/ListVolumesMetricsCmd.java      |     8 +-
 .../cloudstack/api/ListVolumesUsageHistoryCmd.java |    72 +
 .../apache/cloudstack/api/ListZonesMetricsCmd.java |     8 +-
 .../org/apache/cloudstack/api/MetricConstants.java |     4 +-
 .../apache/cloudstack/metrics/MetricsService.java  |    19 +-
 .../cloudstack/metrics/MetricsServiceImpl.java     |   560 +-
 .../response/ClusterMetricsResponse.java           |    12 +
 .../cloudstack/response/DbMetricsResponse.java     |     8 +-
 .../cloudstack/response/HostMetricsResponse.java   |    24 +-
 .../response/InfrastructureResponse.java           |    16 +
 .../response/ManagementServerMetricsResponse.java  |     2 +-
 .../cloudstack/response/VmMetricsResponse.java     |    11 -
 .../response/VmMetricsStatsResponse.java           |     4 +-
 .../cloudstack/response/VolumeMetricsResponse.java |     2 +-
 .../response/VolumeMetricsStatsResponse.java       |    54 +
 .../cloudstack/metrics/MetricsServiceImplTest.java |   183 +-
 .../response/HostMetricsResponseTest.java          |    23 +
 plugins/network-elements/bigswitch/pom.xml         |     2 +-
 .../api/commands/AddBigSwitchBcfDeviceCmd.java     |     6 -
 .../api/commands/DeleteBigSwitchBcfDeviceCmd.java  |     6 -
 .../api/commands/ListBigSwitchBcfDevicesCmd.java   |     2 -
 .../com/cloud/network/BigSwitchBcfDeviceVO.java    |     8 +
 .../cloud/network/bigswitch/BigSwitchBcfApi.java   |    21 +-
 .../cloud/network/bigswitch/BigSwitchBcfUtils.java |    11 +-
 .../cloud/network/element/BigSwitchBcfElement.java |    87 +-
 .../network/guru/BigSwitchBcfGuestNetworkGuru.java |    26 +-
 .../network/resource/BigSwitchBcfResource.java     |    18 +-
 .../cloud/network/bigswitch/BigSwitchApiTest.java  |    10 +-
 .../network/bigswitch/BigSwitchBcfUtilsTest.java   |     9 +-
 .../network/resource/BigSwitchBcfResourceTest.java |     2 +-
 plugins/network-elements/brocade-vcs/pom.xml       |     4 +-
 .../cloud/api/commands/AddBrocadeVcsDeviceCmd.java |     6 -
 .../api/commands/DeleteBrocadeVcsDeviceCmd.java    |     6 -
 .../commands/ListBrocadeVcsDeviceNetworksCmd.java  |     2 -
 .../com/cloud/network/brocade/BrocadeVcsApi.java   |    37 +-
 .../cloud/network/element/BrocadeVcsElement.java   |    18 +-
 .../network/guru/BrocadeVcsGuestNetworkGuru.java   |    39 +-
 .../cloud/network/resource/BrocadeVcsResource.java |    13 +-
 .../META-INF/cloudstack/vcs/module.properties      |     2 +-
 .../META-INF/cloudstack/vcs/spring-vcs-context.xml |    18 +-
 .../cloud/network/brocade/BrocadeVcsApiTest.java   |     2 +-
 .../guru/BrocadeVcsGuestNetworkGuruTest.java       |    14 +-
 plugins/network-elements/cisco-vnmc/pom.xml        |     2 +-
 .../api/commands/AddCiscoAsa1000vResourceCmd.java  |     2 -
 .../api/commands/AddCiscoVnmcResourceCmd.java      |     2 -
 .../commands/DeleteCiscoAsa1000vResourceCmd.java   |     2 -
 .../api/commands/DeleteCiscoVnmcResourceCmd.java   |     2 -
 .../commands/ListCiscoAsa1000vResourcesCmd.java    |     2 -
 .../api/commands/ListCiscoVnmcResourcesCmd.java    |     2 -
 .../cloud/network/cisco/CiscoAsa1000vDevice.java   |     2 +-
 .../cloud/network/cisco/CiscoVnmcConnection.java   |     2 +-
 .../network/cisco/CiscoVnmcConnectionImpl.java     |    10 +-
 .../cloud/network/cisco/CiscoVnmcController.java   |     2 +-
 .../cloud/network/cisco/CiscoVnmcControllerVO.java |     9 +
 .../cloud/network/cisco/NetworkAsa1000vMap.java    |     2 +-
 .../cloud/network/element/CiscoVnmcElement.java    |   102 +-
 .../network/element/CiscoVnmcElementService.java   |     2 -
 .../cloud/network/resource/CiscoVnmcResource.java  |    29 +-
 .../cloudstack/cisco-vnmc/module.properties        |     2 +-
 .../network/cisco/associate-acl-policy-set.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    |    64 +-
 .../network/cisco/create-acl-rule-for-dnat.xml     |   156 +-
 .../network/cisco/create-acl-rule-for-pf.xml       |   304 +-
 .../scripts/network/cisco/create-dhcp-policy.xml   |    14 +-
 .../scripts/network/cisco/create-dnat-rule.xml     |   174 +-
 .../scripts/network/cisco/create-edge-firewall.xml |     2 +-
 .../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  |   110 +-
 .../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/create-source-nat-pool.xml       |     2 +-
 .../network/cisco/create-source-nat-rule.xml       |     6 +-
 .../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 +-
 .../network/element/CiscoVnmcElementTest.java      |     4 +-
 .../network/resource/CiscoVnmcResourceTest.java    |     6 +-
 plugins/network-elements/dns-notifier/pom.xml      |     2 +-
 .../src/main/resources/components-example.xml      |     5 +-
 .../network-elements/elastic-loadbalancer/pom.xml  |     2 +-
 .../java/com/cloud/network/ElasticLbVmMapVO.java   |     4 -
 .../element/ElasticLoadBalancerElement.java        |    10 +-
 .../network/lb/ElasticLoadBalancerManager.java     |     2 +
 .../network/lb/ElasticLoadBalancerManagerImpl.java |    77 +-
 .../cloud/network/lb/LoadBalanceRuleHandler.java   |    57 +-
 .../cloud/network/lb/dao/ElasticLbVmMapDao.java    |     2 +
 .../network/lb/dao/ElasticLbVmMapDaoImpl.java      |    13 +
 .../META-INF/cloudstack/elb/module.properties      |     2 +-
 .../lb/ElasticLoadBalancerManagerImplTest.java     |     6 +-
 .../network/lb/LoadBalanceRuleHandlerTest.java     |    12 +-
 plugins/network-elements/f5/pom.xml                |    41 -
 .../api/commands/AddExternalLoadBalancerCmd.java   |   118 -
 .../cloud/api/commands/AddF5LoadBalancerCmd.java   |   143 -
 .../api/commands/ConfigureF5LoadBalancerCmd.java   |   124 -
 .../commands/DeleteExternalLoadBalancerCmd.java    |    96 -
 .../api/commands/DeleteF5LoadBalancerCmd.java      |   112 -
 .../api/commands/ListExternalLoadBalancersCmd.java |    90 -
 .../commands/ListF5LoadBalancerNetworksCmd.java    |   108 -
 .../cloud/api/commands/ListF5LoadBalancersCmd.java |   112 -
 .../cloud/api/response/F5LoadBalancerResponse.java |   109 -
 .../element/F5ExternalLoadBalancerElement.java     |   538 -
 .../F5ExternalLoadBalancerElementService.java      |    97 -
 .../cloud/network/resource/F5BigIpResource.java    |  1176 --
 .../META-INF/cloudstack/f5/module.properties       |    18 -
 .../META-INF/cloudstack/f5/spring-f5-context.xml   |    34 -
 plugins/network-elements/globodns/pom.xml          |     7 +-
 .../cloudstack/api/AddGloboDnsHostCmd.java         |     6 -
 .../cloudstack/element/GloboDnsElement.java        |     6 +-
 .../cloudstack/resource/GloboDnsResource.java      |    32 +-
 .../META-INF/cloudstack/globodns/module.properties |     2 +-
 .../cloudstack/element/GloboDnsElementTest.java    |     4 +-
 .../cloudstack/resource/GloboDnsResourceTest.java  |     2 +-
 .../network-elements/internal-loadbalancer/pom.xml |     2 +-
 .../element/InternalLoadBalancerElement.java       |    59 +-
 .../network/lb/InternalLoadBalancerVMManager.java  |     2 +-
 .../lb/InternalLoadBalancerVMManagerImpl.java      |   239 +-
 .../core/spring-internallb-core-context.xml        |     2 +-
 .../InternalLbElementServiceTest.java              |     4 +-
 .../internallbelement/InternalLbElementTest.java   |     6 +-
 .../internallbvmmgr/InternalLBVMManagerTest.java   |    12 +-
 .../internallbvmmgr/InternalLBVMServiceTest.java   |    16 +-
 .../internallbvmmgr/LbChildTestConfiguration.java  |     6 +
 .../lb/InternalLoadBalancerVMManagerImplTest.java  |   172 +
 .../src/test/resources/lb_element.xml              |    20 +-
 .../src/test/resources/lb_mgr.xml                  |    24 +-
 .../src/test/resources/lb_svc.xml                  |    26 +-
 plugins/network-elements/juniper-contrail/pom.xml  |    16 +-
 .../api/command/CreateServiceInstanceCmd.java      |     6 -
 .../api/response/ServiceInstanceResponse.java      |     8 +
 .../contrail/management/ContrailElementImpl.java   |   129 +-
 .../network/contrail/management/ContrailGuru.java  |    59 +-
 .../contrail/management/ContrailManagerImpl.java   |    56 +-
 .../management/ContrailVpcElementImpl.java         |    35 +-
 .../network/contrail/management/DBSyncGeneric.java |    25 +-
 .../network/contrail/management/EventUtils.java    |    55 +-
 .../contrail/management/ManagementNetworkGuru.java |    12 +-
 .../contrail/management/ServerDBSyncImpl.java      |   107 +-
 .../management/ServerEventHandlerImpl.java         |    53 +-
 .../contrail/management/ServiceManagerImpl.java    |    27 +-
 .../network/contrail/model/FloatingIpModel.java    |    10 +-
 .../contrail/model/FloatingIpPoolModel.java        |     8 +-
 .../network/contrail/model/InstanceIpModel.java    |     4 +-
 .../network/contrail/model/ModelObject.java        |     5 +-
 .../network/contrail/model/ModelObjectBase.java    |     4 +
 .../network/contrail/model/NetworkPolicyModel.java |    12 +-
 .../contrail/model/ServiceInstanceModel.java       |    18 +-
 .../network/contrail/model/VMInterfaceModel.java   |     6 +-
 .../contrail/model/VirtualMachineModel.java        |    24 +-
 .../contrail/model/VirtualNetworkModel.java        |    35 +-
 .../META-INF/cloudstack/contrail/module.properties |     2 +-
 .../contrail/management/ApiConnectorMockito.java   |    13 -
 .../management/IntegrationTestConfiguration.java   |    34 +-
 .../contrail/management/ManagementServerMock.java  |    55 +-
 .../contrail/management/MockAccountManager.java    |    74 +-
 .../contrail/management/NetworkProviderTest.java   |    15 +-
 .../contrail/management/PublicNetworkTest.java     |     6 -
 .../contrail/model/InstanceIpModelTest.java        |    23 +-
 .../network/contrail/model/MockNetworkVO.java      |    50 +
 .../contrail/model/VMInterfaceModelTest.java       |    23 +-
 .../contrail/model/VirtualMachineModelTest.java    |    29 +-
 .../contrail/model/VirtualNetworkModelTest.java    |    44 +-
 .../src/test/resources/commonContext.xml           |    20 +-
 .../src/test/resources/log4j.properties            |     1 -
 .../src/test/resources/mysql_db_start.sh           |     2 +-
 .../src/test/resources/mysql_db_stop.sh            |     2 -
 .../src/test/resources/providerContext.xml         |     4 +-
 .../src/test/resources/publicNetworkContext.xml    |    22 +-
 plugins/network-elements/juniper-srx/pom.xml       |    37 -
 .../cloud/api/commands/AddExternalFirewallCmd.java |   116 -
 .../com/cloud/api/commands/AddSrxFirewallCmd.java  |   141 -
 .../api/commands/ConfigureSrxFirewallCmd.java      |   123 -
 .../api/commands/DeleteExternalFirewallCmd.java    |    90 -
 .../cloud/api/commands/DeleteSrxFirewallCmd.java   |   111 -
 .../api/commands/ListExternalFirewallsCmd.java     |    89 -
 .../api/commands/ListSrxFirewallNetworksCmd.java   |   107 -
 .../cloud/api/commands/ListSrxFirewallsCmd.java    |   109 -
 .../cloud/api/response/SrxFirewallResponse.java    |   159 -
 .../element/JuniperSRXExternalFirewallElement.java |   551 -
 .../element/JuniperSRXFirewallElementService.java  |    95 -
 .../cloud/network/resource/JuniperSrxResource.java |  3795 -----
 .../META-INF/cloudstack/srx/module.properties      |    18 -
 .../META-INF/cloudstack/srx/spring-srx-context.xml |    35 -
 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 +-
 .../api/commands/AddNetscalerLoadBalancerCmd.java  |     8 -
 .../ConfigureNetscalerLoadBalancerCmd.java         |     8 -
 .../commands/DeleteNetscalerControlCenterCmd.java  |     2 -
 .../commands/DeleteNetscalerLoadBalancerCmd.java   |     8 -
 .../commands/DeleteServicePackageOfferingCmd.java  |     2 -
 .../cloud/api/commands/DeployNetscalerVpxCmd.java  |     2 -
 .../commands/ListNetscalerControlCenterCmd.java    |     4 +-
 .../ListNetscalerLoadBalancerNetworksCmd.java      |     7 -
 .../commands/ListNetscalerLoadBalancersCmd.java    |     2 -
 .../commands/ListRegisteredServicePackageCmd.java  |     2 -
 .../RegisterNetscalerControlCenterCmd.java         |    17 +-
 .../api/commands/RegisterServicePackageCmd.java    |     4 +-
 .../com/cloud/api/commands/StopNetScalerVMCmd.java |     4 +-
 .../response/NetScalerServicePackageResponse.java  |     2 +-
 .../cloud/network/element/NetscalerElement.java    |    68 +-
 .../NetscalerLoadBalancerElementService.java       |     2 +-
 .../resource/NetScalerControlCenterResource.java   |   127 +-
 .../cloud/network/resource/NetscalerResource.java  |   229 +-
 .../com/cloud/network/vm/NetScalerVMManager.java   |     2 +-
 .../cloud/network/vm/NetScalerVMManagerImpl.java   |    26 +-
 .../cloudstack/netscaler/module.properties         |     2 +-
 plugins/network-elements/nicira-nvp/pom.xml        |     2 +-
 .../cloud/api/commands/AddNiciraNvpDeviceCmd.java  |     6 -
 .../api/commands/DeleteNiciraNvpDeviceCmd.java     |     6 -
 .../commands/ListNiciraNvpDeviceNetworksCmd.java   |     2 -
 .../cloud/network/element/NiciraNvpElement.java    |    72 +-
 .../network/guru/NiciraNvpGuestNetworkGuru.java    |    42 +-
 .../cloud/network/nicira/LogicalRouterPort.java    |     2 +-
 .../com/cloud/network/nicira/NatRuleAdapter.java   |     2 +-
 .../com/cloud/network/nicira/NiciraNvpTag.java     |     9 +-
 .../com/cloud/network/nicira/NiciraRestClient.java |    16 +-
 .../cloud/network/nicira/RoutingConfigAdapter.java |     2 +-
 .../network/resource/NiciraNvpRequestWrapper.java  |     2 +-
 .../cloud/network/resource/NiciraNvpResource.java  |    11 +-
 .../cloud/network/resource/NiciraNvpUtilities.java |     2 +-
 .../wrapper/NiciraCheckHealthCommandWrapper.java   |     6 +-
 ...ConfigurePortForwardingRulesCommandWrapper.java |    20 +-
 .../NiciraNvpConfigurePublicIpsCommandWrapper.java |     2 +-
 ...vpConfigureSharedNetworkUuidCommandWrapper.java |    58 +-
 ...ConfigureSharedNetworkVlanIdCommandWrapper.java |    28 +-
 ...raNvpConfigureStaticNatRulesCommandWrapper.java |    20 +-
 ...NiciraNvpCreateLogicalRouterCommandWrapper.java |     6 +-
 ...NiciraNvpCreateLogicalSwitchCommandWrapper.java |     2 +-
 ...raNvpCreateLogicalSwitchPortCommandWrapper.java |     6 +-
 ...NiciraNvpDeleteLogicalRouterCommandWrapper.java |     2 +-
 ...raNvpDeleteLogicalRouterPortCommandWrapper.java |     4 +-
 ...NiciraNvpDeleteLogicalSwitchCommandWrapper.java |     2 +-
 ...raNvpDeleteLogicalSwitchPortCommandWrapper.java |     2 +-
 ...iciraNvpFindL2GatewayServiceCommandWrapper.java |     6 +-
 ...ciraNvpFindLogicalRouterPortCommandWrapper.java |     6 +-
 ...ciraNvpFindLogicalSwitchPortCommandWrapper.java |     2 +-
 .../wrapper/NiciraNvpMaintainCommandWrapper.java   |     2 +-
 .../wrapper/NiciraNvpReadyCommandWrapper.java      |     2 +-
 ...raNvpUpdateLogicalSwitchPortCommandWrapper.java |     2 +-
 .../cloud/network/utils/CommandRetryUtility.java   |     9 +-
 .../META-INF/cloudstack/nvp/module.properties      |     2 +-
 .../network/element/NiciraNvpElementTest.java      |    10 +-
 .../guru/NiciraNvpGuestNetworkGuruTest.java        |    16 +-
 .../com/cloud/network/nicira/NiciraNvpApiIT.java   |    76 +-
 .../com/cloud/network/nicira/NiciraNvpApiTest.java |     2 +-
 .../cloud/network/nicira/NiciraRestClientTest.java |    30 +-
 .../com/cloud/network/nicira/NiciraTagTest.java    |     2 +-
 .../resource/NiciraNvpRequestWrapperTest.java      |     2 +-
 plugins/network-elements/nsx/pom.xml               |    65 +
 .../main/java/org/apache/cloudstack/NsxAnswer.java |    41 +
 .../org/apache/cloudstack/StartupNsxCommand.java   |    26 +
 .../agent/api/CreateNsxDhcpRelayConfigCommand.java |    77 +
 .../CreateNsxDistributedFirewallRulesCommand.java  |    67 +
 .../api/CreateNsxLoadBalancerRuleCommand.java      |    87 +
 .../agent/api/CreateNsxPortForwardRuleCommand.java |    71 +
 .../agent/api/CreateNsxSegmentCommand.java         |    79 +
 .../agent/api/CreateNsxStaticNatCommand.java       |    25 +
 .../agent/api/CreateNsxTier1GatewayCommand.java    |    67 +
 .../api/CreateOrUpdateNsxTier1NatRuleCommand.java  |    69 +
 .../DeleteNsxDistributedFirewallRulesCommand.java  |    27 +
 .../api/DeleteNsxLoadBalancerRuleCommand.java      |    58 +
 .../agent/api/DeleteNsxNatRuleCommand.java         |    73 +
 .../agent/api/DeleteNsxSegmentCommand.java         |    70 +
 .../agent/api/DeleteNsxTier1GatewayCommand.java    |    63 +
 .../apache/cloudstack/agent/api/NsxCommand.java    |    67 +
 .../cloudstack/agent/api/NsxNetworkCommand.java    |   117 +
 .../cloudstack/agent/api/StartupNsxCommand.java    |    27 +
 .../api/command/AddNsxControllerCmd.java           |   130 +
 .../api/command/DeleteNsxControllerCmd.java        |    88 +
 .../api/command/ListNsxControllersCmd.java         |    68 +
 .../api/response/NsxControllerResponse.java        |   136 +
 .../cloudstack/resource/NsxLoadBalancerMember.java |    41 +
 .../apache/cloudstack/resource/NsxNetworkRule.java |    56 +
 .../apache/cloudstack/resource/NsxResource.java    |   500 +
 .../apache/cloudstack/service/NsxApiClient.java    |  1115 ++
 .../org/apache/cloudstack/service/NsxElement.java  |   944 ++
 .../cloudstack/service/NsxGuestNetworkGuru.java    |   333 +
 .../cloudstack/service/NsxProviderService.java     |    35 +
 .../cloudstack/service/NsxProviderServiceImpl.java |   213 +
 .../cloudstack/service/NsxPublicNetworkGuru.java   |   156 +
 .../apache/cloudstack/service/NsxServiceImpl.java  |   215 +
 .../cloudstack/utils/NsxControllerUtils.java       |   151 +
 .../org/apache/cloudstack/utils/NsxHelper.java     |    53 +
 .../core/spring-nsx-core-managers-context.xml      |    32 +
 .../META-INF/cloudstack/nsx/module.properties      |    21 +
 .../META-INF/cloudstack/nsx/spring-nsx-context.xml |    39 +
 .../cloudstack/resource/NsxResourceTest.java       |   293 +
 .../cloudstack/service/NsxApiClientTest.java       |   111 +
 .../apache/cloudstack/service/NsxElementTest.java  |   473 +
 .../service/NsxGuestNetworkGuruTest.java           |   329 +
 .../service/NsxProviderServiceImplTest.java        |   174 +
 .../service/NsxPublicNetworkGuruTest.java          |   182 +
 .../cloudstack/service/NsxServiceImplTest.java     |   162 +
 .../cloudstack/utils/NsxControllerUtilsTest.java   |   198 +
 plugins/network-elements/opendaylight/pom.xml      |     2 +-
 .../network/opendaylight/OpendaylightElement.java  |     2 -
 .../opendaylight/OpendaylightGuestNetworkGuru.java |    38 +-
 .../agent/OpenDaylightControllerResource.java      |    25 +-
 .../OpenDaylightControllerResourceManagerImpl.java |    13 +-
 .../api/NeutronInvalidCredentialsException.java    |     2 +-
 .../network/opendaylight/api/NeutronRestApi.java   |    27 +-
 .../opendaylight/api/NeutronRestApiException.java  |     2 +-
 .../opendaylight/api/NeutronRestFactory.java       |     2 +-
 .../api/enums/NeutronNorthboundEnum.java           |     2 +-
 .../opendaylight/api/model/NeutronNetwork.java     |     2 +-
 .../api/model/NeutronNetworkWrapper.java           |     2 +-
 .../api/model/NeutronNetworksList.java             |     2 +-
 .../opendaylight/api/model/NeutronNode.java        |     2 +-
 .../opendaylight/api/model/NeutronNodeWrapper.java |     2 +-
 .../opendaylight/api/model/NeutronNodesList.java   |     2 +-
 .../opendaylight/api/model/NeutronPort.java        |     2 +-
 .../opendaylight/api/model/NeutronPortWrapper.java |     2 +-
 .../opendaylight/api/model/NeutronPortsList.java   |     2 +-
 .../network/opendaylight/api/resources/Action.java |    31 +-
 .../resources/NeutronNetworksNorthboundAction.java |     2 +-
 .../resources/NeutronNodesNorthboundAction.java    |     2 +-
 .../resources/NeutronPortsNorthboundAction.java    |     2 +-
 .../opendaylight/spring-opendaylight-context.xml   |     1 -
 .../opendaylight/api/test/NeutronEnumsTest.java    |     2 +-
 .../api/test/NeutronNetworkAdapterTest.java        |     2 +-
 .../api/test/NeutronNodeAdapterTest.java           |     2 +-
 .../api/test/NeutronPortAdapterTest.java           |     2 +-
 .../opendaylight/api/test/NeutronRestApiIT.java    |     2 +-
 .../opendaylight/api/test/NeutronRestApiTest.java  |     2 +-
 plugins/network-elements/ovs/pom.xml               |     2 +-
 .../api/OvsVpcPhysicalTopologyConfigCommand.java   |     2 +-
 .../api/OvsVpcRoutingPolicyConfigCommand.java      |     2 +-
 .../java/com/cloud/network/element/OvsElement.java |    64 +-
 .../cloud/network/guru/OvsGuestNetworkGuru.java    |    18 +-
 .../cloud/network/ovs/OvsTunnelManagerImpl.java    |   149 +-
 .../ovs/dao/VpcDistributedRouterSeqNoDaoImpl.java  |     2 -
 plugins/network-elements/palo-alto/pom.xml         |     2 +-
 .../cloud/api/commands/AddPaloAltoFirewallCmd.java |     8 -
 .../api/commands/ConfigurePaloAltoFirewallCmd.java |     8 -
 .../api/commands/DeletePaloAltoFirewallCmd.java    |     8 -
 .../commands/ListPaloAltoFirewallNetworksCmd.java  |     7 -
 .../api/commands/ListPaloAltoFirewallsCmd.java     |     2 -
 .../element/PaloAltoExternalFirewallElement.java   |    16 +-
 .../cloud/network/resource/PaloAltoResource.java   |    71 +-
 .../META-INF/cloudstack/paloalto/module.properties |     2 +-
 .../paloalto/spring-paloalto-context.xml           |     2 +-
 .../network/resource/MockablePaloAltoResource.java |     2 +-
 .../network/resource/PaloAltoResourceTest.java     |     2 +-
 plugins/network-elements/stratosphere-ssp/pom.xml  |     2 +-
 .../apache/cloudstack/api/commands/AddSspCmd.java  |     4 +-
 .../cloudstack/api/commands/DeleteSspCmd.java      |     4 +-
 .../cloudstack/network/dao/SspUuidDaoImpl.java     |     2 -
 .../cloudstack/network/element/SspClient.java      |    19 +-
 .../cloudstack/network/element/SspElement.java     |    72 +-
 .../network/guru/SspGuestNetworkGuru.java          |    22 +-
 .../META-INF/cloudstack/ssp/module.properties      |     2 +-
 .../stratosphere-ssp/sspmock/sspmock.py            |     8 +-
 plugins/network-elements/tungsten/pom.xml          |    49 +
 ...ngstenNetworkGatewayToLogicalRouterCommand.java |    57 +
 .../agent/api/AddTungstenNetworkSubnetCommand.java |   101 +
 .../agent/api/AddTungstenPolicyRuleCommand.java    |   133 +
 .../api/AddTungstenSecondaryIpAddressCommand.java  |    64 +
 .../api/AddTungstenSecurityGroupRuleCommand.java   |    89 +
 .../api/AddTungstenVmToSecurityGroupCommand.java   |    52 +
 .../api/ApplyTungstenNetworkPolicyCommand.java     |    86 +
 .../api/ApplyTungstenPortForwardingCommand.java    |    89 +
 .../agent/api/ApplyTungstenTagCommand.java         |    77 +
 .../agent/api/AssignTungstenFloatingIpCommand.java |    70 +
 .../api/ClearTungstenNetworkGatewayCommand.java    |    57 +
 .../api/CreateTungstenAddressGroupCommand.java     |    64 +
 .../CreateTungstenApplicationPolicySetCommand.java |    52 +
 .../api/CreateTungstenDefaultProjectCommand.java   |    20 +
 .../agent/api/CreateTungstenDomainCommand.java     |    51 +
 .../api/CreateTungstenFirewallPolicyCommand.java   |    64 +
 .../api/CreateTungstenFirewallRuleCommand.java     |   126 +
 .../agent/api/CreateTungstenFloatingIpCommand.java |    70 +
 .../api/CreateTungstenFloatingIpPoolCommand.java   |    59 +
 .../api/CreateTungstenLogicalRouterCommand.java    |    57 +
 .../agent/api/CreateTungstenNetworkCommand.java    |   139 +
 .../CreateTungstenNetworkLoadbalancerCommand.java  |   200 +
 .../api/CreateTungstenNetworkPolicyCommand.java    |    61 +
 .../agent/api/CreateTungstenPolicyCommand.java     |    58 +
 .../agent/api/CreateTungstenProjectCommand.java    |    64 +
 .../CreateTungstenRoutingLogicalRouterCommand.java |    58 +
 .../api/CreateTungstenSecurityGroupCommand.java    |    64 +
 .../api/CreateTungstenServiceGroupCommand.java     |    71 +
 .../agent/api/CreateTungstenTagCommand.java        |    58 +
 .../agent/api/CreateTungstenTagTypeCommand.java    |    52 +
 .../api/CreateTungstenVirtualMachineCommand.java   |   125 +
 .../api/DeleteTungstenAddressGroupCommand.java     |    45 +
 .../DeleteTungstenApplicationPolicySetCommand.java |    45 +
 .../agent/api/DeleteTungstenDomainCommand.java     |    45 +
 .../api/DeleteTungstenFirewallPolicyCommand.java   |    45 +
 .../api/DeleteTungstenFirewallRuleCommand.java     |    45 +
 .../agent/api/DeleteTungstenFloatingIpCommand.java |    57 +
 .../api/DeleteTungstenFloatingIpPoolCommand.java   |    51 +
 .../api/DeleteTungstenLoadBalancerCommand.java     |    83 +
 .../DeleteTungstenLoadBalancerListenerCommand.java |    51 +
 .../agent/api/DeleteTungstenNetworkCommand.java    |    46 +
 .../api/DeleteTungstenNetworkPolicyCommand.java    |    57 +
 .../agent/api/DeleteTungstenObjectCommand.java     |    47 +
 .../agent/api/DeleteTungstenPolicyCommand.java     |    46 +
 .../agent/api/DeleteTungstenProjectCommand.java    |    45 +
 .../DeleteTungstenRoutingLogicalRouterCommand.java |    46 +
 .../api/DeleteTungstenSecurityGroupCommand.java    |    45 +
 .../api/DeleteTungstenServiceGroupCommand.java     |    45 +
 .../agent/api/DeleteTungstenTagCommand.java        |    46 +
 .../agent/api/DeleteTungstenTagTypeCommand.java    |    46 +
 .../api/DeleteTungstenVRouterPortCommand.java      |    51 +
 .../agent/api/DeleteTungstenVmCommand.java         |    46 +
 .../api/DeleteTungstenVmInterfaceCommand.java      |    51 +
 .../agent/api/GetTungstenFabricNetworkCommand.java |    21 +
 .../agent/api/GetTungstenFloatingIpsCommand.java   |    51 +
 .../agent/api/GetTungstenLoadBalancerCommand.java  |    51 +
 .../agent/api/GetTungstenNatIpCommand.java         |    51 +
 .../agent/api/GetTungstenNetworkDnsCommand.java    |    51 +
 .../agent/api/GetTungstenPolicyCommand.java        |    51 +
 .../agent/api/GetTungstenSecurityGroupCommand.java |    45 +
 .../agent/api/ListTungstenAddressGroupCommand.java |    45 +
 .../ListTungstenApplicationPolicySetCommand.java   |    45 +
 ...enConnectedNetworkFromLogicalRouterCommand.java |    45 +
 .../api/ListTungstenFirewallPolicyCommand.java     |    51 +
 .../agent/api/ListTungstenFirewallRuleCommand.java |    51 +
 .../agent/api/ListTungstenNetworkCommand.java      |    51 +
 .../tungsten/agent/api/ListTungstenNicCommand.java |    51 +
 .../agent/api/ListTungstenPolicyCommand.java       |    64 +
 .../agent/api/ListTungstenPolicyRuleCommand.java   |    45 +
 .../ListTungstenRoutingLogicalRouterCommand.java   |    51 +
 .../agent/api/ListTungstenServiceGroupCommand.java |    45 +
 .../tungsten/agent/api/ListTungstenTagCommand.java |    76 +
 .../agent/api/ListTungstenTagTypeCommand.java      |    45 +
 .../tungsten/agent/api/ListTungstenVmCommand.java  |    51 +
 .../api/ReleaseTungstenFloatingIpCommand.java      |    57 +
 ...stenNetworkGatewayFromLogicalRouterCommand.java |    51 +
 .../api/RemoveTungstenNetworkSubnetCommand.java    |    51 +
 .../agent/api/RemoveTungstenPolicyCommand.java     |    51 +
 .../agent/api/RemoveTungstenPolicyRuleCommand.java |    51 +
 .../RemoveTungstenSecondaryIpAddressCommand.java   |    45 +
 .../RemoveTungstenSecurityGroupRuleCommand.java    |    51 +
 .../agent/api/RemoveTungstenTagCommand.java        |    77 +
 .../RemoveTungstenVmFromSecurityGroupCommand.java  |    52 +
 .../api/SetTungstenNetworkGatewayCommand.java      |    70 +
 .../tungsten/agent/api/SetupTfRouteCommand.java    |    64 +
 .../agent/api/SetupTungstenVRouterCommand.java     |    77 +
 .../tungsten/agent/api/StartupTungstenCommand.java |    26 +
 .../network/tungsten/agent/api/TungstenAnswer.java |   112 +
 .../tungsten/agent/api/TungstenCommand.java        |    26 +
 .../UpdateLoadBalancerServiceInstanceCommand.java  |    70 +
 .../UpdateTungstenDefaultSecurityGroupCommand.java |    45 +
 ...teTungstenLoadBalancerHealthMonitorCommand.java |    95 +
 .../UpdateTungstenLoadBalancerListenerCommand.java |    70 +
 .../UpdateTungstenLoadBalancerMemberCommand.java   |    67 +
 .../api/UpdateTungstenLoadBalancerPoolCommand.java |   102 +
 .../api/UpdateTungstenLoadbalancerSslCommand.java  |    83 +
 .../UpdateTungstenLoadbalancerStatsCommand.java    |    71 +
 .../api/UpdateTungstenVrouterConfigCommand.java    |    45 +
 ...stenFabricNetworkGatewayToLogicalRouterCmd.java |    95 +
 .../command/AddTungstenFabricPolicyRuleCmd.java    |   129 +
 .../api/command/ApplyTungstenFabricPolicyCmd.java  |    95 +
 .../api/command/ApplyTungstenFabricTagCmd.java     |   107 +
 .../command/ConfigTungstenFabricServiceCmd.java    |   227 +
 .../CreateTungstenFabricAddressGroupCmd.java       |    93 +
 ...reateTungstenFabricApplicationPolicySetCmd.java |    87 +
 .../CreateTungstenFabricFirewallPolicyCmd.java     |    94 +
 .../CreateTungstenFabricFirewallRuleCmd.java       |   127 +
 .../CreateTungstenFabricLogicalRouterCmd.java      |    85 +
 .../CreateTungstenFabricManagementNetworkCmd.java  |    92 +
 .../api/command/CreateTungstenFabricPolicyCmd.java |    85 +
 .../command/CreateTungstenFabricProviderCmd.java   |   132 +
 .../CreateTungstenFabricPublicNetworkCmd.java      |   103 +
 .../CreateTungstenFabricServiceGroupCmd.java       |    96 +
 .../api/command/CreateTungstenFabricTagCmd.java    |    87 +
 .../command/CreateTungstenFabricTagTypeCmd.java    |    85 +
 .../DeleteTungstenFabricAddressGroupCmd.java       |    84 +
 ...eleteTungstenFabricApplicationPolicySetCmd.java |    84 +
 .../DeleteTungstenFabricFirewallPolicyCmd.java     |    85 +
 .../DeleteTungstenFabricFirewallRuleCmd.java       |    84 +
 .../DeleteTungstenFabricLogicalRouterCmd.java      |    91 +
 .../api/command/DeleteTungstenFabricPolicyCmd.java |    84 +
 .../DeleteTungstenFabricServiceGroupCmd.java       |    84 +
 .../api/command/DeleteTungstenFabricTagCmd.java    |    84 +
 .../command/DeleteTungstenFabricTagTypeCmd.java    |    84 +
 .../command/GetLoadBalancerSslCertificateCmd.java  |    83 +
 .../command/ListTungstenFabricAddressGroupCmd.java |    88 +
 .../ListTungstenFabricApplictionPolicySetCmd.java  |    88 +
 .../ListTungstenFabricFirewallPolicyCmd.java       |    91 +
 .../command/ListTungstenFabricFirewallRuleCmd.java |    91 +
 .../ListTungstenFabricLBHealthMonitorCmd.java      |    73 +
 .../ListTungstenFabricLogicalRouterCmd.java        |    91 +
 .../api/command/ListTungstenFabricNetworkCmd.java  |    93 +
 .../api/command/ListTungstenFabricNicCmd.java      |    87 +
 .../api/command/ListTungstenFabricPolicyCmd.java   |    95 +
 .../command/ListTungstenFabricPolicyRuleCmd.java   |    91 +
 .../command/ListTungstenFabricProvidersCmd.java    |    85 +
 .../command/ListTungstenFabricServiceGroupCmd.java |    88 +
 .../api/command/ListTungstenFabricTagCmd.java      |   102 +
 .../api/command/ListTungstenFabricTagTypeCmd.java  |    88 +
 .../api/command/ListTungstenFabricVmCmd.java       |    87 +
 ...enFabricNetworkGatewayFromLogicalRouterCmd.java |    95 +
 .../api/command/RemoveTungstenFabricPolicyCmd.java |    89 +
 .../command/RemoveTungstenFabricPolicyRuleCmd.java |    89 +
 .../api/command/RemoveTungstenFabricTagCmd.java    |   102 +
 .../command/SynchronizeTungstenFabricDataCmd.java  |    78 +
 .../UpdateTungstenFabricLBHealthMonitorCmd.java    |   159 +
 .../tungsten/api/response/TlsDataResponse.java     |    62 +
 .../TungstenFabricAddressGroupResponse.java        |   116 +
 ...TungstenFabricApplicationPolicySetResponse.java |   136 +
 .../TungstenFabricFirewallPolicyResponse.java      |   119 +
 .../TungstenFabricFirewallRuleResponse.java        |   279 +
 .../TungstenFabricLBHealthMonitorResponse.java     |   185 +
 .../TungstenFabricLogicalRouterResponse.java       |   103 +
 .../response/TungstenFabricNetworkResponse.java    |    88 +
 .../api/response/TungstenFabricNicResponse.java    |    90 +
 .../api/response/TungstenFabricPolicyResponse.java |   135 +
 .../response/TungstenFabricProviderResponse.java   |   148 +
 .../api/response/TungstenFabricRuleResponse.java   |   278 +
 .../TungstenFabricServiceGroupResponse.java        |   129 +
 .../api/response/TungstenFabricTagResponse.java    |   222 +
 .../response/TungstenFabricTagTypeResponse.java    |    82 +
 .../api/response/TungstenFabricVmResponse.java     |    88 +
 .../dao/TungstenFabricLBHealthMonitorDao.java      |    23 +
 .../dao/TungstenFabricLBHealthMonitorDaoImpl.java  |    46 +
 .../dao/TungstenFabricLBHealthMonitorVO.java       |   159 +
 .../tungsten/model/TungstenLoadBalancerMember.java |    47 +
 .../tungsten/model/TungstenLogicalRouter.java      |    51 +
 .../network/tungsten/model/TungstenModel.java      |    20 +
 .../tungsten/model/TungstenNetworkPolicy.java      |    51 +
 .../network/tungsten/model/TungstenRule.java       |   132 +
 .../network/tungsten/model/TungstenTag.java        |    97 +
 .../tungsten/resource/TungstenResource.java        |  2367 +++
 .../network/tungsten/service/TungstenApi.java      |  2791 +++
 .../network/tungsten/service/TungstenElement.java  |  1180 ++
 .../tungsten/service/TungstenFabricUtils.java      |    59 +
 .../tungsten/service/TungstenGuestNetworkGuru.java |   521 +
 .../tungsten/service/TungstenIntrospectApi.java    |    40 +
 .../tungsten/service/TungstenProviderService.java  |    33 +
 .../service/TungstenProviderServiceImpl.java       |   234 +
 .../network/tungsten/service/TungstenService.java  |   199 +
 .../tungsten/service/TungstenServiceImpl.java      |  2539 +++
 .../tungsten/service/TungstenVRouterApi.java       |    49 +
 .../network/tungsten/vrouter/CustomHttpDelete.java |    40 +
 .../network/tungsten/vrouter/Gateway.java          |    74 +
 .../tungsten/vrouter/IntrospectApiConnector.java   |    23 +
 .../vrouter/IntrospectApiConnectorFactory.java     |    32 +
 .../vrouter/IntrospectApiConnectorImpl.java        |    73 +
 .../cloudstack/network/tungsten/vrouter/Port.java  |   166 +
 .../network/tungsten/vrouter/Subnet.java           |    47 +
 .../network/tungsten/vrouter/VRouter.java          |    63 +
 .../tungsten/vrouter/VRouterApiConnector.java      |    34 +
 .../vrouter/VRouterApiConnectorFactory.java        |    32 +
 .../tungsten/vrouter/VRouterApiConnectorImpl.java  |   139 +
 .../META-INF/cloudstack/tungsten/module.properties |    21 +
 .../tungsten/spring-tungsten-context.xml           |    42 +
 ...FabricNetworkGatewayToLogicalRouterCmdTest.java |    81 +
 .../AddTungstenFabricPolicyRuleCmdTest.java        |    94 +
 .../command/ApplyTungstenFabricPolicyCmdTest.java  |    75 +
 .../api/command/ApplyTungstenFabricTagCmdTest.java |    80 +
 .../ConfigTungstenFabricServiceCmdTest.java        |   103 +
 .../CreateTungstenFabricAddressGroupCmdTest.java   |    77 +
 ...eTungstenFabricApplicationPolicySetCmdTest.java |    74 +
 .../CreateTungstenFabricFirewallPolicyCmdTest.java |    77 +
 .../CreateTungstenFabricFirewallRuleCmdTest.java   |    89 +
 .../CreateTungstenFabricLogicalRouterCmdTest.java  |    73 +
 ...eateTungstenFabricManagementNetworkCmdTest.java |    70 +
 .../command/CreateTungstenFabricPolicyCmdTest.java |    71 +
 .../CreateTungstenFabricProviderCmdTest.java       |    78 +
 .../CreateTungstenFabricPublicNetworkCmdTest.java  |    85 +
 .../CreateTungstenFabricServiceGroupCmdTest.java   |    78 +
 .../command/CreateTungstenFabricTagCmdTest.java    |    73 +
 .../CreateTungstenFabricTagTypeCmdTest.java        |    71 +
 .../DeleteTungstenFabricAddressGroupCmdTest.java   |    65 +
 ...eTungstenFabricApplicationPolicySetCmdTest.java |    64 +
 .../DeleteTungstenFabricFirewallPolicyCmdTest.java |    64 +
 .../DeleteTungstenFabricFirewallRuleCmdTest.java   |    64 +
 .../DeleteTungstenFabricLogicalRouterCmdTest.java  |    70 +
 .../command/DeleteTungstenFabricPolicyCmdTest.java |    64 +
 .../DeleteTungstenFabricServiceGroupCmdTest.java   |    64 +
 .../command/DeleteTungstenFabricTagCmdTest.java    |    61 +
 .../DeleteTungstenFabricTagTypeCmdTest.java        |    65 +
 .../GetLoadBalancerSslCertificateCmdTest.java      |    73 +
 .../ListTungstenFabricAddressGroupCmdTest.java     |    91 +
 ...tTungstenFabricApplicationPolicySetCmdTest.java |    91 +
 .../ListTungstenFabricFirewallPolicyCmdTest.java   |    92 +
 .../ListTungstenFabricFirewallRuleCmdTest.java     |    92 +
 .../ListTungstenFabricLBHealthMonitorCmdTest.java  |    73 +
 .../ListTungstenFabricLogicalRouterCmdTest.java    |    92 +
 .../command/ListTungstenFabricNetworkCmdTest.java  |    95 +
 .../api/command/ListTungstenFabricNicCmdTest.java  |    93 +
 .../command/ListTungstenFabricPolicyCmdTest.java   |    96 +
 .../ListTungstenFabricPolicyRuleCmdTest.java       |    96 +
 .../ListTungstenFabricProvidersCmdTest.java        |    72 +
 .../ListTungstenFabricServiceGroupCmdTest.java     |    92 +
 .../api/command/ListTungstenFabricTagCmdTest.java  |   107 +
 .../command/ListTungstenFabricTagTypeCmdTest.java  |    91 +
 .../api/command/ListTungstenFabricVmCmdTest.java   |    89 +
 ...bricNetworkGatewayFromLogicalRouterCmdTest.java |    81 +
 .../command/RemoveTungstenFabricPolicyCmdTest.java |    74 +
 .../RemoveTungstenFabricPolicyRuleCmdTest.java     |    74 +
 .../command/RemoveTungstenFabricTagCmdTest.java    |    82 +
 .../SynchronizeTungstenFabricDataCmdTest.java      |    62 +
 ...UpdateTungstenFabricLBHealthMonitorCmdTest.java |   130 +
 .../tungsten/resource/TungstenResourceTest.java    |  1464 ++
 .../service/MockTungstenAnswerFactory.java         |    38 +
 .../network/tungsten/service/TungstenApiTest.java  |  2065 +++
 .../tungsten/service/TungstenElementTest.java      |   960 ++
 .../tungsten/service/TungstenFabricUtilsTest.java  |   103 +
 .../service/TungstenGuestNetworkGuruTest.java      |   529 +
 .../service/TungstenIntrospectApiTest.java         |    65 +
 .../service/TungstenProviderServiceTest.java       |   142 +
 .../tungsten/service/TungstenServiceImplTest.java  |  1671 ++
 .../tungsten/service/TungstenVRouterApiTest.java   |    85 +
 .../vrouter/IntrospectApiConnectorImplTest.java    |   135 +
 .../vrouter/VRouterApiConnectorImplTest.java       |   232 +
 .../tungsten}/src/test/resources/db.properties     |     0
 .../tungsten/src/test/resources/log4j.properties   |    34 +
 plugins/network-elements/vxlan/pom.xml             |     2 +-
 .../cloud/network/guru/VxlanGuestNetworkGuru.java  |    18 +-
 .../META-INF/cloudstack/vxlan/module.properties    |     2 +-
 .../network/guru/VxlanGuestNetworkGuruTest.java    |     8 +-
 .../outofbandmanagement-drivers/ipmitool/pom.xml   |     2 +-
 .../IpmitoolOutOfBandManagementDriver.java         |    28 +-
 .../driver/ipmitool/IpmitoolWrapper.java           |    62 +-
 .../driver/ipmitool/IpmitoolWrapperTest.java       |     2 +-
 .../nested-cloudstack/pom.xml                      |     2 +-
 .../NestedCloudStackOutOfBandManagementDriver.java |     6 +-
 ...tedCloudStackOutOfBandManagementDriverTest.java |     2 +-
 .../outofbandmanagement-drivers/redfish/pom.xml    |     2 +-
 plugins/pom.xml                                    |    80 +-
 plugins/storage-allocators/random/pom.xml          |     2 +-
 .../allocator/RandomStoragePoolAllocator.java      |    14 +-
 plugins/storage/image/default/pom.xml              |     5 +-
 .../driver/CloudStackImageStoreDriverImpl.java     |    62 +-
 .../CloudStackImageStoreLifeCycleImpl.java         |     7 +-
 .../storage-image-default/module.properties        |     2 +-
 .../spring-storage-image-default-context.xml       |     2 +-
 plugins/storage/image/s3/pom.xml                   |     2 +-
 .../datastore/driver/S3ImageStoreDriverImpl.java   |     8 +-
 .../lifecycle/S3ImageStoreLifeCycleImpl.java       |     7 +-
 .../cloudstack/storage-image-s3/module.properties  |     2 +-
 .../spring-storage-image-s3-context.xml            |     2 +-
 plugins/storage/image/sample/pom.xml               |     5 +-
 plugins/storage/image/swift/pom.xml                |     5 +-
 .../driver/SwiftImageStoreDriverImpl.java          |    23 +-
 .../lifecycle/SwiftImageStoreLifeCycleImpl.java    |     7 +-
 .../storage-image-swift/module.properties          |     2 +-
 .../spring-storage-image-swift-context.xml         |     2 +-
 plugins/storage/object/ceph/pom.xml                |    52 +
 .../driver/CephObjectStoreDriverImpl.java          |   361 +
 .../lifecycle/CephObjectStoreLifeCycleImpl.java    |   135 +
 .../provider/CephObjectStoreProviderImpl.java      |    85 +
 .../storage-object-ceph/module.properties          |    18 +
 .../spring-storage-object-ceph-context.xml         |    31 +
 .../driver/CephObjectStoreDriverImplTest.java      |   112 +
 .../provider/CephObjectStoreProviderImplTest.java  |    50 +
 plugins/storage/object/cloudian/README.md          |   194 +
 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               |    57 +
 .../driver/MinIOObjectStoreDriverImpl.java         |   443 +
 .../lifecycle/MinIOObjectStoreLifeCycleImpl.java   |   132 +
 .../provider/MinIOObjectStoreProviderImpl.java     |    85 +
 .../storage-object-minio/module.properties         |    18 +
 .../spring-storage-object-minio-context.xml        |    31 +
 .../driver/MinIOObjectStoreDriverImplTest.java     |   164 +
 .../provider/MinIOObjectStoreProviderImplTest.java |    58 +
 plugins/storage/object/simulator/pom.xml           |    57 +
 .../driver/SimulatorObjectStoreDriverImpl.java     |   138 +
 .../SimulatorObjectStoreLifeCycleImpl.java         |   119 +
 .../provider/SimulatorObjectStoreProviderImpl.java |    85 +
 .../storage-object-simulator/module.properties     |    18 +
 .../spring-storage-object-simulator-context.xml    |    31 +
 .../SimulatorObjectStoreProviderImplTest.java      |    58 +
 plugins/storage/sharedfs/storagevm/pom.xml         |    30 +
 .../lifecycle/StorageVmSharedFSLifeCycle.java      |   315 +
 .../provider/StorageVmSharedFSProvider.java        |    79 +
 .../sharedfs-provider-storagevm/module.properties  |    18 +
 .../spring-sharedfs-provider-storagevm-context.xml |    35 +
 .../src/main/resources/conf/fsvm-init.yml          |   215 +
 .../lifecycle/StorageVmSharedFSLifeCycleTest.java  |   338 +
 plugins/storage/volume/adaptive/README.md          |   118 +
 plugins/storage/volume/adaptive/pom.xml            |    62 +
 .../storage/datastore/adapter/ProviderAdapter.java |   176 +
 .../adapter/ProviderAdapterConstants.java          |    22 +
 .../datastore/adapter/ProviderAdapterContext.java  |    83 +
 .../adapter/ProviderAdapterDataObject.java         |   159 +
 .../adapter/ProviderAdapterDiskOffering.java       |   196 +
 .../datastore/adapter/ProviderAdapterFactory.java  |    28 +
 .../datastore/adapter/ProviderSnapshot.java        |    28 +
 .../storage/datastore/adapter/ProviderVolume.java  |    40 +
 .../datastore/adapter/ProviderVolumeNamer.java     |    57 +
 .../datastore/adapter/ProviderVolumeStats.java     |    55 +
 .../adapter/ProviderVolumeStorageStats.java        |    71 +
 .../driver/AdaptiveDataStoreDriverImpl.java        |  1007 ++
 .../lifecycle/AdaptiveDataStoreLifeCycleImpl.java  |   404 +
 .../AdaptivePrimaryDatastoreAdapterFactoryMap.java |   139 +
 .../AdaptivePrimaryDatastoreProviderImpl.java      |    87 +
 .../provider/AdaptivePrimaryHostListener.java      |   111 +
 plugins/storage/volume/cloudbyte/pom.xml           |     9 +-
 .../driver/ElastistorPrimaryDataStoreDriver.java   |    25 +-
 .../ElastistorPrimaryDataStoreLifeCycle.java       |    90 +-
 .../datastore/provider/ElastistorHostListener.java |    15 +-
 .../ElastistorPrimaryDataStoreProvider.java        |    11 +-
 .../storage/datastore/util/ElastistorUtil.java     |    72 +-
 .../util/ElastistorVolumeApiServiceImpl.java       |    10 +-
 .../datastore/util/ListElastistorInterfaceCmd.java |     2 -
 .../datastore/util/ListElastistorPoolCmd.java      |     2 -
 .../datastore/util/ListElastistorVolumeCmd.java    |     2 -
 .../util/ListElastistorVolumeResponse.java         |     2 +-
 .../storage-volume-cloudbyte/module.properties     |     2 +-
 plugins/storage/volume/datera/pom.xml              |    23 +-
 .../driver/DateraPrimaryDataStoreDriver.java       |   166 +-
 .../lifecycle/DateraPrimaryDataStoreLifeCycle.java |    86 +-
 .../datastore/provider/DateraHostListener.java     |    27 +-
 .../storage/datastore/util/DateraUtil.java         |    13 +-
 plugins/storage/volume/default/pom.xml             |     5 +-
 .../CloudStackPrimaryDataStoreDriverImpl.java      |   105 +-
 .../CloudStackPrimaryDataStoreLifeCycleImpl.java   |   316 +-
 .../storage-volume-default/module.properties       |     2 +-
 .../spring-storage-volume-default-context.xml      |     2 +-
 ...loudStackPrimaryDataStoreLifeCycleImplTest.java |   136 +-
 plugins/storage/volume/flasharray/pom.xml          |    52 +
 .../adapter/flasharray/FlashArrayAdapter.java      |  1108 ++
 .../flasharray/FlashArrayAdapterFactory.java       |    41 +
 .../adapter/flasharray/FlashArrayApiToken.java     |    34 +
 .../adapter/flasharray/FlashArrayConnection.java   |    68 +
 .../flasharray/FlashArrayConnectionHost.java       |    39 +
 .../flasharray/FlashArrayConnectionHostgroup.java  |    40 +
 .../flasharray/FlashArrayGroupMemberReference.java |    72 +
 .../FlashArrayGroupMemberReferenceList.java        |    38 +
 .../adapter/flasharray/FlashArrayHost.java         |    46 +
 .../adapter/flasharray/FlashArrayHostgroup.java    |    58 +
 .../adapter/flasharray/FlashArrayList.java         |    60 +
 .../adapter/flasharray/FlashArrayPod.java          |    66 +
 .../adapter/flasharray/FlashArrayTag.java          |    77 +
 .../adapter/flasharray/FlashArrayTagList.java      |    39 +
 .../adapter/flasharray/FlashArrayVolume.java       |   253 +
 .../adapter/flasharray/FlashArrayVolumePod.java    |    30 +
 .../adapter/flasharray/FlashArrayVolumeSource.java |    47 +
 .../adapter/flasharray/FlashArrayVolumeSpace.java  |   122 +
 .../FlashArrayPrimaryDatastoreProviderImpl.java    |    32 +
 .../storage-volume-flasharray/module.properties    |    18 +
 .../spring-storage-volume-flasharray-context.xml   |    35 +
 plugins/storage/volume/linstor/CHANGELOG.md        |   114 +
 plugins/storage/volume/linstor/pom.xml             |    11 +-
 .../api/storage/LinstorBackupSnapshotCommand.java  |    28 +
 .../LinstorRevertBackupSnapshotCommand.java        |    28 +
 .../LinstorBackupSnapshotCommandWrapper.java       |   180 +
 .../LinstorRevertBackupSnapshotCommandWrapper.java |   105 +
 .../kvm/storage/LinstorStorageAdaptor.java         |   636 +-
 .../hypervisor/kvm/storage/LinstorStoragePool.java |   185 +-
 .../driver/LinstorPrimaryDataStoreDriverImpl.java  |  1039 +-
 .../LinstorPrimaryDataStoreLifeCycleImpl.java      |    66 +-
 .../datastore/provider/LinstorHostListener.java    |    32 +
 .../LinstorPrimaryDatastoreProviderImpl.java       |     6 +-
 .../util/LinstorConfigurationManager.java          |    47 +
 .../storage/datastore/util/LinstorUtil.java        |   423 +-
 .../snapshot/LinstorVMSnapshotStrategy.java        |   372 +
 .../spring-storage-volume-linstor-context.xml      |     4 +
 .../LinstorPrimaryDataStoreDriverImplTest.java     |    87 +
 .../storage/datastore/util/LinstorUtilTest.java    |   126 +
 plugins/storage/volume/nexenta/pom.xml             |     5 +-
 .../driver/NexentaPrimaryDataStoreDriver.java      |    24 +-
 .../NexentaPrimaryDataStoreLifeCycle.java          |    37 +-
 .../datastore/provider/NexentaHostListener.java    |    15 +-
 .../storage/datastore/util/NexentaNmsClient.java   |     5 +-
 .../datastore/util/NexentaStorAppliance.java       |     6 +-
 .../module.properties                              |     2 +-
 .../spring-storage-volume-nexenta-context.xml      |     2 +-
 .../datastore/util/NexentaStorApplianceTest.java   |     4 +-
 plugins/storage/volume/primera/pom.xml             |    52 +
 .../datastore/adapter/primera/PrimeraAdapter.java  |  1073 ++
 .../adapter/primera/PrimeraAdapterFactory.java     |    41 +
 .../datastore/adapter/primera/PrimeraCpg.java      |   203 +
 .../adapter/primera/PrimeraCpgDiskPattern.java     |    35 +
 .../adapter/primera/PrimeraCpgLDLayout.java        |    49 +
 .../adapter/primera/PrimeraCpgPrivateSpaceMiB.java |    54 +
 .../adapter/primera/PrimeraCpgSAGrowth.java        |    40 +
 .../adapter/primera/PrimeraCpgSAUsage.java         |    54 +
 .../adapter/primera/PrimeraCpgSDGrowth.java        |    54 +
 .../adapter/primera/PrimeraCpgSDUsage.java         |    54 +
 .../adapter/primera/PrimeraCpgUsrUsage.java        |    54 +
 .../datastore/adapter/primera/PrimeraHost.java     |    56 +
 .../adapter/primera/PrimeraHostDescriptor.java     |    40 +
 .../datastore/adapter/primera/PrimeraHostset.java  |   151 +
 .../datastore/adapter/primera/PrimeraKey.java      |    35 +
 .../datastore/adapter/primera/PrimeraPort.java     |    40 +
 .../datastore/adapter/primera/PrimeraPortPos.java  |    47 +
 .../adapter/primera/PrimeraTaskReference.java      |    44 +
 .../adapter/primera/PrimeraTaskStatus.java         |   174 +
 .../datastore/adapter/primera/PrimeraVlun.java     |   180 +
 .../datastore/adapter/primera/PrimeraVlunList.java |    49 +
 .../datastore/adapter/primera/PrimeraVolume.java   |   420 +
 .../adapter/primera/PrimeraVolumeAdminSpace.java   |    54 +
 .../primera/PrimeraVolumeCapacityEfficiency.java   |    40 +
 .../adapter/primera/PrimeraVolumeCopyRequest.java  |    43 +
 .../PrimeraVolumeCopyRequestParameters.java        |   101 +
 .../adapter/primera/PrimeraVolumeLink.java         |    40 +
 .../adapter/primera/PrimeraVolumeLinkList.java     |    37 +
 .../adapter/primera/PrimeraVolumePolicies.java     |    82 +
 .../primera/PrimeraVolumePromoteRequest.java       |    54 +
 .../adapter/primera/PrimeraVolumeRequest.java      |   110 +
 .../PrimeraVolumeRevertSnapshotRequest.java        |    50 +
 .../primera/PrimeraVolumeSnapshotRequest.java      |    43 +
 .../PrimeraVolumeSnapshotRequestParameters.java    |    85 +
 .../primera/PrimeraVolumeSnapshotSpace.java        |    54 +
 .../primera/PrimeraVolumeUpdateRequest.java        |    35 +
 .../adapter/primera/PrimeraVolumeUserSpace.java    |    54 +
 .../PrimeraPrimaryDatastoreProviderImpl.java       |    32 +
 .../storage-volume-primera/module.properties       |    18 +
 .../spring-storage-volume-primera-context.xml      |    35 +
 plugins/storage/volume/sample/pom.xml              |     5 +-
 .../driver/SamplePrimaryDataStoreDriverImpl.java   |    18 +-
 .../SamplePrimaryDataStoreLifeCycleImpl.java       |     8 +
 plugins/storage/volume/scaleio/pom.xml             |     5 +-
 .../datastore/api/StorageConfiguration.java        |    48 +
 .../storage/datastore/api/StoragePool.java         |    11 +
 .../storage/datastore/api/VTreeMigrationInfo.java  |     2 +-
 .../datastore/client/ScaleIOGatewayClient.java     |     8 +
 .../client/ScaleIOGatewayClientConnectionPool.java |    62 +-
 .../datastore/client/ScaleIOGatewayClientImpl.java |   146 +-
 .../driver/ScaleIOPrimaryDataStoreDriver.java      |   817 +-
 .../ScaleIOPrimaryDataStoreLifeCycle.java          |   205 +-
 .../datastore/manager/ScaleIOSDCManager.java       |   133 +
 .../datastore/manager/ScaleIOSDCManagerImpl.java   |   508 +
 .../datastore/provider/ScaleIOHostListener.java    |   190 +-
 .../provider/ScaleIOPrimaryDatastoreProvider.java  |     5 +-
 .../storage/datastore/util/ScaleIOUtil.java        |   392 +-
 .../spring-storage-volume-scaleio-context.xml      |     2 +
 .../client/ScaleIOGatewayClientImplTest.java       |    25 +-
 .../driver/ScaleIOPrimaryDataStoreDriverTest.java  |   600 +
 .../ScaleIOPrimaryDataStoreLifeCycleTest.java      |   111 +-
 plugins/storage/volume/solidfire/pom.xml           |     2 +-
 .../driver/SolidFirePrimaryDataStoreDriver.java    |    73 +-
 .../SolidFirePrimaryDataStoreLifeCycle.java        |    59 +-
 .../SolidFireSharedPrimaryDataStoreLifeCycle.java  |    74 +-
 .../datastore/provider/SolidFireHostListener.java  |    47 +-
 .../provider/SolidFireSharedHostListener.java      |    31 +-
 .../storage/datastore/util/SolidFireUtil.java      |    11 +-
 .../storage-volume-solidfire/module.properties     |     2 +-
 .../apache/cloudstack/storage/test/VolumeTest.java |    16 +-
 .../solidfire/src/test/resource/storageContext.xml |     8 +-
 plugins/storage/volume/storpool/README.md          |    77 +-
 plugins/storage/volume/storpool/pom.xml            |    89 +-
 .../storage/StorPoolModifyStoragePoolAnswer.java   |    22 +-
 .../storage/StorPoolSetVolumeEncryptionAnswer.java |    47 +
 .../StorPoolSetVolumeEncryptionCommand.java        |    70 +
 .../StorPoolBackupSnapshotCommandWrapper.java      |    72 +-
 ...olBackupTemplateFromSnapshotCommandWrapper.java |     6 +-
 ...torPoolCopyVolumeToSecondaryCommandWrapper.java |     6 +-
 .../StorPoolDownloadTemplateCommandWrapper.java    |    14 +-
 .../StorPoolDownloadVolumeCommandWrapper.java      |    13 +-
 .../StorPoolModifyStorageCommandWrapper.java       |    81 +-
 .../StorPoolResizeVolumeCommandWrapper.java        |    10 +-
 .../StorPoolSetVolumeEncryptionCommandWrapper.java |   159 +
 .../kvm/storage/StorPoolStorageAdaptor.java        |   328 +-
 .../kvm/storage/StorPoolStoragePool.java           |   146 +-
 .../collector/StorPoolAbandonObjectsCollector.java |   174 +-
 .../storage/datastore/api/StorPoolSnapshotDef.java |    98 +
 .../storage/datastore/api/StorPoolVolumeDef.java   |   109 +
 .../driver/StorPoolPrimaryDataStoreDriver.java     |  1007 +-
 .../datastore/driver/StorPoolStatsCollector.java   |   294 +
 .../StorPoolPrimaryDataStoreLifeCycle.java         |    41 +-
 .../datastore/provider/StorPoolHostListener.java   |    84 +-
 .../storage/datastore/util/StorPoolHelper.java     |   122 +-
 .../storage/datastore/util/StorPoolUtil.java       |   261 +-
 .../storage/motion/StorPoolDataMotionStrategy.java |   172 +-
 .../snapshot/StorPoolConfigurationManager.java     |    26 +-
 .../storage/snapshot/StorPoolSnapshotStrategy.java |   428 +-
 .../snapshot/StorPoolVMSnapshotStrategy.java       |    45 +-
 .../spring-storage-volume-storpool-context.xml     |    21 +-
 .../driver/StorPoolPrimaryDataStoreDriverTest.java |   243 +
 plugins/user-authenticators/ldap/pom.xml           |    49 +-
 .../cloudstack/api/command/LDAPConfigCmd.java      |     8 -
 .../cloudstack/api/command/LDAPRemoveCmd.java      |     8 -
 .../api/command/LdapAddConfigurationCmd.java       |     2 -
 .../api/command/LdapCreateAccountCmd.java          |     2 -
 .../api/command/LdapDeleteConfigurationCmd.java    |    10 +-
 .../cloudstack/api/command/LdapImportUsersCmd.java |    12 +-
 .../api/command/LdapListConfigurationCmd.java      |     9 +-
 .../cloudstack/api/command/LdapListUsersCmd.java   |    55 +-
 .../cloudstack/api/command/LdapUserSearchCmd.java  |     6 +-
 .../api/command/LinkAccountToLdapCmd.java          |    39 +-
 .../api/command/LinkDomainToLdapCmd.java           |    28 +-
 .../api/command/UnlinkDomainFromLdapCmd.java       |    69 +
 .../api/response/LdapConfigurationResponse.java    |    23 +-
 .../cloudstack/api/response/LdapUserResponse.java  |     2 +-
 .../api/response/LinkAccountToLdapResponse.java    |     2 +-
 .../api/response/LinkDomainToLdapResponse.java     |     2 +-
 .../cloudstack/ldap/ADLdapUserManagerImpl.java     |    28 +-
 .../apache/cloudstack/ldap/LdapAuthenticator.java  |   100 +-
 .../apache/cloudstack/ldap/LdapConfiguration.java  |     5 +-
 .../cloudstack/ldap/LdapConfigurationVO.java       |    22 +-
 .../apache/cloudstack/ldap/LdapContextFactory.java |    49 +-
 .../org/apache/cloudstack/ldap/LdapManager.java    |     7 +-
 .../apache/cloudstack/ldap/LdapManagerImpl.java    |   136 +-
 .../java/org/apache/cloudstack/ldap/LdapUser.java  |     2 +-
 .../cloudstack/ldap/LdapUserManagerFactory.java    |     5 +-
 .../java/org/apache/cloudstack/ldap/LdapUtils.java |     2 +-
 .../ldap/NoLdapUserMatchingQueryException.java     |     2 +-
 .../cloudstack/ldap/OpenLdapUserManagerImpl.java   |   152 +-
 .../cloudstack/ldap/dao/LdapConfigurationDao.java  |     4 +-
 .../ldap/dao/LdapConfigurationDaoImpl.java         |    19 +-
 .../META-INF/cloudstack/ldap/module.properties     |     2 +-
 .../cloudstack/ldap/LdapAuthenticatorSpec.groovy   |     2 +-
 .../ldap/LdapConfigurationResponseSpec.groovy      |     2 +-
 .../cloudstack/ldap/LdapContextFactorySpec.groovy  |     2 +-
 .../org/apache/cloudstack/ldap/LdapUserSpec.groovy |     2 +-
 .../NoLdapUserMatchingQueryExceptionSpec.groovy    |     2 +-
 .../api/command/LdapConfigurationChanger.java      |     2 +-
 .../api/command/LdapCreateAccountCmdTest.java      |     6 +-
 .../api/command/LdapImportUsersCmdTest.java        |    12 +-
 .../api/command/LdapListUsersCmdTest.java          |    46 +-
 .../api/command/LinkAccountToLdapCmdTest.java      |    17 +-
 .../api/command/LinkDomainToLdapCmdTest.java       |    14 +-
 .../cloudstack/ldap/ADLdapUserManagerImplTest.java |     7 +-
 .../cloudstack/ldap/LdapAuthenticatorTest.java     |     6 +-
 .../cloudstack/ldap/LdapConfigurationTest.java     |     4 +-
 .../ldap/LdapDirectoryServerConnectionTest.java    |     4 +-
 .../apache/cloudstack/ldap/LdapTestConfigTool.java |     9 +-
 .../ldap/LdapUnboundidZapdotConnectionTest.java    |     4 +-
 .../cloudstack/ldap/LdapUnitConnectionTest.java    |     4 +-
 .../ldap/LdapUserManagerFactoryTest.java           |     4 +-
 .../ldap/src/test/resources/cloudstack.org.ldif    |     1 -
 .../ldap/src/test/resources/ldapunit.ldif          |     2 +-
 .../ldap/src/test/resources/log4j.xml              |   100 +-
 .../ldap/src/test/resources/minimal.ldif           |     1 -
 .../ldap/src/test/resources/unboundid.ldif         |     1 -
 plugins/user-authenticators/md5/pom.xml            |     2 +-
 .../cloud/server/auth/MD5UserAuthenticator.java    |    88 -
 .../cloudstack/auth/MD5UserAuthenticator.java      |    86 +
 .../META-INF/cloudstack/md5/module.properties      |     2 +-
 .../META-INF/cloudstack/md5/spring-md5-context.xml |     4 +-
 .../server/auth/MD5UserAuthenticatorTest.java      |    83 -
 .../cloudstack/auth/MD5UserAuthenticatorTest.java  |    82 +
 plugins/user-authenticators/oauth2/pom.xml         |    63 +
 .../cloudstack/oauth2/OAuth2AuthManager.java       |    61 +
 .../cloudstack/oauth2/OAuth2AuthManagerImpl.java   |   231 +
 .../cloudstack/oauth2/OAuth2UserAuthenticator.java |    95 +
 .../oauth2/api/command/DeleteOAuthProviderCmd.java |    85 +
 .../oauth2/api/command/ListOAuthProvidersCmd.java  |   145 +
 .../api/command/OauthLoginAPIAuthenticatorCmd.java |   231 +
 .../api/command/RegisterOAuthProviderCmd.java      |   109 +
 .../oauth2/api/command/UpdateOAuthProviderCmd.java |   139 +
 .../api/command/VerifyOAuthCodeAndGetUserCmd.java  |   128 +
 .../oauth2/api/response/OauthProviderResponse.java |   127 +
 .../cloudstack/oauth2/dao/OauthProviderDao.java    |    26 +
 .../oauth2/dao/OauthProviderDaoImpl.java           |    44 +
 .../oauth2/github/GithubOAuth2Provider.java        |   179 +
 .../oauth2/google/GoogleOAuth2Provider.java        |   139 +
 .../cloudstack/oauth2/vo/OauthProviderVO.java      |   128 +
 .../META-INF/cloudstack/oauth2/module.properties   |    18 +
 .../cloudstack/oauth2/spring-oauth2-context.xml    |    56 +
 .../oauth2/OAuth2AuthManagerImplTest.java          |   191 +
 .../oauth2/OAuth2UserAuthenticatorTest.java        |   171 +
 .../api/command/DeleteOAuthProviderCmdTest.java    |    87 +
 .../command/OauthLoginAPIAuthenticatorCmdTest.java |    94 +
 .../api/command/RegisterOAuthProviderCmdTest.java  |    69 +
 .../command/VerifyOAuthCodeAndGetUserCmdTest.java  |   108 +
 .../oauth2/google/GoogleOAuth2ProviderTest.java    |   156 +
 plugins/user-authenticators/pbkdf2/pom.xml         |     2 +-
 .../server/auth/PBKDF2UserAuthenticator.java       |    16 +-
 .../server/auth/PBKD2UserAuthenticatorTest.java    |     4 +-
 plugins/user-authenticators/plain-text/pom.xml     |     2 +-
 .../server/auth/PlainTextUserAuthenticator.java    |    65 -
 .../auth/PlainTextUserAuthenticator.java           |    63 +
 .../cloudstack/plaintext/module.properties         |     2 +-
 .../plaintext/spring-plaintext-context.xml         |     4 +-
 plugins/user-authenticators/saml2/pom.xml          |     8 +-
 .../api/command/AuthorizeSAMLSSOCmd.java           |    10 +-
 .../api/command/GetServiceProviderMetaDataCmd.java |     8 +-
 .../api/command/ListAndSwitchSAMLAccountCmd.java   |    44 +-
 .../apache/cloudstack/api/command/ListIdpsCmd.java |    13 +-
 .../api/command/ListSamlAuthorizationCmd.java      |     4 +-
 .../api/command/SAML2LoginAPIAuthenticatorCmd.java |    53 +-
 .../command/SAML2LogoutAPIAuthenticatorCmd.java    |    16 +-
 .../apache/cloudstack/saml/SAML2AuthManager.java   |    62 +-
 .../cloudstack/saml/SAML2AuthManagerImpl.java      |    56 +-
 .../cloudstack/saml/SAML2UserAuthenticator.java    |    12 +-
 .../java/org/apache/cloudstack/saml/SAMLUtils.java |   120 +-
 .../GetServiceProviderMetaDataCmdTest.java         |     2 +-
 .../cloudstack/SAML2AuthManagerImplTest.java       |     2 +-
 .../cloudstack/SAML2UserAuthenticatorTest.java     |     2 +-
 .../java/org/apache/cloudstack/SAMLUtilsTest.java  |     8 +-
 .../command/ListAndSwitchSAMLAccountCmdTest.java   |    30 +-
 .../command/SAML2LoginAPIAuthenticatorCmdTest.java |    27 +
 .../SAML2LogoutAPIAuthenticatorCmdTest.java        |     2 +-
 .../cloudstack/saml/SAML2AuthManagerImplTest.java  |     2 +-
 plugins/user-authenticators/sha256salted/pom.xml   |     2 +-
 .../server/auth/SHA256SaltedUserAuthenticator.java |   142 -
 .../auth/SHA256SaltedUserAuthenticator.java        |   136 +
 .../cloudstack/sha256salted/module.properties      |     2 +-
 .../sha256salted/spring-sha256salted-context.xml   |     4 +-
 .../cloud/server/auth/test/AuthenticatorTest.java  |   123 -
 .../cloudstack/auth/test/AuthenticatorTest.java    |   123 +
 .../static-pin/pom.xml                             |    30 +
 .../auth/StaticPinUserTwoFactorAuthenticator.java  |    73 +
 .../cloudstack/staticpin/module.properties         |    18 +
 .../staticpin/spring-staticpin-context.xml         |    35 +
 .../user-two-factor-authenticators/totp/pom.xml    |    30 +
 .../auth/TotpUserTwoFactorAuthenticator.java       |    86 +
 .../META-INF/cloudstack/totp/module.properties     |    18 +
 .../cloudstack/totp/spring-google-context.xml      |    35 +
 pom.xml                                            |   177 +-
 .../bindir/cloud-grab-dependent-library-versions   |    95 +-
 python/bindir/cloud-setup-baremetal                |   168 +-
 .../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in    |     5 +-
 .../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in    |     5 +-
 .../SYSCONFDIR/init.d/cloud-ipallocator.in         |     5 +-
 .../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in    |     5 +-
 .../sles/SYSCONFDIR/init.d/cloud-ipallocator.in    |     5 +-
 .../ubuntu/SYSCONFDIR/init.d/cloud-ipallocator.in  |     7 +-
 python/lib/cloud_utils.py                          |     6 +-
 python/lib/cloudutils/configFileOps.py             |    68 +-
 python/lib/cloudutils/networkConfig.py             |    15 +-
 python/lib/cloudutils/serviceConfig.py             |    69 +-
 python/lib/cloudutils/syscfg.py                    |    45 +-
 python/lib/cloudutils/utilities.py                 |    16 +-
 quickcloud/pom.xml                                 |     2 +-
 .../spring-quickcloud-core-context-override.xml    |     2 +-
 requirements-dev.txt                               |    18 +
 requirements.txt                                   |     5 +-
 scripts/installer/cloudstack-help-text             |     8 +-
 scripts/installer/createtmplt.sh                   |    35 +-
 scripts/installer/createvolume.sh                  |    33 +-
 scripts/installer/export-templates.sh              |     1 -
 scripts/installer/installcentos.sh                 |    10 +-
 scripts/installer/installdomp.sh                   |     6 +-
 scripts/installer/pre-check.sh                     |    38 +
 scripts/installer/run_installer.sh                 |     6 +-
 scripts/network/domr/router_proxy.sh               |     6 +-
 scripts/network/exdhcp/dnsmasq_edithosts.sh        |    16 +-
 scripts/network/exdhcp/prepare_dhcpd.sh            |     4 +-
 scripts/network/exdhcp/prepare_dnsmasq.sh          |     8 +-
 scripts/network/juniper/application-add.xml        |     8 +-
 scripts/network/juniper/application-getone.xml     |     6 +-
 scripts/network/juniper/dest-nat-rule-add.xml      |     6 +-
 scripts/network/juniper/dest-nat-rule-getone.xml   |     2 -
 .../juniper/firewall-filter-bytes-getall.xml       |     1 -
 .../network/juniper/guest-vlan-filter-term-add.xml |    22 +-
 scripts/network/juniper/private-interface-add.xml  |    30 +-
 .../network/juniper/private-interface-getone.xml   |    14 +-
 .../juniper/private-interface-with-filters-add.xml |    32 +-
 scripts/network/juniper/proxy-arp-add.xml          |    22 +-
 scripts/network/juniper/proxy-arp-getall.xml       |    12 +-
 scripts/network/juniper/proxy-arp-getone.xml       |    22 +-
 .../network/juniper/public-ip-filter-term-add.xml  |    32 +-
 scripts/network/juniper/security-policy-group.xml  |    14 +-
 scripts/network/juniper/src-nat-rule-add.xml       |     2 -
 scripts/network/juniper/src-nat-rule-getall.xml    |     1 -
 scripts/network/juniper/src-nat-rule-getone.xml    |     2 -
 scripts/network/juniper/static-nat-rule-add.xml    |     2 -
 scripts/network/juniper/static-nat-rule-getall.xml |     2 -
 scripts/network/juniper/static-nat-rule-getone.xml |     2 -
 scripts/network/juniper/test.xml                   |     1 -
 scripts/network/juniper/zone-interface-add.xml     |    19 +-
 scripts/network/juniper/zone-interface-getone.xml  |    19 +-
 scripts/network/ping/baremetal_user_data.py        |     2 +-
 scripts/storage/checkchildren.sh                   |     4 +-
 scripts/storage/installIso.sh                      |    14 +-
 scripts/storage/multipath/cleanStaleMaps.sh        |    39 +
 scripts/storage/multipath/connectVolume.sh         |   133 +
 scripts/storage/multipath/copyVolume.sh            |    32 +
 scripts/storage/multipath/disconnectVolume.sh      |    74 +
 scripts/storage/multipath/resizeVolume.sh          |    70 +
 scripts/storage/qcow2/create_private_template.sh   |     8 +-
 scripts/storage/qcow2/createtmplt.sh               |    22 +-
 scripts/storage/qcow2/createvm.sh                  |    58 +-
 scripts/storage/qcow2/createvolume.sh              |    22 +-
 scripts/storage/qcow2/delvm.sh                     |    14 +-
 scripts/storage/qcow2/get_domr_kernel.sh           |    12 +-
 scripts/storage/qcow2/get_iqn.sh                   |     4 +-
 scripts/storage/qcow2/importmpl.sh                 |    20 +-
 scripts/storage/qcow2/listvmdisk.sh                |    16 +-
 scripts/storage/qcow2/listvmdisksize.sh            |    12 +-
 scripts/storage/qcow2/listvmtmplt.sh               |    10 +-
 scripts/storage/qcow2/listvolume.sh                |    10 +-
 scripts/storage/qcow2/managesnapshot.sh            |     2 +-
 scripts/storage/qcow2/managevolume.sh              |    46 +-
 scripts/storage/secondary/cloud-install-sys-tmplt  |     4 +-
 .../storage/secondary/cloud-install-sys-tmplt.py   |     2 +-
 .../create_privatetemplate_from_snapshot_xen.sh    |    10 +-
 scripts/storage/secondary/createtmplt.sh           |    22 +-
 scripts/storage/secondary/createvolume.sh          |    28 +-
 scripts/storage/secondary/installIso.sh            |    14 +-
 scripts/storage/secondary/listvmtmplt.sh           |    13 +-
 scripts/storage/secondary/listvolume.sh            |    13 +-
 scripts/storage/secondary/setup-sysvm-tmplt        |    12 +-
 scripts/storage/secondary/swift                    |     8 +-
 scripts/util/create-kubernetes-binaries-iso.sh     |    52 +-
 scripts/util/keystore-cert-import                  |    20 +-
 scripts/util/keystore-setup                        |    74 +-
 scripts/util/prepare_linmin.sh                     |     4 +-
 .../hypervisor/external/provisioner/provisioner.sh |   157 +
 scripts/vm/hypervisor/kvm/gpudiscovery.sh          |   936 ++
 scripts/vm/hypervisor/kvm/kvmheartbeat.sh          |    22 +-
 scripts/vm/hypervisor/kvm/kvmspheartbeat.sh        |    66 +
 scripts/vm/hypervisor/kvm/nasbackup.sh             |   309 +
 scripts/vm/hypervisor/kvm/nsrkvmbackup.sh          |   261 +
 scripts/vm/hypervisor/kvm/nsrkvmrestore.sh         |   224 +
 scripts/vm/hypervisor/kvm/setup_agent.sh           |    38 +-
 scripts/vm/hypervisor/ovm3/cloudstack.py           |     4 -
 scripts/vm/hypervisor/ovm3/storagehealth.py        |     2 +-
 scripts/vm/hypervisor/update_host_passwd.sh        |    12 +-
 scripts/vm/hypervisor/versions.sh                  |    25 +-
 .../xenserver/add_to_vcpus_params_live.sh          |     1 -
 scripts/vm/hypervisor/xenserver/check_heartbeat.sh |    10 +-
 .../vm/hypervisor/xenserver/cloud-clean-vlan.sh    |     4 +-
 .../vm/hypervisor/xenserver/cloud-plugin-storage   |     5 +-
 .../hypervisor/xenserver/cloud-prepare-upgrade.sh  |     7 +-
 .../hypervisor/xenserver/cloud-propagate-vlan.sh   |     4 +-
 .../vm/hypervisor/xenserver/cloud-setup-bonding.sh |    13 +-
 scripts/vm/hypervisor/xenserver/cloudlog           |     1 -
 .../hypervisor/xenserver/cloudstack_pluginlib.py   |     2 +-
 .../xenserver/copy_vhd_from_secondarystorage.sh    |    14 +-
 .../xenserver/copy_vhd_to_secondarystorage.sh      |    12 +-
 .../create_privatetemplate_from_snapshot.sh        |    14 +-
 .../vm/hypervisor/xenserver/kill_copy_process.sh   |    10 +-
 scripts/vm/hypervisor/xenserver/launch_hb.sh       |     6 +-
 scripts/vm/hypervisor/xenserver/make_migratable.sh |     8 +-
 scripts/vm/hypervisor/xenserver/network_info.sh    |     5 +-
 scripts/vm/hypervisor/xenserver/ovs-get-bridge.sh  |     4 +-
 .../vm/hypervisor/xenserver/ovs-get-dhcp-iface.sh  |     4 +-
 scripts/vm/hypervisor/xenserver/ovstunnel          |     2 +-
 scripts/vm/hypervisor/xenserver/perfmon.py         |     8 +-
 scripts/vm/hypervisor/xenserver/s3xenserver        |     6 +-
 .../hypervisor/xenserver/setup_heartbeat_file.sh   |    14 +-
 scripts/vm/hypervisor/xenserver/setup_iscsi.sh     |     7 +-
 scripts/vm/hypervisor/xenserver/setupxenserver.sh  |     7 +-
 scripts/vm/hypervisor/xenserver/storagePlugin      |    46 +-
 scripts/vm/hypervisor/xenserver/swift              |     8 +-
 .../vm/hypervisor/xenserver/upgrade_snapshot.sh    |    14 +-
 .../vm/hypervisor/xenserver/upgrade_vnc_config.sh  |     5 +-
 scripts/vm/hypervisor/xenserver/vmops              |     4 +-
 scripts/vm/hypervisor/xenserver/vmopsSnapshot      |     7 +-
 scripts/vm/hypervisor/xenserver/vmopspremium       |   135 +-
 scripts/vm/hypervisor/xenserver/xcposs/NFSSR.py    |    14 -
 scripts/vm/hypervisor/xenserver/xcposs/patch       |     2 +-
 scripts/vm/hypervisor/xenserver/xcpserver/NFSSR.py |    15 -
 scripts/vm/hypervisor/xenserver/xcpserver/patch    |     2 +-
 .../vm/hypervisor/xenserver/xcpserver83/NFSSR.py   |   278 +
 scripts/vm/hypervisor/xenserver/xcpserver83/patch  |    65 +
 scripts/vm/hypervisor/xenserver/xenheartbeat.sh    |     2 +-
 .../vm/hypervisor/xenserver/xenserver56/NFSSR.py   |    14 -
 .../hypervisor/xenserver/xenserver56fp1/NFSSR.py   |    15 -
 .../vm/hypervisor/xenserver/xenserver60/NFSSR.py   |    14 -
 scripts/vm/hypervisor/xenserver/xenserver60/patch  |     2 +-
 scripts/vm/hypervisor/xenserver/xenserver62/patch  |     2 +-
 scripts/vm/hypervisor/xenserver/xenserver65/patch  |     2 +-
 .../xenserver/xenserver84/cloud-plugin-storage     |   303 +
 .../xenserver/xenserver84/cloudstack_pluginlib.py  |   894 +
 .../xenserver/xenserver84/ovs-vif-flows.py         |   145 +
 scripts/vm/hypervisor/xenserver/xenserver84/patch  |    70 +
 scripts/vm/hypervisor/xenserver/xenserver84/swift  |  1884 +++
 scripts/vm/hypervisor/xenserver/xenserver84/vmops  |  1607 ++
 .../hypervisor/xenserver/xenserver84/vmopsSnapshot |   622 +
 .../hypervisor/xenserver/xenserver84/vmopspremium  |   159 +
 scripts/vm/hypervisor/xenserver/xs_cleanup.sh      |     9 +-
 scripts/vm/network/ovs-pvlan-cleanup.sh            |     5 +-
 scripts/vm/network/ovs-pvlan-dhcp-host.sh          |     4 +-
 scripts/vm/network/ovs-pvlan-kvm-dhcp-host.sh      |     4 +-
 scripts/vm/network/ovs-pvlan-kvm-vm.sh             |     0
 scripts/vm/network/ovs-pvlan-vm.sh                 |     5 +-
 scripts/vm/network/security_group.py               |    15 +-
 scripts/vm/network/tungsten/create_tap_device.sh   |    20 +
 scripts/vm/network/tungsten/delete_tap_device.sh   |    22 +
 .../vm/network/tungsten/setup_tungsten_vrouter.sh  |    24 +
 .../tungsten/update_tungsten_loadbalancer_ssl.sh   |    36 +
 .../tungsten/update_tungsten_loadbalancer_stats.sh |    41 +
 scripts/vm/network/vnet/modifyvlan.sh              |    30 +-
 scripts/vm/network/vnet/modifyvxlan-evpn.sh        |   163 +
 scripts/vm/network/vnet/ovstunnel.py               |    11 +-
 scripts/vm/pingtest.sh                             |     6 +-
 scripts/vm/systemvm/injectkeys.sh                  |     4 +-
 server/conf/cloudstack-catalina.logrotate          |     2 +-
 server/conf/cloudstack-management.logrotate.in     |    28 +
 server/conf/cloudstack-sudoers.in                  |     2 +-
 server/conf/log4j-cloud.xml.in                     |   242 +-
 server/conf/migration-components.xml               |     2 +
 server/pom.xml                                     |    25 +-
 .../com/cloud/acl/AffinityGroupAccessChecker.java  |     4 +-
 .../src/main/java/com/cloud/acl/DomainChecker.java |    80 +-
 .../manager/allocator/impl/FirstFitAllocator.java  |   260 +-
 .../allocator/impl/FirstFitRoutingAllocator.java   |     8 +-
 .../allocator/impl/RecreateHostAllocator.java      |    17 +-
 .../allocator/impl/UserConcentratedAllocator.java  |    47 +-
 .../manager/authn/impl/BasicAgentAuthManager.java  |     4 +-
 .../java/com/cloud/alert/AlertManagerImpl.java     |   430 +-
 .../java/com/cloud/alert/ClusterAlertAdapter.java  |    36 +-
 .../com/cloud/alert/ConsoleProxyAlertAdapter.java  |   179 +-
 .../alert/SecondaryStorageVmAlertAdapter.java      |   183 +-
 .../java/com/cloud/api/ApiAsyncJobDispatcher.java  |    14 +-
 server/src/main/java/com/cloud/api/ApiDBUtils.java |   399 +-
 .../src/main/java/com/cloud/api/ApiDispatcher.java |    18 +-
 .../main/java/com/cloud/api/ApiResponseHelper.java |  1158 +-
 .../java/com/cloud/api/ApiSerializerHelper.java    |     9 +-
 server/src/main/java/com/cloud/api/ApiServer.java  |   545 +-
 server/src/main/java/com/cloud/api/ApiServlet.java |   421 +-
 .../java/com/cloud/api/ApiSessionListener.java     |    23 +-
 .../com/cloud/api/EncodedStringTypeAdapter.java    |     9 +-
 .../com/cloud/api/ResponseObjectTypeAdapter.java   |    17 +-
 .../api/auth/APIAuthenticationManagerImpl.java     |    19 +-
 .../DefaultForgotPasswordAPIAuthenticatorCmd.java  |   165 +
 .../api/auth/DefaultLoginAPIAuthenticatorCmd.java  |    18 +-
 .../api/auth/DefaultLogoutAPIAuthenticatorCmd.java |    11 +-
 .../DefaultResetPasswordAPIAuthenticatorCmd.java   |   193 +
 ...ListUserTwoFactorAuthenticatorProvidersCmd.java |    98 +
 .../auth/SetupUserTwoFactorAuthenticationCmd.java  |    94 +
 ...ValidateUserTwoFactorAuthenticationCodeCmd.java |   143 +
 .../api/dispatch/ParamGenericValidationWorker.java |    12 +-
 .../com/cloud/api/dispatch/ParamProcessWorker.java |   165 +-
 .../com/cloud/api/dispatch/ParamUnpackWorker.java  |     7 +-
 .../java/com/cloud/api/doc/ApiXmlDocWriter.java    |    15 +-
 .../java/com/cloud/api/query/QueryManagerImpl.java |  4083 +++--
 .../com/cloud/api/query/ViewResponseHelper.java    |   165 +-
 .../com/cloud/api/query/dao/AccountJoinDao.java    |     2 +
 .../cloud/api/query/dao/AccountJoinDaoImpl.java    |   114 +-
 .../api/query/dao/AffinityGroupJoinDaoImpl.java    |    63 +-
 .../cloud/api/query/dao/AsyncJobJoinDaoImpl.java   |    20 +-
 .../com/cloud/api/query/dao/DataCenterJoinDao.java |     2 +
 .../cloud/api/query/dao/DataCenterJoinDaoImpl.java |    82 +-
 .../cloud/api/query/dao/DiskOfferingJoinDao.java   |     2 +
 .../api/query/dao/DiskOfferingJoinDaoImpl.java     |    63 +-
 .../com/cloud/api/query/dao/DomainJoinDao.java     |     2 +
 .../com/cloud/api/query/dao/DomainJoinDaoImpl.java |   109 +-
 .../cloud/api/query/dao/DomainRouterJoinDao.java   |     3 +
 .../api/query/dao/DomainRouterJoinDaoImpl.java     |    32 +-
 .../java/com/cloud/api/query/dao/HostJoinDao.java  |     2 +
 .../com/cloud/api/query/dao/HostJoinDaoImpl.java   |   186 +-
 .../java/com/cloud/api/query/dao/HostTagDao.java   |    30 -
 .../com/cloud/api/query/dao/HostTagDaoImpl.java    |   124 -
 .../cloud/api/query/dao/ImageStoreJoinDaoImpl.java |     2 -
 .../api/query/dao/InstanceGroupJoinDaoImpl.java    |     2 -
 .../api/query/dao/NetworkOfferingJoinDao.java      |     3 +
 .../api/query/dao/NetworkOfferingJoinDaoImpl.java  |    62 +-
 .../api/query/dao/ProjectAccountJoinDaoImpl.java   |     4 +-
 .../query/dao/ProjectInvitationJoinDaoImpl.java    |     4 +-
 .../cloud/api/query/dao/ProjectJoinDaoImpl.java    |     2 -
 .../api/query/dao/ResourceTagJoinDaoImpl.java      |     5 -
 .../api/query/dao/SecurityGroupJoinDaoImpl.java    |     4 +-
 .../api/query/dao/ServiceOfferingJoinDao.java      |     5 +
 .../api/query/dao/ServiceOfferingJoinDaoImpl.java  |   145 +-
 .../com/cloud/api/query/dao/SnapshotJoinDao.java   |    39 +
 .../cloud/api/query/dao/SnapshotJoinDaoImpl.java   |   314 +
 .../cloud/api/query/dao/StoragePoolJoinDao.java    |     8 +-
 .../api/query/dao/StoragePoolJoinDaoImpl.java      |   175 +-
 .../com/cloud/api/query/dao/TemplateJoinDao.java   |     4 +-
 .../cloud/api/query/dao/TemplateJoinDaoImpl.java   |   203 +-
 .../cloud/api/query/dao/UserAccountJoinDao.java    |     3 +-
 .../api/query/dao/UserAccountJoinDaoImpl.java      |    13 +-
 .../com/cloud/api/query/dao/UserVmJoinDao.java     |    23 +-
 .../com/cloud/api/query/dao/UserVmJoinDaoImpl.java |   259 +-
 .../com/cloud/api/query/dao/VolumeJoinDaoImpl.java |    47 +-
 .../api/query/dao/VpcOfferingJoinDaoImpl.java      |    21 +-
 .../java/com/cloud/api/query/vo/AccountJoinVO.java |    77 +
 .../com/cloud/api/query/vo/AsyncJobJoinVO.java     |     7 +
 .../com/cloud/api/query/vo/DataCenterJoinVO.java   |    16 +
 .../java/com/cloud/api/query/vo/DomainJoinVO.java  |    90 +-
 .../com/cloud/api/query/vo/DomainRouterJoinVO.java |    38 +-
 .../java/com/cloud/api/query/vo/HostJoinVO.java    |    63 +-
 .../java/com/cloud/api/query/vo/HostTagVO.java     |    61 -
 .../cloud/api/query/vo/ManagementServerJoinVO.java |     4 +
 .../cloud/api/query/vo/NetworkOfferingJoinVO.java  |    43 +
 .../cloud/api/query/vo/ServiceOfferingJoinVO.java  |   123 +-
 .../com/cloud/api/query/vo/SnapshotJoinVO.java     |   362 +
 .../com/cloud/api/query/vo/StoragePoolJoinVO.java  |    35 +-
 .../com/cloud/api/query/vo/TemplateJoinVO.java     |    51 +-
 .../com/cloud/api/query/vo/UserAccountJoinVO.java  |    14 +
 .../java/com/cloud/api/query/vo/UserVmJoinVO.java  |   165 +-
 .../java/com/cloud/api/query/vo/VolumeJoinVO.java  |    19 +-
 .../com/cloud/api/query/vo/VpcOfferingJoinVO.java  |    34 +
 .../cloud/api/response/ApiResponseSerializer.java  |    33 +-
 .../main/java/com/cloud/bgp/BGPServiceImpl.java    |   459 +
 .../com/cloud/capacity/CapacityManagerImpl.java    |   473 +-
 .../main/java/com/cloud/configuration/Config.java  |   269 +-
 .../configuration/ConfigurationManagerImpl.java    |  2738 ++-
 .../AgentBasedConsoleProxyManager.java             |    51 +-
 .../AgentBasedStandaloneConsoleProxyManager.java   |    30 +-
 .../java/com/cloud/consoleproxy/AgentHookBase.java |    96 +-
 .../cloud/consoleproxy/ConsoleProxyManager.java    |    75 +-
 .../consoleproxy/ConsoleProxyManagerImpl.java      |   619 +-
 .../cloud/consoleproxy/ConsoleProxyService.java    |     5 +-
 .../consoleproxy/StaticConsoleProxyManager.java    |     4 +-
 .../java/com/cloud/dc/DedicatedResourceVO.java     |     8 +
 .../com/cloud/dc/dao/DedicatedResourceDao.java     |     5 +-
 .../com/cloud/dc/dao/DedicatedResourceDaoImpl.java |    50 +
 .../deploy/DeploymentPlanningManagerImpl.java      |  1163 +-
 .../java/com/cloud/deploy/FirstFitPlanner.java     |   265 +-
 .../deploy/dao/PlannerHostReservationDaoImpl.java  |     2 +-
 .../com/cloud/event/ActionEventInterceptor.java    |    17 +-
 .../java/com/cloud/event/ActionEventUtils.java     |    86 +-
 .../main/java/com/cloud/event/AlertGenerator.java  |    23 +-
 .../java/com/cloud/event/dao/EventJoinDaoImpl.java |     9 +-
 .../com/cloud/ha/AbstractInvestigatorImpl.java     |    39 +-
 .../com/cloud/ha/CheckOnAgentInvestigator.java     |    10 +-
 server/src/main/java/com/cloud/ha/HaWorkVO.java    |    15 +-
 .../cloud/ha/HighAvailabilityManagerExtImpl.java   |    10 +-
 .../com/cloud/ha/HighAvailabilityManagerImpl.java  |   538 +-
 server/src/main/java/com/cloud/ha/KVMFencer.java   |    11 +-
 .../cloud/ha/ManagementIPSystemVMInvestigator.java |    36 +-
 .../main/java/com/cloud/ha/RecreatableFencer.java  |    14 +-
 .../java/com/cloud/ha/UserVmDomRInvestigator.java  |    67 +-
 .../java/com/cloud/ha/XenServerInvestigator.java   |     4 +-
 .../java/com/cloud/ha/dao/HighAvailabilityDao.java |     6 +
 .../com/cloud/ha/dao/HighAvailabilityDaoImpl.java  |    61 +-
 .../hypervisor/CloudZonesStartupProcessor.java     |    10 +-
 .../com/cloud/hypervisor/HypervisorGuruBase.java   |   314 +-
 .../hypervisor/HypervisorGuruManagerImpl.java      |     2 -
 .../main/java/com/cloud/hypervisor/KVMGuru.java    |   169 +-
 .../discoverer/CustomServerDiscoverer.java         |    37 +
 .../kvm/discoverer/KvmServerDiscoverer.java        |     2 -
 .../kvm/discoverer/LibvirtServerDiscoverer.java    |   139 +-
 .../kvm/discoverer/LxcServerDiscoverer.java        |     2 -
 .../cloud/hypervisor/kvm/dpdk/DpdkHelperImpl.java  |    25 +-
 .../metadata/ResourceMetaDataManagerImpl.java      |     6 +-
 .../network/ExternalDeviceUsageManagerImpl.java    |    80 +-
 .../network/ExternalFirewallDeviceManager.java     |     2 +-
 .../network/ExternalFirewallDeviceManagerImpl.java |    53 +-
 .../cloud/network/ExternalIpAddressAllocator.java  |    10 +-
 .../ExternalLoadBalancerDeviceManagerImpl.java     |   110 +-
 .../network/ExternalNetworkDeviceManagerImpl.java  |    16 -
 .../com/cloud/network/IpAddressManagerImpl.java    |   966 +-
 .../com/cloud/network/Ipv6AddressManagerImpl.java  |    23 +-
 .../java/com/cloud/network/Ipv6ServiceImpl.java    |    58 +-
 .../cloud/network/NetworkMigrationManagerImpl.java |    53 +-
 .../java/com/cloud/network/NetworkModelImpl.java   |   519 +-
 .../java/com/cloud/network/NetworkServiceImpl.java |  2076 ++-
 .../com/cloud/network/NetworkUsageManagerImpl.java |    60 +-
 .../com/cloud/network/PortProfileManagerImpl.java  |    13 +-
 .../com/cloud/network/SDNProviderOpObject.java     |   129 +
 .../com/cloud/network/SshKeysDistriMonitor.java    |    46 +-
 .../cloud/network/StorageNetworkManagerImpl.java   |     8 +-
 .../com/cloud/network/as/AutoScaleManager.java     |    14 +-
 .../com/cloud/network/as/AutoScaleManagerImpl.java |   552 +-
 .../network/element/ConfigDriveNetworkElement.java |   231 +-
 .../network/element/VirtualRouterElement.java      |   138 +-
 .../network/element/VpcVirtualRouterElement.java   |   190 +-
 .../network/firewall/FirewallManagerImpl.java      |   315 +-
 .../com/cloud/network/guru/ControlNetworkGuru.java |    40 +-
 .../com/cloud/network/guru/DirectNetworkGuru.java  |    39 +-
 .../network/guru/DirectPodBasedNetworkGuru.java    |    16 +-
 .../network/guru/ExternalGuestNetworkGuru.java     |    36 +-
 .../com/cloud/network/guru/GuestNetworkGuru.java   |    98 +-
 .../cloud/network/guru/PodBasedNetworkGuru.java    |    15 +-
 .../com/cloud/network/guru/PrivateNetworkGuru.java |    15 +-
 .../com/cloud/network/guru/PublicNetworkGuru.java  |    35 +-
 .../com/cloud/network/guru/StorageNetworkGuru.java |    10 +-
 .../cloud/network/lb/LBHealthCheckManagerImpl.java |    16 +-
 .../network/lb/LoadBalancingRulesManagerImpl.java  |   523 +-
 .../cloud/network/router/CommandSetupHelper.java   |   257 +-
 .../com/cloud/network/router/NetworkHelper.java    |     3 +
 .../cloud/network/router/NetworkHelperImpl.java    |   286 +-
 .../com/cloud/network/router/NicProfileHelper.java |     2 +-
 .../cloud/network/router/NicProfileHelperImpl.java |    12 +-
 .../cloud/network/router/RouterControlHelper.java  |     7 +-
 .../router/VirtualNetworkApplianceManager.java     |   123 +-
 .../router/VirtualNetworkApplianceManagerImpl.java |  1181 +-
 .../cloud/network/router/VpcNetworkHelperImpl.java |    15 +-
 .../VpcVirtualNetworkApplianceManagerImpl.java     |   250 +-
 .../com/cloud/network/rules/AdvancedVpnRules.java  |     6 +-
 .../com/cloud/network/rules/BasicVpnRules.java     |     2 +-
 .../com/cloud/network/rules/BgpPeersRules.java     |    48 +
 .../com/cloud/network/rules/DhcpEntryRules.java    |     2 +-
 .../com/cloud/network/rules/DhcpPvlanRules.java    |     2 +-
 .../com/cloud/network/rules/DhcpSubNetRules.java   |     6 +-
 .../cloud/network/rules/IpAssociationRules.java    |     2 +-
 .../com/cloud/network/rules/NetworkAclsRules.java  |     2 +-
 .../com/cloud/network/rules/NicPlugInOutRules.java |    22 +-
 .../cloud/network/rules/PasswordToRouterRules.java |     2 +-
 .../cloud/network/rules/PrivateGatewayRules.java   |    27 +-
 .../java/com/cloud/network/rules/RuleApplier.java  |     6 +-
 .../cloud/network/rules/RuleApplierWrapper.java    |     2 +-
 .../com/cloud/network/rules/RulesManagerImpl.java  |   524 +-
 .../cloud/network/rules/SshKeyToRouterRules.java   |     2 +-
 .../com/cloud/network/rules/StaticNatRules.java    |     2 +-
 .../com/cloud/network/rules/StaticRoutesRules.java |     2 +-
 .../com/cloud/network/rules/UserdataPwdRules.java  |     2 +-
 .../cloud/network/rules/UserdataToRouterRules.java |     2 +-
 .../cloud/network/rules/VpcIpAssociationRules.java |    10 +-
 .../security/LocalSecurityGroupWorkQueue.java      |     5 +-
 .../network/security/SecurityGroupListener.java    |    61 +-
 .../network/security/SecurityGroupManagerImpl.java |   228 +-
 .../security/SecurityGroupManagerImpl2.java        |    65 +-
 .../network/security/SecurityGroupWorkTracker.java |     7 +-
 .../cloud/network/vpc/NetworkACLManagerImpl.java   |    75 +-
 .../cloud/network/vpc/NetworkACLServiceImpl.java   |   292 +-
 .../java/com/cloud/network/vpc/VpcManagerImpl.java |  1604 +-
 .../vpc/VpcPrivateGatewayTransactionCallable.java  |    16 +-
 .../network/vpn/RemoteAccessVpnManagerImpl.java    |   239 +-
 .../cloud/network/vpn/Site2SiteVpnManagerImpl.java |   208 +-
 .../java/com/cloud/projects/ProjectManager.java    |    14 +-
 .../com/cloud/projects/ProjectManagerImpl.java     |   222 +-
 .../java/com/cloud/resource/DiscovererBase.java    |    40 +-
 .../com/cloud/resource/DummyHostDiscoverer.java    |     4 +-
 .../com/cloud/resource/ResourceManagerImpl.java    |  2181 ++-
 .../resource/RollingMaintenanceManagerImpl.java    |   104 +-
 .../resourceicon/ResourceIconManagerImpl.java      |    28 +-
 .../cloud/resourcelimit/CheckedReservation.java    |   163 +-
 .../resourcelimit/ResourceLimitManagerImpl.java    |  1828 +-
 .../com/cloud/server/ConfigurationServerImpl.java  |   271 +-
 .../java/com/cloud/server/ManagementServer.java    |     4 +
 .../server/ManagementServerHostStatsEntry.java     |    33 +-
 .../com/cloud/server/ManagementServerImpl.java     |  1936 ++-
 .../main/java/com/cloud/server/StatsCollector.java |   703 +-
 .../com/cloud/server/auth/UserAuthenticator.java   |    47 -
 .../com/cloud/servlet/CloudStartupServlet.java     |     2 -
 .../com/cloud/servlet/ConsoleProxyClientParam.java |    28 +
 .../ConsoleProxyPasswordBasedEncryptor.java        |    76 +-
 .../com/cloud/servlet/ConsoleProxyServlet.java     |   112 +-
 .../cloud/storage/CheckAndRepairVolumePayload.java |    41 +
 .../com/cloud/storage/CreateSnapshotPayload.java   |    30 +
 .../com/cloud/storage/ImageStoreDetailsUtil.java   |     4 +-
 .../com/cloud/storage/ImageStoreServiceImpl.java   |    77 +-
 .../com/cloud/storage/ImageStoreUploadMonitor.java |     2 +-
 .../cloud/storage/ImageStoreUploadMonitorImpl.java |    78 +-
 .../java/com/cloud/storage/OCFS2ManagerImpl.java   |    26 +-
 .../com/cloud/storage/ResizeVolumePayload.java     |    16 +
 .../java/com/cloud/storage/StorageManagerImpl.java |  2136 ++-
 .../com/cloud/storage/StoragePoolAutomation.java   |    10 +-
 .../cloud/storage/StoragePoolAutomationImpl.java   |   519 +-
 .../java/com/cloud/storage/TemplateProfile.java    |    36 +-
 .../com/cloud/storage/VolumeApiServiceImpl.java    |  1856 +-
 .../storage/download/DownloadActiveState.java      |    10 +-
 .../cloud/storage/download/DownloadErrorState.java |     2 +-
 .../cloud/storage/download/DownloadListener.java   |    60 +-
 .../cloud/storage/download/DownloadMonitor.java    |     4 +-
 .../storage/download/DownloadMonitorImpl.java      |   120 +-
 .../com/cloud/storage/download/DownloadState.java  |    11 +-
 .../storage/listener/SnapshotStateListener.java    |    29 +-
 .../cloud/storage/listener/StoragePoolMonitor.java |   148 +-
 .../storage/listener/StorageSyncListener.java      |    11 +-
 .../storage/listener/VolumeStateListener.java      |    46 +-
 .../resource/DummySecondaryStorageResource.java    |     2 -
 .../secondary/SecondaryStorageListener.java        |     9 +-
 .../secondary/SecondaryStorageVmManager.java       |    27 +
 .../cloud/storage/snapshot/SnapshotManager.java    |    34 +-
 .../storage/snapshot/SnapshotManagerImpl.java      |  1250 +-
 .../storage/snapshot/SnapshotSchedulerImpl.java    |   206 +-
 .../cloud/storage/upload/UploadActiveState.java    |     8 +-
 .../com/cloud/storage/upload/UploadErrorState.java |     3 +-
 .../com/cloud/storage/upload/UploadListener.java   |    26 +-
 .../com/cloud/storage/upload/UploadMonitor.java    |     2 +-
 .../cloud/storage/upload/UploadMonitorImpl.java    |    42 +-
 .../java/com/cloud/storage/upload/UploadState.java |    11 +-
 .../upload/params/TemplateUploadParams.java        |    10 +-
 .../cloud/storage/upload/params/UploadParams.java  |     4 +
 .../storage/upload/params/UploadParamsBase.java    |    49 +-
 .../com/cloud/tags/ResourceManagerUtilImpl.java    |    24 +-
 .../com/cloud/tags/TaggedResourceManagerImpl.java  |    29 +-
 .../cloud/template/HypervisorTemplateAdapter.java  |   341 +-
 .../java/com/cloud/template/TemplateAdapter.java   |    10 +-
 .../com/cloud/template/TemplateAdapterBase.java    |   275 +-
 .../com/cloud/template/TemplateManagerImpl.java    |   533 +-
 .../main/java/com/cloud/test/DatabaseConfig.java   |    69 +-
 .../main/java/com/cloud/test/IPRangeConfig.java    |    36 +-
 .../main/java/com/cloud/test/PodZoneConfig.java    |     6 -
 .../src/main/java/com/cloud/test/TestAppender.java |   179 -
 .../java/com/cloud/usage/UsageServiceImpl.java     |    81 +-
 .../main/java/com/cloud/user/AccountManager.java   |    19 +
 .../java/com/cloud/user/AccountManagerImpl.java    |  1462 +-
 .../main/java/com/cloud/user/DomainManager.java    |     2 +
 .../java/com/cloud/user/DomainManagerImpl.java     |   444 +-
 .../main/java/com/cloud/user/PasswordPolicy.java   |     9 +-
 .../java/com/cloud/user/PasswordPolicyImpl.java    |    17 +-
 .../java/com/cloud/vm/SystemVmLoadScanner.java     |    13 +-
 .../src/main/java/com/cloud/vm/UserVmManager.java  |    88 +-
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  |  4998 ++++--
 .../java/com/cloud/vm/UserVmStateListener.java     |    32 +-
 .../cloud/vm/snapshot/VMSnapshotManagerImpl.java   |   121 +-
 .../cloudstack/acl/ProjectRoleManagerImpl.java     |    12 +-
 .../org/apache/cloudstack/acl/RoleManagerImpl.java |   246 +-
 .../affinity/AffinityGroupServiceImpl.java         |    34 +-
 .../agent/lb/IndirectAgentLBServiceImpl.java       |   506 +-
 .../IndirectAgentLBRoundRobinAlgorithm.java        |     7 +-
 .../algorithm/IndirectAgentLBShuffleAlgorithm.java |     2 +-
 .../algorithm/IndirectAgentLBStaticAlgorithm.java  |     2 +-
 .../annotation/AnnotationManagerImpl.java          |    59 +-
 .../apache/cloudstack/auth/UserAuthenticator.java  |    47 +
 .../cloudstack/backup/BackupManagerImpl.java       |  1422 +-
 .../backup/BackupRepositoryServiceImpl.java        |   165 +
 .../org/apache/cloudstack/ca/CAManagerImpl.java    |    39 +-
 .../cloudstack/cluster/ClusterDrsServiceImpl.java  |  1078 ++
 .../command/ReconcileCommandServiceImpl.java       |  1146 ++
 .../consoleproxy/ConsoleAccessManagerImpl.java     |   662 +-
 .../cloudstack/diagnostics/DiagnosticsHelper.java  |     7 +-
 .../diagnostics/DiagnosticsServiceImpl.java        |    41 +-
 .../fileprocessor/DiagnosticsFilesList.java        |    12 +-
 .../diagnostics/to/DiagnosticsDataObject.java      |    13 +
 .../diagnostics/to/DiagnosticsDataTO.java          |     4 +
 .../direct/download/DirectDownloadManagerImpl.java |   167 +-
 .../org/apache/cloudstack/gpu/GpuServiceImpl.java  |  1392 ++
 .../cloudstack/gui/theme/GuiThemeServiceImpl.java  |   445 +
 .../java/org/apache/cloudstack/ha/HAManager.java   |     2 +-
 .../org/apache/cloudstack/ha/HAManagerImpl.java    |    37 +-
 .../ha/provider/host/HAAbstractHostProvider.java   |    16 +-
 .../cloudstack/ha/task/ActivityCheckTask.java      |     2 -
 .../org/apache/cloudstack/ha/task/BaseHATask.java  |     9 +-
 .../apache/cloudstack/ha/task/HealthCheckTask.java |     2 -
 .../jsinterpreter/JsInterpreterHelper.java         |   240 +
 .../cloudstack/network/RoutedIpv4ManagerImpl.java  |  1673 ++
 .../lb/ApplicationLoadBalancerManagerImpl.java     |    13 +-
 .../deployment/RouterDeploymentDefinition.java     |    55 +-
 .../RouterDeploymentDefinitionBuilder.java         |     8 +
 .../deployment/VpcRouterDeploymentDefinition.java  |    33 +-
 .../cloudstack/network/ssl/CertServiceImpl.java    |   114 +-
 .../network/topology/AdvancedNetworkTopology.java  |    61 +-
 .../network/topology/AdvancedNetworkVisitor.java   |    34 +-
 .../network/topology/BasicNetworkTopology.java     |    71 +-
 .../network/topology/BasicNetworkVisitor.java      |    14 +-
 .../network/topology/NetworkTopology.java          |     5 +-
 .../network/topology/NetworkTopologyContext.java   |     2 +-
 .../network/topology/NetworkTopologyVisitor.java   |     8 +-
 .../OutOfBandManagementServiceImpl.java            |    55 +-
 .../outofbandmanagement/PowerOperationTask.java    |    10 +-
 .../cloudstack/poll/BackgroundPollManagerImpl.java |     6 +-
 .../apache/cloudstack/region/RegionManager.java    |     2 +-
 .../cloudstack/region/RegionManagerImpl.java       |     2 -
 .../cloudstack/region/RegionServiceImpl.java       |     2 -
 .../apache/cloudstack/region/RegionsApiUtil.java   |    39 +-
 .../gslb/GlobalLoadBalancingRulesServiceImpl.java  |    36 +-
 .../resource/ResourceCleanupServiceImpl.java       |   846 +
 .../apache/cloudstack/snapshot/SnapshotHelper.java |   202 +-
 .../cloudstack/storage/NfsMountManagerImpl.java    |    34 +-
 .../storage/browser/StorageBrowserImpl.java        |   419 +
 .../storage/heuristics/HeuristicRuleHelper.java    |   283 +
 .../heuristics/presetvariables/Account.java        |    41 +
 .../storage/heuristics/presetvariables/Domain.java |    30 +
 .../GenericHeuristicPresetVariable.java            |    47 +
 .../presetvariables/PresetVariables.java           |    72 +
 .../presetvariables/SecondaryStorage.java          |    64 +
 .../heuristics/presetvariables/Snapshot.java       |    44 +
 .../heuristics/presetvariables/Template.java       |    56 +
 .../storage/heuristics/presetvariables/Volume.java |    44 +
 .../storage/object/BucketApiServiceImpl.java       |   366 +
 .../storage/sharedfs/SharedFSServiceImpl.java      |   720 +
 .../sharedfs/query/dao/SharedFSJoinDao.java        |    38 +
 .../sharedfs/query/dao/SharedFSJoinDaoImpl.java    |   187 +
 .../storage/sharedfs/query/vo/SharedFSJoinVO.java  |   320 +
 .../storage/template/VnfTemplateManagerImpl.java   |   373 +
 .../volume/VolumeImportUnmanageManagerImpl.java    |   516 +
 .../cloudstack/user/UserPasswordResetManager.java  |    87 +
 .../user/UserPasswordResetManagerImpl.java         |   306 +
 .../cloudstack/vm/ImportVmTasksManagerImpl.java    |   248 +
 .../cloudstack/vm/UnmanagedVMsManagerImpl.java     |  2496 ++-
 .../cloudstack/vm/lease/VMLeaseManagerImpl.java    |   382 +
 .../vm/schedule/VMScheduleManagerImpl.java         |   326 +
 .../apache/cloudstack/vm/schedule/VMScheduler.java |    36 +
 .../cloudstack/vm/schedule/VMSchedulerImpl.java    |   414 +
 .../apache/cloudstack/webhook/WebhookHelper.java   |    28 +
 .../core/spring-server-core-managers-context.xml   |   103 +-
 .../core/spring-server-core-misc-context.xml       |     6 +-
 .../server-alert-adapter-backend/module.properties |     2 +-
 ...spring-server-alert-adapter-backend-context.xml |     2 +-
 .../server-alert-adapter-compute/module.properties |     2 +-
 ...spring-server-alert-adapter-compute-context.xml |     2 +-
 .../server-alert-adapter-storage/module.properties |     2 +-
 ...spring-server-alert-adapter-storage-context.xml |     2 +-
 .../cloudstack/server-allocator/module.properties  |     2 +-
 .../spring-server-allocator-context.xml            |     2 +-
 .../cloudstack/server-api/module.properties        |     2 +-
 .../server-api/spring-server-api-context.xml       |     2 +-
 .../cloudstack/server-compute/module.properties    |     2 +-
 .../spring-server-compute-context.xml              |     2 +
 .../cloudstack/server-discoverer/module.properties |     2 +-
 .../spring-server-discoverer-context.xml           |     5 +
 .../cloudstack/server-fencer/module.properties     |     2 +-
 .../server-fencer/spring-server-fencer-context.xml |     4 +-
 .../server-investigator/module.properties          |     2 +-
 .../spring-server-investigator-context.xml         |     2 +-
 .../cloudstack/server-network/module.properties    |     2 +-
 .../cloudstack/server-planner/module.properties    |     2 +-
 .../cloudstack/server-storage/module.properties    |     2 +-
 .../server-template-adapter/module.properties      |     2 +-
 .../spring-server-template-adapter-context.xml     |     2 +-
 .../system/spring-server-system-context.xml        |     2 +-
 .../com/cloud/upgrade/databaseCreatorContext.xml   |     6 +-
 server/src/test/async-job-component.xml            |     6 +-
 .../test/java/com/cloud/acl/DomainCheckerTest.java |   166 +
 .../allocator/impl/FirstFitAllocatorTest.java      |   231 +
 .../com/cloud/alert/AlertControlsUnitTest.java     |    41 +-
 .../java/com/cloud/alert/AlertManagerImplTest.java |   200 +-
 .../java/com/cloud/alert/MockAlertManagerImpl.java |     5 +-
 server/src/test/java/com/cloud/api/APITest.java    |    11 +-
 .../test/java/com/cloud/api/ApiDispatcherTest.java |    19 +-
 .../java/com/cloud/api/ApiResponseHelperTest.java  |   639 +-
 .../src/test/java/com/cloud/api/ApiServerTest.java |   179 +
 .../test/java/com/cloud/api/ApiServletTest.java    |   219 +-
 .../src/test/java/com/cloud/api/ListPerfTest.java  |     4 +-
 .../src/test/java/com/cloud/api/LoginResponse.java |     4 +-
 .../api/dispatch/CommandCreationWorkerTest.java    |    14 +-
 .../api/dispatch/DispatchChainFactoryTest.java     |     1 +
 .../dispatch/ParamGenericValidationWorkerTest.java |    73 +-
 .../cloud/api/dispatch/ParamProcessWorkerTest.java |   139 +-
 .../dispatch/SpecificCmdValidationWorkerTest.java  |    10 +-
 .../query/MutualExclusiveIdsManagerBaseTest.java   |    19 +-
 .../com/cloud/api/query/QueryManagerImplTest.java  |   505 +-
 .../GenericDaoBaseWithTagInformationBaseTest.java  |    27 +-
 .../query/dao/SecurityGroupJoinDaoImplTest.java    |    39 +-
 .../api/query/dao/SnapshotJoinDaoImplTest.java     |   109 +
 .../api/query/dao/TemplateJoinDaoImplTest.java     |    68 +-
 .../cloud/api/query/dao/UserVmJoinDaoImplTest.java |   123 +-
 .../cloud/api/query/dao/VolumeJoinDaoImplTest.java |    10 +-
 .../java/com/cloud/bgp/BGPServiceImplTest.java     |   176 +
 .../cloud/capacity/CapacityManagerImplTest.java    |   182 +
 .../com/cloud/capacity/CapacityManagerTest.java    |    21 +-
 .../java/com/cloud/configuration/ConfigTest.java   |    42 +
 .../ConfigurationManagerImplTest.java              |  1143 ++
 .../configuration/ConfigurationManagerTest.java    |   548 +-
 .../cloud/configuration/ValidateIpRangeTest.java   |    26 +-
 .../consoleproxy/ConsoleProxyManagerImplTest.java  |   107 +
 .../consoleproxy/ConsoleProxyManagerTest.java      |    85 +-
 .../deploy/DeploymentPlanningManagerImplTest.java  |   503 +-
 .../cloud/event/ActionEventInterceptorTest.java    |   109 +-
 .../java/com/cloud/event/ActionEventUtilsTest.java |    55 +-
 .../com/cloud/event/EventControlsUnitTest.java     |    44 +-
 .../com/cloud/event/dao/EventJoinDaoImplTest.java  |    16 +-
 .../cloud/ha/HighAvailabilityManagerImplTest.java  |   248 +-
 .../src/test/java/com/cloud/ha/KVMFencerTest.java  |    31 +-
 .../cloud/ha/dao/HighAvailabilityDaoImplTest.java  |   125 +
 .../java/com/cloud/hypervisor/KVMGuruTest.java     |    12 +-
 .../discoverer/LibvirtServerDiscovererTest.java    |    54 +
 .../hypervisor/kvm/dpdk/DpdkHelperImplTest.java    |    25 +-
 .../test/java/com/cloud/keystore/KeystoreTest.java |     8 +-
 .../metadata/ResourceMetaDataManagerTest.java      |    37 +-
 .../cloud/network/CreatePrivateNetworkTest.java    |    64 +-
 .../cloud/network/DedicateGuestVlanRangesTest.java |    56 +-
 .../ExternalLoadBalancerDeviceManagerImplTest.java |    36 +-
 .../com/cloud/network/IpAddressManagerTest.java    |   267 +-
 .../com/cloud/network/Ipv6AddressManagerTest.java  |    27 +-
 .../com/cloud/network/Ipv6ServiceImplTest.java     |    80 +-
 .../com/cloud/network/MockFirewallManagerImpl.java |    16 +-
 .../com/cloud/network/MockNetworkModelImpl.java    |    39 +-
 .../com/cloud/network/NetworkModelImplTest.java    |   198 +-
 .../java/com/cloud/network/NetworkModelTest.java   |    89 +-
 .../com/cloud/network/NetworkServiceImplTest.java  |   961 +-
 .../cloud/network/UpdatePhysicalNetworkTest.java   |    25 +-
 .../cloud/network/as/AutoScaleManagerImplTest.java |   647 +-
 .../com/cloud/network/as/AutoScaleManagerTest.java |     2 +-
 .../element/ConfigDriveNetworkElementTest.java     |   219 +-
 .../network/element/VirtualRouterElementTest.java  |   125 +-
 .../element/VpcVirtualRouterElementTest.java       |    49 +-
 .../network/firewall/FirewallManagerTest.java      |   187 +-
 .../cloud/network/guru/DirectNetworkGuruTest.java  |    41 +-
 .../network/guru/ExternalGuestNetworkGuruTest.java |    29 +-
 .../cloud/network/lb/AssignLoadBalancerTest.java   |    16 +-
 .../lb/LoadBalancingRulesManagerImplTest.java      |   209 +-
 .../cloud/network/lb/UpdateLoadBalancerTest.java   |    19 +-
 .../network/router/CommandSetupHelperTest.java     |   196 +-
 .../network/router/NetworkHelperImplTest.java      |   104 +-
 .../network/router/RouterControlHelperTest.java    |    27 +-
 .../VirtualNetworkApplianceManagerImplTest.java    |   134 +-
 .../com/cloud/network/rules/BgpPeersRulesTest.java |    98 +
 .../security/SecurityGroupManagerImpl2Test.java    |    27 +-
 .../security/SecurityGroupManagerImplTest.java     |    11 +-
 .../SecurityGroupManagerTestConfiguration.java     |    40 +-
 .../network/security/SecurityGroupQueueTest.java   |     7 +-
 .../network/vpc/NetworkACLManagerImplTest.java     |     9 +-
 .../cloud/network/vpc/NetworkACLManagerTest.java   |   349 +
 .../network/vpc/NetworkACLServiceImplTest.java     |   360 +-
 .../com/cloud/network/vpc/VpcManagerImplTest.java  |   403 +-
 .../vpn/RemoteAccessVpnManagerImplTest.java        |    89 +-
 .../com/cloud/projects/MockProjectManagerImpl.java |    15 +-
 .../com/cloud/projects/ProjectManagerImplTest.java |   131 +
 .../cloud/resource/MockResourceManagerImpl.java    |   139 +-
 .../cloud/resource/ResourceManagerImplTest.java    |   799 +-
 .../RollingMaintenanceManagerImplTest.java         |    70 +-
 .../resourceicon/ResourceIconManagerImplTest.java  |    37 +-
 .../resourcelimit/CheckedReservationTest.java      |   147 +-
 .../ResourceLimitManagerImplTest.java              |  1323 +-
 .../cloud/server/ConfigurationServerImplTest.java  |    23 +-
 .../com/cloud/server/ManagementServerImplTest.java |  1055 +-
 .../java/com/cloud/server/StatsCollectorTest.java  |   393 +-
 .../java/com/cloud/snapshot/SnapshotDaoTest.java   |    19 +-
 .../snapshot/SnapshotDaoTestConfiguration.java     |    22 +-
 .../cloud/storage/ImageStoreDetailsUtilTest.java   |    15 +-
 .../com/cloud/storage/StorageManagerImplTest.java  |  1610 +-
 .../cloud/storage/VolumeApiServiceImplTest.java    |  1215 +-
 .../com/cloud/storage/dao/AsyncJobJoinDaoTest.java |     2 +-
 .../com/cloud/storage/dao/StoragePoolDaoTest.java  |     9 +-
 .../dao/StoragePoolDaoTestConfiguration.java       |     7 +-
 .../storage/listener/StoragePoolMonitorTest.java   |    54 +-
 .../storage/snapshot/SnapshotManagerImplTest.java  |   523 +
 .../storage/snapshot/SnapshotManagerTest.java      |   444 +-
 .../snapshot/SnapshotSchedulerImplTest.java        |   277 +
 .../cloud/tags/TaggedResourceManagerImplTest.java  |    22 +-
 .../template/HypervisorTemplateAdapterTest.java    |   352 +-
 .../cloud/template/TemplateManagerImplTest.java    |   205 +-
 .../com/cloud/user/AccountManagerImplTest.java     |   864 +-
 .../AccountManagerImplVolumeDeleteEventTest.java   |    83 +-
 .../com/cloud/user/AccountManagetImplTestBase.java |    69 +-
 .../java/com/cloud/user/DomainManagerImplTest.java |   115 +-
 .../com/cloud/user/MockAccountManagerImpl.java     |   452 -
 .../java/com/cloud/user/MockUsageEventDao.java     |    44 +-
 .../com/cloud/user/PasswordPolicyImplTest.java     |    18 +
 .../java/com/cloud/vm/FirstFitPlannerTest.java     |   186 +-
 .../java/com/cloud/vm/UserVmManagerImplTest.java   |  3555 +++-
 .../test/java/com/cloud/vm/UserVmManagerTest.java  |   131 +-
 .../vm/dao/UserVmCloneSettingDaoImplTest.java      |    11 +-
 .../UserVmCloneSettingDaoTestConfiguration.java    |     5 +-
 .../java/com/cloud/vm/dao/UserVmDaoImplTest.java   |    10 +-
 .../cloud/vm/dao/UserVmDaoTestConfiguration.java   |     7 +-
 .../cloud/vm/snapshot/VMSnapshotManagerTest.java   |   114 +-
 .../cloud/vpc/MockConfigurationManagerImpl.java    |   132 +-
 .../java/com/cloud/vpc/MockNetworkManagerImpl.java |   101 +-
 .../java/com/cloud/vpc/MockNetworkModelImpl.java   |    43 +-
 .../cloud/vpc/MockResourceLimitManagerImpl.java    |   216 +-
 .../com/cloud/vpc/MockSite2SiteVpnManagerImpl.java |    30 +-
 .../cloud/vpc/MockSite2SiteVpnServiceProvider.java |    10 +-
 .../vpc/MockVpcVirtualNetworkApplianceManager.java |    24 +
 .../java/com/cloud/vpc/NetworkACLManagerTest.java  |   346 -
 .../java/com/cloud/vpc/NetworkACLServiceTest.java  |    69 +-
 .../test/java/com/cloud/vpc/Site2SiteVpnTest.java  |    77 -
 .../test/java/com/cloud/vpc/VpcApiUnitTest.java    |    21 +-
 .../java/com/cloud/vpc/VpcTestConfiguration.java   |    45 +-
 .../cloud/vpc/dao/MockConfigurationDaoImpl.java    |     6 +-
 .../java/com/cloud/vpc/dao/MockNetworkDaoImpl.java |    25 +-
 .../cloud/vpc/dao/MockNetworkOfferingDaoImpl.java  |    14 +-
 .../vpc/dao/MockNetworkServiceMapDaoImpl.java      |    10 +-
 .../java/com/cloud/vpc/dao/MockVpcDaoImpl.java     |    16 +-
 .../com/cloud/vpc/dao/MockVpcOfferingDaoImpl.java  |     5 +
 .../vpc/dao/MockVpcOfferingServiceMapDaoImpl.java  |    16 +-
 .../apache/cloudstack/acl/RoleManagerImplTest.java |   185 +-
 .../cloudstack/affinity/AffinityApiUnitTest.java   |    92 +-
 .../affinity/AffinityGroupServiceImplTest.java     |   107 +-
 .../agent/lb/IndirectAgentLBServiceImplTest.java   |    37 +-
 .../IndirectAgentLBRoundRobinAlgorithmTest.java    |    10 +-
 .../IndirectAgentLBShuffleAlgorithmTest.java       |    10 +-
 .../IndirectAgentLBStaticAlgorithmTest.java        |    10 +-
 .../annotation/AnnotationManagerImplTest.java      |    41 +-
 .../cloudstack/backup/BackupManagerTest.java       |  2033 ++-
 .../backup/BackupRepositoryServiceImplTest.java    |   243 +
 .../apache/cloudstack/ca/CABackgroundTaskTest.java |    41 +-
 .../apache/cloudstack/ca/CAManagerImplTest.java    |    39 +-
 .../cluster/ClusterDrsServiceImplTest.java         |   950 ++
 .../consoleproxy/ConsoleAccessManagerImplTest.java |   705 +-
 .../DiagnosticsFilesListFactoryTest.java           |    19 +-
 .../diagnostics/DiagnosticsServiceImplTest.java    |    28 +-
 .../download/DirectDownloadManagerImplTest.java    |     6 +-
 .../apache/cloudstack/gpu/GpuServiceImplTest.java  |  1495 ++
 .../gui/theme/GuiThemeServiceImplTest.java         |   215 +
 .../jsinterpreter/JsInterpreterHelperTest.java     |   228 +
 .../network/RoutedIpv4ManagerImplTest.java         |  1217 ++
 .../network/lb/ApplicationLoadBalancerTest.java    |    72 +-
 .../deployment/RouterDeploymentDefinitionTest.java |    71 +-
 .../RouterDeploymentDefinitionTestBase.java        |    27 +-
 .../VpcRouterDeploymentDefinitionTest.java         |    47 +-
 .../cloudstack/network/ssl/CertServiceTest.java    |   371 +-
 .../networkoffering/ChildTestConfiguration.java    |    10 +-
 .../networkoffering/CreateNetworkOfferingTest.java |    80 +-
 .../OutOfBandManagementServiceTest.java            |     2 +-
 .../poll/BackgroundPollManagerImplTest.java        |     2 +-
 .../cloudstack/privategw/AclOnPrivateGwTest.java   |    58 +-
 .../cloudstack/region/RegionManagerTest.java       |    16 +-
 .../GlobalLoadBalancingRulesServiceImplTest.java   |    77 +-
 .../resource/ResourceCleanupServiceImplTest.java   |   688 +
 .../cloudstack/service/NetrisServiceMockTest.java  |   134 +
 .../cloudstack/service/ServiceOfferingVOTest.java  |    16 +-
 .../cloudstack/snapshot/SnapshotHelperTest.java    |    77 +-
 .../storage/browser/StorageBrowserImplTest.java    |   459 +
 .../heuristics/HeuristicRuleHelperTest.java        |   192 +
 .../heuristics/presetvariables/AccountTest.java    |    46 +
 .../heuristics/presetvariables/DomainTest.java     |    41 +
 .../GenericHeuristicPresetVariableTest.java        |    40 +
 .../presetvariables/SecondaryStorageTest.java      |    45 +
 .../heuristics/presetvariables/SnapshotTest.java   |    44 +
 .../heuristics/presetvariables/TemplateTest.java   |    46 +
 .../heuristics/presetvariables/VolumeTest.java     |    44 +
 .../storage/object/BucketApiServiceImplTest.java   |   183 +
 .../storage/sharedfs/SharedFSServiceImplTest.java  |   665 +
 .../query/dao/SharedFSJoinDaoImplTest.java         |   152 +
 .../template/VnfTemplateManagerImplTest.java       |   389 +
 .../VolumeImportUnmanageManagerImplTest.java       |   622 +
 .../user/UserPasswordResetManagerImplTest.java     |   150 +
 .../cloudstack/vm/UnmanagedVMsManagerImplTest.java |  1121 +-
 .../vm/lease/VMLeaseManagerImplTest.java           |   316 +
 .../vm/schedule/VMScheduleManagerImplTest.java     |   282 +
 .../vm/schedule/VMSchedulerImplTest.java           |   388 +
 .../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 +-
 server/src/test/resources/appLoadBalancer.xml      |    28 +-
 .../src/test/resources/createNetworkOffering.xml   |   156 +-
 server/src/test/resources/db.properties            |   142 +-
 server/src/test/resources/testContext.xml          |   160 +-
 services/console-proxy/pom.xml                     |     2 +-
 services/console-proxy/rdpconsole/README.txt       |     2 +-
 services/console-proxy/rdpconsole/pom.xml          |     2 +-
 services/console-proxy/rdpconsole/rdp-config.bat   |    11 +-
 .../java/common/BufferedImagePixelsAdapter.java    |    11 +-
 .../main/java/common/adapter/AwtCanvasAdapter.java |     6 -
 .../src/main/java/rdpclient/RdpClient.java         |    11 +-
 .../java/rdpclient/clip/ClipboardDataFormat.java   |    14 -
 .../src/main/java/rdpclient/ntlmssp/NegoFlags.java |     4 +-
 .../java/rdpclient/ntlmssp/asn1/TSRequest.java     |     6 -
 .../main/java/rdpclient/ntlmssp/package-info.java  |     1 -
 .../java/rdpclient/rdp/ClientConfirmActivePDU.java |     2 +-
 .../src/main/java/rdpclient/rdp/ClientInfoPDU.java |     6 +-
 .../rdpclient/rdp/ClientMCSAttachUserRequest.java  |     2 -
 ...nnelJoinRequestServerMCSChannelConfirmPDUs.java |     5 -
 .../java/rdpclient/rdp/ClientSynchronizePDU.java   |     3 -
 .../java/rdpclient/rdp/ServerBitmapUpdate.java     |     1 -
 .../java/rdpclient/rdp/ServerDemandActivePDU.java  |    11 +-
 .../java/rdpclient/rdp/ServerIOChannelRouter.java  |     8 +-
 .../src/main/java/rdpclient/rdp/ServerMCSPDU.java  |     4 -
 .../src/main/java/streamer/BaseElement.java        |     5 +-
 .../src/main/java/streamer/ByteBuffer.java         |     2 +-
 .../src/main/java/streamer/InputStreamSource.java  |     6 +-
 .../src/main/java/streamer/OutputStreamSink.java   |     6 +-
 .../src/main/java/streamer/PipelineImpl.java       |     7 +-
 .../rdpconsole/src/main/java/streamer/Queue.java   |     1 -
 .../src/main/java/streamer/SocketWrapperImpl.java  |    10 +-
 .../src/main/java/streamer/SyncLink.java           |    29 +-
 .../src/main/java/streamer/apr/AprSocketSink.java  |     4 +-
 .../main/java/streamer/apr/AprSocketSource.java    |     4 +-
 .../java/streamer/apr/AprSocketWrapperImpl.java    |     8 +-
 .../java/streamer/bco/BcoSocketWrapperImpl.java    |    10 +-
 .../src/main/java/streamer/debug/FakeSource.java   |     4 +-
 .../src/main/java/streamer/debug/MockServer.java   |    15 +-
 .../src/main/java/streamer/debug/MockSource.java   |     1 -
 .../java/vncclient/vnc/Vnc33Authentication.java    |     2 -
 .../src/main/java/vncclient/vnc/Vnc33Hello.java    |     2 -
 .../main/java/vncclient/vnc/VncInitializer.java    |     2 -
 .../main/java/vncclient/vnc/VncMessageHandler.java |     2 -
 .../rdpconsole/src/test/doc/dev-rdp-config.bat     |    25 +-
 .../src/test/java/common/ClientTest.java           |     8 +-
 .../src/test/java/streamer/BaseElementTest.java    |     2 +-
 services/console-proxy/server/pom.xml              |    10 +-
 .../com/cloud/consoleproxy/AjaxFIFOImageCache.java |    23 +-
 .../consoleproxy/AuthenticationException.java      |     2 +-
 .../java/com/cloud/consoleproxy/ConsoleProxy.java  |   149 +-
 .../consoleproxy/ConsoleProxyAjaxHandler.java      |    93 +-
 .../consoleproxy/ConsoleProxyAjaxImageHandler.java |    37 +-
 .../ConsoleProxyBaseServerFactoryImpl.java         |    13 +-
 .../cloud/consoleproxy/ConsoleProxyClientBase.java |    23 +-
 .../consoleproxy/ConsoleProxyClientParam.java      |    39 +-
 .../ConsoleProxyClientStatsCollector.java          |    16 +-
 .../cloud/consoleproxy/ConsoleProxyCmdHandler.java |    17 +-
 .../cloud/consoleproxy/ConsoleProxyGCThread.java   |    48 +-
 .../ConsoleProxyHttpHandlerHelper.java             |    38 +-
 .../consoleproxy/ConsoleProxyLoggerFactory.java    |   103 -
 .../cloud/consoleproxy/ConsoleProxyMonitor.java    |    29 +-
 .../consoleproxy/ConsoleProxyNoVNCHandler.java     |    55 +-
 .../consoleproxy/ConsoleProxyNoVNCServer.java      |     9 +-
 .../consoleproxy/ConsoleProxyNoVncClient.java      |   262 +-
 .../ConsoleProxyPasswordBasedEncryptor.java        |    83 +-
 .../cloud/consoleproxy/ConsoleProxyRdpClient.java  |    16 +-
 .../consoleproxy/ConsoleProxyResourceHandler.java  |    51 +-
 .../ConsoleProxySecureServerFactoryImpl.java       |    27 +-
 .../consoleproxy/ConsoleProxyThumbnailHandler.java |    49 +-
 .../cloud/consoleproxy/ConsoleProxyVncClient.java  |    18 +-
 .../consoleproxy/rdp/RdpBufferedImageCanvas.java   |    10 +-
 .../java/com/cloud/consoleproxy/util/Logger.java   |   223 -
 .../com/cloud/consoleproxy/util/LoggerFactory.java |    21 -
 .../java/com/cloud/consoleproxy/util/RawHTTP.java  |    15 +-
 .../consoleproxy/vnc/BufferedImageCanvas.java      |    12 +-
 .../com/cloud/consoleproxy/vnc/NoVncClient.java    |   381 +-
 .../com/cloud/consoleproxy/vnc/RfbConstants.java   |     7 +-
 .../java/com/cloud/consoleproxy/vnc/VncClient.java |    42 +-
 .../consoleproxy/vnc/VncClientPacketSender.java    |    10 +-
 .../consoleproxy/vnc/VncServerPacketReceiver.java  |    12 +-
 .../cloud/consoleproxy/vnc/network/NioSocket.java  |   123 +
 .../consoleproxy/vnc/network/NioSocketHandler.java |    44 +
 .../vnc/network/NioSocketHandlerImpl.java          |   112 +
 .../vnc/network/NioSocketInputStream.java          |   212 +
 .../vnc/network/NioSocketOutputStream.java         |   114 +
 .../vnc/network/NioSocketSSLEngineManager.java     |   205 +
 .../consoleproxy/vnc/network/NioSocketStream.java  |    90 +
 .../vnc/network/NioSocketTLSInputStream.java       |    71 +
 .../vnc/network/NioSocketTLSOutputStream.java      |    64 +
 .../vnc/packet/server/AbstractRect.java            |     7 +-
 .../consoleproxy/vnc/packet/server/RawRect.java    |     4 +-
 .../vnc/packet/server/ServerCutText.java           |     8 +-
 .../consoleproxy/vnc/security/NoneVncSecurity.java |    27 +
 .../consoleproxy/vnc/security/VncAuthSecurity.java |    61 +
 .../consoleproxy/vnc/security/VncSecurity.java     |    45 +
 .../consoleproxy/vnc/security/VncTLSSecurity.java  |   105 +
 .../websocket/WebSocketReverseProxy.java           |     6 +-
 .../ConsoleProxyHttpHandlerHelperTest.java         |    33 +-
 .../consoleproxy/ConsoleProxyNoVncClientTest.java  |    32 +
 services/pom.xml                                   |     2 +-
 services/secondary-storage/controller/pom.xml      |     2 +-
 .../PremiumSecondaryStorageManagerImpl.java        |    19 +-
 .../SecondaryStorageManagerImpl.java               |   444 +-
 .../SecondaryStorageManagerImplTest.java           |   170 +
 .../SecondaryStorageManagerTest.java               |    58 +-
 services/secondary-storage/pom.xml                 |     2 +-
 services/secondary-storage/server/pom.xml          |    14 +-
 .../storage/formatinspector/Qcow2HeaderField.java  |    51 +
 .../storage/formatinspector/Qcow2Inspector.java    |   296 +
 .../storage/resource/HttpUploadServerHandler.java  |   107 +-
 .../storage/resource/IpTablesHelper.java           |    67 +
 .../resource/LocalNfsSecondaryStorageResource.java |    19 +-
 .../resource/LocalSecondaryStorageResource.java    |     6 +-
 .../resource/NfsSecondaryStorageResource.java      |   708 +-
 .../resource/SecondaryStorageDiscoverer.java       |    32 +-
 .../storage/template/DownloadManager.java          |    18 +-
 .../storage/template/DownloadManagerImpl.java      |   511 +-
 .../storage/template/UploadManagerImpl.java        |   109 +-
 .../secondary-storage-discoverer/module.properties |     2 +-
 ...spring-secondary-storage-discoverer-context.xml |     2 +-
 .../resource/HttpUploadServerHandlerTest.java      |    74 +
 .../LocalNfsSecondaryStorageResourceTest.java      |     4 -
 .../resource/NfsSecondaryStorageResourceTest.java  |   264 +-
 .../storage/template/DownloadManagerImplTest.java  |    47 +
 setup/bindir/cloud-migrate-databases.in            |   303 +-
 .../bindir/cloud-set-guest-password-configdrive.in |     4 +-
 ...t-guest-sshkey-password-userdata-configdrive.in |     6 +-
 setup/bindir/cloud-setup-baremetal.in              |    59 +-
 setup/bindir/cloud-setup-databases.in              |    81 +-
 setup/bindir/cloud-setup-encryption.in             |   273 +-
 setup/bindir/cloud-sysvmadm.in                     |   325 +-
 setup/db/221to222upgrade.sh                        |    12 +-
 setup/db/22beta4to22GA.sql                         |     8 +-
 setup/db/create-database-premium.sql               |     4 +-
 setup/db/create-database-simulator.sql             |     4 +-
 setup/db/create-database.sql                       |    14 +-
 setup/db/create-schema-premium.sql                 |    10 +-
 setup/db/create-schema-simulator.sql               |    36 +-
 setup/db/create-schema.sql                         |    11 +-
 setup/db/data-20to21.sql                           |     8 +-
 setup/db/data-22beta1to22beta2.sql                 |     4 +-
 setup/db/deploy-db-clouddev.sh                     |     4 +-
 setup/db/deploy-db-dev.sh                          |    10 +-
 setup/db/deploy-db-simulator.sh                    |    10 +-
 setup/db/index-20to21.sql                          |     5 +-
 setup/db/index-212to213.sql                        |     5 +-
 setup/db/postprocess-20to21.sql                    |     4 +-
 setup/db/server-setup.sql                          |     4 +-
 setup/db/server-setup.xml                          |    38 +-
 setup/db/templates.simulator.sql                   |     4 +-
 setup/db/templates.sql                             |     9 +-
 setup/dev/advancedsg.cfg                           |   142 +-
 setup/dev/advancedsgtf.cfg                         |   131 +
 setup/dev/advancedtf.cfg                           |   134 +
 setup/dev/advdualzone.cfg                          |    60 +-
 setup/dev/basic.cfg                                |     2 +-
 systemvm/agent/certs/realhostip.key                |     2 +-
 systemvm/agent/conf/consoleproxy.properties        |     1 +
 systemvm/agent/conf/log4j-cloud.xml                |   198 +-
 systemvm/agent/images/bright-green.png             |   Bin 3903 -> 352 bytes
 systemvm/agent/images/gray-green.png               |   Bin 3833 -> 264 bytes
 systemvm/agent/images/left.png                     |   Bin 3024 -> 321 bytes
 systemvm/agent/images/right.png                    |   Bin 3131 -> 413 bytes
 systemvm/agent/images/right2.png                   |   Bin 3156 -> 434 bytes
 systemvm/agent/images/winlog.png                   |   Bin 2629 -> 2314 bytes
 systemvm/agent/js/cloud.logger.js                  |     2 +-
 systemvm/agent/js/jquery.js                        |     2 +-
 systemvm/agent/noVNC/app/error-handler.js          |   109 +-
 systemvm/agent/noVNC/app/images/alt.png            |   Bin 335 -> 241 bytes
 systemvm/agent/noVNC/app/images/clipboard.png      |   Bin 220 -> 157 bytes
 systemvm/agent/noVNC/app/images/connect.png        |   Bin 424 -> 304 bytes
 systemvm/agent/noVNC/app/images/ctrl.png           |   Bin 399 -> 263 bytes
 systemvm/agent/noVNC/app/images/ctrlaltdel.png     |   Bin 191 -> 134 bytes
 systemvm/agent/noVNC/app/images/disconnect.png     |   Bin 442 -> 331 bytes
 systemvm/agent/noVNC/app/images/drag.png           |   Bin 336 -> 238 bytes
 systemvm/agent/noVNC/app/images/error.png          |   Bin 348 -> 279 bytes
 systemvm/agent/noVNC/app/images/esc.png            |   Bin 365 -> 267 bytes
 systemvm/agent/noVNC/app/images/expander.png       |   Bin 167 -> 127 bytes
 systemvm/agent/noVNC/app/images/fullscreen.png     |   Bin 280 -> 200 bytes
 systemvm/agent/noVNC/app/images/handle.png         |   Bin 126 -> 93 bytes
 systemvm/agent/noVNC/app/images/handle_bg.png      |   Bin 123 -> 91 bytes
 systemvm/agent/noVNC/app/images/icons/Makefile     |    68 +-
 .../agent/noVNC/app/images/icons/novnc-120x120.png |   Bin 4028 -> 2771 bytes
 .../agent/noVNC/app/images/icons/novnc-144x144.png |   Bin 4582 -> 3095 bytes
 .../agent/noVNC/app/images/icons/novnc-152x152.png |   Bin 5216 -> 3657 bytes
 .../agent/noVNC/app/images/icons/novnc-16x16.png   |   Bin 675 -> 439 bytes
 .../agent/noVNC/app/images/icons/novnc-192x192.png |   Bin 5787 -> 4024 bytes
 .../agent/noVNC/app/images/icons/novnc-24x24.png   |   Bin 1000 -> 730 bytes
 .../agent/noVNC/app/images/icons/novnc-32x32.png   |   Bin 1064 -> 809 bytes
 .../agent/noVNC/app/images/icons/novnc-48x48.png   |   Bin 1397 -> 1147 bytes
 .../agent/noVNC/app/images/icons/novnc-60x60.png   |   Bin 1932 -> 1608 bytes
 .../agent/noVNC/app/images/icons/novnc-64x64.png   |   Bin 1946 -> 1677 bytes
 .../agent/noVNC/app/images/icons/novnc-72x72.png   |   Bin 2699 -> 1786 bytes
 .../agent/noVNC/app/images/icons/novnc-76x76.png   |   Bin 2874 -> 1982 bytes
 .../agent/noVNC/app/images/icons/novnc-96x96.png   |   Bin 2351 -> 2060 bytes
 .../agent/noVNC/app/images/icons/novnc-ios-120.png |     0
 .../agent/noVNC/app/images/icons/novnc-ios-152.png |     0
 .../agent/noVNC/app/images/icons/novnc-ios-167.png |     0
 .../agent/noVNC/app/images/icons/novnc-ios-180.png |     0
 .../agent/noVNC/app/images/icons/novnc-ios-40.png  |     0
 .../agent/noVNC/app/images/icons/novnc-ios-58.png  |     0
 .../agent/noVNC/app/images/icons/novnc-ios-60.png  |     0
 .../agent/noVNC/app/images/icons/novnc-ios-80.png  |     0
 .../agent/noVNC/app/images/icons/novnc-ios-87.png  |     0
 .../noVNC/app/images/icons/novnc-ios-icon.svg      |   183 +
 .../agent/noVNC/app/images/icons/novnc.ico         |     0
 systemvm/agent/noVNC/app/images/info.png           |   Bin 448 -> 296 bytes
 systemvm/agent/noVNC/app/images/keyboard.png       |   Bin 308 -> 217 bytes
 systemvm/agent/noVNC/app/images/power.png          |   Bin 421 -> 300 bytes
 systemvm/agent/noVNC/app/images/settings.png       |   Bin 379 -> 241 bytes
 systemvm/agent/noVNC/app/images/shift.png          |   Bin 212 -> 135 bytes
 systemvm/agent/noVNC/app/images/tab.png            |   Bin 190 -> 144 bytes
 .../agent/noVNC/app/images/toggleextrakeys.png     |   Bin 353 -> 238 bytes
 systemvm/agent/noVNC/app/images/warning.png        |   Bin 319 -> 216 bytes
 systemvm/agent/noVNC/app/images/windows.png        |   Bin 219 -> 158 bytes
 systemvm/agent/noVNC/app/locale/cs.json            |    26 +-
 systemvm/agent/noVNC/app/locale/de.json            |    31 +-
 systemvm/agent/noVNC/app/locale/el.json            |    53 +-
 systemvm/agent/noVNC/app/locale/es.json            |    38 +-
 systemvm/agent/noVNC/app/locale/fr.json            |    82 +
 systemvm/agent/noVNC/app/locale/it.json            |    68 +
 systemvm/agent/noVNC/app/locale/ja.json            |    62 +-
 systemvm/agent/noVNC/app/locale/ko.json            |    24 +-
 systemvm/agent/noVNC/app/locale/nl.json            |    80 +-
 systemvm/agent/noVNC/app/locale/pl.json            |    27 +-
 systemvm/agent/noVNC/app/locale/pt_BR.json         |    72 +
 systemvm/agent/noVNC/app/locale/ru.json            |    53 +-
 systemvm/agent/noVNC/app/locale/sv.json            |    47 +-
 systemvm/agent/noVNC/app/locale/tr.json            |     4 +-
 systemvm/agent/noVNC/app/locale/zh_CN.json         |    92 +-
 systemvm/agent/noVNC/app/locale/zh_TW.json         |    24 +-
 systemvm/agent/noVNC/app/localization.js           |    64 +-
 systemvm/agent/noVNC/app/styles/base.css           |  1141 +-
 systemvm/agent/noVNC/app/styles/constants.css      |    30 +
 systemvm/agent/noVNC/app/styles/input.css          |   628 +
 systemvm/agent/noVNC/app/ui.js                     |   302 +-
 systemvm/agent/noVNC/app/webutil.js                |   151 +-
 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/des.js            |   330 +
 systemvm/agent/noVNC/core/crypto/dh.js             |    55 +
 systemvm/agent/noVNC/core/crypto/md5.js            |    82 +
 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         |   146 +
 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         |   185 +
 systemvm/agent/noVNC/core/deflator.js              |     7 +-
 systemvm/agent/noVNC/core/des.js                   |   266 -
 systemvm/agent/noVNC/core/display.js               |   109 +-
 systemvm/agent/noVNC/core/encodings.js             |    12 +-
 systemvm/agent/noVNC/core/inflator.js              |     5 +-
 systemvm/agent/noVNC/core/input/domkeytable.js     |    48 +-
 systemvm/agent/noVNC/core/input/fixedkeys.js       |     2 +-
 systemvm/agent/noVNC/core/input/gesturehandler.js  |     2 +-
 systemvm/agent/noVNC/core/input/keyboard.js        |   200 +-
 systemvm/agent/noVNC/core/input/uskeysym.js        |     2 +-
 systemvm/agent/noVNC/core/input/util.js            |    55 +-
 systemvm/agent/noVNC/core/input/vkeys.js           |     3 +-
 systemvm/agent/noVNC/core/input/xtscancodes.js     |     8 +-
 systemvm/agent/noVNC/core/ra2.js                   |   312 +
 systemvm/agent/noVNC/core/rfb.js                   |  1581 +-
 systemvm/agent/noVNC/core/util/browser.js          |   157 +-
 systemvm/agent/noVNC/core/util/cursor.js           |    22 +-
 systemvm/agent/noVNC/core/util/element.js          |     2 +-
 systemvm/agent/noVNC/core/util/events.js           |     6 +-
 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/util/polyfill.js         |    61 -
 systemvm/agent/noVNC/core/util/strings.js          |     2 +-
 systemvm/agent/noVNC/core/websock.js               |   221 +-
 systemvm/agent/noVNC/defaults.json                 |     1 +
 systemvm/agent/noVNC/docs/novnc_proxy.1            |    37 +
 .../noVNC/keymaps/generate-language-keymaps.py     |   127 +
 systemvm/agent/noVNC/keymaps/keymap-ja             |   995 ++
 systemvm/agent/noVNC/keymaps/keymap-ja-atset1.js   |   102 +
 systemvm/agent/noVNC/mandatory.json                |     1 +
 systemvm/agent/noVNC/package.json                  |    69 +-
 systemvm/agent/noVNC/po/fr.po                      |   345 +
 systemvm/agent/noVNC/po/it.po                      |   300 +
 systemvm/agent/noVNC/po/pt_BR.po                   |   299 +
 systemvm/agent/noVNC/utils/convert.js              |   140 +
 .../vendor/browser-es-module-loader/README.md      |    15 -
 .../vendor/browser-es-module-loader/genworker.js   |    13 -
 .../browser-es-module-loader/rollup.config.js      |    15 -
 .../browser-es-module-loader/src/babel-worker.js   |    23 -
 .../src/browser-es-module-loader.js                |   279 -
 systemvm/agent/noVNC/vendor/pako/README.md         |    19 +
 systemvm/agent/noVNC/vendor/promise.js             |   255 -
 systemvm/agent/noVNC/vnc.html                      |   223 +-
 systemvm/agent/noVNC/vnc_lite.html                 |    18 +-
 systemvm/agent/packages/packages.ini               |    11 +
 .../packages/python-is-python3_3.9.2-1_all.deb     |   Bin 0 -> 2800 bytes
 .../packages/python3-netaddr_0.7.19-5_all.deb      |   Bin 0 -> 253016 bytes
 systemvm/agent/scripts/_run.sh                     |     2 +-
 systemvm/agent/scripts/consoleproxy.sh             |    33 -
 systemvm/agent/scripts/ipfirewall.sh               |     2 +-
 systemvm/agent/scripts/run-proxy.sh                |    12 -
 systemvm/agent/scripts/secstorage.sh               |    33 -
 systemvm/agent/scripts/ssvm-check.sh               |    42 +-
 systemvm/agent/scripts/utils.sh                    |     0
 systemvm/agent/ui/viewer.ftl                       |    10 +-
 systemvm/debian/etc/apache2/vhost.template         |     2 +-
 systemvm/debian/etc/logrotate.d/haproxy            |     2 +-
 systemvm/debian/etc/modprobe.d/pcspkr.conf         |     2 +-
 .../system/hyperv-daemons.hv-fcopy-daemon.service  |     4 +-
 .../system/hyperv-daemons.hv-kvp-daemon.service    |     4 +-
 .../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/etc/vpcdnsmasq.conf                |     2 +-
 systemvm/debian/opt/cloud/bin/baremetal-vr.py      |     4 +-
 systemvm/debian/opt/cloud/bin/baremetal_snat.sh    |    28 +-
 systemvm/debian/opt/cloud/bin/checkrouter.sh       |    22 +-
 systemvm/debian/opt/cloud/bin/cks_iso.sh           |    34 +
 systemvm/debian/opt/cloud/bin/configure.py         |   452 +-
 systemvm/debian/opt/cloud/bin/cs/CsAddress.py      |   278 +-
 systemvm/debian/opt/cloud/bin/cs/CsApp.py          |     6 +-
 systemvm/debian/opt/cloud/bin/cs/CsBgpPeers.py     |   119 +
 systemvm/debian/opt/cloud/bin/cs/CsConfig.py       |    40 +-
 systemvm/debian/opt/cloud/bin/cs/CsDatabag.py      |    40 +-
 systemvm/debian/opt/cloud/bin/cs/CsDhcp.py         |    29 +-
 systemvm/debian/opt/cloud/bin/cs/CsFile.py         |     5 +-
 systemvm/debian/opt/cloud/bin/cs/CsGuestNetwork.py |    16 +-
 systemvm/debian/opt/cloud/bin/cs/CsHelper.py       |    14 +-
 systemvm/debian/opt/cloud/bin/cs/CsLoadBalancer.py |    46 +-
 systemvm/debian/opt/cloud/bin/cs/CsMonitor.py      |     2 +-
 systemvm/debian/opt/cloud/bin/cs/CsNetfilter.py    |   102 +-
 systemvm/debian/opt/cloud/bin/cs/CsProcess.py      |     2 +-
 systemvm/debian/opt/cloud/bin/cs/CsRedundant.py    |    35 +-
 systemvm/debian/opt/cloud/bin/cs/CsRoute.py        |    23 +-
 systemvm/debian/opt/cloud/bin/cs/CsRule.py         |     2 +-
 systemvm/debian/opt/cloud/bin/cs/CsStaticRoutes.py |     4 +-
 .../debian/opt/cloud/bin/cs/CsVpcGuestNetwork.py   |    32 +-
 systemvm/debian/opt/cloud/bin/cs_bgppeers.py       |    26 +
 systemvm/debian/opt/cloud/bin/cs_dhcp.py           |     6 +-
 systemvm/debian/opt/cloud/bin/cs_firewallrules.py  |     6 +-
 .../debian/opt/cloud/bin/cs_forwardingrules.py     |    28 +-
 systemvm/debian/opt/cloud/bin/cs_guestnetwork.py   |     8 +-
 systemvm/debian/opt/cloud/bin/cs_ip.py             |     4 +-
 .../debian/opt/cloud/bin/cs_remoteaccessvpn.py     |     4 +-
 systemvm/debian/opt/cloud/bin/cs_site2sitevpn.py   |     4 +-
 systemvm/debian/opt/cloud/bin/cs_vpnusers.py       |    10 +-
 systemvm/debian/opt/cloud/bin/diagnostics.py       |     4 +-
 systemvm/debian/opt/cloud/bin/dnsmasq.sh           |     2 +
 .../opt/cloud/bin/filesystem_writable_check.py     |     6 +-
 systemvm/debian/opt/cloud/bin/getRouterAlerts.sh   |     2 +-
 .../debian/opt/cloud/bin/get_diagnostics_files.py  |     8 +-
 systemvm/debian/opt/cloud/bin/loadbalancer.sh      |     4 +-
 systemvm/debian/opt/cloud/bin/manage_service.sh    |    19 +
 systemvm/debian/opt/cloud/bin/merge.py             |    15 +-
 systemvm/debian/opt/cloud/bin/passwd_server_ip.py  |    41 +-
 systemvm/debian/opt/cloud/bin/patched.sh           |     2 +-
 systemvm/debian/opt/cloud/bin/prepare_pxe.sh       |     5 +-
 systemvm/debian/opt/cloud/bin/setup/bootstrap.sh   |    21 +-
 systemvm/debian/opt/cloud/bin/setup/cksnode.sh     |     9 +-
 .../debian/opt/cloud/bin/setup/cloud-early-config  |    34 +-
 systemvm/debian/opt/cloud/bin/setup/common.sh      |    55 +-
 .../debian/opt/cloud/bin/setup/consoleproxy.sh     |     8 +-
 systemvm/debian/opt/cloud/bin/setup/dhcpsrvr.sh    |     1 +
 systemvm/debian/opt/cloud/bin/setup/elbvm.sh       |     1 +
 systemvm/debian/opt/cloud/bin/setup/ilbvm.sh       |     1 +
 systemvm/debian/opt/cloud/bin/setup/init.sh        |    15 +-
 systemvm/debian/opt/cloud/bin/setup/patch.sh       |   130 +
 systemvm/debian/opt/cloud/bin/setup/postinit.sh    |   127 +-
 systemvm/debian/opt/cloud/bin/setup/router.sh      |     9 +-
 systemvm/debian/opt/cloud/bin/setup/secstorage.sh  |     7 +-
 systemvm/debian/opt/cloud/bin/setup/sharedfsvm.sh  |    70 +
 systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh   |    16 +-
 systemvm/debian/opt/cloud/bin/setup_tf_route.py    |    45 +
 systemvm/debian/opt/cloud/bin/update_config.py     |     4 +-
 .../opt/cloud/bin/update_interface_config.sh       |    63 +
 systemvm/debian/opt/cloud/bin/vmdata.py            |    50 +-
 systemvm/debian/opt/cloud/bin/vr_cfg.sh            |     2 +-
 .../debian/opt/cloud/templates/check_bumpup.sh     |     0
 .../opt/cloud/templates/conntrackd.conf.templ      |     2 +-
 systemvm/debian/opt/cloud/testdata/vmp0001.json    |     2 +-
 systemvm/debian/root/func.sh                       |     0
 .../debian/root/health_checks/cpu_usage_check.py   |    18 +-
 systemvm/debian/root/health_checks/dhcp_check.py   |     8 +-
 .../debian/root/health_checks/disk_space_check.py  |     8 +-
 systemvm/debian/root/health_checks/dns_check.py    |     6 +-
 .../debian/root/health_checks/gateways_check.py    |     8 +-
 .../debian/root/health_checks/haproxy_check.py     |    22 +-
 .../debian/root/health_checks/iptables_check.py    |     8 +-
 .../root/health_checks/memory_usage_check.py       |    16 +-
 .../root/health_checks/router_version_check.py     |    20 +-
 .../debian/root/health_checks/utility/__init__.py  |     2 +-
 systemvm/debian/root/monitorServices.py            |   110 +-
 systemvm/patch-sysvms.sh                           |    37 +-
 systemvm/pom.xml                                   |     4 +-
 systemvm/systemvm-agent-descriptor.xml             |     8 +
 systemvm/test/__init__.py                          |    20 +
 systemvm/test/runtests.sh                          |     2 +-
 test/bindirbak/cloud-run-test.in                   |     4 +-
 test/conf/config.xml                               |   206 +-
 test/conf/deploy.properties                        |     4 +-
 test/conf/deploy.xml                               |     8 +-
 test/conf/log4j-stdout.properties                  |     4 +-
 test/conf/log4j.properties                         |     4 +-
 test/conf/tool.properties                          |     4 +-
 .../maint/test_zone_level_local_storage_setting.py |     2 +-
 .../maint/test_egress_rules_host_maintenance.py    |     6 +-
 .../component/maint/test_host_high_availability.py |     2 +-
 .../maint/test_primary_storage_nfsmountopts_kvm.py |   184 +
 .../maint/testpath_disable_enable_zone.py          |     2 +-
 .../component/maint/testpath_disablestoragepool.py |     2 +-
 .../component/maint/testpath_vMotion_vmware.py     |     4 +-
 .../component/test_acl_isolatednetwork.py          |    18 +-
 .../component/test_acl_isolatednetwork_delete.py   |     8 +-
 .../integration/component/test_acl_listsnapshot.py |     2 +-
 test/integration/component/test_acl_listvm.py      |     2 +-
 test/integration/component/test_acl_listvolume.py  |     2 +-
 .../component/test_acl_sharednetwork.py            |     2 +-
 ...est_acl_sharednetwork_deployVM-impersonation.py |   122 +-
 .../component/test_add_remove_network.py           |     2 +-
 .../component/test_advancedsg_networks.py          |   188 +-
 .../component/test_affinity_groups_projects.py     |    19 +-
 test/integration/component/test_assign_vm.py       |     6 +-
 .../component/test_base_image_updation.py          |    10 +-
 .../integration/component/test_browse_templates.py |    14 +-
 test/integration/component/test_browse_volumes.py  |    34 +-
 test/integration/component/test_configdrive.py     |    14 +-
 test/integration/component/test_deploy_vm_lease.py |   358 +
 .../component/test_deploy_vm_userdata_multi_nic.py |     4 +-
 .../component/test_deploy_vm_userdata_reg.py       |     4 +-
 .../component/test_edgezone_supportedoperations.py |   133 +
 test/integration/component/test_egress_fw_rules.py |     6 +-
 test/integration/component/test_egress_rules.py    |    64 +-
 .../component/test_escalations_instances.py        |    10 +-
 .../component/test_escalations_ipaddresses.py      |     4 +-
 test/integration/component/test_host.py            |   400 +-
 test/integration/component/test_interop_xd_ccp.py  |     4 +-
 .../component/test_interpod_migration.py           |     2 +-
 test/integration/component/test_ip_reservation.py  |     6 +-
 test/integration/component/test_ldap.py            |     9 +-
 .../integration/component/test_ldap_auto_import.py |     2 +-
 .../component/test_multi_tag_support.py            |   434 +-
 .../component/test_multiple_ips_per_nic.py         |     4 +-
 .../component/test_multiple_nic_support.py         |    54 +-
 .../test_multiple_physical_network_creation.py     |   405 +
 .../component/test_ncc_integration_dedicated.py    |   538 +-
 .../component/test_ncc_integration_shared.py       |   646 +-
 .../integration/component/test_netscaler_nw_off.py |     6 +-
 test/integration/component/test_network_ipv6.py    |     2 +-
 test/integration/component/test_network_mtu.py     |   395 +
 test/integration/component/test_project_configs.py |   158 +-
 test/integration/component/test_project_limits.py  |    18 +-
 .../component/test_project_resources.py            |    94 +-
 test/integration/component/test_project_usage.py   |    25 +-
 .../integration/component/test_ps_resize_volume.py |     6 +-
 test/integration/component/test_region_vpc.py      |     2 +-
 .../component/test_resource_limit_tags.py          |   692 +
 test/integration/component/test_resource_limits.py |     2 +-
 .../component/test_rootvolume_resize.py            |     4 +-
 test/integration/component/test_security_groups.py |   120 +-
 test/integration/component/test_shared_networks.py |     4 +-
 test/integration/component/test_snapshot_copy.py   |   351 +
 .../component/test_snapshots_improvement.py        |     6 +-
 test/integration/component/test_stopped_vm.py      |     2 +-
 test/integration/component/test_tags.py            |    70 +-
 test/integration/component/test_update_vm.py       |   124 +-
 test/integration/component/test_vpc.py             |     8 +-
 .../test_vpc_distributed_routing_offering.py       |     2 +-
 test/integration/component/test_vpc_ipv6.py        |     2 +-
 test/integration/component/test_vpc_network.py     |    14 +-
 test/integration/component/test_vpc_offerings.py   |     2 +-
 .../component/test_vpc_vm_life_cycle.py            |     8 +-
 .../component/test_vpc_vms_deployment.py           |     6 +-
 test/integration/component/test_vpn_users.py       |   118 +-
 test/integration/plugins/ldap/test_ldap.py         |    22 +-
 test/integration/plugins/linstor/README.md         |    37 +-
 .../plugins/linstor/test_linstor_volumes.py        |   315 +-
 .../plugins/quota/test_quota_balance.py            |   191 +
 test/integration/plugins/scaleio/README.md         |    41 +-
 .../plugins/scaleio/test_scaleio_volumes.py        |   243 +
 .../plugins/storpool/MigrateVolumeToStorPool.py    |    47 +-
 .../plugins/storpool/TestEncryptedVolumes.py       |   622 +
 .../plugins/storpool/TestStorPoolVolumes.py        |   180 +-
 .../plugins/storpool/TestTagsOnStorPool.py         |   198 +-
 .../plugins/storpool/TestVmSnapshots.py            |    38 +-
 test/integration/plugins/storpool/sp_util.py       |   240 +-
 test/integration/plugins/storpool/storpool.cfg     |   154 +
 .../test_snapshot_copy_on_primary_storage.py       |   255 +
 .../plugins/storpool/test_storpool_tiers.py        |   643 +
 .../integration/plugins/test_quota_tariff_order.py |   175 +
 test/integration/plugins/tf/common.py              |    94 +
 test/integration/plugins/tf/test_isolated_zone.py  |  1410 ++
 test/integration/plugins/tf/test_shared_zone.py    |   972 ++
 test/integration/smoke/test_2fa.py                 |   294 +
 test/integration/smoke/test_account_access.py      |   198 +
 test/integration/smoke/test_accounts.py            |     2 +-
 test/integration/smoke/test_annotations.py         |     7 +
 .../smoke/test_attach_multiple_volumes.py          |     6 +-
 .../smoke/test_backup_recovery_dummy.py            |    92 +-
 test/integration/smoke/test_backup_recovery_nas.py |   267 +
 .../smoke/test_backup_recovery_veeam.py            |   308 +
 test/integration/smoke/test_bucket.py              |   111 +
 test/integration/smoke/test_certauthority_root.py  |    36 +-
 test/integration/smoke/test_cluster_drs.py         |   319 +
 test/integration/smoke/test_create_network.py      |    81 +
 .../smoke/test_deploy_vgpu_enabled_vm.py           |   234 +-
 .../smoke/test_deploy_vm_extra_config_data.py      |    22 +-
 .../smoke/test_deploy_vm_root_resize.py            |     9 +
 .../smoke/test_deploy_vm_with_userdata.py          |     2 +-
 test/integration/smoke/test_direct_download.py     |     5 +-
 test/integration/smoke/test_dynamicroles.py        |    15 +-
 .../test_enable_account_settings_for_domain.py     |     4 +-
 test/integration/smoke/test_events_resource.py     |    21 +-
 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_global_acls.py         |   246 +
 test/integration/smoke/test_global_settings.py     |   155 +
 test/integration/smoke/test_guest_os.py            |   272 +
 test/integration/smoke/test_host_control_state.py  |   474 +
 test/integration/smoke/test_host_ping.py           |   108 +
 test/integration/smoke/test_host_tags.py           |   160 +
 test/integration/smoke/test_hostha_simulator.py    |     2 +-
 .../smoke/test_image_store_object_migration.py     |   233 +
 .../smoke/test_import_unmanage_volumes.py          |   187 +
 test/integration/smoke/test_internal_lb.py         |     7 +-
 test/integration/smoke/test_ipv4_routing.py        |  1673 ++
 test/integration/smoke/test_kubernetes_clusters.py |   582 +-
 .../smoke/test_kubernetes_supported_versions.py    |     3 +-
 test/integration/smoke/test_list_accounts.py       |   379 +
 test/integration/smoke/test_list_disk_offerings.py |   319 +
 test/integration/smoke/test_list_domains.py        |   216 +
 test/integration/smoke/test_list_hosts.py          |   372 +
 .../smoke/test_list_service_offerings.py           |   559 +
 test/integration/smoke/test_list_storage_pools.py  |   396 +
 test/integration/smoke/test_list_volumes.py        |   615 +
 test/integration/smoke/test_login.py               |     1 +
 test/integration/smoke/test_metrics_api.py         |   222 +-
 test/integration/smoke/test_migration.py           |     2 +-
 .../smoke/test_ms_maintenance_and_safe_shutdown.py |   174 +
 test/integration/smoke/test_network.py             |   509 +-
 test/integration/smoke/test_network_acl.py         |    26 +
 test/integration/smoke/test_network_ipv6.py        |    13 +-
 test/integration/smoke/test_network_permissions.py |    15 +-
 .../smoke/test_network_traffic_type_api.py         |    73 +
 .../smoke/test_nonstrict_affinity_group.py         |   454 +
 test/integration/smoke/test_object_stores.py       |   108 +
 test/integration/smoke/test_outofbandmanagement.py |     2 +-
 .../smoke/test_outofbandmanagement_nestedplugin.py |     2 +-
 test/integration/smoke/test_over_provisioning.py   |     8 +-
 test/integration/smoke/test_primary_storage.py     |    14 +-
 .../smoke/test_primary_storage_scope.py            |   178 +
 test/integration/smoke/test_private_roles.py       |   275 +
 test/integration/smoke/test_privategw_acl.py       |     4 +-
 .../smoke/test_privategw_acl_ovs_gre.py            |     2 +-
 test/integration/smoke/test_projects.py            |   285 +-
 test/integration/smoke/test_public_ip_range.py     |     3 +-
 test/integration/smoke/test_purge_expunged_vms.py  |   371 +
 test/integration/smoke/test_quarantined_ips.py     |   329 +
 test/integration/smoke/test_register_userdata.py   |   165 +-
 test/integration/smoke/test_resource_names.py      |   299 +
 test/integration/smoke/test_restore_vm.py          |   215 +
 test/integration/smoke/test_routers.py             |    79 +-
 test/integration/smoke/test_routers_network_ops.py |    32 +-
 test/integration/smoke/test_scale_vm.py            |   112 +-
 test/integration/smoke/test_secondary_storage.py   |     2 +-
 test/integration/smoke/test_service_offerings.py   |   163 +-
 test/integration/smoke/test_set_sourcenat.py       |   274 +
 test/integration/smoke/test_sharedfs_lifecycle.py  |   289 +
 test/integration/smoke/test_snapshots.py           |   192 +-
 test/integration/smoke/test_ssl_offloading.py      |   568 +
 test/integration/smoke/test_ssvm.py                |    45 +-
 test/integration/smoke/test_systemvm_userdata.py   |   410 +
 test/integration/smoke/test_templates.py           |    55 +-
 test/integration/smoke/test_usage.py               |    41 +-
 test/integration/smoke/test_vm_autoscaling.py      |   200 +-
 .../smoke/test_vm_deployment_planner.py            |    16 +-
 test/integration/smoke/test_vm_life_cycle.py       |   262 +-
 .../smoke/test_vm_lifecycle_unmanage_import.py     |    92 +-
 .../smoke/test_vm_lifecycle_unmanage_kvm_import.py |   473 +
 .../test_vm_lifecycle_with_snapshot_or_volume.py   |   318 +
 test/integration/smoke/test_vm_schedule.py         |   613 +
 test/integration/smoke/test_vm_snapshot_kvm.py     |    61 +-
 test/integration/smoke/test_vm_snapshots.py        |    26 +-
 test/integration/smoke/test_vm_strict_host_tags.py |   552 +
 test/integration/smoke/test_vnf_templates.py       |   341 +
 test/integration/smoke/test_volumes.py             |    80 +-
 test/integration/smoke/test_vpc_ipv6.py            |     9 +-
 test/integration/smoke/test_vpc_redundant.py       |     7 +-
 test/integration/smoke/test_vpc_vpn.py             |   299 +-
 test/integration/smoke/test_webhook_delivery.py    |   212 +
 test/integration/smoke/test_webhook_lifecycle.py   |   392 +
 .../testpaths/testpath_multiple_snapshot.py        |     2 +-
 test/integration/testpaths/testpath_restore_vm.py  |     2 +-
 .../integration/testpaths/testpath_same_vm_name.py |     2 +-
 .../testpaths/testpath_snapshot_hadrning.py        |    10 +-
 .../testpaths/testpath_storage_migration.py        |    10 +-
 test/integration/testpaths/testpath_usage.py       |    86 +-
 test/integration/testpaths/testpath_vmlc.py        |     2 +-
 .../testpath_volume_cuncurrent_snapshots.py        |     4 +-
 .../testpaths/testpath_volumelifecycle.py          |     2 +-
 test/metadata/adapter.xml                          |    20 +-
 .../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/commands                        |   382 +-
 test/metadata/func/directnw_regression.xml         |  3820 ++---
 test/metadata/func/error_events.properties         |    64 +-
 test/metadata/func/expunge.xml                     |  2414 +--
 test/metadata/func/external_firewall.xml           |    60 +-
 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/portforwarding.xml              |    94 +-
 test/metadata/func/private_templates.xml           |  1822 +-
 test/metadata/func/regression.xml                  |  8886 +++++-----
 test/metadata/func/regression_events.properties    |    86 +-
 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/sanity.xml                      |    48 +-
 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/srxstresswithportfwd.xml        |   595 -
 test/metadata/func/static_nat.xml                  |   170 +-
 test/metadata/func/templatedwnldstress.xml         |  1514 +-
 test/metadata/func/templates_sync.xml              |  2123 ++-
 test/metadata/func/userapi.xml                     |  2586 +--
 test/metadata/func/vmapi.xml                       |  1782 +-
 test/metadata/func/vmsync.xml                      |   814 +-
 test/pom.xml                                       |    30 +-
 test/scripts/bootstrap-regression.sh               |     8 +-
 test/scripts/build-env.sh                          |     8 +-
 test/scripts/certDeleteEC2.sh                      |     6 +-
 test/scripts/certSubmitEC2.sh                      |     6 +-
 test/scripts/checkLog.sh                           |     6 +-
 test/scripts/checkOutOfMemory.sh                   |     8 +-
 test/scripts/cleanparallel.sh                      |     9 +-
 test/scripts/deploy-and-run-regression.sh          |     7 +-
 test/scripts/deploy.sh                             |     6 +-
 test/scripts/deploycluster.sh                      |    13 +-
 test/scripts/executeUserAPI.sh                     |     8 +-
 test/scripts/invoke.sh                             |     6 +-
 test/scripts/regression.sh                         |     6 +-
 test/scripts/run.bat                               |     4 +-
 test/scripts/run.sh                                |     7 +-
 test/scripts/script_lock_test/test.sh              |     4 +-
 test/scripts/script_lock_test/test_task.sh         |     4 +-
 test/scripts/sign.sh                               |     6 +-
 test/scripts/signEC2.sh                            |     6 +-
 test/scripts/usage/allocated.sh                    |     7 +-
 test/scripts/usage/network.sh                      |     6 +-
 test/scripts/usage/running.sh                      |     6 +-
 test/scripts/usage/volume_usage.sh                 |     8 +-
 test/scripts/usercloud.properties                  |     4 +-
 test/scripts/xen/corrupttemplate.sh                |     8 +-
 test/scripts/xen/createfaketemplate.sh             |     8 +-
 test/scripts/xen/killvm.sh                         |     8 +-
 test/scripts/xen/listtemplate.sh                   |     8 +-
 test/scripts/xen/listvdi.sh                        |     8 +-
 test/scripts/xen/listvm.sh                         |     8 +-
 test/scripts/xen/ms.sh                             |     8 +-
 test/scripts/xen/removetemplate.sh                 |    10 +-
 test/scripts/xen/shutdown.sh                       |     8 +-
 test/scripts/xen/sleep.sh                          |     8 +-
 test/scripts/xen/ssh.sh                            |     6 +-
 test/selenium/ReadMe.txt                           |    66 -
 test/selenium/browser/firefox.py                   |    55 -
 test/selenium/common/Global_Locators.py            |   230 -
 test/selenium/common/__init__.py                   |    16 -
 test/selenium/common/shared.py                     |   148 -
 test/selenium/cspages/__init__.py                  |    16 -
 test/selenium/cspages/accounts/accountspage.py     |   175 -
 test/selenium/cspages/accounts/userspage.py        |   146 -
 test/selenium/cspages/cspage.py                    |    20 -
 test/selenium/cspages/dashboard/__init__.py        |    16 -
 test/selenium/cspages/dashboard/dashboardpage.py   |    73 -
 test/selenium/cspages/login/__init__.py            |    16 -
 test/selenium/cspages/login/loginpage.py           |   103 -
 test/selenium/cstests/__init__.py                  |    16 -
 test/selenium/cstests/regressiontests/__init__.py  |    16 -
 test/selenium/cstests/smoketests/__init__.py       |    16 -
 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 -
 test/selenium/lib/initialize.py                    |    46 -
 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 -
 .../com/cloud/sample/UserCloudAPIExecutor.java     |   188 -
 .../com/cloud/test/longrun/BuildGuestNetwork.java  |   123 -
 .../java/com/cloud/test/longrun/GuestNetwork.java  |   107 -
 .../com/cloud/test/longrun/PerformanceWithAPI.java |   190 -
 .../main/java/com/cloud/test/longrun/User.java     |   202 -
 .../com/cloud/test/longrun/VirtualMachine.java     |    95 -
 .../java/com/cloud/test/regression/ApiCommand.java |   848 -
 .../java/com/cloud/test/regression/ConfigTest.java |   125 -
 .../cloud/test/regression/DelegatedAdminTest.java  |   129 -
 .../java/com/cloud/test/regression/Deploy.java     |   109 -
 .../com/cloud/test/regression/EventsApiTest.java   |   176 -
 .../main/java/com/cloud/test/regression/HA.java    |    80 -
 .../cloud/test/regression/LoadBalancingTest.java   |   142 -
 .../cloud/test/regression/PortForwardingTest.java  |   143 -
 .../java/com/cloud/test/regression/SanityTest.java |    86 -
 .../main/java/com/cloud/test/regression/Test.java  |    88 -
 .../java/com/cloud/test/regression/TestCase.java   |   138 -
 .../com/cloud/test/regression/TestCaseEngine.java  |   275 -
 .../java/com/cloud/test/regression/VMApiTest.java  |    91 -
 .../main/java/com/cloud/test/stress/SshTest.java   |    90 -
 .../cloud/test/stress/StressTestDirectAttach.java  |  1353 --
 .../com/cloud/test/stress/TestClientWithAPI.java   |  2289 ---
 .../main/java/com/cloud/test/stress/WgetTest.java  |   150 -
 .../cloud/test/ui/AbstractSeleniumTestCase.java    |    55 -
 .../java/com/cloud/test/ui/AddAndDeleteAISO.java   |   127 -
 .../com/cloud/test/ui/AddAndDeleteATemplate.java   |   126 -
 .../java/com/cloud/test/ui/UIScenarioTest.java     |    86 -
 .../java/com/cloud/test/utils/ConsoleProxy.java    |   110 -
 .../java/com/cloud/test/utils/IpSqlGenerator.java  |    89 -
 .../java/com/cloud/test/utils/ProxyLoadTemp.java   |   112 -
 .../main/java/com/cloud/test/utils/SignEC2.java    |   143 -
 .../java/com/cloud/test/utils/SignRequest.java     |   112 -
 .../com/cloud/test/utils/SqlDataGenerator.java     |    49 -
 .../main/java/com/cloud/test/utils/SubmitCert.java |   198 -
 .../main/java/com/cloud/test/utils/TestClient.java |   385 -
 .../java/com/cloud/test/utils/UtilsForTest.java    |   210 -
 test/systemvm/README.md                            |    35 +-
 test/systemvm/test_update_config.py                |     2 +-
 tools/apidoc/build-apidoc.sh                       |    14 +-
 tools/apidoc/gen_toc.py                            |   117 +-
 tools/apidoc/generatecommand.xsl                   |    51 +-
 tools/apidoc/generatecommands.xsl                  |     4 +-
 tools/apidoc/generatecustomcommand.xsl             |     1 -
 tools/apidoc/generategenericcommand.xsl            |     1 -
 tools/apidoc/generatetoc.xsl                       |     1 -
 tools/apidoc/generatetoc_footer.xsl                |     8 +-
 tools/apidoc/generatetoc_header.xsl                |    16 +-
 tools/apidoc/images/cloudstack.png                 |   Bin 8575 -> 5300 bytes
 tools/apidoc/includes/main.css                     |    14 +-
 tools/apidoc/pom.xml                               |     4 +-
 tools/appliance/README.md                          |    20 +-
 tools/appliance/build.sh                           |    24 +-
 .../cks/ubuntu/22.04/cks-ubuntu-2204.json          |    56 +
 .../appliance/cks/ubuntu/22.04/http/meta-data      |     0
 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 +
 .../ubuntu/22.04}/scripts/cleanup.sh               |     0
 .../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 +
 tools/appliance/systemvmtemplate/http/preseed.cfg  |   113 -
 .../systemvmtemplate/http/preseed_aarch64.cfg      |   122 +
 .../systemvmtemplate/http/preseed_x86_64.cfg       |   113 +
 .../systemvmtemplate/scripts/apt_upgrade.sh        |     4 +-
 .../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     |     2 +-
 .../systemvmtemplate/scripts/configure_locale.sh   |     4 +-
 .../systemvmtemplate/scripts/configure_login.sh    |     0
 .../scripts/configure_networking.sh                |     0
 .../scripts/configure_persistent_config.sh         |     0
 .../scripts/configure_systemvm_services.sh         |    14 +-
 .../appliance/systemvmtemplate/scripts/finalize.sh |     1 +
 .../scripts/install_systemvm_packages.sh           |    39 +-
 .../template-base_aarch64-target_aarch64.json      |    93 +
 .../template-base_x86_64-target_aarch64.json       |    91 +
 .../template-base_x86_64-target_x86_64.json        |    75 +
 tools/appliance/systemvmtemplate/template.json     |    75 -
 tools/build/build_asf.sh                           |    18 +-
 tools/build/installer/debinstall_full.sh           |     8 +-
 tools/build/installer/rpminstall_full.sh           |    10 +-
 tools/build/setnextversion.sh                      |     5 +-
 tools/checkstyle/pom.xml                           |     2 +-
 tools/checkstyle/src/main/resources/cloud-pmd.xml  |     4 +-
 .../checkstyle/src/main/resources/cloud-style.xml  |    16 +-
 tools/cli/README                                   |     1 -
 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/devcloud-kvm.sql                |     4 +-
 tools/devcloud-kvm/kvm.properties                  |     4 +-
 tools/devcloud-kvm/pom.xml                         |    12 +-
 tools/devcloud4/.gitignore                         |     2 +-
 tools/devcloud4/README.md                          |    42 +-
 tools/devcloud4/advanced/README.md                 |    43 +-
 tools/devcloud4/advanced/marvin.cfg                |     4 +-
 tools/devcloud4/basic/README.md                    |    35 +-
 tools/devcloud4/basic/marvin.cfg                   |     4 +-
 .../binary-installation-advanced/Berksfile         |     2 +-
 .../binary-installation-advanced/marvin.cfg.erb    |     2 +-
 .../devcloud4/binary-installation-basic/Berksfile  |     2 +-
 .../binary-installation-basic/marvin.cfg.erb       |     2 +-
 .../devcloud4/common/binary-installation/README.md |    18 +
 .../attributes/database_server.rb                  |     4 +-
 .../binary-installation/attributes/default.rb      |     6 +-
 .../common/binary-installation/metadata.rb         |     4 +-
 .../binary-installation/recipes/database_server.rb |     5 +-
 .../common/binary-installation/recipes/default.rb  |     6 +-
 .../recipes/management_server.rb                   |     4 +-
 .../binary-installation/recipes/nfsshares.rb       |     4 +-
 tools/devcloud4/common/configure-network.sh        |    34 +-
 .../common/development-installation/README.md      |    18 +
 .../attributes/database_server.rb                  |     4 +-
 .../development-installation/attributes/default.rb |     6 +-
 .../files/default/cloud-install-sys-tmplt          |     5 +-
 .../files/default/createtmplt.sh                   |    24 +-
 .../common/development-installation/metadata.rb    |     4 +-
 .../recipes/database_server.rb                     |     5 +-
 .../development-installation/recipes/default.rb    |     6 +-
 .../development-installation/recipes/nfsshares.rb  |     4 +-
 .../recipes/system_templates.rb                    |     6 +-
 tools/devcloud4/pom.xml                            |    10 +-
 tools/devcloud4/prefill.sql                        |     6 +-
 tools/docker/Dockerfile                            |     9 +-
 tools/docker/Dockerfile.marvin                     |     5 +-
 tools/docker/Dockerfile.smokedev                   |     6 +-
 tools/docker/README.md                             |    43 +-
 tools/docker/docker-compose.yml                    |     6 +-
 tools/docker/docker_run_tests.sh                   |     0
 tools/docker/systemtpl.sh                          |     4 +-
 tools/eclipse/eclipse.epf                          |  1184 +-
 tools/eclipse/set-eclipse-profile.sh               |    46 +-
 tools/git/git-fwd-merge                            |     7 +-
 tools/git/git-pr                                   |    50 +-
 tools/git/prepare-commit-msg                       |     1 -
 tools/logo/apache_cloudstack.png                   |   Bin 155790 -> 81454 bytes
 tools/marvin/CHANGES.txt                           |     4 +-
 tools/marvin/DISCLAIMER.txt                        |    12 +-
 tools/marvin/MANIFEST.in                           |     4 +-
 tools/marvin/marvin/cloudstackConnection.py        |     5 +-
 tools/marvin/marvin/cloudstackException.py         |     3 +-
 tools/marvin/marvin/cloudstackTestCase.py          |    25 +-
 .../marvin/config/Baremetal_AdvZone_Vmware.cfg     |     6 +-
 tools/marvin/marvin/config/setup.cfg               |     2 +-
 tools/marvin/marvin/config/test_data.py            |   947 +-
 tools/marvin/marvin/configGenerator.py             |    33 +-
 tools/marvin/marvin/dbConnection.py                |     2 +-
 tools/marvin/marvin/deployDataCenter.py            |    60 +-
 tools/marvin/marvin/lib/base.py                    |  2115 ++-
 tools/marvin/marvin/lib/common.py                  |    11 +-
 tools/marvin/marvin/lib/ncc.py                     |     6 +-
 tools/marvin/marvin/lib/utils.py                   |    69 +-
 tools/marvin/marvin/misc/build/CI.md               |    88 +-
 tools/marvin/marvin/misc/build/README.md           |    44 +-
 tools/marvin/marvin/misc/build/asf_test.cfg        |   142 +-
 tools/marvin/marvin/misc/build/configure.py        |     2 +-
 tools/marvin/marvin/misc/build/kvm.cfg             |   212 +-
 tools/marvin/marvin/misc/build/kvm.properties      |     4 +-
 tools/marvin/marvin/misc/build/redeploy.sh         |     6 +-
 tools/marvin/marvin/misc/build/vm-start.sh         |     1 -
 tools/marvin/marvin/misc/build/xen.cfg             |   212 +-
 tools/marvin/marvin/misc/build/xen.properties      |     4 +-
 .../marvin/sandbox/advanced/setup.properties       |     4 +-
 .../marvin/sandbox/advancedsg/setup.properties     |     4 +-
 tools/marvin/marvin/sandbox/basic/setup.properties |     4 +-
 .../demo/simulator/simulatordemo.properties        |     4 +-
 .../sandbox/demo/simulator/testcase/libs/common.py |     4 +-
 tools/marvin/marvin/sandbox/run-marvin.sh          |     4 +-
 tools/marvin/mvn-setup.py                          |     4 +-
 tools/marvin/pom.xml                               |    56 +-
 tools/marvin/setup.py                              |     4 +-
 tools/{travis => marvin}/xunit-reader.py           |     0
 tools/ngui/README.md                               |    34 +-
 tools/ngui/precache.py                             |     2 +-
 tools/ngui/requester.py                            |     2 +-
 .../bootstrap/img/glyphicons-halflings-white.png   |   Bin 8777 -> 8660 bytes
 .../static/bootstrap/img/glyphicons-halflings.png  |   Bin 12799 -> 12020 bytes
 tools/ngui/static/bootstrap/js/bootstrap.min.js    |     2 +-
 tools/ngui/static/css/app.css                      |     2 +-
 tools/ngui/static/js/app/dashboard/dashboard.js    |     1 -
 .../static/js/app/infrastructure/infrastructure.js |     1 -
 tools/ngui/static/js/lib/angular.js                |     6 +-
 tools/ngui/templates/index.html                    |   106 +-
 tools/pom.xml                                      |     2 +-
 tools/transifex/.tx/config                         |     1 -
 tools/transifex/README-transifex.txt               |     4 +-
 tools/transifex/sync-transifex-ui.sh               |    11 +-
 tools/travis/after_failure.sh                      |    24 -
 tools/travis/after_script.sh                       |    22 -
 tools/travis/after_success.sh                      |    20 -
 tools/travis/before_install.sh                     |   139 -
 tools/travis/before_script.sh                      |    27 -
 tools/travis/install.sh                            |    76 -
 tools/travis/script.sh                             |    36 -
 .../database_comparision_during_upgrade/README     |     1 -
 .../before_upgrade_data_collection.sh              |     2 -
 .../cloud_schema_comparision.sh                    |    10 +-
 .../fresh_install_data_collection.sh               |     1 -
 .../test_config_before_and_after_upgrade.sh        |     1 -
 ...test_config_between_fresh_and_upgraded_setup.sh |    25 +-
 .../usage_schema_comparison.sh                     |     1 -
 tools/whisker/LICENSE                              |     1 -
 tools/whisker/descriptor-for-packaging.xml         |   192 +-
 tools/whisker/descriptor.xml                       |   186 +-
 ui/.babelrc                                        |     2 +-
 ui/.env.primate-qa                                 |     2 +-
 ui/.env.qa                                         |     1 +
 ui/.gitattributes                                  |     2 +-
 ui/Dockerfile                                      |     2 +-
 ui/README.md                                       |    48 +-
 ui/docs/customize.md                               |    19 +
 ui/docs/development.md                             |    29 +-
 ui/docs/full-test-plan.template.md                 |     4 +-
 ui/docs/screenshot-dashboard.png                   |   Bin 2285907 -> 205830 bytes
 ui/docs/smoke-test-plan.template.md                |     4 +-
 ui/index.html                                      |     2 +-
 ui/jest.config.js                                  |     4 +-
 ui/package-lock.json                               |  6123 +++----
 ui/package.json                                    |    35 +-
 ui/public/assets/403.png                           |   Bin 39320 -> 27688 bytes
 ui/public/assets/404.png                           |   Bin 33621 -> 22689 bytes
 ui/public/assets/500.png                           |   Bin 28168 -> 20340 bytes
 ui/public/assets/asf-logo.svg                      |   116 +
 ui/public/assets/banner.svg                        |     2 +-
 ui/public/assets/bg-what-is-cloudstack.png         |   Bin 36116 -> 27854 bytes
 ui/public/assets/error.png                         |   Bin 24973 -> 18884 bytes
 ui/public/assets/feather.svg                       |    89 +
 ui/public/assets/github.svg                        |     1 +
 ui/public/assets/google.svg                        |     1 +
 ui/public/assets/logo.svg                          |     2 +-
 ui/public/assets/mini-logo.svg                     |     2 +-
 ui/public/assets/success.png                       |   Bin 17274 -> 11590 bytes
 ui/public/cloud-image-templates.json               |   110 +
 ui/public/config.json                              |    53 +-
 ui/public/css/apache-theme.css                     |  1169 ++
 ui/public/css/dark-theme.css                       |  1592 ++
 ui/public/error.html                               |     2 +-
 ui/public/example.html                             |     2 +-
 ui/public/index.html                               |     6 +-
 ui/public/js/less.min.js                           |     2 +-
 ui/public/locales/ar.json                          |    34 +-
 ui/public/locales/ca.json                          |    32 +-
 ui/public/locales/de_DE.json                       |    45 +-
 ui/public/locales/el_GR.json                       |    75 +-
 ui/public/locales/en.json                          |  2925 +++-
 ui/public/locales/es.json                          |    33 +-
 ui/public/locales/fr_FR.json                       |    32 +-
 ui/public/locales/hi.json                          |     6 +-
 ui/public/locales/hu.json                          |    36 +-
 ui/public/locales/it_IT.json                       |    34 +-
 ui/public/locales/ja_JP.json                       |    40 +-
 ui/public/locales/ko_KR.json                       |    45 +-
 ui/public/locales/nb_NO.json                       |    32 +-
 ui/public/locales/nl_NL.json                       |    34 +-
 ui/public/locales/pl.json                          |    34 +-
 ui/public/locales/pt_BR.json                       |   162 +-
 ui/public/locales/ru_RU.json                       |    32 +-
 ui/public/locales/te.json                          |  3736 ++++
 ui/public/locales/zh_CN.json                       |    42 +-
 ui/src/api/index.js                                |   104 +-
 ui/src/assets/icons/dark.svg                       |     2 +-
 ui/src/assets/icons/debian.svg                     |   153 -
 ui/src/assets/icons/kubernetes.svg                 |    59 +-
 ui/src/assets/icons/light.svg                      |     2 +-
 ui/src/assets/icons/tungsten.svg                   |    26 +
 ui/src/components/CheckBoxSelectPair.vue           |    22 +-
 ui/src/components/KeyValuePairInput.vue            |    91 +
 ui/src/components/header/AnnouncementBanner.vue    |   145 +
 ui/src/components/header/CreateMenu.vue            |   112 +
 ui/src/components/header/ExternalLink.vue          |    54 +
 ui/src/components/header/HeaderNotice.vue          |    10 +-
 ui/src/components/header/ProjectMenu.vue           |   128 +-
 ui/src/components/header/SamlDomainSwitcher.vue    |    13 +-
 ui/src/components/header/TranslationMenu.vue       |     1 +
 ui/src/components/header/UserMenu.vue              |   104 +-
 ui/src/components/menu/SMenu.vue                   |    11 +
 ui/src/components/menu/SideMenu.vue                |     2 -
 ui/src/components/multitab/index.less              |     2 +-
 ui/src/components/page/GlobalFooter.vue            |    24 +-
 ui/src/components/page/GlobalHeader.vue            |     8 +-
 ui/src/components/page/GlobalLayout.vue            |   223 +-
 ui/src/components/view/ActionButton.vue            |    30 +-
 ui/src/components/view/AnnotationsTab.vue          |    14 +-
 ui/src/components/view/BackupMetadata.vue          |   137 +
 ui/src/components/view/BulkActionProgress.vue      |    53 +-
 ui/src/components/view/BulkActionView.vue          |    63 +-
 ui/src/components/view/DateTimeFilter.vue          |   173 +
 ui/src/components/view/DedicateData.vue            |    20 +-
 ui/src/components/view/DedicateDomain.vue          |    20 +-
 ui/src/components/view/DedicateModal.vue           |    10 +-
 ui/src/components/view/DeployVMFromBackup.vue      |  2761 +++
 ui/src/components/view/DetailSettings.vue          |    52 +-
 ui/src/components/view/DetailsTab.vue              |   334 +-
 ui/src/components/view/EventsTab.vue               |    33 +-
 ui/src/components/view/GPUDevicesTab.vue           |   902 +
 ui/src/components/view/GPUSummaryTab.vue           |   293 +
 ui/src/components/view/GPUTab.vue                  |   440 +
 .../components/view/ImageDeployInstanceButton.vue  |   155 +
 ui/src/components/view/ImageStoreSelectView.vue    |   193 +
 ui/src/components/view/InfoCard.vue                |  1721 +-
 .../view/InstanceNicsNetworkSelectListView.vue     |    48 +-
 .../InstanceVolumesStoragePoolSelectListView.vue   |    45 +-
 ui/src/components/view/ListResourceTable.vue       |    41 +-
 ui/src/components/view/ListView.vue                |  1547 +-
 ui/src/components/view/NicNetworkSelectForm.vue    |    26 +-
 ui/src/components/view/ObjectListTable.vue         |    89 +
 ui/src/components/view/ObjectStoreBrowser.vue      |   547 +
 ui/src/components/view/ResourceCountUsage.vue      |   145 +-
 ui/src/components/view/ResourceIcon.vue            |    16 +-
 ui/src/components/view/ResourceLimitTab.vue        |   107 +-
 ui/src/components/view/ResourceView.vue            |    48 +-
 ui/src/components/view/SearchView.vue              |  1175 +-
 ui/src/components/view/SettingsTab.vue             |   147 +-
 ui/src/components/view/StatsTab.vue                |   586 +-
 ui/src/components/view/StoragePoolSelectView.vue   |   110 +-
 ui/src/components/view/TestWebhookDeliveryView.vue |   278 +
 ui/src/components/view/TreeView.vue                |   203 +-
 ui/src/components/view/UploadResourceIcon.vue      |     8 +-
 ui/src/components/view/VgpuProfilesTab.vue         |   405 +
 ui/src/components/view/VmwareData.vue              |     4 +-
 ui/src/components/view/VolumesTab.vue              |    69 +-
 ui/src/components/view/WebhookDeliveriesTab.vue    |   526 +
 ui/src/components/view/chart/LineChart.vue         |    55 -
 ui/src/components/view/stats/FilterStats.vue       |   165 -
 ui/src/components/view/stats/ResourceStatsInfo.vue |    30 +-
 .../view/stats/ResourceStatsLineChart.vue          |   239 +
 .../components/widgets/BlockRadioGroupSelect.vue   |   154 +
 ui/src/components/widgets/Breadcrumb.vue           |    14 +-
 ui/src/components/widgets/ChartCard.vue            |     1 -
 ui/src/components/widgets/Console.vue              |    76 +-
 ui/src/components/widgets/CopyLabel.vue            |    59 +
 ui/src/components/widgets/DetailsInput.vue         |   186 +
 ui/src/components/widgets/Drawer.vue               |     2 +-
 ui/src/components/widgets/InfiniteScrollSelect.vue |   316 +
 ui/src/components/widgets/OsLogo.vue               |    73 +-
 ui/src/components/widgets/ResourceLabel.vue        |    21 +-
 ui/src/components/widgets/Status.vue               |    77 +-
 ui/src/components/widgets/TooltipLabel.vue         |    11 +-
 ui/src/config/router.js                            |   102 +-
 ui/src/config/section/account.js                   |    66 +-
 ui/src/config/section/compute.js                   |   492 +-
 ui/src/config/section/config.js                    |   316 +-
 ui/src/config/section/domain.js                    |    41 +-
 ui/src/config/section/event.js                     |    22 +-
 ui/src/config/section/extension.js                 |   147 +
 ui/src/config/section/extension/customaction.js    |    94 +
 ui/src/config/section/image.js                     |   103 +-
 ui/src/config/section/infra.js                     |    26 +
 ui/src/config/section/infra/backupRepositories.js  |    63 +
 ui/src/config/section/infra/clusters.js            |    52 +-
 ui/src/config/section/infra/hosts.js               |   116 +-
 ui/src/config/section/infra/ilbvms.js              |    16 +-
 ui/src/config/section/infra/managementServers.js   |    88 +-
 ui/src/config/section/infra/objectStorages.js      |    74 +
 ui/src/config/section/infra/phynetworks.js         |    12 +-
 ui/src/config/section/infra/pods.js                |    11 +-
 ui/src/config/section/infra/primaryStorages.js     |    46 +-
 ui/src/config/section/infra/routers.js             |    17 +-
 ui/src/config/section/infra/secondaryStorages.js   |    37 +-
 ui/src/config/section/infra/systemVms.js           |    17 +-
 ui/src/config/section/infra/zones.js               |    43 +-
 ui/src/config/section/network.js                   |   812 +-
 ui/src/config/section/offering.js                  |   254 +-
 ui/src/config/section/plugin/quota.js              |   101 +-
 ui/src/config/section/project.js                   |    10 +-
 ui/src/config/section/role.js                      |    46 +-
 ui/src/config/section/storage.js                   |   503 +-
 ui/src/config/section/tools.js                     |   166 +
 ui/src/config/section/user.js                      |    84 +-
 ui/src/config/section/zone.js                      |    45 +
 ui/src/core/ext.js                                 |    12 +-
 ui/src/core/lazy_lib/components_use.js             |    14 +-
 ui/src/core/lazy_lib/icons_use.js                  |    54 +
 ui/src/layouts/UserLayout.vue                      |     8 +-
 ui/src/locales/index.js                            |     2 +-
 ui/src/main.js                                     |    85 +-
 ui/src/permission.js                               |    80 +-
 ui/src/store/getters.js                            |    14 +-
 ui/src/store/modules/app.js                        |    31 +-
 ui/src/store/modules/permission.js                 |    31 +-
 ui/src/store/modules/user.js                       |   281 +-
 ui/src/store/mutation-types.js                     |     6 +
 ui/src/style/README.md                             |    28 +-
 ui/src/style/common/function.less                  |     2 +-
 ui/src/style/components/view/StatsTab.scss         |     5 +-
 ui/src/style/dark-mode.less                        |    66 +-
 ui/src/style/frame/content.less                    |     2 +-
 ui/src/style/frame/search.less                     |     2 +-
 ui/src/style/frame/sider.less                      |     2 +-
 ui/src/style/frame/top-menu.less                   |     2 +-
 ui/src/style/index.less                            |     4 +-
 ui/src/style/objects/form.scss                     |    44 +
 ui/src/style/objects/table.less                    |     2 +-
 ui/src/style/vars.less                             |    62 +-
 ui/src/utils/date.js                               |   104 +
 ui/src/utils/device.js                             |     6 +-
 ui/src/utils/extension.js                          |    30 +
 ui/src/utils/guiTheme.js                           |   103 +
 ui/src/utils/links.js                              |    36 +
 ui/src/utils/network.js                            |    51 +
 ui/src/utils/plugins.js                            |   209 +-
 ui/src/utils/quota.js                              |   124 +
 ui/src/utils/renderIcon.js                         |     5 +-
 ui/src/utils/request.js                            |    83 +-
 ui/src/utils/sort.js                               |    15 +-
 ui/src/utils/util.js                               |    55 +
 ui/src/utils/zone.js                               |    25 +
 ui/src/views/AutogenView.vue                       |   886 +-
 ui/src/views/auth/ForgotPassword.vue               |   262 +
 ui/src/views/auth/Login.vue                        |   258 +-
 ui/src/views/auth/ResetPassword.vue                |   319 +
 ui/src/views/compute/AssignInstance.vue            |   180 +-
 ui/src/views/compute/AttachIso.vue                 |    20 +-
 ui/src/views/compute/AutoScaleDownPolicyTab.vue    |   115 +-
 ui/src/views/compute/AutoScaleLoadBalancing.vue    |   121 +-
 ui/src/views/compute/AutoScaleUpPolicyTab.vue      |   111 +-
 ui/src/views/compute/AutoScaleVmProfile.vue        |   184 +-
 ui/src/views/compute/BackupScheduleWizard.vue      |    32 +-
 ui/src/views/compute/ChangeAffinity.vue            |    12 +-
 ui/src/views/compute/CreateAutoScaleVmGroup.vue    |   964 +-
 ui/src/views/compute/CreateKubernetesCluster.vue   |   517 +-
 ui/src/views/compute/CreateSSHKeyPair.vue          |    37 +-
 ui/src/views/compute/CreateSnapshotWizard.vue      |    24 +-
 ui/src/views/compute/DeployVM.vue                  |  1936 ++-
 ui/src/views/compute/DeployVnfAppliance.vue        |  2994 ++++
 ui/src/views/compute/DestroyVM.vue                 |    18 +-
 ui/src/views/compute/EditVM.vue                    |   190 +-
 ui/src/views/compute/InstanceSchedules.vue         |   536 +
 ui/src/views/compute/InstanceTab.vue               |   577 +-
 ui/src/views/compute/KubernetesAddNodes.vue        |   186 +
 ui/src/views/compute/KubernetesRemoveNodes.vue     |   151 +
 ui/src/views/compute/KubernetesServiceTab.vue      |   191 +-
 ui/src/views/compute/MigrateVMStorage.vue          |     8 +-
 ui/src/views/compute/MigrateWizard.vue             |   154 +-
 ui/src/views/compute/RegisterUserData.vue          |    83 +-
 ui/src/views/compute/ReinstallVm.vue               |   421 +
 ui/src/views/compute/ResetSshKeyPair.vue           |    20 +-
 ui/src/views/compute/ResetUserData.vue             |    72 +-
 ui/src/views/compute/ScaleKubernetesCluster.vue    |   211 +-
 ui/src/views/compute/ScaleVM.vue                   |    35 +-
 ui/src/views/compute/StartBackup.vue               |   166 +
 ui/src/views/compute/StartVirtualMachine.vue       |    49 +-
 ui/src/views/compute/UpgradeKubernetesCluster.vue  |    10 +-
 ui/src/views/compute/backup/BackupSchedule.vue     |   165 +-
 .../views/compute/backup/CreateBackupSchedule.vue  |   183 +
 ui/src/views/compute/backup/FormSchedule.vue       |    84 +-
 .../compute/wizard/AffinityGroupSelection.vue      |     9 +-
 .../compute/wizard/ComputeOfferingSelection.vue    |   156 +-
 ui/src/views/compute/wizard/DeployButtons.vue      |   129 +
 .../wizard/DeployInstanceBackupSelection.vue       |   154 +
 .../views/compute/wizard/DiskOfferingSelection.vue |    37 +-
 .../views/compute/wizard/LoadBalancerSelection.vue |    16 +-
 ui/src/views/compute/wizard/MultiDiskSelection.vue |    92 +-
 .../views/compute/wizard/MultiNetworkSelection.vue |   165 +-
 .../views/compute/wizard/NetworkConfiguration.vue  |   219 +-
 ui/src/views/compute/wizard/NetworkSelection.vue   |    76 +-
 .../compute/wizard/OsBasedImageRadioGroup.vue      |   213 +
 .../views/compute/wizard/OsBasedImageSelection.vue |   375 +
 .../wizard/OsBasedImageSelectionSearchView.vue     |   119 +
 ui/src/views/compute/wizard/OwnershipSelection.vue |   257 +
 .../compute/wizard/SecurityGroupSelection.vue      |    11 +-
 .../views/compute/wizard/SshKeyPairSelection.vue   |    11 +-
 .../views/compute/wizard/TemplateIsoRadioGroup.vue |    27 +-
 .../views/compute/wizard/TemplateIsoSelection.vue  |    19 +-
 ui/src/views/compute/wizard/UserDataSelection.vue  |    27 +-
 ui/src/views/compute/wizard/VnfNicsSelection.vue   |   166 +
 .../wizard/VolumeDiskOfferingSelectView.vue        |   280 +
 .../compute/wizard/ZoneBlockRadioGroupSelect.vue   |    51 +
 ui/src/views/dashboard/CapacityDashboard.vue       |   573 +-
 ui/src/views/dashboard/Dashboard.vue               |    10 +-
 ui/src/views/dashboard/SetupTwoFaAtLogin.vue       |   337 +
 ui/src/views/dashboard/UsageDashboard.vue          |   696 +-
 ui/src/views/dashboard/VerifyOauth.vue             |    93 +
 ui/src/views/dashboard/VerifyTwoFa.vue             |   197 +
 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                    |   127 +-
 ui/src/views/iam/AddLdapAccount.vue                |    60 +-
 ui/src/views/iam/AddUser.vue                       |   140 +-
 ui/src/views/iam/ChangeUserPassword.vue            |     4 +-
 ui/src/views/iam/ConfigureSamlSsoAuth.vue          |    12 +-
 ui/src/views/iam/CreateRole.vue                    |    29 +-
 ui/src/views/iam/DeleteAccount.vue                 |   176 +
 ui/src/views/iam/DeleteAccountWrapper.vue          |    74 +
 ui/src/views/iam/DomainActionForm.vue              |    27 +-
... 2886 lines suppressed ...