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

pearl11594 pushed a change to branch dedicate-backup-offering-to-domain
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


    from 385f99b2c36 address comments
     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 e21aacf5bea Bump `actions/cache` to `v5` (#12247)
     add 91376c79945 cleanup LDAP code according to warnings (#11436)
     add 28820f6e253 Bump org.influxdb:influxdb-java from 2.22 to 2.25 (#12270)
     add bb5da0e49cf security groups: conntrack only if needed (#10594)
     add 13f805fbf3b Log4j2 refactor cloud api module (#8728)
     add 558232e8e6b Feature s390x multiarch support (#12214)
     add eb93f0105e3 Bump com.zaxxer:HikariCP from 5.1.0 to 7.0.2 (#12266)
     add d5165183eae KVM memballooning requires free page reporting and 
autodeflate (#11932)
     add de1b1d24c2e Python exception processing static routes fixed (#11967)
     add e08e66d66de kvm: use preallocation option for fat disk resize (#11986)
     add e9900aba23a Show time correctly in the backup schedule UI  (#12012)
     add 8936e4c5350 api:rename RegisterCmd.java => RegisterUserKeyCmd.java 
(#12259)
     add ba26d95ad7c api: create/register/upload template with empty template 
tag (#12234)
     add e8200a0b749 Prioritize copying templates from other secondary storages 
instead of downloading them (#10363)
     add 79ab1566b11 packaging: use latest cmk release link directly (#11429)
     add 061ce9b39bc Fix VM and volume metrics listing regressions (#12284)
     add 47a6ac89ba5 Update templateConfig.sh to not break with directorys with 
space on t… (#10898)
     add cee330e7c87 Merge branch '4.20' into 4.22
     add e2d37733623 Merge release branch 4.22 to main
     add b394b5ba74e Fix terms, typos and grammar mistakes in the API, error 
messages, events, etc. (#7857)
     add 55ab7c5589e Merge branch '4.20' into 4.22
     add 22da57f922d Merge branch '4.22'
     add e0c13cc3ec5 Cleanup userconcentratedpod_random and 
userconcentratedpod_firstfit allocation algorithms (#12233)
     add 5bf869c8034 Replace deprecated 'egrep' commands with 'grep -E'. 
(#12306)
     add 34b8870f591 systemvm-template: support on-demand download during setup 
and registration (#11656)
     add 432a3065bc8 api: fix response annotation for createBackupSchedule 
(#11950)
     add 56a39e6be75 Add 'dataDiskController' VM setting/detail for KVM 
hypervisor (#12334)
     add 6a2d91ed8a3 Merge branch '4.20' into 4.22
     add 40d21f093f9 Merge branch '4.22'
     add 46cb805c902 Removal of internal ID in backup event descriptions 
(#12197)
     add 81b991ae9c9 Show volume UUIDs in the backup details page (#12156)
     add cd557969727 webhook: fixes, filter enhancement (#12023)
     add 7a11bd2f987 CKS: Fix issue with scaling down CKS Nodes when deployed 
in HA mode (#12302)
     add 7ff76cb2d7b Protect upgrades from failures  (#12319)
     add 5cb279b6f10 ui: fix test delivery params in create webhook form 
(#12318)
     add 10dcbd76f0f linstor: Provide /dev/drbd/by-res/ resource paths to 
CloudStack (#12300)
     add 4f749378551 Event typo fix (#12350)
     add 77cb0827d35 Refactor XML parsing to use safer document builders in 
multiple classes (#12129)
     add ca64406a880 replace momentjs with dayjs and use watch instead of 
update (#12351)
     add 959c5fff688 Merge branch '4.20' into 4.22
     add 4628385051c Merge branch '4.22'
     add 890659adf85 Merge branch 'main' of 
https://github.com/apache/cloudstack into dedicate-backup-offering-to-domain

No new revisions were added by this update.

Summary of changes:
 .../CODEOWNERS                                     |    9 +-
 .../dependabot.yml                                 |   13 +-
 .github/linters/.yamllint.yml                      |    3 +-
 .github/linters/codespell.txt                      |    2 -
 .github/workflows/main-sonar-check.yml             |    4 +-
 .github/workflows/pre-commit.yml                   |    2 +-
 .github/workflows/sonar-check.yml                  |    4 +-
 .github/workflows/stale.yml                        |   41 +
 .pre-commit-config.yaml                            |   11 +-
 LICENSE                                            |  242 ++--
 NOTICE                                             |   52 +-
 agent/src/main/java/com/cloud/agent/Agent.java     |    6 +-
 .../consoleproxy/ConsoleProxyResource.java         |    4 +-
 .../com/cloud/agent/api/storage/OVFHelper.java     |   53 +-
 .../com/cloud/agent/api/storage/OVFParser.java     |    4 +-
 .../commands/ListRecurringSnapshotScheduleCmd.java |    4 +-
 api/src/main/java/com/cloud/cpu/CPU.java           |    3 +-
 .../com/cloud/deploy/DeploymentClusterPlanner.java |    4 +-
 .../java/com/cloud/deploy/DeploymentPlanner.java   |    2 +-
 api/src/main/java/com/cloud/host/HostStats.java    |    1 -
 .../main/java/com/cloud/network/Ipv6Service.java   |    2 +-
 api/src/main/java/com/cloud/network/Network.java   |    6 +-
 .../java/com/cloud/network/NetworkService.java     |    2 +-
 .../com/cloud/network/as/AutoScaleVmGroup.java     |    2 +-
 .../cloud/network/rules/LbStickinessMethod.java    |    4 +-
 .../java/com/cloud/server/ManagementService.java   |   16 +
 .../main/java/com/cloud/user/AccountService.java   |    4 +-
 .../java/com/cloud/user/ResourceLimitService.java  |    2 +-
 .../java/com/cloud/vm/snapshot/VMSnapshot.java     |    6 +-
 .../java/org/apache/cloudstack/acl/RoleType.java   |    4 +-
 .../cloudstack/affinity/AffinityGroupResponse.java |   20 +-
 .../affinity/AffinityGroupTypeResponse.java        |    2 +-
 .../cloudstack/api/AbstractGetUploadParamsCmd.java |   14 +-
 .../org/apache/cloudstack/api/ApiConstants.java    |    1 +
 .../cloudstack/api/BaseAsyncCreateCustomIdCmd.java |    2 +-
 .../cloudstack/api/BaseAsyncCustomIdCmd.java       |    2 +-
 .../java/org/apache/cloudstack/api/BaseCmd.java    |    2 +-
 .../org/apache/cloudstack/api/BaseCustomIdCmd.java |    2 +-
 .../api/BaseListAccountResourcesCmd.java           |    2 +-
 .../cloudstack/api/BaseListDomainResourcesCmd.java |    4 +-
 .../api/BaseListProjectAndAccountResourcesCmd.java |    2 +-
 .../api/BaseListRetrieveOnlyResourceCountCmd.java  |    2 +-
 .../api/BaseListTemplateOrIsoPermissionsCmd.java   |    2 +-
 .../org/apache/cloudstack/api/BaseResponse.java    |    4 +-
 .../api/BaseResponseWithAnnotations.java           |    2 +-
 .../api/BaseResponseWithAssociatedNetwork.java     |    4 +-
 .../api/BaseResponseWithTagInformation.java        |    2 +-
 .../cloudstack/api/BaseUpdateTemplateOrIsoCmd.java |   28 +-
 .../api/BaseUpdateTemplateOrIsoPermissionsCmd.java |   16 +-
 .../command/admin/account/CreateAccountCmd.java    |   18 +-
 .../command/admin/account/DeleteAccountCmd.java    |    6 +-
 .../command/admin/account/DisableAccountCmd.java   |   10 +-
 .../command/admin/account/EnableAccountCmd.java    |    6 +-
 .../admin/account/ListAccountsCmdByAdmin.java      |    2 +-
 .../api/command/admin/account/LockAccountCmd.java  |    6 +-
 .../command/admin/account/UpdateAccountCmd.java    |   16 +-
 .../api/command/admin/acl/CreateRoleCmd.java       |    2 +-
 .../api/command/admin/acl/UpdateRoleCmd.java       |    2 +-
 .../command/admin/acl/UpdateRolePermissionCmd.java |    2 +-
 .../admin/acl/project/CreateProjectRoleCmd.java    |    2 +-
 .../admin/acl/project/UpdateProjectRoleCmd.java    |    2 +-
 .../project/UpdateProjectRolePermissionCmd.java    |    2 +-
 .../admin/address/AcquirePodIpCmdByAdmin.java      |    2 +-
 .../admin/address/AssociateIPAddrCmdByAdmin.java   |    2 +-
 .../address/ListPublicIpAddressesCmdByAdmin.java   |    2 +-
 .../admin/address/ReleasePodIpCmdByAdmin.java      |    2 +-
 .../UpdateVMAffinityGroupCmdByAdmin.java           |    2 +-
 .../command/admin/annotation/AddAnnotationCmd.java |   10 +-
 .../admin/annotation/ListAnnotationsCmd.java       |   10 +-
 .../admin/annotation/RemoveAnnotationCmd.java      |    4 +-
 .../annotation/UpdateAnnotationVisibilityCmd.java  |    6 +-
 .../command/admin/autoscale/CreateCounterCmd.java  |    4 +-
 .../command/admin/autoscale/DeleteCounterCmd.java  |    6 +-
 .../admin/backup/ImportBackupOfferingCmd.java      |    4 +-
 .../admin/backup/UpdateBackupOfferingCmd.java      |    2 +-
 .../command/admin/ca/ProvisionCertificateCmd.java  |    4 +-
 .../api/command/admin/ca/RevokeCertificateCmd.java |    2 +-
 .../api/command/admin/cluster/AddClusterCmd.java   |   26 +-
 .../command/admin/cluster/DeleteClusterCmd.java    |    2 +-
 .../api/command/admin/cluster/ListClustersCmd.java |   18 +-
 .../command/admin/cluster/UpdateClusterCmd.java    |   12 +-
 .../command/admin/config/ListCfgGroupsByCmd.java   |    2 +-
 .../api/command/admin/config/ListCfgsByCmd.java    |   22 +-
 .../config/ListHypervisorCapabilitiesCmd.java      |    2 +-
 .../api/command/admin/config/ResetCfgCmd.java      |   14 +-
 .../api/command/admin/config/UpdateCfgCmd.java     |   28 +-
 .../config/UpdateHypervisorCapabilitiesCmd.java    |   16 +-
 .../admin/diagnostics/GetDiagnosticsDataCmd.java   |    8 +-
 .../admin/diagnostics/RunDiagnosticsCmd.java       |    8 +-
 .../ListTemplateDirectDownloadCertificatesCmd.java |    8 +-
 ...visionTemplateDirectDownloadCertificateCmd.java |    4 +-
 ...RevokeTemplateDirectDownloadCertificateCmd.java |   10 +-
 ...UploadTemplateDirectDownloadCertificateCmd.java |    6 +-
 .../api/command/admin/domain/CreateDomainCmd.java  |    4 +-
 .../api/command/admin/domain/DeleteDomainCmd.java  |    4 +-
 .../admin/domain/ListDomainChildrenCmd.java        |    8 +-
 .../api/command/admin/domain/ListDomainsCmd.java   |    4 +-
 .../api/command/admin/domain/UpdateDomainCmd.java  |    2 +-
 .../api/command/admin/guest/AddGuestOsCmd.java     |    4 +-
 .../command/admin/guest/AddGuestOsMappingCmd.java  |    4 +-
 .../admin/guest/GetHypervisorGuestOsNamesCmd.java  |    4 +-
 .../command/admin/guest/ListGuestOsMappingCmd.java |   12 +-
 .../command/admin/ha/ConfigureHAForHostCmd.java    |    2 +-
 .../command/admin/ha/DisableHAForClusterCmd.java   |    2 +-
 .../api/command/admin/ha/DisableHAForHostCmd.java  |    2 +-
 .../api/command/admin/ha/DisableHAForZoneCmd.java  |    2 +-
 .../command/admin/ha/EnableHAForClusterCmd.java    |    2 +-
 .../api/command/admin/ha/EnableHAForHostCmd.java   |    2 +-
 .../api/command/admin/ha/EnableHAForZoneCmd.java   |    2 +-
 .../api/command/admin/host/AddHostCmd.java         |   18 +-
 .../command/admin/host/AddSecondaryStorageCmd.java |    4 +-
 .../admin/host/CancelHostAsDegradedCmd.java        |    2 +-
 .../admin/host/CancelHostMaintenanceCmd.java       |    4 +-
 .../admin/host/DeclareHostAsDegradedCmd.java       |    4 +-
 .../api/command/admin/host/DeleteHostCmd.java      |    6 +-
 .../admin/host/FindHostsForMigrationCmd.java       |    4 +-
 .../api/command/admin/host/ListHostsCmd.java       |   28 +-
 .../admin/host/PrepareForHostMaintenanceCmd.java   |    2 +-
 .../api/command/admin/host/ReconnectHostCmd.java   |    2 +-
 .../admin/host/ReleaseHostReservationCmd.java      |    2 +-
 .../api/command/admin/host/UpdateHostCmd.java      |   10 +-
 .../command/admin/host/UpdateHostPasswordCmd.java  |   10 +-
 .../ConfigureInternalLoadBalancerElementCmd.java   |    2 +-
 .../CreateInternalLoadBalancerElementCmd.java      |    2 +-
 .../admin/internallb/ListInternalLBVMsCmd.java     |   22 +-
 .../ListInternalLoadBalancerElementsCmd.java       |    6 +-
 .../admin/internallb/StartInternalLBVMCmd.java     |   14 +-
 .../admin/internallb/StopInternalLBVMCmd.java      |   16 +-
 .../api/command/admin/iso/AttachIsoCmdByAdmin.java |    2 +-
 .../api/command/admin/iso/CopyIsoCmdByAdmin.java   |    2 +-
 .../api/command/admin/iso/DetachIsoCmdByAdmin.java |    2 +-
 .../admin/iso/ListIsoPermissionsCmdByAdmin.java    |    4 +-
 .../ListLoadBalancerRuleInstancesCmdByAdmin.java   |    2 +-
 .../api/command/admin/management/ListMgmtsCmd.java |    4 +-
 .../command/admin/network/AddNetworkDeviceCmd.java |    2 +-
 .../network/AddNetworkServiceProviderCmd.java      |    8 +-
 .../network/CreateManagementNetworkIpRangeCmd.java |    3 +-
 .../admin/network/CreateNetworkCmdByAdmin.java     |   14 +-
 .../admin/network/CreateNetworkOfferingCmd.java    |   52 +-
 .../admin/network/CreatePhysicalNetworkCmd.java    |   26 +-
 .../network/CreateStorageNetworkIpRangeCmd.java    |   14 +-
 .../admin/network/DedicateGuestVlanRangeCmd.java   |   10 +-
 .../network/DeleteManagementNetworkIpRangeCmd.java |    2 +-
 .../admin/network/DeleteNetworkOfferingCmd.java    |    2 +-
 .../network/DeleteNetworkServiceProviderCmd.java   |    2 +-
 .../admin/network/DeletePhysicalNetworkCmd.java    |    2 +-
 .../network/DeleteStorageNetworkIpRangeCmd.java    |    4 +-
 .../network/ListDedicatedGuestVlanRangesCmd.java   |   14 +-
 .../command/admin/network/ListGuestVlansCmd.java   |   10 +-
 .../admin/network/ListNetworkDeviceCmd.java        |    2 +-
 .../network/ListNetworkServiceProvidersCmd.java    |    6 +-
 .../admin/network/ListNetworksCmdByAdmin.java      |    2 +-
 .../admin/network/ListPhysicalNetworksCmd.java     |    6 +-
 .../network/ListStorageNetworkIpRangeCmd.java      |    8 +-
 .../network/ListSupportedNetworkServicesCmd.java   |    4 +-
 .../command/admin/network/MigrateNetworkCmd.java   |    8 +-
 .../api/command/admin/network/MigrateVPCCmd.java   |   14 +-
 .../network/ReleaseDedicatedGuestVlanRangeCmd.java |    2 +-
 .../admin/network/UpdateNetworkCmdByAdmin.java     |    2 +-
 .../admin/network/UpdateNetworkOfferingCmd.java    |   22 +-
 .../network/UpdateNetworkServiceProviderCmd.java   |    4 +-
 .../admin/network/UpdatePhysicalNetworkCmd.java    |    8 +-
 .../UpdatePodManagementNetworkIpRangeCmd.java      |    2 +-
 .../network/UpdateStorageNetworkIpRangeCmd.java    |    6 +-
 .../admin/offering/CreateDiskOfferingCmd.java      |   55 +-
 .../admin/offering/CreateServiceOfferingCmd.java   |   79 +-
 .../admin/offering/DeleteServiceOfferingCmd.java   |    2 +-
 .../admin/offering/UpdateDiskOfferingCmd.java      |   40 +-
 .../admin/offering/UpdateServiceOfferingCmd.java   |   16 +-
 .../ChangeOutOfBandManagementPasswordCmd.java      |    4 +-
 .../ConfigureOutOfBandManagementCmd.java           |   12 +-
 .../DisableOutOfBandManagementForClusterCmd.java   |    2 +-
 .../DisableOutOfBandManagementForHostCmd.java      |    2 +-
 .../DisableOutOfBandManagementForZoneCmd.java      |    2 +-
 .../EnableOutOfBandManagementForClusterCmd.java    |    2 +-
 .../EnableOutOfBandManagementForHostCmd.java       |    2 +-
 .../EnableOutOfBandManagementForZoneCmd.java       |    2 +-
 .../IssueOutOfBandManagementPowerActionCmd.java    |    6 +-
 .../api/command/admin/pod/CreatePodCmd.java        |   12 +-
 .../api/command/admin/pod/DeletePodCmd.java        |    2 +-
 .../api/command/admin/pod/ListPodsByCmd.java       |   10 +-
 .../api/command/admin/pod/UpdatePodCmd.java        |   12 +-
 .../admin/region/CreatePortableIpRangeCmd.java     |   10 +-
 .../admin/region/DeletePortableIpRangeCmd.java     |    2 +-
 .../admin/region/ListPortableIpRangesCmd.java      |    2 +-
 .../api/command/admin/region/UpdateRegionCmd.java  |    4 +-
 .../command/admin/resource/ArchiveAlertsCmd.java   |    8 +-
 .../admin/resource/CleanVMReservationsCmd.java     |    6 +-
 .../command/admin/resource/DeleteAlertsCmd.java    |    8 +-
 .../api/command/admin/resource/ListAlertsCmd.java  |    6 +-
 .../command/admin/resource/ListCapacityCmd.java    |   10 +-
 .../admin/resource/StartRollingMaintenanceCmd.java |   14 +-
 .../admin/resource/icon/DeleteResourceIconCmd.java |    6 +-
 .../admin/resource/icon/ListResourceIconCmd.java   |    4 +-
 .../admin/resource/icon/UploadResourceIconCmd.java |    4 +-
 .../admin/router/ConfigureOvsElementCmd.java       |    2 +-
 .../router/ConfigureVirtualRouterElementCmd.java   |    2 +-
 .../router/CreateVirtualRouterElementCmd.java      |    2 +-
 .../api/command/admin/router/DestroyRouterCmd.java |    2 +-
 .../router/GetRouterHealthCheckResultsCmd.java     |    4 +-
 .../command/admin/router/ListOvsElementsCmd.java   |    6 +-
 .../api/command/admin/router/ListRoutersCmd.java   |   24 +-
 .../admin/router/ListVirtualRouterElementsCmd.java |    6 +-
 .../api/command/admin/router/RebootRouterCmd.java  |    2 +-
 .../api/command/admin/router/StartRouterCmd.java   |    2 +-
 .../api/command/admin/router/StopRouterCmd.java    |    4 +-
 .../api/command/admin/router/UpgradeRouterCmd.java |    2 +-
 .../admin/router/UpgradeRouterTemplateCmd.java     |   18 +-
 .../command/admin/storage/AddImageStoreCmd.java    |   10 +-
 .../CancelPrimaryStorageMaintenanceCmd.java        |    2 +-
 .../storage/CreateSecondaryStagingStoreCmd.java    |   12 +-
 .../admin/storage/CreateStoragePoolCmd.java        |   24 +-
 .../storage/DeleteSecondaryStagingStoreCmd.java    |    2 +-
 .../storage/FindStoragePoolsForMigrationCmd.java   |    2 +-
 .../command/admin/storage/ListImageStoresCmd.java  |   12 +-
 .../storage/ListSecondaryStagingStoresCmd.java     |   10 +-
 .../command/admin/storage/ListStoragePoolsCmd.java |   18 +-
 .../admin/storage/ListStorageProvidersCmd.java     |    2 +-
 .../storage/MigrateSecondaryStorageDataCmd.java    |    6 +-
 .../storage/UpdateCloudToUseObjectStoreCmd.java    |    8 +-
 .../admin/storage/UpdateStoragePoolCmd.java        |    8 +-
 .../api/command/admin/swift/AddSwiftCmd.java       |    6 +-
 .../api/command/admin/swift/ListSwiftsCmd.java     |    2 +-
 .../command/admin/systemvm/DestroySystemVmCmd.java |    6 +-
 .../command/admin/systemvm/ListSystemVMsCmd.java   |   18 +-
 .../command/admin/systemvm/MigrateSystemVMCmd.java |   16 +-
 .../command/admin/systemvm/PatchSystemVMCmd.java   |    2 +-
 .../command/admin/systemvm/RebootSystemVmCmd.java  |    4 +-
 .../command/admin/systemvm/ScaleSystemVMCmd.java   |    4 +-
 .../command/admin/systemvm/StartSystemVMCmd.java   |    4 +-
 .../command/admin/systemvm/StopSystemVmCmd.java    |    6 +-
 .../command/admin/systemvm/UpgradeSystemVMCmd.java |    6 +-
 .../admin/template/CopyTemplateCmdByAdmin.java     |    2 +-
 .../admin/template/CreateTemplateCmdByAdmin.java   |    4 +-
 .../ListTemplatePermissionsCmdByAdmin.java         |    4 +-
 .../admin/template/ListTemplatesCmdByAdmin.java    |    2 +-
 .../command/admin/template/PrepareTemplateCmd.java |    8 +-
 .../admin/template/RegisterTemplateCmdByAdmin.java |    2 +-
 .../admin/template/UpdateTemplateCmdByAdmin.java   |    2 +-
 .../api/command/admin/usage/AddTrafficTypeCmd.java |    6 +-
 .../command/admin/usage/DeleteTrafficTypeCmd.java  |    2 +-
 .../admin/usage/ListTrafficMonitorsCmd.java        |    2 +-
 .../command/admin/usage/ListTrafficTypesCmd.java   |    2 +-
 .../command/admin/usage/UpdateTrafficTypeCmd.java  |    2 +-
 .../api/command/admin/user/CreateUserCmd.java      |    6 +-
 .../api/command/admin/user/DeleteUserCmd.java      |    2 +-
 .../api/command/admin/user/GetUserKeysCmd.java     |    6 +-
 .../api/command/admin/user/ListUsersCmd.java       |    2 +-
 .../api/command/admin/user/MoveUserCmd.java        |    2 +-
 .../{RegisterCmd.java => RegisterUserKeyCmd.java}  |    8 +-
 .../api/command/admin/user/UpdateUserCmd.java      |    6 +-
 .../command/admin/vlan/CreateVlanIpRangeCmd.java   |   43 +-
 .../admin/vlan/DedicatePublicIpRangeCmd.java       |    8 +-
 .../command/admin/vlan/DeleteVlanIpRangeCmd.java   |    2 +-
 .../command/admin/vlan/ListVlanIpRangesCmd.java    |   20 +-
 .../admin/vlan/ReleasePublicIpRangeCmd.java        |    2 +-
 .../command/admin/vlan/UpdateVlanIpRangeCmd.java   |   22 +-
 .../api/command/admin/vm/AddNicToVMCmdByAdmin.java |    2 +-
 .../api/command/admin/vm/AssignVMCmd.java          |   18 +-
 .../api/command/admin/vm/DeployVMCmdByAdmin.java   |    6 +-
 .../api/command/admin/vm/DestroyVMCmdByAdmin.java  |    2 +-
 .../api/command/admin/vm/ExpungeVMCmd.java         |    8 +-
 .../api/command/admin/vm/GetVMUserDataCmd.java     |    4 +-
 .../admin/vm/ImportUnmanagedInstanceCmd.java       |   46 +-
 .../admin/vm/ListUnmanagedInstancesCmd.java        |    6 +-
 .../api/command/admin/vm/ListVMsCmdByAdmin.java    |   10 +-
 .../api/command/admin/vm/MigrateVMCmd.java         |   26 +-
 .../vm/MigrateVirtualMachineWithVolumeCmd.java     |   18 +-
 .../api/command/admin/vm/RebootVMCmdByAdmin.java   |    2 +-
 .../api/command/admin/vm/RecoverVMCmd.java         |    6 +-
 .../admin/vm/RemoveNicFromVMCmdByAdmin.java        |    2 +-
 .../admin/vm/ResetVMPasswordCmdByAdmin.java        |    4 +-
 .../command/admin/vm/ResetVMSSHKeyCmdByAdmin.java  |    4 +-
 .../command/admin/vm/ResetVMUserDataCmdAdmin.java  |    4 +-
 .../api/command/admin/vm/RestoreVMCmdByAdmin.java  |    2 +-
 .../api/command/admin/vm/ScaleVMCmdByAdmin.java    |    2 +-
 .../api/command/admin/vm/StartVMCmdByAdmin.java    |    2 +-
 .../api/command/admin/vm/StopVMCmdByAdmin.java     |    2 +-
 .../command/admin/vm/UnmanageVMInstanceCmd.java    |    6 +-
 .../admin/vm/UpdateDefaultNicForVMCmdByAdmin.java  |    2 +-
 .../api/command/admin/vm/UpdateVMCmdByAdmin.java   |    6 +-
 .../api/command/admin/vm/UpgradeVMCmdByAdmin.java  |    4 +-
 .../vmsnapshot/RevertToVMSnapshotCmdByAdmin.java   |    2 +-
 .../admin/volume/AttachVolumeCmdByAdmin.java       |    2 +-
 .../admin/volume/CreateVolumeCmdByAdmin.java       |    2 +-
 .../admin/volume/DetachVolumeCmdByAdmin.java       |    2 +-
 .../admin/vpc/CreatePrivateGatewayByAdminCmd.java  |    6 +-
 .../command/admin/vpc/CreateVPCOfferingCmd.java    |   26 +-
 .../command/admin/vpc/DeletePrivateGatewayCmd.java |    2 +-
 .../command/admin/vpc/DeleteVPCOfferingCmd.java    |    2 +-
 .../command/admin/vpc/UpdateVPCOfferingCmd.java    |   14 +-
 .../api/command/admin/zone/CreateZoneCmd.java      |   26 +-
 .../api/command/admin/zone/DeleteZoneCmd.java      |    2 +-
 .../api/command/admin/zone/UpdateZoneCmd.java      |   30 +-
 .../user/account/AddAccountToProjectCmd.java       |   14 +-
 .../command/user/account/AddUserToProjectCmd.java  |   14 +-
 .../user/account/DeleteAccountFromProjectCmd.java  |   10 +-
 .../user/account/DeleteUserFromProjectCmd.java     |   12 +-
 .../api/command/user/account/ListAccountsCmd.java  |   16 +-
 .../user/account/ListProjectAccountsCmd.java       |   10 +-
 .../command/user/address/AssociateIPAddrCmd.java   |   32 +-
 .../user/address/DisassociateIPAddrCmd.java        |    4 +-
 .../user/address/ListPublicIpAddressesCmd.java     |   28 +-
 .../api/command/user/address/ReleaseIPAddrCmd.java |    4 +-
 .../api/command/user/address/ReserveIPAddrCmd.java |   12 +-
 .../api/command/user/address/UpdateIPAddrCmd.java  |    4 +-
 .../user/affinitygroup/CreateAffinityGroupCmd.java |   10 +-
 .../user/affinitygroup/DeleteAffinityGroupCmd.java |    6 +-
 .../user/affinitygroup/ListAffinityGroupsCmd.java  |    8 +-
 .../affinitygroup/UpdateVMAffinityGroupCmd.java    |   16 +-
 .../user/autoscale/CreateAutoScalePolicyCmd.java   |   12 +-
 .../user/autoscale/CreateAutoScaleVmGroupCmd.java  |   30 +-
 .../autoscale/CreateAutoScaleVmProfileCmd.java     |   28 +-
 .../command/user/autoscale/CreateConditionCmd.java |    8 +-
 .../user/autoscale/DeleteAutoScalePolicyCmd.java   |    4 +-
 .../user/autoscale/DeleteAutoScaleVmGroupCmd.java  |   12 +-
 .../autoscale/DeleteAutoScaleVmProfileCmd.java     |   12 +-
 .../command/user/autoscale/DeleteConditionCmd.java |    6 +-
 .../user/autoscale/DisableAutoScaleVmGroupCmd.java |    8 +-
 .../user/autoscale/EnableAutoScaleVmGroupCmd.java  |    8 +-
 .../user/autoscale/ListAutoScalePoliciesCmd.java   |   10 +-
 .../user/autoscale/ListAutoScaleVmGroupsCmd.java   |   16 +-
 .../user/autoscale/ListAutoScaleVmProfilesCmd.java |   14 +-
 .../command/user/autoscale/ListConditionsCmd.java  |    4 +-
 .../command/user/autoscale/ListCountersCmd.java    |    2 +-
 .../user/autoscale/UpdateAutoScalePolicyCmd.java   |   10 +-
 .../user/autoscale/UpdateAutoScaleVmGroupCmd.java  |   22 +-
 .../autoscale/UpdateAutoScaleVmProfileCmd.java     |   22 +-
 .../command/user/autoscale/UpdateConditionCmd.java |    4 +-
 .../AssignVirtualMachineToBackupOfferingCmd.java   |    8 +-
 .../api/command/user/backup/CreateBackupCmd.java   |   10 +-
 .../user/backup/CreateBackupScheduleCmd.java       |   13 +-
 .../api/command/user/backup/DeleteBackupCmd.java   |   12 +-
 .../user/backup/DeleteBackupScheduleCmd.java       |    4 +-
 .../command/user/backup/ListBackupScheduleCmd.java |    5 +-
 .../api/command/user/backup/ListBackupsCmd.java    |   10 +-
 .../RemoveVirtualMachineFromBackupOfferingCmd.java |   10 +-
 .../api/command/user/backup/RestoreBackupCmd.java  |    8 +-
 .../RestoreVolumeFromBackupAndAttachToVMCmd.java   |   10 +-
 .../user/backup/UpdateBackupScheduleCmd.java       |    2 +-
 .../consoleproxy/CreateConsoleEndpointCmd.java     |    6 +-
 .../api/command/user/event/ArchiveEventsCmd.java   |    8 +-
 .../api/command/user/event/DeleteEventsCmd.java    |    8 +-
 .../api/command/user/event/ListEventsCmd.java      |   22 +-
 .../user/firewall/CreateEgressFirewallRuleCmd.java |   27 +-
 .../user/firewall/CreateFirewallRuleCmd.java       |   22 +-
 .../user/firewall/CreatePortForwardingRuleCmd.java |   28 +-
 .../user/firewall/DeleteEgressFirewallRuleCmd.java |    2 +-
 .../user/firewall/DeleteFirewallRuleCmd.java       |    2 +-
 .../user/firewall/DeletePortForwardingRuleCmd.java |    2 +-
 .../user/firewall/ListEgressFirewallRulesCmd.java  |    6 +-
 .../user/firewall/ListFirewallRulesCmd.java        |    6 +-
 .../user/firewall/ListPortForwardingRulesCmd.java  |    6 +-
 .../user/firewall/UpdateEgressFirewallRuleCmd.java |    4 +-
 .../user/firewall/UpdateFirewallRuleCmd.java       |    4 +-
 .../user/firewall/UpdatePortForwardingRuleCmd.java |   14 +-
 .../user/guest/ListGuestOsCategoriesCmd.java       |    2 +-
 .../api/command/user/guest/ListGuestOsCmd.java     |    6 +-
 .../user/ipv6/CreateIpv6FirewallRuleCmd.java       |   26 +-
 .../user/ipv6/DeleteIpv6FirewallRuleCmd.java       |    2 +-
 .../user/ipv6/ListIpv6FirewallRulesCmd.java        |    8 +-
 .../user/ipv6/UpdateIpv6FirewallRuleCmd.java       |   20 +-
 .../api/command/user/iso/AttachIsoCmd.java         |   10 +-
 .../api/command/user/iso/DeleteIsoCmd.java         |    4 +-
 .../api/command/user/iso/DetachIsoCmd.java         |    8 +-
 .../api/command/user/iso/ExtractIsoCmd.java        |    8 +-
 .../command/user/iso/GetUploadParamsForIsoCmd.java |   14 +-
 .../command/user/iso/ListIsoPermissionsCmd.java    |    4 +-
 .../api/command/user/iso/ListIsosCmd.java          |   36 +-
 .../api/command/user/iso/RegisterIsoCmd.java       |   32 +-
 .../api/command/user/job/ListAsyncJobsCmd.java     |    2 +-
 .../command/user/job/QueryAsyncJobResultCmd.java   |    2 +-
 .../loadbalancer/AssignCertToLoadBalancerCmd.java  |    4 +-
 .../loadbalancer/AssignToLoadBalancerRuleCmd.java  |   12 +-
 .../CreateApplicationLoadBalancerCmd.java          |   20 +-
 .../loadbalancer/CreateLBHealthCheckPolicyCmd.java |   10 +-
 .../loadbalancer/CreateLBStickinessPolicyCmd.java  |   12 +-
 .../loadbalancer/CreateLoadBalancerRuleCmd.java    |   40 +-
 .../DeleteApplicationLoadBalancerCmd.java          |    2 +-
 .../loadbalancer/DeleteLBHealthCheckPolicyCmd.java |    2 +-
 .../loadbalancer/DeleteLBStickinessPolicyCmd.java  |    2 +-
 .../loadbalancer/DeleteLoadBalancerRuleCmd.java    |    2 +-
 .../ListApplicationLoadBalancersCmd.java           |   14 +-
 .../loadbalancer/ListLBHealthCheckPoliciesCmd.java |    6 +-
 .../loadbalancer/ListLBStickinessPoliciesCmd.java  |    6 +-
 .../ListLoadBalancerRuleInstancesCmd.java          |   12 +-
 .../loadbalancer/ListLoadBalancerRulesCmd.java     |   14 +-
 .../RemoveCertFromLoadBalancerCmd.java             |    2 +-
 .../RemoveFromLoadBalancerRuleCmd.java             |   14 +-
 .../UpdateApplicationLoadBalancerCmd.java          |    4 +-
 .../loadbalancer/UpdateLBHealthCheckPolicyCmd.java |    2 +-
 .../loadbalancer/UpdateLBStickinessPolicyCmd.java  |    4 +-
 .../loadbalancer/UpdateLoadBalancerRuleCmd.java    |   10 +-
 .../user/loadbalancer/UploadSslCertCmd.java        |    6 +-
 .../user/nat/CreateIpForwardingRuleCmd.java        |   18 +-
 .../user/nat/DeleteIpForwardingRuleCmd.java        |    2 +-
 .../api/command/user/nat/DisableStaticNatCmd.java  |    2 +-
 .../api/command/user/nat/EnableStaticNatCmd.java   |   12 +-
 .../command/user/nat/ListIpForwardingRulesCmd.java |    4 +-
 .../command/user/network/CreateNetworkACLCmd.java  |   24 +-
 .../user/network/CreateNetworkACLListCmd.java      |   14 +-
 .../api/command/user/network/CreateNetworkCmd.java |   58 +-
 .../user/network/CreateNetworkPermissionsCmd.java  |    8 +-
 .../command/user/network/DeleteNetworkACLCmd.java  |    6 +-
 .../user/network/DeleteNetworkACLListCmd.java      |    2 +-
 .../api/command/user/network/DeleteNetworkCmd.java |    4 +-
 .../user/network/ListNetworkACLListsCmd.java       |    8 +-
 .../command/user/network/ListNetworkACLsCmd.java   |   12 +-
 .../user/network/ListNetworkOfferingsCmd.java      |   36 +-
 .../user/network/ListNetworkPermissionsCmd.java    |    4 +-
 .../api/command/user/network/ListNetworksCmd.java  |   42 +-
 .../user/network/MoveNetworkAclItemCmd.java        |    4 +-
 .../user/network/RemoveNetworkPermissionsCmd.java  |   12 +-
 .../user/network/ReplaceNetworkACLListCmd.java     |    6 +-
 .../user/network/ResetNetworkPermissionsCmd.java   |    6 +-
 .../command/user/network/RestartNetworkCmd.java    |    2 +-
 .../user/network/UpdateNetworkACLItemCmd.java      |   22 +-
 .../user/network/UpdateNetworkACLListCmd.java      |    6 +-
 .../api/command/user/network/UpdateNetworkCmd.java |   24 +-
 .../routing/CreateRoutingFirewallRuleCmd.java      |    2 +-
 .../user/offering/ListDiskOfferingsCmd.java        |    6 +-
 .../user/offering/ListServiceOfferingsCmd.java     |   18 +-
 .../command/user/project/ActivateProjectCmd.java   |    2 +-
 .../api/command/user/project/CreateProjectCmd.java |   10 +-
 .../api/command/user/project/DeleteProjectCmd.java |    4 +-
 .../user/project/DeleteProjectInvitationCmd.java   |    2 +-
 .../user/project/ListProjectInvitationsCmd.java    |   10 +-
 .../api/command/user/project/ListProjectsCmd.java  |   12 +-
 .../command/user/project/SuspendProjectCmd.java    |    2 +-
 .../api/command/user/project/UpdateProjectCmd.java |   18 +-
 .../user/project/UpdateProjectInvitationCmd.java   |    8 +-
 .../ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java |    4 +-
 .../ha/gslb/CreateGlobalLoadBalancerRuleCmd.java   |   16 +-
 .../ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java   |    2 +-
 .../ha/gslb/ListGlobalLoadBalancerRuleCmd.java     |    4 +-
 .../gslb/RemoveFromGlobalLoadBalancerRuleCmd.java  |    2 +-
 .../ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java   |   10 +-
 .../user/resource/GetCloudIdentifierCmd.java       |    2 +-
 .../user/resource/ListDetailOptionsCmd.java        |    6 +-
 .../command/user/resource/ListHypervisorsCmd.java  |    2 +-
 .../user/resource/ListResourceLimitsCmd.java       |   12 +-
 .../user/resource/UpdateResourceCountCmd.java      |    6 +-
 .../user/resource/UpdateResourceLimitCmd.java      |   10 +-
 .../AuthorizeSecurityGroupEgressCmd.java           |   22 +-
 .../AuthorizeSecurityGroupIngressCmd.java          |   24 +-
 .../user/securitygroup/CreateSecurityGroupCmd.java |    8 +-
 .../user/securitygroup/DeleteSecurityGroupCmd.java |    8 +-
 .../user/securitygroup/ListSecurityGroupsCmd.java  |    6 +-
 .../user/securitygroup/UpdateSecurityGroupCmd.java |    2 +-
 .../command/user/snapshot/ArchiveSnapshotCmd.java  |    8 +-
 .../command/user/snapshot/CreateSnapshotCmd.java   |   24 +-
 .../snapshot/CreateSnapshotFromVMSnapshotCmd.java  |   30 +-
 .../user/snapshot/CreateSnapshotPolicyCmd.java     |   16 +-
 .../command/user/snapshot/DeleteSnapshotCmd.java   |    8 +-
 .../user/snapshot/DeleteSnapshotPoliciesCmd.java   |    8 +-
 .../user/snapshot/ListSnapshotPoliciesCmd.java     |    8 +-
 .../command/user/snapshot/ListSnapshotsCmd.java    |   16 +-
 .../command/user/snapshot/RevertSnapshotCmd.java   |    8 +-
 .../user/snapshot/UpdateSnapshotPolicyCmd.java     |   16 +-
 .../api/command/user/ssh/CreateSSHKeyPairCmd.java  |    6 +-
 .../api/command/user/ssh/DeleteSSHKeyPairCmd.java  |    6 +-
 .../api/command/user/ssh/ListSSHKeyPairsCmd.java   |    2 +-
 .../command/user/ssh/RegisterSSHKeyPairCmd.java    |    6 +-
 .../api/command/user/tag/CreateTagsCmd.java        |    6 +-
 .../api/command/user/tag/ListTagsCmd.java          |   10 +-
 .../api/command/user/template/CopyTemplateCmd.java |   18 +-
 .../command/user/template/CreateTemplateCmd.java   |   56 +-
 .../command/user/template/DeleteTemplateCmd.java   |   12 +-
 .../command/user/template/ExtractTemplateCmd.java  |   14 +-
 .../template/GetUploadParamsForTemplateCmd.java    |   38 +-
 .../user/template/ListTemplatePermissionsCmd.java  |    4 +-
 .../command/user/template/ListTemplatesCmd.java    |   38 +-
 .../command/user/template/RegisterTemplateCmd.java |   62 +-
 .../command/user/template/UpdateTemplateCmd.java   |    6 +-
 .../template/UpdateTemplatePermissionsCmd.java     |    6 +-
 .../command/user/userdata/DeleteUserDataCmd.java   |    8 +-
 .../user/userdata/LinkUserDataToTemplateCmd.java   |   14 +-
 .../api/command/user/userdata/ListUserDataCmd.java |    2 +-
 .../command/user/userdata/RegisterUserDataCmd.java |   13 +-
 .../api/command/user/vm/AddIpToVmNicCmd.java       |   16 +-
 .../api/command/user/vm/AddNicToVMCmd.java         |   14 +-
 .../api/command/user/vm/BaseDeployVMCmd.java       |    4 +-
 .../api/command/user/vm/CreateVMFromBackupCmd.java |    2 +-
 .../api/command/user/vm/CreateVMScheduleCmd.java   |   16 +-
 .../api/command/user/vm/DeleteVMScheduleCmd.java   |   12 +-
 .../api/command/user/vm/DeployVMCmd.java           |   19 +-
 .../api/command/user/vm/DestroyVMCmd.java          |   10 +-
 .../api/command/user/vm/GetVMPasswordCmd.java      |    6 +-
 .../api/command/user/vm/ListNicsCmd.java           |   12 +-
 .../api/command/user/vm/ListVMScheduleCmd.java     |    8 +-
 .../cloudstack/api/command/user/vm/ListVMsCmd.java |   52 +-
 .../api/command/user/vm/RebootVMCmd.java           |   10 +-
 .../api/command/user/vm/RemoveIpFromVmNicCmd.java  |    6 +-
 .../api/command/user/vm/RemoveNicFromVMCmd.java    |    8 +-
 .../api/command/user/vm/ResetVMPasswordCmd.java    |   14 +-
 .../api/command/user/vm/ResetVMSSHKeyCmd.java      |   20 +-
 .../api/command/user/vm/ResetVMUserDataCmd.java    |   20 +-
 .../api/command/user/vm/RestoreVMCmd.java          |   10 +-
 .../cloudstack/api/command/user/vm/ScaleVMCmd.java |   12 +-
 .../cloudstack/api/command/user/vm/StartVMCmd.java |   20 +-
 .../cloudstack/api/command/user/vm/StopVMCmd.java  |   14 +-
 .../command/user/vm/UpdateDefaultNicForVMCmd.java  |    8 +-
 .../api/command/user/vm/UpdateVMCmd.java           |   50 +-
 .../api/command/user/vm/UpdateVMScheduleCmd.java   |   12 +-
 .../api/command/user/vm/UpdateVmNicIpCmd.java      |   14 +-
 .../api/command/user/vm/UpgradeVMCmd.java          |   12 +-
 .../api/command/user/vmgroup/CreateVMGroupCmd.java |   12 +-
 .../api/command/user/vmgroup/DeleteVMGroupCmd.java |    6 +-
 .../api/command/user/vmgroup/ListVMGroupsCmd.java  |    6 +-
 .../api/command/user/vmgroup/UpdateVMGroupCmd.java |    6 +-
 .../user/vmsnapshot/CreateVMSnapshotCmd.java       |   20 +-
 .../user/vmsnapshot/DeleteVMSnapshotCmd.java       |    8 +-
 .../command/user/vmsnapshot/ListVMSnapshotCmd.java |   12 +-
 .../user/vmsnapshot/RevertToVMSnapshotCmd.java     |    8 +-
 .../command/user/volume/AddResourceDetailCmd.java  |    6 +-
 .../api/command/user/volume/AssignVolumeCmd.java   |    6 +-
 .../api/command/user/volume/AttachVolumeCmd.java   |   10 +-
 .../user/volume/ChangeOfferingForVolumeCmd.java    |    4 +-
 .../api/command/user/volume/CreateVolumeCmd.java   |   32 +-
 .../api/command/user/volume/DeleteVolumeCmd.java   |    2 +-
 .../api/command/user/volume/DestroyVolumeCmd.java  |    2 +-
 .../api/command/user/volume/DetachVolumeCmd.java   |   10 +-
 .../api/command/user/volume/ExtractVolumeCmd.java  |    8 +-
 .../user/volume/GetUploadParamsForVolumeCmd.java   |    2 +-
 .../user/volume/ListResourceDetailsCmd.java        |   10 +-
 .../api/command/user/volume/ListVolumesCmd.java    |   30 +-
 .../api/command/user/volume/MigrateVolumeCmd.java  |    6 +-
 .../api/command/user/volume/ResizeVolumeCmd.java   |    4 +-
 .../api/command/user/volume/UpdateVolumeCmd.java   |    6 +-
 .../api/command/user/volume/UploadVolumeCmd.java   |   16 +-
 .../command/user/vpc/CreatePrivateGatewayCmd.java  |   22 +-
 .../api/command/user/vpc/CreateStaticRouteCmd.java |    9 +-
 .../api/command/user/vpc/CreateVPCCmd.java         |   38 +-
 .../api/command/user/vpc/DeleteStaticRouteCmd.java |    2 +-
 .../api/command/user/vpc/DeleteVPCCmd.java         |    2 +-
 .../command/user/vpc/ListPrivateGatewaysCmd.java   |   10 +-
 .../api/command/user/vpc/ListStaticRoutesCmd.java  |    8 +-
 .../api/command/user/vpc/ListVPCOfferingsCmd.java  |   16 +-
 .../api/command/user/vpc/ListVPCsCmd.java          |   24 +-
 .../api/command/user/vpc/RestartVPCCmd.java        |    4 +-
 .../api/command/user/vpc/UpdateVPCCmd.java         |   12 +-
 .../api/command/user/vpn/AddVpnUserCmd.java        |   18 +-
 .../command/user/vpn/CreateRemoteAccessVpnCmd.java |   22 +-
 .../command/user/vpn/CreateVpnConnectionCmd.java   |   18 +-
 .../user/vpn/CreateVpnCustomerGatewayCmd.java      |   18 +-
 .../api/command/user/vpn/CreateVpnGatewayCmd.java  |    8 +-
 .../command/user/vpn/DeleteRemoteAccessVpnCmd.java |   10 +-
 .../command/user/vpn/DeleteVpnConnectionCmd.java   |    6 +-
 .../user/vpn/DeleteVpnCustomerGatewayCmd.java      |    6 +-
 .../api/command/user/vpn/DeleteVpnGatewayCmd.java  |    6 +-
 .../command/user/vpn/ListRemoteAccessVpnsCmd.java  |   10 +-
 .../command/user/vpn/ListVpnConnectionsCmd.java    |    8 +-
 .../user/vpn/ListVpnCustomerGatewaysCmd.java       |    4 +-
 .../api/command/user/vpn/ListVpnGatewaysCmd.java   |    8 +-
 .../api/command/user/vpn/ListVpnUsersCmd.java      |    6 +-
 .../api/command/user/vpn/RemoveVpnUserCmd.java     |   18 +-
 .../command/user/vpn/ResetVpnConnectionCmd.java    |   10 +-
 .../command/user/vpn/UpdateRemoteAccessVpnCmd.java |    8 +-
 .../command/user/vpn/UpdateVpnConnectionCmd.java   |    6 +-
 .../user/vpn/UpdateVpnCustomerGatewayCmd.java      |   16 +-
 .../api/command/user/vpn/UpdateVpnGatewayCmd.java  |    6 +-
 .../api/command/user/zone/ListZonesCmd.java        |   16 +-
 .../cloudstack/api/response/AccountResponse.java   |  116 +-
 .../api/response/AcquireIPAddressResponse.java     |   60 +-
 .../api/response/AcquirePodIpCmdResponse.java      |    8 +-
 .../cloudstack/api/response/AlertResponse.java     |    8 +-
 .../api/response/AnnotationResponse.java           |   18 +-
 .../ApplicationLoadBalancerInstanceResponse.java   |    8 +-
 .../response/ApplicationLoadBalancerResponse.java  |   32 +-
 .../ApplicationLoadBalancerRuleResponse.java       |    6 +-
 .../cloudstack/api/response/AsyncJobResponse.java  |   30 +-
 .../api/response/AutoScalePolicyResponse.java      |   22 +-
 .../api/response/AutoScaleVmGroupResponse.java     |   50 +-
 .../api/response/AutoScaleVmProfileResponse.java   |   30 +-
 .../api/response/BackupOfferingResponse.java       |   14 +-
 .../api/response/BackupProviderResponse.java       |    4 +-
 .../cloudstack/api/response/BackupResponse.java    |   36 +-
 .../api/response/BackupRestorePointResponse.java   |    6 +-
 .../api/response/BackupScheduleResponse.java       |   10 +-
 .../api/response/BaseRolePermissionResponse.java   |    6 +-
 .../cloudstack/api/response/BaseRoleResponse.java  |    8 +-
 .../api/response/CAProviderResponse.java           |    4 +-
 .../api/response/CapabilitiesResponse.java         |   46 +-
 .../api/response/CapabilityResponse.java           |    6 +-
 .../cloudstack/api/response/CapacityResponse.java  |   24 +-
 .../api/response/ChildTemplateResponse.java        |    8 +-
 .../api/response/CloudIdentifierResponse.java      |    6 +-
 .../cloudstack/api/response/ClusterResponse.java   |   24 +-
 .../cloudstack/api/response/ConditionResponse.java |   18 +-
 .../api/response/ConfigurationGroupResponse.java   |    8 +-
 .../api/response/ConfigurationResponse.java        |   30 +-
 .../response/ConfigurationSubGroupResponse.java    |    4 +-
 .../response/ConsoleEndpointWebsocketResponse.java |   10 +-
 .../cloudstack/api/response/CounterResponse.java   |    4 +-
 .../response/CreateConsoleEndpointResponse.java    |    8 +-
 .../api/response/CustomCertificateResponse.java    |    2 +-
 .../DataCenterGuestIpv6PrefixResponse.java         |   14 +-
 ...irectDownloadCertificateHostStatusResponse.java |    8 +-
 .../DirectDownloadCertificateResponse.java         |   22 +-
 .../api/response/DiskOfferingResponse.java         |   66 +-
 .../cloudstack/api/response/DomainResponse.java    |   94 +-
 .../api/response/DomainRouterResponse.java         |  100 +-
 .../cloudstack/api/response/EventResponse.java     |   34 +-
 .../cloudstack/api/response/ExceptionResponse.java |    8 +-
 .../api/response/ExternalFirewallResponse.java     |   22 +-
 .../api/response/ExternalLoadBalancerResponse.java |   14 +-
 .../cloudstack/api/response/ExtractResponse.java   |   26 +-
 .../cloudstack/api/response/FirewallResponse.java  |   30 +-
 .../api/response/FirewallRuleResponse.java         |   34 +-
 .../api/response/GetUploadParamsResponse.java      |    8 +-
 .../api/response/GetVMPasswordResponse.java        |    2 +-
 .../api/response/GlobalLoadBalancerResponse.java   |   26 +-
 .../cloudstack/api/response/GpuResponse.java       |    2 +-
 .../api/response/GuestOSCategoryResponse.java      |    4 +-
 .../cloudstack/api/response/GuestOSResponse.java   |   14 +-
 .../api/response/GuestOsMappingResponse.java       |   14 +-
 .../api/response/GuestVlanRangeResponse.java       |   18 +-
 .../cloudstack/api/response/GuestVlanResponse.java |   30 +-
 .../api/response/HAProviderResponse.java           |    4 +-
 .../api/response/HostForMigrationResponse.java     |    2 +-
 .../cloudstack/api/response/HostHAResponse.java    |   10 +-
 .../cloudstack/api/response/HostResponse.java      |  114 +-
 .../cloudstack/api/response/HostTagResponse.java   |    6 +-
 .../response/HypervisorCapabilitiesResponse.java   |   18 +-
 .../response/HypervisorGuestOsNamesResponse.java   |    8 +-
 .../api/response/HypervisorGuestOsResponse.java    |    4 +-
 .../cloudstack/api/response/IPAddressResponse.java |   68 +-
 .../api/response/ImageStoreDetailResponse.java     |    4 +-
 .../api/response/ImageStoreResponse.java           |   22 +-
 .../api/response/InstanceGroupResponse.java        |   16 +-
 .../InternalLoadBalancerElementResponse.java       |    4 +-
 .../api/response/IpForwardingRuleResponse.java     |   20 +-
 .../cloudstack/api/response/IpRangeResponse.java   |   12 +-
 .../cloudstack/api/response/Ipv6RouteResponse.java |    4 +-
 ...ntAllowedToCreateOfferingsWithTagsResponse.java |    2 +-
 .../cloudstack/api/response/IsoVmResponse.java     |   22 +-
 .../api/response/LBHealthCheckPolicyResponse.java  |   14 +-
 .../api/response/LBHealthCheckResponse.java        |   12 +-
 .../api/response/LBStickinessPolicyResponse.java   |   14 +-
 .../api/response/LBStickinessResponse.java         |   18 +-
 .../api/response/LoadBalancerResponse.java         |   42 +-
 .../response/LoadBalancerRuleVmMapResponse.java    |    4 +-
 .../cloudstack/api/response/LoginCmdResponse.java  |   14 +-
 .../api/response/ManagementServerResponse.java     |   24 +-
 .../cloudstack/api/response/MigrationResponse.java |    2 +-
 .../api/response/NetworkACLItemResponse.java       |   28 +-
 .../api/response/NetworkACLResponse.java           |    6 +-
 .../api/response/NetworkDeviceResponse.java        |    2 +-
 .../api/response/NetworkOfferingResponse.java      |   58 +-
 .../api/response/NetworkPermissionsResponse.java   |   14 +-
 .../cloudstack/api/response/NetworkResponse.java   |  134 +-
 .../api/response/NicExtraDhcpOptionResponse.java   |   10 +-
 .../cloudstack/api/response/NicResponse.java       |   52 +-
 .../api/response/NicSecondaryIpResponse.java       |   10 +-
 .../api/response/OutOfBandManagementResponse.java  |   22 +-
 .../api/response/OvsProviderResponse.java          |   16 +-
 .../api/response/PhysicalNetworkResponse.java      |   22 +-
 .../cloudstack/api/response/PodResponse.java       |   26 +-
 .../api/response/PortableIpRangeResponse.java      |   14 +-
 .../api/response/PortableIpResponse.java           |   20 +-
 .../api/response/PrivateGatewayResponse.java       |   32 +-
 .../api/response/ProjectAccountResponse.java       |   24 +-
 .../api/response/ProjectInvitationResponse.java    |   20 +-
 .../cloudstack/api/response/ProjectResponse.java   |   90 +-
 .../response/ProjectRolePermissionResponse.java    |    8 +-
 .../api/response/ProjectRoleResponse.java          |    2 +-
 .../cloudstack/api/response/ProviderResponse.java  |   14 +-
 .../cloudstack/api/response/RegionResponse.java    |   10 +-
 ...rResponse.java => RegisterUserKeyResponse.java} |    8 +-
 .../api/response/RemoteAccessVpnResponse.java      |   26 +-
 .../api/response/ResourceCountResponse.java        |   16 +-
 .../api/response/ResourceDetailResponse.java       |    6 +-
 .../api/response/ResourceIconResponse.java         |    6 +-
 .../api/response/ResourceLimitResponse.java        |   18 +-
 .../api/response/ResourceTagResponse.java          |   22 +-
 .../api/response/RolePermissionResponse.java       |    6 +-
 .../cloudstack/api/response/RoleResponse.java      |    4 +-
 .../RollingMaintenanceHostSkippedResponse.java     |    6 +-
 .../RollingMaintenanceHostUpdatedResponse.java     |   10 +-
 .../api/response/RollingMaintenanceResponse.java   |    8 +-
 .../response/RouterHealthCheckResultResponse.java  |   10 +-
 .../RouterHealthCheckResultsListResponse.java      |    4 +-
 .../api/response/RunDiagnosticsResponse.java       |    6 +-
 .../api/response/SSHKeyPairResponse.java           |   12 +-
 .../api/response/SecurityGroupResponse.java        |   26 +-
 .../api/response/SecurityGroupRuleResponse.java    |   20 +-
 .../api/response/ServiceOfferingResponse.java      |  102 +-
 .../cloudstack/api/response/ServiceResponse.java   |    6 +-
 .../response/Site2SiteCustomerGatewayResponse.java |   32 +-
 .../response/Site2SiteVpnConnectionResponse.java   |   40 +-
 .../api/response/Site2SiteVpnGatewayResponse.java  |   22 +-
 .../api/response/SnapshotPolicyResponse.java       |   14 +-
 .../cloudstack/api/response/SnapshotResponse.java  |   40 +-
 .../api/response/SnapshotScheduleResponse.java     |    8 +-
 .../cloudstack/api/response/SslCertResponse.java   |   20 +-
 .../api/response/StaticRouteResponse.java          |   18 +-
 .../cloudstack/api/response/StatsResponse.java     |   28 +-
 .../response/StorageNetworkIpRangeResponse.java    |   18 +-
 .../api/response/StoragePoolResponse.java          |   46 +-
 .../api/response/StorageProviderResponse.java      |    4 +-
 .../api/response/StorageTagResponse.java           |    6 +-
 .../cloudstack/api/response/SuccessResponse.java   |    4 +-
 .../api/response/SystemVmInstanceResponse.java     |   12 +-
 .../cloudstack/api/response/SystemVmResponse.java  |   70 +-
 .../api/response/TemplateOVFPropertyResponse.java  |   20 +-
 .../api/response/TemplatePermissionsResponse.java  |   10 +-
 .../cloudstack/api/response/TemplateResponse.java  |  100 +-
 .../api/response/TrafficMonitorResponse.java       |   10 +-
 .../response/TrafficTypeImplementorResponse.java   |    4 +-
 .../api/response/TrafficTypeResponse.java          |   16 +-
 .../api/response/UnmanageVMInstanceResponse.java   |    4 +-
 .../response/UnmanagedInstanceDiskResponse.java    |   22 +-
 .../api/response/UnmanagedInstanceResponse.java    |   26 +-
 .../api/response/UsageRecordResponse.java          |   64 +-
 .../cloudstack/api/response/UserDataResponse.java  |   18 +-
 .../cloudstack/api/response/UserResponse.java      |   48 +-
 .../UserTwoFactorAuthenticationSetupResponse.java  |    8 +-
 ...UserTwoFactorAuthenticatorProviderResponse.java |    4 +-
 .../cloudstack/api/response/UserVmResponse.java    |  162 +--
 .../api/response/VMScheduleResponse.java           |    8 +-
 .../api/response/VMSnapshotResponse.java           |   42 +-
 .../api/response/VMUserDataResponse.java           |    4 +-
 .../cloudstack/api/response/VgpuResponse.java      |    6 +-
 .../response/VirtualRouterProviderResponse.java    |   16 +-
 .../api/response/VlanIpRangeResponse.java          |   50 +-
 .../api/response/VmwareDatacenterResponse.java     |    2 +-
 .../cloudstack/api/response/VolumeResponse.java    |  114 +-
 .../api/response/VpcOfferingResponse.java          |   34 +-
 .../cloudstack/api/response/VpcResponse.java       |   60 +-
 .../cloudstack/api/response/VpnUsersResponse.java  |   18 +-
 .../response/VsphereStoragePoliciesResponse.java   |   10 +-
 .../cloudstack/api/response/ZoneResponse.java      |   44 +-
 .../cloudstack/cluster/ClusterDrsAlgorithm.java    |  198 +--
 .../cloudstack/config/ApiServiceConfiguration.java |   19 +
 .../org/apache/cloudstack/context/CallContext.java |   12 +-
 .../org/apache/cloudstack/context/LogContext.java  |    8 +-
 .../org/apache/cloudstack/query/QueryService.java  |    4 +-
 .../com/cloud/agent/api/storage/OVFHelperTest.java |   14 +-
 api/src/test/java/com/cloud/cpu/CPUTest.java       |    5 +-
 .../api/command/admin/config/UpdateCfgCmdTest.java |   81 ++
 .../admin/vlan/UpdateVlanIpRangeCmdTest.java       |    2 +-
 .../vm/MigrateVirtualMachineWithVolumeCmdTest.java |    8 +-
 .../api/command/test/AddVpnUserCmdTest.java        |    2 +-
 .../test/CreateAutoScaleVmProfileCmdTest.java      |    2 +-
 .../api/command/test/CreateSnapshotCmdTest.java    |    2 +-
 .../api/command/test/ScaleVMCmdTest.java           |    6 +-
 .../test/UpdateAutoScaleVmProfileCmdTest.java      |    2 +-
 .../api/command/test/UpdateVmNicIpTest.java        |    2 +-
 .../config/ApiServiceConfigurationTest.java        |   95 ++
 client/bindir/cloud-setup-management.in            |  141 ++
 client/conf/server.properties.in                   |    5 +
 .../virtualnetwork/VirtualRoutingResource.java     |    4 +-
 .../com/cloud/network/HAProxyConfigurator.java     |    3 -
 .../storage/template/HttpTemplateDownloader.java   |    2 +-
 .../com/cloud/storage/template/IsoProcessor.java   |    2 +-
 .../template/MetalinkTemplateDownloader.java       |    2 +-
 .../com/cloud/storage/template/OVAProcessor.java   |   12 +-
 .../com/cloud/storage/template/QCOW2Processor.java |    2 +-
 .../storage/template/S3TemplateDownloader.java     |    4 +-
 .../cloud/storage/template/TemplateLocation.java   |    4 +-
 .../com/cloud/storage/template/VhdProcessor.java   |    2 +-
 .../com/cloud/storage/template/VmdkProcessor.java  |    4 +-
 .../download/DirectTemplateDownloaderImpl.java     |    8 +-
 .../download/HttpDirectTemplateDownloader.java     |    6 +-
 .../download/HttpsDirectTemplateDownloader.java    |    4 +-
 .../download/MetalinkDirectTemplateDownloader.java |   10 +-
 .../virtualnetwork/VirtualRoutingResourceTest.java |    4 -
 debian/rules                                       |    3 +-
 .../service/NetworkOrchestrationService.java       |    8 +-
 .../service/StorageOrchestrationService.java       |    6 +
 .../service/VolumeOrchestrationService.java        |    4 +-
 .../api/storage/ObjectInDataStoreStateMachine.java |    9 +-
 .../engine/subsystem/api/storage/SnapshotInfo.java |    2 +-
 .../subsystem/api/storage/TemplateService.java     |    2 +
 .../java/com/cloud/storage/StorageManager.java     |   26 +-
 .../java/com/cloud/template/TemplateManager.java   |    2 +-
 .../main/java/com/cloud/vm/VmWorkSerializer.java   |    2 -
 .../com/cloud/agent/manager/AgentManagerImpl.java  |    2 -
 .../agent/manager/ClusteredAgentManagerImpl.java   |    5 +-
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |   74 +-
 .../entity/api/db/dao/EngineHostDaoImpl.java       |    1 -
 .../engine/orchestration/DataMigrationUtility.java |   90 +-
 .../engine/orchestration/NetworkOrchestrator.java  |   78 +-
 .../engine/orchestration/StorageOrchestrator.java  |  154 ++-
 .../engine/orchestration/VolumeOrchestrator.java   |   14 +-
 .../service/api/ProvisioningServiceImpl.java       |    8 -
 .../com/cloud/dc/dao/ClusterVSMMapDaoImpl.java     |    3 -
 .../com/cloud/dc/dao/DataCenterDetailsDaoImpl.java |    3 +-
 .../cloud/dc/dao/DataCenterIpAddressDaoImpl.java   |   10 +-
 .../dao/DataCenterLinkLocalIpAddressDaoImpl.java   |    2 +-
 .../network/security/dao/VmRulesetLogDaoImpl.java  |    1 -
 .../cloud/storage/dao/LaunchPermissionDaoImpl.java |    2 +-
 .../java/com/cloud/storage/dao/VMTemplateDao.java  |    5 +-
 .../com/cloud/storage/dao/VMTemplateDaoImpl.java   |   50 +-
 .../com/cloud/upgrade/DatabaseUpgradeChecker.java  |  111 +-
 .../upgrade/SystemVmTemplateRegistration.java      |  993 ++++++++------
 .../java/com/cloud/upgrade/dao/Upgrade218to22.java |    6 +-
 .../com/cloud/upgrade/dao/Upgrade2214to30.java     |    2 -
 .../com/cloud/upgrade/dao/Upgrade222to224.java     |    2 +-
 .../java/com/cloud/upgrade/dao/Upgrade302to40.java |    1 -
 .../com/cloud/upgrade/dao/Upgrade304to305.java     |   51 +-
 .../com/cloud/upgrade/dao/Upgrade410to420.java     |   16 +-
 .../com/cloud/upgrade/dao/Upgrade41500to41510.java |   18 +-
 .../com/cloud/upgrade/dao/Upgrade41520to41600.java |    8 +-
 .../com/cloud/upgrade/dao/Upgrade41600to41610.java |    4 +-
 .../com/cloud/upgrade/dao/Upgrade41610to41700.java |    4 +-
 .../com/cloud/upgrade/dao/Upgrade41700to41710.java |    4 +-
 .../com/cloud/upgrade/dao/Upgrade41710to41720.java |    4 +-
 .../com/cloud/upgrade/dao/Upgrade41720to41800.java |    4 +-
 .../com/cloud/upgrade/dao/Upgrade41810to41900.java |    4 +-
 .../com/cloud/upgrade/dao/Upgrade42210to42300.java |   15 +
 .../java/com/cloud/usage/dao/UsageDaoImpl.java     |    4 +-
 .../cloud/usage/dao/UsageVMInstanceDaoImpl.java    |    4 +-
 .../main/java/com/cloud/user/UserAccountVO.java    |    4 -
 .../main/java/com/cloud/vm/dao/UserVmDaoImpl.java  |    2 +-
 .../java/com/cloud/vm/dao/VMInstanceDaoImpl.java   |    2 +-
 .../cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java   |    2 +-
 .../storage/datastore/db/VolumeDataStoreVO.java    |    2 -
 ..._index.sql => cloud.idempotent_drop_column.sql} |   11 +-
 .../resources/META-INF/db/schema-42010to42100.sql  |    8 +-
 .../resources/META-INF/db/schema-42210to42300.sql  |   21 +
 .../cloud/storage/dao/VMTemplateDaoImplTest.java   |   87 +-
 .../DatabaseUpgradeCheckerDoUpgradesTest.java      |  173 +++
 .../cloud/upgrade/DatabaseUpgradeCheckerTest.java  |   92 +-
 .../upgrade/SystemVmTemplateRegistrationTest.java  | 1388 ++++++++++++++++++--
 engine/schema/templateConfig.sh                    |   37 +-
 .../cache/manager/StorageCacheManagerImpl.java     |    2 +-
 .../StorageCacheReplacementAlgorithmLRU.java       |    1 -
 .../storage/configdrive/ConfigDriveBuilder.java    |    6 +-
 .../storage/motion/AncientDataMotionStrategy.java  |    4 +-
 .../motion/StorageSystemDataMotionStrategy.java    |   12 +-
 .../storage/image/SecondaryStorageServiceImpl.java |    4 +-
 .../storage/image/TemplateServiceImpl.java         |  195 ++-
 .../storage/image/TemplateServiceImplTest.java     |  102 ++
 .../cloudstack/storage/test/SnapshotTest.java      |    2 +-
 .../cloudstack/storage/test/VolumeServiceTest.java |   43 -
 .../apache/cloudstack/storage/test/VolumeTest.java |    2 +-
 .../cloudstack/storage/test/VolumeTestVmware.java  |    2 +-
 .../storage/snapshot/DefaultSnapshotStrategy.java  |    2 +-
 .../storage/snapshot/SnapshotServiceImpl.java      |   12 +-
 .../snapshot/StorageSystemSnapshotStrategy.java    |    2 +-
 .../vmsnapshot/DefaultVMSnapshotStrategy.java      |   34 +-
 .../vmsnapshot/ScaleIOVMSnapshotStrategy.java      |   44 +-
 .../vmsnapshot/StorageVMSnapshotStrategy.java      |   36 +-
 .../vmsnapshot/VMSnapshotStrategyKVMTest.java      |    1 -
 .../allocator/AbstractStoragePoolAllocator.java    |    2 +-
 .../storage/datastore/DataObjectManagerImpl.java   |    8 +-
 .../datastore/ObjectInDataStoreManagerImpl.java    |   16 +-
 .../storage/helper/VMSnapshotHelperImpl.java       |    6 +-
 .../cloudstack/storage/volume/VolumeObject.java    |    2 +-
 .../storage/volume/VolumeServiceImpl.java          |   51 +-
 .../storage/volume/VolumeObjectTest.java           |    4 +-
 extensions/Proxmox/proxmox.sh                      |   10 +-
 .../java/com/cloud/cluster/ClusterManagerImpl.java |    2 +-
 .../main/java/com/cloud/utils/db/GlobalLock.java   |   33 +-
 .../utils/db/TransactionContextBuilderTest.java    |    3 -
 .../AsyncSampleEventDrivenStyleCaller.java         |   15 +-
 .../framework/jobs/dao/AsyncJobJoinMapDaoImpl.java |   64 -
 .../framework/jobs/impl/JobSerializerHelper.java   |    1 -
 packaging/el8/cloud.spec                           |    3 +-
 .../api/command/user/discovery/ListApisCmd.java    |    2 +-
 .../api/response/ApiDiscoveryResponse.java         |   16 +-
 .../api/response/ApiParameterResponse.java         |   14 +-
 .../api/response/ApiResponseResponse.java          |    8 +-
 .../command/admin/ratelimit/ResetApiLimitCmd.java  |    2 +-
 .../cloudstack/api/response/ApiLimitResponse.java  |   10 +-
 .../cloudstack/ratelimit/integration/APITest.java  |    1 -
 .../ratelimit/integration/LoginResponse.java       |   18 +-
 .../cloudstack/backup/veeam/VeeamClient.java       |    2 +-
 .../cloudstack/api/command/QuotaBalanceCmd.java    |    2 +-
 .../cloudstack/api/command/QuotaCreditsCmd.java    |    6 +-
 .../api/command/QuotaEmailTemplateListCmd.java     |    2 +-
 .../api/command/QuotaEmailTemplateUpdateCmd.java   |    2 +-
 .../cloudstack/api/command/QuotaStatementCmd.java  |    2 +-
 .../cloudstack/api/command/QuotaSummaryCmd.java    |    4 +-
 .../api/response/QuotaBalanceResponse.java         |   18 +-
 .../api/response/QuotaEnabledResponse.java         |    2 +-
 .../api/response/QuotaStatementItemResponse.java   |   14 +-
 .../api/response/QuotaStatementResponse.java       |   16 +-
 .../api/response/QuotaSummaryResponse.java         |   22 +-
 .../api/response/QuotaTariffResponse.java          |   20 +-
 .../cloudstack/api/response/QuotaTypeResponse.java |    4 +-
 .../api/response/QuotaUpdateResponse.java          |    2 +-
 .../api/commands/DedicateClusterCmd.java           |    6 +-
 .../cloudstack/api/commands/DedicateHostCmd.java   |    6 +-
 .../cloudstack/api/commands/DedicatePodCmd.java    |    6 +-
 .../cloudstack/api/commands/DedicateZoneCmd.java   |    6 +-
 .../api/commands/ListDedicatedClustersCmd.java     |    8 +-
 .../api/commands/ListDedicatedHostsCmd.java        |    8 +-
 .../api/commands/ListDedicatedPodsCmd.java         |    8 +-
 .../api/commands/ListDedicatedZonesCmd.java        |    8 +-
 .../api/commands/ReleaseDedicatedClusterCmd.java   |    2 +-
 .../api/commands/ReleaseDedicatedHostCmd.java      |    2 +-
 .../api/commands/ReleaseDedicatedPodCmd.java       |    2 +-
 .../api/commands/ReleaseDedicatedZoneCmd.java      |    2 +-
 .../api/response/DedicateClusterResponse.java      |   12 +-
 .../api/response/DedicateHostResponse.java         |   12 +-
 .../api/response/DedicatePodResponse.java          |   12 +-
 .../api/response/DedicateZoneResponse.java         |   12 +-
 .../org/apache/cloudstack/cluster/Balanced.java    |   25 +-
 .../apache/cloudstack/cluster/BalancedTest.java    |   61 +-
 .../org/apache/cloudstack/cluster/Condensed.java   |   26 +-
 .../apache/cloudstack/cluster/CondensedTest.java   |   61 +-
 .../org/apache/cloudstack/mom/webhook/Webhook.java |    4 +-
 .../cloudstack/mom/webhook/WebhookApiService.java  |    7 +
 .../mom/webhook/WebhookApiServiceImpl.java         |  222 +++-
 .../cloudstack/mom/webhook/WebhookFilter.java      |  114 ++
 .../cloudstack/mom/webhook/WebhookService.java     |    2 +
 .../cloudstack/mom/webhook/WebhookServiceImpl.java |  128 +-
 ...eteWebhookCmd.java => AddWebhookFilterCmd.java} |   70 +-
 .../webhook/api/command/user/CreateWebhookCmd.java |    6 +-
 ...WebhookCmd.java => DeleteWebhookFilterCmd.java} |   29 +-
 .../command/user/ExecuteWebhookDeliveryCmd.java    |    2 -
 .../api/command/user/ListWebhookDeliveriesCmd.java |    2 -
 ...eWebhookCmd.java => ListWebhookFiltersCmd.java} |   50 +-
 .../webhook/api/command/user/ListWebhooksCmd.java  |    4 +-
 .../webhook/api/command/user/UpdateWebhookCmd.java |    5 +-
 .../api/response/WebhookFilterResponse.java        |   78 +-
 .../mom/webhook/dao/WebhookDeliveryDaoImpl.java    |    4 +
 .../{WebhookJoinDao.java => WebhookFilterDao.java} |    9 +-
 .../mom/webhook/dao/WebhookFilterDaoImpl.java      |   79 ++
 .../cloudstack/mom/webhook/vo/WebhookFilterVO.java |  155 +++
 .../webhook/spring-event-webhook-context.xml       |    1 +
 .../mom/webhook/WebhookApiServiceImplTest.java     | 1134 +++++++++++++++-
 .../mom/webhook/WebhookServiceImplTest.java        |  669 ++++++++++
 .../api/command/user/AddWebhookFilterCmdTest.java  |  110 ++
 .../command/user/DeleteWebhookDeliveryCmdTest.java |   35 +
 ...mdTest.java => DeleteWebhookFilterCmdTest.java} |   47 +-
 .../command/user/ListWebhookFiltersCmdTest.java    |   76 ++
 .../mom/webhook/dao/WebhookDaoImplTest.java        |  170 +++
 .../webhook/dao/WebhookDeliveryDaoImplTest.java    |  126 ++
 .../dao/WebhookDeliveryJoinDaoImplTest.java        |  129 ++
 .../mom/webhook/dao/WebhookFilterDaoImplTest.java  |  130 ++
 .../mom/webhook/dao/WebhookJoinDaoImplTest.java    |  115 ++
 .../networkservice/BaremetalDhcpManagerImpl.java   |    1 -
 .../networkservice/BaremetalDhcpResponse.java      |   10 +-
 .../BaremetalKickStartServiceImpl.java             |    8 +-
 .../networkservice/BaremetalPxeManagerImpl.java    |    6 +-
 .../networkservice/BaremetalPxeResponse.java       |    8 +-
 .../networkservice/BaremetalRctResponse.java       |    4 +-
 .../apache/cloudstack/api/AddBaremetalDhcpCmd.java |    4 +-
 .../apache/cloudstack/api/AddBaremetalHostCmd.java |    4 +-
 .../api/AddBaremetalKickStartPxeCmd.java           |    4 +-
 .../apache/cloudstack/api/AddBaremetalPxeCmd.java  |    4 +-
 .../api/AddBaremetalPxePingServerCmd.java          |    6 +-
 .../apache/cloudstack/api/AddBaremetalRctCmd.java  |    4 +-
 .../api/BaremetalProvisionDoneNotificationCmd.java |    4 +-
 .../cloudstack/api/DeleteBaremetalRctCmd.java      |    2 +-
 .../cloudstack/api/ListBaremetalDhcpCmd.java       |    4 +-
 .../cloudstack/api/ListBaremetalPxeServersCmd.java |    4 +-
 .../apache/cloudstack/api/ListBaremetalRctCmd.java |    2 +-
 .../HypervResource/CloudStackTypes.cs              |    2 +-
 .../resource/HypervDirectConnectResource.java      |   20 +-
 plugins/hypervisors/kvm/pom.xml                    |    9 -
 .../kvm/resource/LibvirtComputingResource.java     |   16 +-
 .../hypervisor/kvm/resource/LibvirtVMDef.java      |   13 +-
 .../LibvirtBackupSnapshotCommandWrapper.java       |    2 +-
 .../LibvirtCreateVMSnapshotCommandWrapper.java     |    6 +-
 .../LibvirtDeleteVMSnapshotCommandWrapper.java     |   12 +-
 .../LibvirtHandleConfigDriveCommandWrapper.java    |    2 +-
 .../wrapper/LibvirtMigrateCommandWrapper.java      |    4 +-
 .../LibvirtMigrateVolumeCommandWrapper.java        |    9 +-
 .../LibvirtRestoreVMSnapshotCommandWrapper.java    |    6 +-
 .../LibvirtRevertToVMSnapshotCommandWrapper.java   |    4 +-
 .../kvm/storage/KVMStoragePoolManager.java         |    4 +-
 .../kvm/storage/KVMStorageProcessor.java           |   14 +-
 .../kvm/storage/LibvirtStorageAdaptor.java         |    2 +-
 .../apache/cloudstack/utils/linux/KVMHostInfo.java |    2 +-
 .../org/apache/cloudstack/utils/qemu/QemuImg.java  |   84 +-
 .../kvm/resource/LibvirtComputingResourceTest.java |    5 +-
 .../kvm/resource/LibvirtDomainXMLParserTest.java   |    4 +-
 .../hypervisor/kvm/resource/LibvirtVMDefTest.java  |   15 +
 .../LibvirtMigrateVolumeCommandWrapperTest.java    |    2 +-
 .../apache/cloudstack/utils/qemu/QemuImgTest.java  |  207 ++-
 .../src/main/java/com/cloud/ovm/object/Test.java   |   58 -
 .../com/cloud/hypervisor/ovm3/objects/Network.java |    2 +-
 .../com/cloud/hypervisor/ovm3/objects/Xen.java     |    2 +-
 .../ovm3/resources/helpers/Ovm3StoragePool.java    |    6 +-
 .../src/test/resources/scripts/clean_primary.sh    |    2 +-
 .../src/test/resources/scripts/clean_secondary.sh  |    2 +-
 .../agent/manager/MockStorageManagerImpl.java      |   34 +-
 .../com/cloud/agent/manager/MockVmManagerImpl.java |   24 +-
 .../api/commands/CleanupSimulatorMockCmd.java      |    4 +-
 .../cloud/api/commands/ConfigureSimulatorCmd.java  |   18 +-
 .../ConfigureSimulatorHAProviderState.java         |    2 +-
 .../commands/ListSimulatorHAStateTransitions.java  |    2 +-
 .../cloud/api/commands/QuerySimulatorMockCmd.java  |    4 +-
 .../java/com/cloud/api/response/MockResponse.java  |   14 +-
 .../api/response/SimulatorHAStateResponse.java     |   10 +-
 .../apache/cloudstack/api/AddUcsManagerCmd.java    |   10 +-
 .../api/AssociateUcsProfileToBladeCmd.java         |    8 +-
 .../apache/cloudstack/api/DeleteUcsManagerCmd.java |    2 +-
 .../org/apache/cloudstack/api/ListUcsBladeCmd.java |    2 +-
 .../apache/cloudstack/api/ListUcsManagerCmd.java   |    4 +-
 .../apache/cloudstack/api/ListUcsProfileCmd.java   |    2 +-
 .../cloudstack/api/response/UcsBladeResponse.java  |   10 +-
 .../api/response/UcsManagerResponse.java           |    8 +-
 .../api/response/UcsProfileResponse.java           |    2 +-
 .../api/commands/DisableCiscoNexusVSMCmd.java      |    2 +-
 .../cloud/api/response/CiscoNexusVSMResponse.java  |   18 +-
 .../cloud/hypervisor/vmware/VmwareCleanupMaid.java |    9 -
 .../hypervisor/vmware/VmwareServerDiscoverer.java  |    4 +-
 .../manager/CleanupFullyClonedTemplatesTask.java   |    8 +-
 .../hypervisor/vmware/manager/VmwareManager.java   |    2 +-
 .../vmware/manager/VmwareManagerImpl.java          |   26 +-
 .../vmware/manager/VmwareStorageManagerImpl.java   |   12 +-
 .../hypervisor/vmware/resource/VmwareResource.java |    8 +-
 .../network/CiscoNexusVSMDeviceManagerImpl.java    |   26 +-
 .../java/com/cloud/network/VmwareTrafficLabel.java |    2 +-
 .../motion/VmwareStorageMotionStrategyTest.java    |    4 +-
 .../java/com/cloud/hypervisor/XenServerGuru.java   |    2 +-
 .../xenserver/resource/CitrixResourceBase.java     |   46 +-
 .../resource/XenServerStorageProcessor.java        |   12 +-
 ...ixAttachOrDettachConfigDriveCommandWrapper.java |   10 +-
 .../CitrixCleanupNetworkRulesCmdWrapper.java       |    2 +-
 .../CitrixCreateVMSnapshotCommandWrapper.java      |    6 +-
 .../wrapper/xenbase/CitrixReadyCommandWrapper.java |   10 +-
 .../CitrixRevertToVMSnapshotCommandWrapper.java    |    2 +-
 .../wrapper/xenbase/CitrixStartCommandWrapper.java |    4 +-
 .../wrapper/xenbase/CitrixRequestWrapperTest.java  |   31 -
 .../wrapper/xenbase/XenServer610WrapperTest.java   |   11 -
 .../cloudstack/cloudian/CloudianConnectorImpl.java |    8 +-
 .../cloudian/response/CloudianEnabledResponse.java |    4 +-
 .../response/CloudianSsoLoginResponse.java         |    2 +-
 .../cloudian/client/CloudianClientTest.java        |   34 +-
 .../cluster/KubernetesClusterManagerImpl.java      |   73 +-
 .../KubernetesClusterActionWorker.java             |    4 +-
 .../KubernetesClusterScaleWorker.java              |   24 +-
 .../version/AddKubernetesSupportedVersionCmd.java  |   16 +-
 .../DeleteKubernetesSupportedVersionCmd.java       |    2 +-
 .../UpdateKubernetesSupportedVersionCmd.java       |    4 +-
 .../AddVirtualMachinesToKubernetesClusterCmd.java  |    4 +-
 .../cluster/CreateKubernetesClusterCmd.java        |   32 +-
 .../cluster/DeleteKubernetesClusterCmd.java        |    2 +-
 .../cluster/GetKubernetesClusterConfigCmd.java     |    2 +-
 .../cluster/ListKubernetesClustersCmd.java         |    8 +-
 ...oveVirtualMachinesFromKubernetesClusterCmd.java |    4 +-
 .../cluster/ScaleKubernetesClusterCmd.java         |    8 +-
 .../cluster/StartKubernetesClusterCmd.java         |    2 +-
 .../cluster/StopKubernetesClusterCmd.java          |    2 +-
 .../cluster/UpgradeKubernetesClusterCmd.java       |    4 +-
 .../ListKubernetesSupportedVersionsCmd.java        |   10 +-
 .../response/KubernetesClusterConfigResponse.java  |    4 +-
 .../api/response/KubernetesClusterResponse.java    |   56 +-
 .../KubernetesSupportedVersionResponse.java        |   24 +-
 ...rtualMachinesFromKubernetesClusterResponse.java |    2 +-
 .../KubernetesClusterScaleWorkerTest.java          |   66 +-
 .../api/command/BaseMSMaintenanceActionCmd.java    |    2 +-
 .../api/BaseResourceUsageHistoryCmd.java           |    4 +-
 .../apache/cloudstack/api/ListDbMetricsCmd.java    |    2 +-
 .../apache/cloudstack/api/ListMgmtsMetricsCmd.java |    2 +-
 .../api/ListSystemVMsUsageHistoryCmd.java          |    6 +-
 .../cloudstack/api/ListVMsMetricsCmdByAdmin.java   |    8 +-
 .../cloudstack/api/ListVMsUsageHistoryCmd.java     |    6 +-
 .../cloudstack/api/ListVolumesUsageHistoryCmd.java |    7 +-
 .../cloudstack/metrics/MetricsServiceImpl.java     |   48 +-
 .../response/ClusterMetricsResponse.java           |   36 +-
 .../cloudstack/response/DbMetricsResponse.java     |   20 +-
 .../cloudstack/response/HostMetricsResponse.java   |   36 +-
 .../response/ManagementServerMetricsResponse.java  |   26 +-
 .../response/StoragePoolMetricsResponse.java       |   16 +-
 .../response/UsageServerMetricsResponse.java       |   10 +-
 .../cloudstack/response/VmMetricsResponse.java     |   14 +-
 .../response/VmMetricsStatsResponse.java           |    8 +-
 .../cloudstack/response/VolumeMetricsResponse.java |    4 +-
 .../response/VolumeMetricsStatsResponse.java       |    6 +-
 .../cloudstack/response/ZoneMetricsResponse.java   |   36 +-
 .../api/commands/AddBigSwitchBcfDeviceCmd.java     |    8 +-
 .../api/commands/ListBigSwitchBcfDevicesCmd.java   |    4 +-
 .../api/response/BigSwitchBcfDeviceResponse.java   |   14 +-
 .../cloud/api/commands/AddBrocadeVcsDeviceCmd.java |    4 +-
 .../commands/ListBrocadeVcsDeviceNetworksCmd.java  |    4 +-
 .../api/commands/ListBrocadeVcsDevicesCmd.java     |    2 +-
 .../api/response/BrocadeVcsDeviceResponse.java     |   10 +-
 .../api/commands/AddCiscoAsa1000vResourceCmd.java  |    4 +-
 .../api/commands/AddCiscoVnmcResourceCmd.java      |    2 +-
 .../commands/ListCiscoAsa1000vResourcesCmd.java    |    2 +-
 .../api/commands/ListCiscoVnmcResourcesCmd.java    |    2 +-
 .../response/CiscoAsa1000vResourceResponse.java    |   10 +-
 .../api/response/CiscoVnmcResourceResponse.java    |    6 +-
 .../network/cisco/CiscoVnmcConnectionImpl.java     |    1 -
 .../network/element/CiscoVnmcElementService.java   |    2 -
 .../java/com/cloud/network/ElasticLbVmMapVO.java   |    4 -
 .../network/lb/ElasticLoadBalancerManagerImpl.java |   28 +-
 .../cloud/network/lb/LoadBalanceRuleHandler.java   |   22 +-
 .../cloudstack/api/AddGloboDnsHostCmd.java         |    2 +-
 .../cloudstack/resource/GloboDnsResource.java      |    8 +-
 .../element/InternalLoadBalancerElement.java       |   24 +-
 .../lb/InternalLoadBalancerVMManagerImpl.java      |   66 +-
 .../api/response/ServiceInstanceResponse.java      |   18 +-
 .../contrail/management/ContrailElementImpl.java   |    4 +-
 .../network/contrail/management/ContrailGuru.java  |    2 +-
 .../contrail/management/ServerDBSyncImpl.java      |    4 +-
 .../contrail/management/ManagementServerMock.java  |   37 +-
 .../contrail/management/MockAccountManager.java    |    4 +-
 .../api/commands/AddNetscalerLoadBalancerCmd.java  |   10 +-
 .../ConfigureNetscalerLoadBalancerCmd.java         |    8 +-
 .../commands/DeleteNetscalerLoadBalancerCmd.java   |    2 +-
 .../commands/DeleteServicePackageOfferingCmd.java  |    2 +-
 .../cloud/api/commands/DeployNetscalerVpxCmd.java  |    6 +-
 .../commands/ListNetscalerControlCenterCmd.java    |    2 +-
 .../ListNetscalerLoadBalancerNetworksCmd.java      |    4 +-
 .../commands/ListNetscalerLoadBalancersCmd.java    |    6 +-
 .../commands/ListRegisteredServicePackageCmd.java  |    2 +-
 .../com/cloud/api/commands/StopNetScalerVMCmd.java |    2 +-
 .../response/NetscalerControlCenterResponse.java   |    8 +-
 .../response/NetscalerLoadBalancerResponse.java    |   28 +-
 .../cloud/network/resource/NetscalerResource.java  |    4 +-
 .../cloud/api/commands/AddNiciraNvpDeviceCmd.java  |    2 +-
 .../commands/ListNiciraNvpDeviceNetworksCmd.java   |    2 +-
 .../api/commands/ListNiciraNvpDevicesCmd.java      |    2 +-
 .../api/response/NiciraNvpDeviceResponse.java      |   16 +-
 .../api/commands/AddOpenDaylightControllerCmd.java |    2 +-
 .../commands/ListOpenDaylightControllersCmd.java   |    4 +-
 .../responses/OpenDaylightControllerResponse.java  |   10 +-
 .../cloud/api/commands/AddPaloAltoFirewallCmd.java |    4 +-
 .../api/commands/ConfigurePaloAltoFirewallCmd.java |    2 +-
 .../commands/ListPaloAltoFirewallNetworksCmd.java  |    4 +-
 .../api/commands/ListPaloAltoFirewallsCmd.java     |    4 +-
 .../api/response/PaloAltoFirewallResponse.java     |   32 +-
 .../apache/cloudstack/api/commands/AddSspCmd.java  |   12 +-
 .../cloudstack/api/commands/DeleteSspCmd.java      |    2 +-
 .../cloudstack/api/response/SspResponse.java       |    8 +-
 ...stenFabricNetworkGatewayToLogicalRouterCmd.java |    4 +-
 .../command/AddTungstenFabricPolicyRuleCmd.java    |    6 +-
 .../api/command/ApplyTungstenFabricPolicyCmd.java  |   12 +-
 .../api/command/ApplyTungstenFabricTagCmd.java     |   18 +-
 .../command/ConfigTungstenFabricServiceCmd.java    |    6 +-
 .../CreateTungstenFabricAddressGroupCmd.java       |    4 +-
 ...reateTungstenFabricApplicationPolicySetCmd.java |    4 +-
 .../CreateTungstenFabricFirewallPolicyCmd.java     |    8 +-
 .../CreateTungstenFabricFirewallRuleCmd.java       |   12 +-
 .../CreateTungstenFabricLogicalRouterCmd.java      |    4 +-
 .../CreateTungstenFabricManagementNetworkCmd.java  |    4 +-
 .../api/command/CreateTungstenFabricPolicyCmd.java |    4 +-
 .../command/CreateTungstenFabricProviderCmd.java   |    2 +-
 .../CreateTungstenFabricPublicNetworkCmd.java      |    4 +-
 .../CreateTungstenFabricServiceGroupCmd.java       |    4 +-
 .../api/command/CreateTungstenFabricTagCmd.java    |    4 +-
 .../command/CreateTungstenFabricTagTypeCmd.java    |    4 +-
 .../DeleteTungstenFabricAddressGroupCmd.java       |    6 +-
 ...eleteTungstenFabricApplicationPolicySetCmd.java |    6 +-
 .../DeleteTungstenFabricFirewallPolicyCmd.java     |    6 +-
 .../DeleteTungstenFabricFirewallRuleCmd.java       |    6 +-
 .../DeleteTungstenFabricLogicalRouterCmd.java      |    6 +-
 .../api/command/DeleteTungstenFabricPolicyCmd.java |    6 +-
 .../DeleteTungstenFabricServiceGroupCmd.java       |    6 +-
 .../api/command/DeleteTungstenFabricTagCmd.java    |    6 +-
 .../command/DeleteTungstenFabricTagTypeCmd.java    |    6 +-
 .../command/GetLoadBalancerSslCertificateCmd.java  |    4 +-
 .../command/ListTungstenFabricAddressGroupCmd.java |    6 +-
 .../ListTungstenFabricApplictionPolicySetCmd.java  |    6 +-
 .../ListTungstenFabricFirewallPolicyCmd.java       |    8 +-
 .../command/ListTungstenFabricFirewallRuleCmd.java |    8 +-
 .../ListTungstenFabricLBHealthMonitorCmd.java      |    4 +-
 .../ListTungstenFabricLogicalRouterCmd.java        |    8 +-
 .../api/command/ListTungstenFabricNetworkCmd.java  |    6 +-
 .../api/command/ListTungstenFabricNicCmd.java      |    6 +-
 .../api/command/ListTungstenFabricPolicyCmd.java   |   10 +-
 .../command/ListTungstenFabricPolicyRuleCmd.java   |    8 +-
 .../command/ListTungstenFabricServiceGroupCmd.java |    6 +-
 .../api/command/ListTungstenFabricTagCmd.java      |   14 +-
 .../api/command/ListTungstenFabricTagTypeCmd.java  |    4 +-
 .../api/command/ListTungstenFabricVmCmd.java       |    6 +-
 ...enFabricNetworkGatewayFromLogicalRouterCmd.java |    4 +-
 .../api/command/RemoveTungstenFabricPolicyCmd.java |    8 +-
 .../command/RemoveTungstenFabricPolicyRuleCmd.java |    8 +-
 .../api/command/RemoveTungstenFabricTagCmd.java    |   16 +-
 .../command/SynchronizeTungstenFabricDataCmd.java  |    2 +-
 .../UpdateTungstenFabricLBHealthMonitorCmd.java    |   22 +-
 .../tungsten/api/response/TlsDataResponse.java     |    2 +-
 .../TungstenFabricAddressGroupResponse.java        |    8 +-
 ...TungstenFabricApplicationPolicySetResponse.java |    4 +-
 .../TungstenFabricFirewallPolicyResponse.java      |    2 +-
 .../TungstenFabricLBHealthMonitorResponse.java     |   22 +-
 .../TungstenFabricLogicalRouterResponse.java       |    2 +-
 .../api/response/TungstenFabricPolicyResponse.java |    2 +-
 .../response/TungstenFabricProviderResponse.java   |    2 +-
 .../api/response/TungstenFabricTagResponse.java    |    8 +-
 .../tungsten/service/TungstenElementTest.java      |   54 -
 .../driver/ElastistorPrimaryDataStoreDriver.java   |    5 +-
 .../storage/datastore/util/ElastistorUtil.java     |    9 -
 .../datastore/util/ListElastistorInterfaceCmd.java |    2 +-
 .../util/ListElastistorInterfaceResponse.java      |    6 +-
 .../datastore/util/ListElastistorPoolCmd.java      |    2 +-
 .../datastore/util/ListElastistorPoolResponse.java |   14 +-
 .../datastore/util/ListElastistorVolumeCmd.java    |    2 +-
 .../util/ListElastistorVolumeResponse.java         |   10 +-
 .../CloudStackPrimaryDataStoreDriverImpl.java      |    8 +-
 plugins/storage/volume/linstor/CHANGELOG.md        |   17 +-
 .../kvm/storage/LinstorStorageAdaptor.java         |    7 +-
 .../storage/datastore/util/LinstorUtil.java        |   35 +-
 .../storage/datastore/util/LinstorUtilTest.java    |    1 -
 .../driver/NexentaPrimaryDataStoreDriver.java      |    3 -
 .../datastore/util/NexentaStorApplianceTest.java   |    1 -
 .../datastore/client/ScaleIOGatewayClientImpl.java |    8 +-
 .../driver/ScaleIOPrimaryDataStoreDriver.java      |   10 +-
 .../driver/SolidFirePrimaryDataStoreDriver.java    |    8 +-
 .../SolidFirePrimaryDataStoreLifeCycle.java        |    4 +-
 .../storage/datastore/util/SolidFireUtil.java      |    2 +-
 .../apache/cloudstack/storage/test/VolumeTest.java |   12 -
 .../StorPoolDownloadVolumeCommandWrapper.java      |    1 -
 .../collector/StorPoolAbandonObjectsCollector.java |    1 -
 .../driver/StorPoolPrimaryDataStoreDriver.java     |    1 -
 .../datastore/driver/StorPoolStatsCollector.java   |    4 +-
 .../storage/datastore/util/StorPoolHelper.java     |   26 -
 .../storage/motion/StorPoolDataMotionStrategy.java |    4 +-
 .../storage/snapshot/StorPoolSnapshotStrategy.java |    4 +-
 .../snapshot/StorPoolVMSnapshotStrategy.java       |   32 +-
 plugins/user-authenticators/ldap/pom.xml           |    6 +
 .../api/command/LdapAddConfigurationCmd.java       |    2 +-
 .../api/command/LdapCreateAccountCmd.java          |   15 +-
 .../api/command/LdapDeleteConfigurationCmd.java    |    4 +-
 .../cloudstack/api/command/LdapImportUsersCmd.java |   33 +-
 .../api/command/LdapListConfigurationCmd.java      |   16 +-
 .../cloudstack/api/command/LdapListUsersCmd.java   |  112 +-
 .../cloudstack/api/command/LdapUserSearchCmd.java  |    6 +-
 .../api/command/LinkAccountToLdapCmd.java          |   20 +-
 .../api/command/LinkDomainToLdapCmd.java           |   18 +-
 .../api/command/UnlinkDomainFromLdapCmd.java       |   69 +
 .../api/response/LdapConfigurationResponse.java    |    6 +-
 .../api/response/LinkAccountToLdapResponse.java    |   12 +-
 .../api/response/LinkDomainToLdapResponse.java     |   10 +-
 .../cloudstack/ldap/ADLdapUserManagerImpl.java     |    6 +-
 .../apache/cloudstack/ldap/LdapAuthenticator.java  |   27 +-
 .../apache/cloudstack/ldap/LdapConfiguration.java  |   88 +-
 .../apache/cloudstack/ldap/LdapContextFactory.java |   14 +-
 .../org/apache/cloudstack/ldap/LdapManager.java    |    7 +-
 .../apache/cloudstack/ldap/LdapManagerImpl.java    |  155 ++-
 .../org/apache/cloudstack/ldap/LdapTrustMapVO.java |    4 +-
 .../java/org/apache/cloudstack/ldap/LdapUser.java  |    2 +-
 .../apache/cloudstack/ldap/LdapUserManager.java    |   18 +-
 .../cloudstack/ldap/OpenLdapUserManagerImpl.java   |   34 +-
 .../cloudstack/ldap/dao/LdapConfigurationDao.java  |    6 +-
 .../ldap/dao/LdapConfigurationDaoImpl.java         |    6 -
 .../api/command/LdapListUsersCmdTest.java          |    4 +-
 .../api/command/LinkAccountToLdapCmdTest.java      |    1 +
 .../cloudstack/ldap/ADLdapUserManagerImplTest.java |   44 +-
 .../api/response/SamlAuthorizationResponse.java    |    6 +-
 .../auth/TotpUserTwoFactorAuthenticator.java       |    2 +-
 pom.xml                                            |    7 +-
 scripts/installer/createtmplt.sh                   |    5 -
 scripts/installer/createvolume.sh                  |    5 -
 scripts/storage/multipath/connectVolume.sh         |    2 +-
 scripts/storage/multipath/resizeVolume.sh          |    2 +-
 scripts/storage/secondary/listvmtmplt.sh           |    5 -
 scripts/storage/secondary/listvolume.sh            |    5 -
 scripts/util/keystore-setup                        |    2 +-
 scripts/vm/hypervisor/ovm3/cloudstack.py           |    4 -
 scripts/vm/hypervisor/xenserver/perfmon.py         |    6 -
 scripts/vm/hypervisor/xenserver/xcposs/NFSSR.py    |   14 -
 scripts/vm/hypervisor/xenserver/xcpserver/NFSSR.py |   15 -
 .../vm/hypervisor/xenserver/xenserver56/NFSSR.py   |   14 -
 .../hypervisor/xenserver/xenserver56fp1/NFSSR.py   |   15 -
 .../vm/hypervisor/xenserver/xenserver60/NFSSR.py   |   14 -
 scripts/vm/network/ovs-pvlan-kvm-vm.sh             |    2 +-
 scripts/vm/network/ovs-pvlan-vm.sh                 |    2 +-
 scripts/vm/network/security_group.py               |  241 ++--
 scripts/vm/network/vnet/ovstunnel.py               |    9 -
 .../src/main/java/com/cloud/acl/DomainChecker.java |    2 +-
 .../manager/allocator/impl/FirstFitAllocator.java  |    2 +-
 .../allocator/impl/UserConcentratedAllocator.java  |    2 -
 .../auth/SetupUserTwoFactorAuthenticationCmd.java  |    4 +-
 ...ValidateUserTwoFactorAuthenticationCodeCmd.java |    2 +-
 .../java/com/cloud/api/doc/ApiXmlDocWriter.java    |    2 -
 .../java/com/cloud/api/query/QueryManagerImpl.java |    1 +
 .../main/java/com/cloud/configuration/Config.java  |   20 +-
 .../configuration/ConfigurationManagerImpl.java    |   77 +-
 .../consoleproxy/ConsoleProxyManagerImpl.java      |    8 +-
 .../com/cloud/ha/HighAvailabilityManagerImpl.java  |    6 +-
 .../kvm/discoverer/LibvirtServerDiscoverer.java    |    8 +-
 .../network/ExternalNetworkDeviceManagerImpl.java  |   14 -
 .../java/com/cloud/network/NetworkModelImpl.java   |    2 +-
 .../java/com/cloud/network/NetworkServiceImpl.java |  106 +-
 .../com/cloud/network/as/AutoScaleManager.java     |    5 +-
 .../com/cloud/network/as/AutoScaleManagerImpl.java |   53 +-
 .../network/element/ConfigDriveNetworkElement.java |   32 +-
 .../com/cloud/network/guru/DirectNetworkGuru.java  |   14 +-
 .../network/guru/ExternalGuestNetworkGuru.java     |    8 +-
 .../com/cloud/network/guru/GuestNetworkGuru.java   |    2 +-
 .../com/cloud/network/guru/PrivateNetworkGuru.java |    2 +-
 .../com/cloud/network/guru/PublicNetworkGuru.java  |    2 +-
 .../network/lb/LoadBalancingRulesManagerImpl.java  |   44 +-
 .../cloud/network/router/NetworkHelperImpl.java    |   24 +-
 .../VpcVirtualNetworkApplianceManagerImpl.java     |    2 +-
 .../cloud/network/rules/PrivateGatewayRules.java   |    1 -
 .../com/cloud/network/rules/RulesManagerImpl.java  |    2 -
 .../network/security/SecurityGroupManagerImpl.java |    9 +-
 .../security/SecurityGroupManagerImpl2.java        |    6 +-
 .../com/cloud/resource/ResourceManagerImpl.java    |    2 +-
 .../com/cloud/server/ConfigurationServerImpl.java  |    2 -
 .../com/cloud/server/ManagementServerImpl.java     |  207 ++-
 .../main/java/com/cloud/server/StatsCollector.java |    2 +-
 .../api/response/BaremetalTemplateResponse.java    |    2 +-
 .../java/com/cloud/storage/StorageManagerImpl.java |  113 +-
 .../cloud/storage/StoragePoolAutomationImpl.java   |  505 ++++---
 .../com/cloud/storage/VolumeApiServiceImpl.java    |    8 +-
 .../storage/snapshot/SnapshotManagerImpl.java      |   14 +-
 .../storage/snapshot/SnapshotSchedulerImpl.java    |    6 +-
 .../cloud/template/HypervisorTemplateAdapter.java  |    6 +-
 .../com/cloud/template/TemplateAdapterBase.java    |   36 +-
 .../com/cloud/template/TemplateManagerImpl.java    |  214 +--
 .../main/java/com/cloud/test/DatabaseConfig.java   |    2 +-
 .../main/java/com/cloud/test/IPRangeConfig.java    |   36 +-
 .../main/java/com/cloud/test/PodZoneConfig.java    |    6 -
 .../java/com/cloud/user/AccountManagerImpl.java    |   16 +-
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  |  230 ++--
 .../cloud/vm/snapshot/VMSnapshotManagerImpl.java   |  122 +-
 .../cloudstack/cluster/ClusterDrsServiceImpl.java  |  288 +++-
 .../diagnostics/DiagnosticsServiceImpl.java        |    4 +-
 .../cloudstack/storage/NfsMountManagerImpl.java    |    1 -
 server/src/test/java/com/cloud/api/APITest.java    |    1 -
 .../java/com/cloud/api/ApiResponseHelperTest.java  |    4 +-
 .../src/test/java/com/cloud/api/LoginResponse.java |   18 +-
 .../ConfigurationManagerImplTest.java              |   38 +
 .../cloud/network/DedicateGuestVlanRangesTest.java |    2 +-
 .../cloud/network/as/AutoScaleManagerImplTest.java |   74 +-
 .../com/cloud/server/ManagementServerImplTest.java |  234 ++--
 .../com/cloud/user/AccountManagerImplTest.java     |   16 +
 .../test/java/com/cloud/vpc/Site2SiteVpnTest.java  |   75 --
 .../java/com/cloud/vpc/VpcTestConfiguration.java   |    5 -
 .../cluster/ClusterDrsServiceImplTest.java         |  506 ++++++-
 .../networkoffering/CreateNetworkOfferingTest.java |    2 -
 .../main/java/common/adapter/AwtCanvasAdapter.java |    6 -
 .../src/main/java/rdpclient/RdpClient.java         |    9 -
 .../java/rdpclient/clip/ClipboardDataFormat.java   |   14 -
 .../java/rdpclient/ntlmssp/asn1/TSRequest.java     |    6 -
 .../java/rdpclient/rdp/ClientConfirmActivePDU.java |    2 +-
 .../rdpclient/rdp/ClientMCSAttachUserRequest.java  |    2 -
 ...nnelJoinRequestServerMCSChannelConfirmPDUs.java |    5 -
 .../java/rdpclient/rdp/ClientSynchronizePDU.java   |    2 -
 .../java/rdpclient/rdp/ServerBitmapUpdate.java     |    1 -
 .../java/rdpclient/rdp/ServerDemandActivePDU.java  |   11 +-
 .../java/rdpclient/rdp/ServerIOChannelRouter.java  |    6 -
 .../src/main/java/rdpclient/rdp/ServerMCSPDU.java  |    4 -
 .../src/main/java/streamer/BaseElement.java        |    1 -
 .../src/main/java/streamer/PipelineImpl.java       |    3 -
 .../rdpconsole/src/main/java/streamer/Queue.java   |    1 -
 .../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 -
 .../java/com/cloud/consoleproxy/ConsoleProxy.java  |    1 -
 .../SecondaryStorageManagerImpl.java               |    6 +-
 .../resource/NfsSecondaryStorageResource.java      |   82 +-
 .../storage/template/DownloadManagerImpl.java      |   14 +-
 .../storage/template/UploadManagerImpl.java        |    1 -
 .../LocalNfsSecondaryStorageResourceTest.java      |    1 -
 .../resource/NfsSecondaryStorageResourceTest.java  |    2 +-
 systemvm/agent/scripts/run-proxy.sh                |   12 -
 systemvm/agent/scripts/ssvm-check.sh               |    2 +-
 systemvm/debian/opt/cloud/bin/cs/CsAddress.py      |    2 +-
 systemvm/debian/opt/cloud/bin/cs/CsRoute.py        |    2 +-
 .../opt/cloud/bin/update_interface_config.sh       |    2 +-
 .../maint/test_primary_storage_nfsmountopts_kvm.py |    2 +-
 .../component/maint/testpath_disablestoragepool.py |   20 +-
 .../component/maint/testpath_vMotion_vmware.py     |   12 +-
 .../component/test_base_image_updation.py          |    2 +-
 .../integration/component/test_browse_templates.py |    6 +-
 .../component/test_browse_templates2.py            |    2 +-
 test/integration/component/test_browse_volumes.py  |    6 +-
 test/integration/component/test_deploy_vgpu_vm.py  |   22 +-
 .../component/test_hypervisor_capabilities.py      |    6 +-
 .../component/test_multiple_nic_support.py         |    4 +-
 .../test_multiple_subnets_in_isolated_network.py   |    4 +-
 ...est_multiple_subnets_in_isolated_network_rvr.py |    4 +-
 .../component/test_multiple_subnets_in_vpc.py      |    4 +-
 .../component/test_multiple_subnets_in_vpc_rvr.py  |    4 +-
 .../integration/component/test_netscaler_nw_off.py |    6 +-
 .../component/test_rootvolume_resize.py            |    2 +-
 .../component/test_vpc_vm_life_cycle.py            |    2 +-
 test/integration/smoke/test_routers.py             |    4 +-
 test/integration/smoke/test_ssvm.py                |   18 +-
 test/integration/smoke/test_webhook_lifecycle.py   |    2 +-
 tools/docker/docker-compose.yml                    |    2 +-
 ui/public/locales/en.json                          |   22 +-
 ui/src/components/view/DateTimeFilter.vue          |   53 +-
 ui/src/components/view/DedicateDomain.vue          |    2 +-
 ui/src/components/view/DeployVMFromBackup.vue      |   19 +-
 ui/src/components/view/DetailsTab.vue              |    4 +-
 ui/src/components/view/GPUDevicesTab.vue           |   10 +-
 ui/src/components/view/GPUSummaryTab.vue           |   11 +-
 ui/src/components/view/GPUTab.vue                  |   10 +-
 ui/src/components/view/ListView.vue                |   12 +-
 ui/src/components/view/ResourceCountUsage.vue      |   10 +-
 ui/src/components/view/ResourceLimitTab.vue        |   10 +-
 ui/src/components/view/TestWebhookDeliveryView.vue |   14 +-
 ui/src/components/view/VgpuProfilesTab.vue         |   10 +-
 ui/src/components/view/WebhookFiltersTab.vue       |  416 ++++++
 ui/src/components/view/stats/ResourceStatsInfo.vue |   10 +-
 .../view/stats/ResourceStatsLineChart.vue          |   10 +-
 ui/src/config/section/domain.js                    |   16 +-
 ui/src/config/section/tools.js                     |    4 +
 ui/src/utils/plugins.js                            |    3 +-
 ui/src/views/compute/AttachIso.vue                 |    4 +-
 ui/src/views/compute/CreateAutoScaleVmGroup.vue    |   12 +-
 ui/src/views/compute/DeployVM.vue                  |   16 +-
 ui/src/views/compute/DeployVnfAppliance.vue        |   16 +-
 ui/src/views/compute/EditVM.vue                    |    4 +-
 ui/src/views/compute/ReinstallVm.vue               |   10 +-
 ui/src/views/compute/backup/BackupSchedule.vue     |    3 +-
 ui/src/views/compute/backup/FormSchedule.vue       |   92 +-
 .../wizard/DeployInstanceBackupSelection.vue       |    4 +-
 .../views/compute/wizard/OsBasedImageSelection.vue |    4 +-
 ui/src/views/extension/CreateExtension.vue         |    6 +-
 ui/src/views/extension/UpdateCustomAction.vue      |    4 +-
 ui/src/views/iam/AddAccount.vue                    |   85 +-
 ui/src/views/iam/CreateRole.vue                    |    2 +-
 ui/src/views/iam/EditAccount.vue                   |    6 +-
 ui/src/views/iam/ImportRole.vue                    |    2 +-
 ui/src/views/infra/ClusterUpdate.vue               |    4 +
 ui/src/views/infra/Resources.vue                   |   10 +-
 ui/src/views/infra/network/IpRangesTabPublic.vue   |   26 +-
 ui/src/views/infra/routers/RouterHealthCheck.vue   |    4 +-
 ui/src/views/infra/zone/ZoneWizardAddResources.vue |    3 +
 ui/src/views/infra/zone/ZoneWizardLaunchZone.vue   |    2 +-
 .../infra/zone/ZoneWizardRegisterTemplate.vue      |    2 +-
 ui/src/views/network/NicsTab.vue                   |   65 +-
 ui/src/views/network/VpnDetails.vue                |  250 ++--
 ui/src/views/offering/AddComputeOffering.vue       |    6 +-
 ui/src/views/project/iam/ProjectRoleTab.vue        |    2 +-
 .../storage/ChangeSharedFSServiceOffering.vue      |    2 +-
 ui/src/views/storage/FormSchedule.vue              |   79 +-
 ui/src/views/tools/CreateWebhook.vue               |    2 +-
 .../java/com/cloud/usage/UsageManagerImpl.java     |   84 +-
 .../usage/parser/VMSnapshotOnPrimaryParser.java    |    4 +-
 .../cloud/usage/parser/VMSnapshotUsageParser.java  |    2 +-
 .../java/com/cloud/usage/UsageSanityCheckerIT.java |    8 +-
 .../cloud/utils/cisco/n1kv/vsm/NetconfHelper.java  |    2 +-
 .../com/cloud/utils/cisco/n1kv/vsm/VsmCommand.java |   23 +-
 .../main/java/com/cloud/utils/net/NetUtils.java    |   14 +-
 .../java/com/cloud/utils/ssh/SSHCmdHelper.java     |    8 +-
 .../java/com/cloud/utils/xmlobject/XmlObject.java  |    3 -
 .../com/cloud/utils/xmlobject/XmlObjectParser.java |    4 -
 .../utils/imagestore/ImageStoreUtil.java           |    4 +-
 .../cloudstack/utils/security/DigestHelper.java    |   20 +-
 .../utils/server/ServerPropertiesUtil.java         |   58 +
 .../utils/server/ServerPropertiesUtilTest.java     |   95 ++
 .../hypervisor/vmware/mo/VirtualMachineMO.java     |  106 +-
 .../hypervisor/vmware/util/VmwareContext.java      |    8 +-
 1441 files changed, 17854 insertions(+), 10467 deletions(-)
 copy debian/cloudstack-marvin.postinst => .github/CODEOWNERS (84%)
 mode change 100755 => 100644
 copy agent/conf/environment.properties.in => .github/dependabot.yml (61%)
 create mode 100644 .github/workflows/stale.yml
 rename 
api/src/main/java/org/apache/cloudstack/api/command/admin/user/{RegisterCmd.java
 => RegisterUserKeyCmd.java} (93%)
 rename 
api/src/main/java/org/apache/cloudstack/api/response/{RegisterResponse.java => 
RegisterUserKeyResponse.java} (87%)
 create mode 100644 
api/src/test/java/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmdTest.java
 create mode 100644 
api/src/test/java/org/apache/cloudstack/config/ApiServiceConfigurationTest.java
 copy 
engine/schema/src/main/resources/META-INF/db/procedures/{cloud.idempotent_drop_index.sql
 => cloud.idempotent_drop_column.sql} (70%)
 create mode 100644 
engine/schema/src/test/java/com/cloud/upgrade/DatabaseUpgradeCheckerDoUpgradesTest.java
 create mode 100644 
plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/WebhookFilter.java
 copy 
plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/api/command/user/{DeleteWebhookCmd.java
 => AddWebhookFilterCmd.java} (60%)
 copy 
plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/api/command/user/{DeleteWebhookCmd.java
 => DeleteWebhookFilterCmd.java} (79%)
 copy 
plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/api/command/user/{DeleteWebhookCmd.java
 => ListWebhookFiltersCmd.java} (65%)
 copy 
api/src/main/java/org/apache/cloudstack/api/response/ExtensionResourceResponse.java
 => 
plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/api/response/WebhookFilterResponse.java
 (51%)
 copy 
plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/dao/{WebhookJoinDao.java
 => WebhookFilterDao.java} (71%)
 create mode 100644 
plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/dao/WebhookFilterDaoImpl.java
 create mode 100644 
plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/vo/WebhookFilterVO.java
 create mode 100644 
plugins/event-bus/webhook/src/test/java/org/apache/cloudstack/mom/webhook/WebhookServiceImplTest.java
 create mode 100644 
plugins/event-bus/webhook/src/test/java/org/apache/cloudstack/mom/webhook/api/command/user/AddWebhookFilterCmdTest.java
 copy 
plugins/event-bus/webhook/src/test/java/org/apache/cloudstack/mom/webhook/api/command/user/{DeleteWebhookDeliveryCmdTest.java
 => DeleteWebhookFilterCmdTest.java} (78%)
 create mode 100644 
plugins/event-bus/webhook/src/test/java/org/apache/cloudstack/mom/webhook/api/command/user/ListWebhookFiltersCmdTest.java
 create mode 100644 
plugins/event-bus/webhook/src/test/java/org/apache/cloudstack/mom/webhook/dao/WebhookDaoImplTest.java
 create mode 100644 
plugins/event-bus/webhook/src/test/java/org/apache/cloudstack/mom/webhook/dao/WebhookDeliveryDaoImplTest.java
 create mode 100644 
plugins/event-bus/webhook/src/test/java/org/apache/cloudstack/mom/webhook/dao/WebhookDeliveryJoinDaoImplTest.java
 create mode 100644 
plugins/event-bus/webhook/src/test/java/org/apache/cloudstack/mom/webhook/dao/WebhookFilterDaoImplTest.java
 create mode 100644 
plugins/event-bus/webhook/src/test/java/org/apache/cloudstack/mom/webhook/dao/WebhookJoinDaoImplTest.java
 create mode 100644 
plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/UnlinkDomainFromLdapCmd.java
 delete mode 100644 server/src/test/java/com/cloud/vpc/Site2SiteVpnTest.java
 create mode 100644 ui/src/components/view/WebhookFiltersTab.vue
 create mode 100644 
utils/src/main/java/org/apache/cloudstack/utils/server/ServerPropertiesUtil.java
 create mode 100644 
utils/src/test/java/org/apache/cloudstack/utils/server/ServerPropertiesUtilTest.java

Reply via email to