This is an automated email from the ASF dual-hosted git repository.
pearl11594 pushed a change to branch veeam-counter-fix
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 78a4b9a9c8b change to while - issure refactoring
add 1efa46cb4d1 fix removeUsage for backups (#11522)
add b09f3e8ff7e ui: fix overflow for value in DetailInput (#11771)
add 5a8a1e27e10 Fixed and enhanced vlan field validation in the UI (#10983)
add b7a11cb203a NAS backup provider: Support restore from backup to
volumes on Ceph storage pool(s), and take backup for stopped instances with
volumes on Ceph storage pool(s) (#11684)
add 9bcd98876d6 Make kvm domain persistent when unmanaged from CS (#11541)
add 30cb8c7a820 Fix importing unmanaged instances due to incorrect
internal name (#11753)
add 70af55e8489 UI support for extraconfig in deploy and update instance
(#11719)
add c631d6a480d CKS: generate a random UUID as password of CKS user in
project (#11639)
add ca7138b3bdf server: Consider Instance in Starting state as well for
allocation algorithm (#11751)
add e12813de497 CKS: fix CKS creation on an existing Shared and Routed
network (#11735)
add 8e4dc0a66d2 VMware: match nic mac for ip address fetch (#10641)
add 963a67b8167 server: add user.password.reset.smtp.useStartTLS and
enabledSecurityProtocols for password reset (#11228)
add 823cb00a0a0 server: do not enable the disabled local storage(s) on
host connection during mgmt server / agent start (#11722)
add a208db54ea8 linstor: use sparse/discard qemu-img convert on thin
devices (#11787)
add aca82359606 Merge branch '4.19' into 4.20
add 5f63e8493c5 Merge branch '4.20'
add 858663fcf7c UI: fix missing comma at end of line
add d2615bb142c Add support for providing userdata to system VMs (#11654)
add 09b63bc2e82 Storage pool response improvements (#10740)
add a15fbd9bcc8 refactor: remove use of term entry-point from extensions
code base (#11488)
add cc3170577c1 Add `Hypervisor default` as cache mode for disk offerings
(#10282)
add 314c4591ecb systemvmtemplate: Bump Debian version to 12.12.0 (#11778)
add 270d3f9a2da UI: Deal with crosssite api call after login (#10533)
add 9f20979bcee UI: Fix primary storage for datastore cluster and retain
traffic labels during zone deployment (#11760)
add b143ddc4058 Sanitize the rbd file cmd parameter logs during qemu-img
convert (through Script) (#11801)
add 89d2b17461f storage: change storage pool to Up state when cancel
storage migration (#11773)
add 6089c161a6c Merge remote-tracking branch 'apache/4.20'
add a6ef24d1679 server: consistent domainpath in api responses (#11589)
add f67b738eb3d Migrate volume improvements, to bypass secondary storage
when copy volume between pools is allowed directly (#11625)
add 973819dad61 API: Add support to list all snapshot policies & backup
schedules (#11587)
add 2b1f0bbbdbd UI: Fix for cluster addition in VMware (#11812)
add 67250d99d44 ui: fix add host form state on submit (#11815)
add df49c4f14bf UI: Move Backup Repository to Infrastructure (from
Configuration) (#11738)
add b99a03092f2 Added Extension for MaaS integration in CloudStack (#11613)
add b106d6e190b VMware to KVM Migrations improvements (#11594)
add cc6ee906d51 Markdown: add documentation on pre-commit usage (#11680)
add 0b9afe77cac Enforce distinct hostnames network (#10212)
add 162c45f8fa9 api/server: list networks by name (#11470)
add 1e23d6bc205 server: enable KVM volume and VM snapshot by default
(#11446)
add 136ea3eafac UI: Removal of UI blockage to access the
`changeOfferingForVolume` API (#10135)
add a5a934dac14 pre-commit: add hooks `check-illegal-windows-names` and
`file-contents-sorter` (#11662)
add 0e93ae3bdf5 UI: Add validator for CIDR being passed (#11465)
add 8464e46b53f PR #11778 with changes for main branch (#11781)
add 0ca267f5166 Allow uploading of ISO for creating kubernetes supported
versions (#9561)
add 22ba8dd504d Remove misspelled file not found from rat excludes (#11665)
add e27528f8b2a Update GitHub Actions (#11664)
add cdb0604e7b6 pre-commit: enforce mixed-line-ending for all files
(#11667)
add 349feebd151 Standardize Markdown headings; enforce MD003 with
markdownlint (#11688)
add 0ca63f36a52 api,server,ui: allow cleaning up external details for host
and serviceoffering (#11548)
add 5e7ae227d3a UI: Prevent exceptions when network service provider
that's disabled is viewed (#11413)
add c9ce6e305c1 ui: Allow edit source CIDR on load balancer rule (#11766)
add a574f7ac99c Add logs for host removal (#10423)
add dfcbd2e9772 server: consistent behaviour for list apis with project=-1
(#11767)
add 9e535e35d27 Support xz format for template registration (#11786)
add f71d3a8e9fe update the developers guide link on the API page (#11832)
add c0a4392b053 Fix volume copy from primary to primary in simulator
(#11836)
add 046014b4c55 NAS BnR: Create Instance from Backup issues (#11754)
add f4b6a74a94a Add support for CSI driver in CKS (#11419)
add 0e8b0b8e406 Allow counters to be created with same name, provider and
source as a deleted one (#10223)
add 309b444205a pom.xml: update jetty version (#11793)
add 4d95f08a3ab Delete template from storage pool instantly if no volume
is using it (#11782)
add 86cad79c156 importvm: fix IP address allocation on Shared networks
(#11811)
add 6f931dbd005 agent: increase timeout for host arch retrieval (#11254)
(#11822)
add 43278710362 Routed: fix create network exception when auto-allocation
is disabled (#11624)
add b82369c2415 systemvm: fix duplicated "en_US.UTF-8 UTF-8" in
/etc/locale.gen (#11823)
add eee43e534fa cloudutils: fix warning, error during kvm agent
installation (#11318)
add c8d44d92a76 api,server: fix entity access
add 03a4b9f4fd3 server,utils: improve js interpretation functionality
add 8b9f5fd8f96 Merge branch '4.20'
add e7a55a766c5 Fixes for Import VM Tasks listing (#11841)
add d8766418e01 extensions: custom action entity access
add 4cdcde2fe7a server: do not return extension path to non root admins
(#11856)
add f63118c011e Add erikbocks as a collaborator (#11863)
add a6068a850cd Update CI workflow to use Ubuntu 24.04 (#11873)
add 8bbe253b009 Merge release branch 4.20 to main
add 2fcf96267dd UI: Fix duplicate memory values on InfoCard view
conditions (#11896)
add 4b74a99a57c Fix: NPE thrown on VMware to KVM migration tasks listing
for removed VMs (#11892)
add a839e25d559 Fix OOB test failures in ci.yml github actions (#11887)
add b1851ba18a3 Merge release branch 4.20 to main
add a2fcbd608aa Avoid html escaping while saving vmsettings in
backup_details (#11900)
add 7ef5db21532 UI: Fix upgrade router template operation failure (#11901)
add 024f89dc7d0 pre-commit: add oxipng a lossless PNG compression
optimizer (#11065)
add e7b83260580 pre-commit auto add license for all Markdown files (#11870)
add 941227ec8cd pre-commit add `chmod 644` manual hook for Markdown
(#11651)
add 4dc3931233b Updating pom.xml version numbers for release 4.20.2.0
add 15d2137800b Merge tag '4.20.2.0' into 4.20
add e333ce9782d Updating pom.xml version numbers for release
4.20.3.0-SNAPSHOT
add 255c4615dd9 Fix VMScheduler unit test for daylight saving time (#11907)
add c2c1e11580e Merge branch '4.20'
add bfc4f60e1da [VMware to KVM migration] Check source VM against the
selected offering (#11908)
add e20d57f33e0 Fix checking resources before power state check of the VM
add f52a27cce6d UI: Minor fix for extra params display for VMware to KVM
migration (#11909)
add 2dbc86abfae Fix CKS cluster creation not honoring the CKS ISO arch
(#11902)
add 15c61acedfe Fix the config 'powerflex.connect.on.demand' description
(#11926)
add 3d6cafe1936 Handle null mountTimeout in RestoreBackupCommand (#11944)
add 71f47d61304 Updating pom.xml version numbers for release 4.22.0.0
add d160731b9fb Updating pom.xml version numbers for release
4.22.1.0-SNAPSHOT
add e90e436ef87 UI: Enable listall (for Affinity Groups, SSH Keypairs,
User Data) in deploy instance wizard for admin, and lists SSH Keypairs, User
Data by domain/account (#11906)
add d53b6dbda42 api/test: fix storage pool update with only id (#11897)
add 5504b053e44 Merge branch '4.20' into 4.22
add ac8c200790f merge fix
add b8ec941ec12 uefi property typo (#11929)
add 9c0efb70723 DB setup: support db schema creation (with --schema-only)
without force recreate option (#12004)
add 2dd1e6d786f Enable UEFI on KVM hosts (by default), and configure with
some default settings (#11740)
add 8230f04a790 CKS: update cloud.kubernetes.cluster.network.offering to
dynamic (#11847)
add c5c3cc40c1e consider Instance in Starting state for
listPodsByUserConcentration (#11845)
add 2954e969475 Veeam: get templateId from vm instance if vm is created
from ISO (#10705)
add d26122bf22b Veeam: use pre-defined object mapper (#10715)
add 50fe265017c Merge remote-tracking branch 'apache/4.20' into 4.22
add 15439ede7d4 UI: Update and reset domain level configuration (#11571)
add 671d8ad704b Track volume usage data at a vm granularity as well
(#11531)
add e90e31d3861 add isPerson check to query for AD (#11843)
add 21d844ba1c2 ui: fix zone options for image instance deploy button
(#12060)
add dba889ea3ef UI: fix list of zones if zone has icon (#12083)
add 9ec8cc4186f api,server,ui: improve listing public ip for associate
(#11591)
add e33f4754f53 Fix DB upgrade script for 4.22 (#12111)
add 81787b310ee fix API Request Parameters Logged Credential Masking in
ApiServer (#12020)
add f0a0936675c server: fix volume offering not updated after offering
change (#12003)
add 028dd869456 fixed Password Exposure in IPMI Tool Command Execution
(#12028)
add e23c7ef7017 Merge release branch 4.20 to 4.22
add 516012a0b49 ceph: fix offline volume migration between ceph pools
(#12103)
add f379d789635 ui: fix section search filter (#12146)
add 44119cf34fc ui: fix dsiple managementservermetricsresponse -
agentcount (#12148)
add 243f566a603 refactor: add null check for BroadcastDomainType
retrievals (#11572)
add 2941b518ba1 Merge remote-tracking branch 'apache/4.20' into 4.22
add 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 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 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 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 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 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 2d4b7ba3578 Add mountopts to backup repository response (#12360)
add fca928d609b fix HMAC Signatures and API Keys Logged in Plaintext
(#12021)
add a29de0ed066 Retry cloneVM task when any file access issue while
cloning from volume or template (#12335)
add 57331aca2fc Skip removal of offerings if in use during domain removal
(#11780)
add 750290b8aed Prevent NPE when removing NIC from a stopped VM using
service offering with CPU cap set (#12232)
add 425c4e33120 Merge remote-tracking branch 'apache/4.20' into 4.22
add bc3d7c314bb Change the `value` parameter of the `updateConfiguration`
API to be required (#10790)
add 9a38e75abdf Fix Linstor shrink qcow2 volumes (#12387)
add c91e84c6d8b Avoid double counting primary storage allocated capacity
for storage pools having a parent (#12181)
add ef1aaa0551d kvm: allow skip forcing disk controller (#11750)
add e25cf437c05 Merge branch '4.20' into 4.22
add 04875f15177 Improve logs for VM migrations (#12332)
add 2399edd3807 [UI] Fix for the login url with nested redirect parameters
(#12356)
add d1d6ab15482 Merge branch '4.22' of
https://github.com/apache/cloudstack into veeam-counter-fix
No new revisions were added by this update.
Summary of changes:
.asf.yaml | 1 +
.github/linters/.markdown-lint.yml | 3 -
.github/linters/codespell.txt | 2 +-
.github/workflows/build.yml | 6 +-
.github/workflows/ci.yml | 30 +-
.github/workflows/codecov.yml | 4 +-
.github/workflows/codeql-analysis.yml | 2 +-
.github/workflows/docker-cloudstack-simulator.yml | 2 +-
.../workflows/license-templates/LICENSE.txt | 0
.github/workflows/linter.yml | 4 +-
.github/workflows/main-sonar-check.yml | 4 +-
.github/workflows/rat.yml | 4 +-
.github/workflows/sonar-check.yml | 4 +-
.github/workflows/ui.yml | 4 +-
.markdownlintignore | 1 +
.pre-commit-config.yaml | 39 +-
CONTRIBUTING.md | 55 +-
INSTALL.md | 19 +
PRE-COMMIT.md | 62 +
README.md | 19 +
agent/conf/agent.properties | 6 +
.../conf/uefi.properties.in | 10 +-
agent/pom.xml | 2 +-
agent/src/main/java/com/cloud/agent/Agent.java | 7 +-
.../cloud/agent/properties/AgentProperties.java | 14 +
.../consoleproxy/ConsoleProxyResource.java | 4 +-
api/pom.xml | 2 +-
.../com/cloud/agent/api/storage/OVFHelper.java | 18 +-
.../commands/ListRecurringSnapshotScheduleCmd.java | 4 +-
.../kubernetes/cluster/KubernetesCluster.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 +-
api/src/main/java/com/cloud/network/Networks.java | 12 +-
.../com/cloud/network/as/AutoScaleService.java | 2 +
.../com/cloud/network/as/AutoScaleVmGroup.java | 2 +-
.../main/java/com/cloud/offering/DiskOffering.java | 7 +-
.../java/com/cloud/server/ManagementService.java | 29 +-
.../java/com/cloud/server/ResourceManagerUtil.java | 1 +
.../java/com/cloud/storage/VolumeApiService.java | 2 +
.../cloud/storage/snapshot/SnapshotApiService.java | 2 +-
.../com/cloud/storage/snapshot/SnapshotPolicy.java | 3 +-
.../main/java/com/cloud/user/AccountService.java | 4 +-
.../java/com/cloud/user/ResourceLimitService.java | 2 +-
api/src/main/java/com/cloud/vm/UserVmService.java | 6 +-
.../main/java/com/cloud/vm/VmDetailConstants.java | 3 +
.../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 | 42 +-
.../org/apache/cloudstack/api/ApiConstants.java | 9 +
.../cloudstack/api/BaseAsyncCreateCustomIdCmd.java | 2 +-
.../cloudstack/api/BaseAsyncCustomIdCmd.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 | 26 +-
.../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 | 13 +-
.../command/admin/autoscale/DeleteCounterCmd.java | 4 +-
.../admin/backup/ImportBackupOfferingCmd.java | 4 +-
.../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 | 10 +-
.../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 | 16 +-
.../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 | 4 +-
.../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 | 20 +-
.../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 | 2 +-
.../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 +-
.../admin/network/DeleteNetworkOfferingCmd.java | 2 +-
.../network/DeleteNetworkServiceProviderCmd.java | 2 +-
.../admin/network/DeletePhysicalNetworkCmd.java | 2 +-
.../network/DeleteStorageNetworkIpRangeCmd.java | 2 +-
.../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 +-
.../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 | 28 +-
.../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 | 10 +-
.../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 | 2 +-
.../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 | 41 +-
.../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 | 38 +-
.../api/command/admin/vm/ImportVmCmd.java | 20 +
...ForImportCmd.java => ListImportVMTasksCmd.java} | 84 +-
.../admin/vm/ListUnmanagedInstancesCmd.java | 6 +-
.../api/command/admin/vm/ListVMsCmdByAdmin.java | 10 +-
.../api/command/admin/vm/MigrateVMCmd.java | 26 +-
.../vm/MigrateVirtualMachineWithVolumeCmd.java | 16 +-
.../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 | 43 +-
.../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 | 20 +-
.../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 | 2 +-
.../user/autoscale/DeleteAutoScaleVmGroupCmd.java | 12 +-
.../autoscale/DeleteAutoScaleVmProfileCmd.java | 12 +-
.../command/user/autoscale/DeleteConditionCmd.java | 4 +-
.../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 | 8 +-
.../user/backup/CreateBackupScheduleCmd.java | 13 +-
.../api/command/user/backup/DeleteBackupCmd.java | 8 +-
.../user/backup/DeleteBackupScheduleCmd.java | 4 +-
.../command/user/backup/ListBackupScheduleCmd.java | 33 +-
.../api/command/user/backup/ListBackupsCmd.java | 8 +-
.../RemoveVirtualMachineFromBackupOfferingCmd.java | 10 +-
.../api/command/user/backup/RestoreBackupCmd.java | 6 +-
.../RestoreVolumeFromBackupAndAttachToVMCmd.java | 10 +-
.../user/backup/UpdateBackupScheduleCmd.java | 2 +-
.../backup/repository/AddBackupRepositoryCmd.java | 3 +-
.../command/user/config/ListCapabilitiesCmd.java | 1 +
.../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 | 20 +-
.../user/firewall/CreateFirewallRuleCmd.java | 20 +-
.../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 | 37 +-
.../command/user/iso/ListIsoPermissionsCmd.java | 2 +-
.../api/command/user/iso/ListIsosCmd.java | 34 +-
.../api/command/user/iso/RegisterIsoCmd.java | 30 +-
.../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 | 8 +-
.../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 | 16 +-
.../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 | 12 +-
.../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 | 49 +-
.../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 +-
.../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 | 15 +-
.../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 | 44 +-
.../command/user/template/DeleteTemplateCmd.java | 12 +-
.../command/user/template/ExtractTemplateCmd.java | 14 +-
.../template/GetUploadParamsForTemplateCmd.java | 36 +-
.../user/template/ListTemplatePermissionsCmd.java | 2 +-
.../command/user/template/ListTemplatesCmd.java | 36 +-
.../command/user/template/RegisterTemplateCmd.java | 60 +-
.../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/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 | 10 +-
.../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 | 7 +-
.../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 | 36 +-
.../command/user/vpn/CreateRemoteAccessVpnCmd.java | 20 +-
.../command/user/vpn/CreateVpnConnectionCmd.java | 16 +-
.../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 | 22 +-
.../api/response/BackupProviderResponse.java | 4 +-
.../api/response/BackupRepositoryResponse.java | 12 +
.../cloudstack/api/response/BackupResponse.java | 44 +-
.../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 | 54 +-
.../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 | 12 +-
.../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/ImportVMTaskResponse.java | 257 ++
.../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 | 22 +-
.../cloudstack/api/response/SnapshotResponse.java | 40 +-
.../api/response/SnapshotScheduleResponse.java | 8 +-
.../cloudstack/api/response/SslCertResponse.java | 18 +-
.../api/response/StaticRouteResponse.java | 18 +-
.../cloudstack/api/response/StatsResponse.java | 28 +-
.../response/StorageNetworkIpRangeResponse.java | 18 +-
.../api/response/StoragePoolResponse.java | 61 +-
.../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 | 16 +-
.../response/UnmanagedInstanceDiskResponse.java | 22 +-
.../api/response/UnmanagedInstanceResponse.java | 26 +-
.../response/UpgradeRouterTemplateResponse.java | 17 -
.../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 | 164 +-
.../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 +-
.../apache/cloudstack/backup/BackupManager.java | 5 +-
.../cloudstack/backup/BackupRepositoryService.java | 1 -
.../apache/cloudstack/backup/BackupSchedule.java | 3 +-
.../cloudstack/cluster/ClusterDrsAlgorithm.java | 198 +-
.../cloudstack/config/ApiServiceConfiguration.java | 19 +
.../org/apache/cloudstack/query/QueryService.java | 4 +-
.../cloudstack/userdata/UserDataManager.java | 12 +
.../ClusterDrsPlan.java => vm/ImportVmTask.java} | 37 +-
.../apache/cloudstack/vm/ImportVmTasksManager.java | 38 +
.../apache/cloudstack/vm/UnmanageVMService.java | 7 +-
.../com/cloud/agent/api/storage/OVFHelperTest.java | 14 +-
.../test/java/com/cloud/network/NetworksTest.java | 18 +
.../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 | 2 +-
.../test/UpdateAutoScaleVmProfileCmdTest.java | 2 +-
.../api/command/test/UpdateVmNicIpTest.java | 2 +-
.../user/backup/ListBackupScheduleCmdTest.java | 98 +
.../user/snapshot/ListSnapshotPoliciesCmdTest.java | 79 +
.../config/ApiServiceConfigurationTest.java | 95 +
client/pom.xml | 2 +-
core/pom.xml | 2 +-
.../cloud/agent/api/ConvertInstanceCommand.java | 17 +-
.../agent/api/ImportConvertedInstanceCommand.java | 9 +-
...ainCommand.java => UnmanageInstanceAnswer.java} | 10 +-
...leCommand.java => UnmanageInstanceCommand.java} | 40 +-
.../virtualnetwork/VirtualRoutingResource.java | 4 +-
.../storage/template/HttpTemplateDownloader.java | 4 +-
.../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 +-
.../cloudstack/backup/RestoreBackupCommand.java | 12 +-
.../cloudstack/backup/TakeBackupCommand.java | 10 +
.../download/DirectTemplateDownloaderImpl.java | 8 +-
.../download/HttpDirectTemplateDownloader.java | 6 +-
.../download/HttpsDirectTemplateDownloader.java | 4 +-
.../download/MetalinkDirectTemplateDownloader.java | 10 +-
.../cloudstack/storage/to/VolumeObjectTO.java | 6 +-
debian/changelog | 10 +-
debian/cloudstack-agent.install | 1 +
debian/cloudstack-agent.postinst | 2 +-
debian/cloudstack-management.install | 1 +
debian/control | 2 +-
debian/rules | 3 +-
developer/pom.xml | 2 +-
engine/api/pom.xml | 2 +-
.../java/com/cloud/vm/VirtualMachineManager.java | 5 +-
.../service/NetworkOrchestrationService.java | 8 +-
.../service/StorageOrchestrationService.java | 6 +
.../service/VolumeOrchestrationService.java | 5 +-
.../engine/subsystem/api/storage/ClusterScope.java | 6 +
.../engine/subsystem/api/storage/HostScope.java | 10 +-
.../api/storage/ObjectInDataStoreStateMachine.java | 9 +-
.../api/storage/PrimaryDataStoreLifeCycle.java | 4 +-
.../engine/subsystem/api/storage/SnapshotInfo.java | 2 +-
.../subsystem/api/storage/TemplateService.java | 2 +
.../engine/subsystem/api/storage/ZoneScope.java | 6 +
engine/components-api/pom.xml | 2 +-
.../main/java/com/cloud/event/UsageEventUtils.java | 12 +
.../java/com/cloud/storage/StorageManager.java | 28 +-
.../java/com/cloud/template/TemplateManager.java | 11 +-
engine/orchestration/pom.xml | 2 +-
.../agent/manager/ClusteredAgentManagerImpl.java | 4 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 227 +-
.../engine/orchestration/DataMigrationUtility.java | 90 +-
.../engine/orchestration/NetworkOrchestrator.java | 98 +-
.../engine/orchestration/StorageOrchestrator.java | 154 +-
.../engine/orchestration/VolumeOrchestrator.java | 23 +-
.../cloud/vm/VirtualMachineManagerImplTest.java | 317 +-
.../orchestration/NetworkOrchestratorTest.java | 2 +-
.../orchestration/VolumeOrchestratorTest.java | 2 +-
engine/pom.xml | 2 +-
engine/schema/pom.xml | 2 +-
.../com/cloud/capacity/dao/CapacityDaoImpl.java | 11 +
.../cloud/dc/dao/DataCenterIpAddressDaoImpl.java | 10 +-
.../dao/DataCenterLinkLocalIpAddressDaoImpl.java | 2 +-
.../main/java/com/cloud/event/UsageEventVO.java | 22 +
.../com/cloud/event/dao/UsageEventDaoImpl.java | 8 +-
.../java/com/cloud/host/dao/HostDetailsDao.java | 2 +
.../com/cloud/host/dao/HostDetailsDaoImpl.java | 23 +-
.../java/com/cloud/network/as/dao/CounterDao.java | 1 +
.../com/cloud/network/as/dao/CounterDaoImpl.java | 16 +
.../java/com/cloud/network/dao/NetworkDao.java | 7 +
.../java/com/cloud/network/dao/NetworkDaoImpl.java | 30 +
.../java/com/cloud/storage/DiskOfferingVO.java | 2 +-
.../java/com/cloud/storage/SnapshotPolicyVO.java | 38 +-
.../java/com/cloud/storage/StoragePoolHostVO.java | 6 +
.../com/cloud/storage/dao/DiskOfferingDao.java | 2 +
.../com/cloud/storage/dao/DiskOfferingDaoImpl.java | 16 +
.../cloud/storage/dao/LaunchPermissionDaoImpl.java | 2 +-
.../com/cloud/storage/dao/VMTemplateDaoImpl.java | 6 +-
.../com/cloud/storage/dao/VMTemplatePoolDao.java | 2 +
.../cloud/storage/dao/VMTemplatePoolDaoImpl.java | 10 +
.../main/java/com/cloud/storage/dao/VolumeDao.java | 2 +
.../java/com/cloud/storage/dao/VolumeDaoImpl.java | 15 +
.../java/com/cloud/upgrade/DatabaseCreator.java | 2 +-
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 113 +-
.../upgrade/SystemVmTemplateRegistration.java | 40 +-
.../java/com/cloud/upgrade/dao/Upgrade218to22.java | 6 +-
.../com/cloud/upgrade/dao/Upgrade222to224.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade304to305.java | 10 +-
.../com/cloud/upgrade/dao/Upgrade410to420.java | 12 +-
.../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/Upgrade42100to42200.java | 73 +
...e42100to42200.java => Upgrade42200to42210.java} | 6 +-
.../main/java/com/cloud/usage/UsageVolumeVO.java | 14 +-
.../com/cloud/usage/dao/UsageBackupDaoImpl.java | 2 +-
.../java/com/cloud/usage/dao/UsageDaoImpl.java | 4 +-
.../com/cloud/usage/dao/UsageStorageDaoImpl.java | 2 +
.../cloud/usage/dao/UsageVMInstanceDaoImpl.java | 4 +-
.../java/com/cloud/usage/dao/UsageVolumeDao.java | 6 +-
.../com/cloud/usage/dao/UsageVolumeDaoImpl.java | 86 +-
.../src/main/java/com/cloud/vm/ImportVMTaskVO.java | 270 ++
.../dao/ImportVMTaskDao.java} | 18 +-
.../java/com/cloud/vm/dao/ImportVMTaskDaoImpl.java | 74 +
.../main/java/com/cloud/vm/dao/UserVmDaoImpl.java | 4 +-
.../main/java/com/cloud/vm/dao/VMInstanceDao.java | 4 +
.../java/com/cloud/vm/dao/VMInstanceDaoImpl.java | 45 +-
.../cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java | 2 +-
.../apache/cloudstack/backup/BackupScheduleVO.java | 38 +-
.../cloudstack/backup/dao/BackupOfferingDao.java | 2 +-
.../backup/dao/BackupOfferingDaoImpl.java | 5 +-
.../storage/datastore/db/PrimaryDataStoreDao.java | 1 +
.../datastore/db/PrimaryDataStoreDaoImpl.java | 17 +
.../spring-engine-schema-core-daos-context.xml | 1 +
..._index.sql => cloud.idempotent_drop_column.sql} | 11 +-
...ey.sql => cloud.idempotent_drop_unique_key.sql} | 11 +-
.../main/resources/META-INF/db/schema-410to420.sql | 2 +-
.../resources/META-INF/db/schema-42010to42100.sql | 8 +-
.../resources/META-INF/db/schema-42100to42200.sql | 53 +
...cleanup.sql => schema-42200to42210-cleanup.sql} | 2 +-
...to41400-cleanup.sql => schema-42200to42210.sql} | 13 +-
.../DatabaseUpgradeCheckerDoUpgradesTest.java | 173 +
.../cloud/upgrade/DatabaseUpgradeCheckerTest.java | 92 +-
.../upgrade/SystemVmTemplateRegistrationTest.java | 4 +-
.../cloud/upgrade/dao/Upgrade42100to42200Test.java | 242 ++
engine/schema/templateConfig.sh | 14 +-
engine/service/pom.xml | 2 +-
engine/storage/cache/pom.xml | 2 +-
.../cache/manager/StorageCacheManagerImpl.java | 2 +-
engine/storage/configdrive/pom.xml | 2 +-
.../storage/configdrive/ConfigDriveBuilder.java | 6 +-
engine/storage/datamotion/pom.xml | 2 +-
.../storage/motion/AncientDataMotionStrategy.java | 101 +-
.../motion/StorageSystemDataMotionStrategy.java | 46 +-
.../motion/AncientDataMotionStrategyTest.java | 200 +
engine/storage/image/pom.xml | 2 +-
.../storage/image/SecondaryStorageServiceImpl.java | 4 +-
.../storage/image/TemplateServiceImpl.java | 195 +-
.../storage/image/TemplateServiceImplTest.java | 102 +
engine/storage/integration-test/pom.xml | 2 +-
.../cloudstack/storage/test/SnapshotTest.java | 2 +-
.../storage/test/SnapshotTestWithFakeData.java | 2 +-
.../apache/cloudstack/storage/test/VolumeTest.java | 2 +-
.../cloudstack/storage/test/VolumeTestVmware.java | 2 +-
engine/storage/object/pom.xml | 2 +-
engine/storage/pom.xml | 2 +-
engine/storage/snapshot/pom.xml | 2 +-
.../storage/snapshot/DefaultSnapshotStrategy.java | 2 +-
.../storage/snapshot/SnapshotServiceImpl.java | 12 +-
.../snapshot/StorageSystemSnapshotStrategy.java | 2 +-
.../vmsnapshot/DefaultVMSnapshotStrategy.java | 35 +-
.../vmsnapshot/ScaleIOVMSnapshotStrategy.java | 44 +-
.../vmsnapshot/StorageVMSnapshotStrategy.java | 36 +-
.../storage/datastore/DataObjectManagerImpl.java | 8 +-
.../datastore/ObjectInDataStoreManagerImpl.java | 16 +-
.../storage/endpoint/DefaultEndPointSelector.java | 8 +-
.../storage/helper/VMSnapshotHelperImpl.java | 6 +-
.../volume/datastore/PrimaryDataStoreHelper.java | 7 +-
engine/storage/volume/pom.xml | 2 +-
.../storage/datastore/PrimaryDataStoreImpl.java | 1 +
.../storage/volume/VolumeDataFactoryImpl.java | 8 +
.../cloudstack/storage/volume/VolumeObject.java | 2 +-
.../storage/volume/VolumeServiceImpl.java | 52 +-
.../storage/volume/VolumeObjectTest.java | 4 +-
engine/userdata/cloud-init/pom.xml | 2 +-
engine/userdata/pom.xml | 2 +-
.../cloudstack/userdata/UserDataManagerImpl.java | 30 +
.../userdata/UserDataManagerImplTest.java | 90 +
extensions/MaaS/maas.py | 263 ++
extensions/Proxmox/proxmox.sh | 10 +-
framework/agent-lb/pom.xml | 2 +-
framework/ca/pom.xml | 2 +-
framework/cluster/pom.xml | 2 +-
.../java/com/cloud/cluster/ClusterManagerImpl.java | 2 +-
framework/config/pom.xml | 2 +-
.../cloudstack/framework/config/ConfigKey.java | 58 +
framework/db/pom.xml | 2 +-
framework/direct-download/pom.xml | 2 +-
framework/events/pom.xml | 2 +-
framework/extensions/pom.xml | 6 +-
.../extensions/api/DeleteExtensionCmd.java | 3 +-
.../extensions/api/UpdateExtensionCmd.java | 2 +-
.../extensions/manager/ExtensionsManagerImpl.java | 37 +-
.../manager/ExtensionsManagerImplTest.java | 33 +
framework/ipc/pom.xml | 2 +-
framework/jobs/pom.xml | 2 +-
framework/managed-context/pom.xml | 2 +-
framework/pom.xml | 2 +-
framework/quota/pom.xml | 2 +-
.../apache/cloudstack/quota/QuotaManagerImpl.java | 4 +-
.../cloudstack/quota/QuotaManagerImplTest.java | 5 +-
framework/rest/pom.xml | 2 +-
framework/security/pom.xml | 2 +-
framework/spring/lifecycle/pom.xml | 2 +-
framework/spring/module/pom.xml | 2 +-
packaging/README.md | 19 +
packaging/debian/replace.properties | 5 +
packaging/el8/cloud.spec | 16 +-
packaging/el8/replace.properties | 5 +
plugins/acl/dynamic-role-based/pom.xml | 2 +-
plugins/acl/project-role-based/pom.xml | 2 +-
plugins/acl/static-role-based/pom.xml | 2 +-
.../explicit-dedication/pom.xml | 2 +-
.../host-affinity/pom.xml | 2 +-
.../host-anti-affinity/pom.xml | 2 +-
.../non-strict-host-affinity/pom.xml | 2 +-
.../non-strict-host-anti-affinity/pom.xml | 2 +-
plugins/alert-handlers/snmp-alerts/pom.xml | 2 +-
plugins/alert-handlers/syslog-alerts/pom.xml | 2 +-
plugins/api/discovery/pom.xml | 2 +-
.../api/command/user/discovery/ListApisCmd.java | 2 +-
.../api/response/ApiDiscoveryResponse.java | 16 +-
.../api/response/ApiParameterResponse.java | 14 +-
.../api/response/ApiResponseResponse.java | 8 +-
plugins/api/rate-limit/pom.xml | 2 +-
.../command/admin/ratelimit/ResetApiLimitCmd.java | 2 +-
.../cloudstack/api/response/ApiLimitResponse.java | 10 +-
.../ratelimit/integration/LoginResponse.java | 18 +-
plugins/api/solidfire-intg-test/pom.xml | 2 +-
plugins/api/vmware-sioc/pom.xml | 2 +-
plugins/backup/dummy/pom.xml | 2 +-
plugins/backup/nas/pom.xml | 2 +-
.../cloudstack/backup/NASBackupProvider.java | 64 +-
plugins/backup/networker/pom.xml | 2 +-
plugins/backup/veeam/pom.xml | 2 +-
.../cloudstack/backup/veeam/VeeamClient.java | 47 +-
.../cloudstack/backup/veeam/VeeamClientTest.java | 4 +-
plugins/ca/root-ca/pom.xml | 2 +-
plugins/database/mysql-ha/pom.xml | 2 +-
plugins/database/quota/pom.xml | 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/QuotaResponseBuilderImpl.java | 19 +-
.../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 +-
.../org/apache/cloudstack/quota/QuotaService.java | 12 +-
.../apache/cloudstack/quota/QuotaServiceImpl.java | 9 +
plugins/dedicated-resources/pom.xml | 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 +-
.../implicit-dedication/pom.xml | 2 +-
.../user-concentrated-pod/pom.xml | 2 +-
.../deployment-planners/user-dispersing/pom.xml | 2 +-
plugins/drs/cluster/balanced/pom.xml | 2 +-
.../org/apache/cloudstack/cluster/Balanced.java | 25 +-
.../apache/cloudstack/cluster/BalancedTest.java | 61 +-
plugins/drs/cluster/condensed/pom.xml | 2 +-
.../org/apache/cloudstack/cluster/Condensed.java | 26 +-
.../apache/cloudstack/cluster/CondensedTest.java | 61 +-
plugins/event-bus/inmemory/pom.xml | 2 +-
plugins/event-bus/kafka/pom.xml | 2 +-
plugins/event-bus/rabbitmq/pom.xml | 2 +-
plugins/event-bus/webhook/pom.xml | 2 +-
plugins/ha-planners/skip-heurestics/pom.xml | 2 +-
plugins/host-allocators/random/pom.xml | 2 +-
plugins/hypervisors/baremetal/pom.xml | 2 +-
.../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 +-
plugins/hypervisors/external/pom.xml | 2 +-
.../ExternalPathPayloadProvisioner.java | 6 +-
.../HypervResourceController1Test.cs | 700 ++--
.../HypervResourceControllerTest.cs | 2294 +++++------
.../ROOT.virtualization.v2.Msvm_ComputerSystem.cs | 3636 ++++++++---------
.../ROOT.virtualization.v2.Msvm_ConcreteJob.cs | 3686 ++++++++---------
...on.v2.Msvm_EthernetPortAllocationSettingData.cs | 2328 +++++------
...OT.virtualization.v2.Msvm_EthernetSwitchPort.cs | 4238 ++++++++++----------
...on.v2.Msvm_EthernetSwitchPortVlanSettingData.cs | 2044 +++++-----
....virtualization.v2.Msvm_ExternalEthernetPort.cs | 4174 +++++++++----------
...irtualization.v2.Msvm_ImageManagementService.cs | 3050 +++++++-------
....virtualization.v2.Msvm_KvpExchangeComponent.cs | 3230 +++++++--------
...tion.v2.Msvm_KvpExchangeComponentSettingData.cs | 2070 +++++-----
...T.virtualization.v2.Msvm_KvpExchangeDataItem.cs | 1340 +++----
.../ROOT.virtualization.v2.Msvm_LANEndpoint.cs | 2844 ++++++-------
...OOT.virtualization.v2.Msvm_MemorySettingData.cs | 2326 +++++------
....virtualization.v2.Msvm_ProcessorSettingData.cs | 2268 +++++------
...zation.v2.Msvm_ResourceAllocationSettingData.cs | 2020 +++++-----
...ization.v2.Msvm_StorageAllocationSettingData.cs | 2428 +++++------
...OT.virtualization.v2.Msvm_SummaryInformation.cs | 3074 +++++++-------
...ion.v2.Msvm_SyntheticEthernetPortSettingData.cs | 2130 +++++-----
...virtualization.v2.Msvm_VirtualEthernetSwitch.cs | 2772 ++++++-------
....Msvm_VirtualEthernetSwitchManagementService.cs | 3030 +++++++-------
...alization.v2.Msvm_VirtualHardDiskSettingData.cs | 2102 +++++-----
...ation.v2.Msvm_VirtualSystemManagementService.cs | 3832 +++++++++---------
...vm_VirtualSystemManagementServiceSettingData.cs | 1618 ++++----
...tualization.v2.Msvm_VirtualSystemSettingData.cs | 3314 +++++++--------
plugins/hypervisors/hyperv/pom.xml | 2 +-
.../resource/HypervDirectConnectResource.java | 20 +-
.../motion/HypervStorageMotionStrategy.java | 1 +
plugins/hypervisors/kvm/pom.xml | 11 +-
.../kvm/resource/LibvirtComputingResource.java | 107 +-
.../hypervisor/kvm/resource/LibvirtVMDef.java | 10 +-
.../LibvirtBackupSnapshotCommandWrapper.java | 2 +-
.../LibvirtConvertInstanceCommandWrapper.java | 73 +-
.../LibvirtCreateVMSnapshotCommandWrapper.java | 6 +-
.../LibvirtDeleteVMSnapshotCommandWrapper.java | 12 +-
.../LibvirtHandleConfigDriveCommandWrapper.java | 2 +-
...bvirtImportConvertedInstanceCommandWrapper.java | 16 +-
.../wrapper/LibvirtMigrateCommandWrapper.java | 13 +-
.../LibvirtMigrateVolumeCommandWrapper.java | 9 +-
.../LibvirtPrepareForMigrationCommandWrapper.java | 4 +
.../LibvirtRestoreBackupCommandWrapper.java | 142 +-
.../LibvirtRestoreVMSnapshotCommandWrapper.java | 6 +-
.../LibvirtRevertToVMSnapshotCommandWrapper.java | 4 +-
.../wrapper/LibvirtTakeBackupCommandWrapper.java | 26 +-
.../LibvirtUnmanageInstanceCommandWrapper.java | 174 +
.../kvm/storage/KVMStoragePoolManager.java | 4 +-
.../kvm/storage/KVMStorageProcessor.java | 69 +-
.../kvm/storage/LibvirtStorageAdaptor.java | 43 +-
.../kvm/storage/MultipathSCSIAdapterBase.java | 18 -
.../kvm/storage/ScaleIOStorageAdaptor.java | 23 +-
.../org/apache/cloudstack/utils/qemu/QemuImg.java | 91 +-
.../kvm/resource/LibvirtComputingResourceTest.java | 66 +-
.../kvm/resource/LibvirtDomainXMLParserTest.java | 4 +-
.../hypervisor/kvm/resource/LibvirtVMDefTest.java | 15 +
.../LibvirtConvertInstanceCommandWrapperTest.java | 23 +-
.../LibvirtMigrateVolumeCommandWrapperTest.java | 2 +-
.../LibvirtRestoreBackupCommandWrapperTest.java | 27 +
.../LibvirtUnmanageInstanceCommandWrapperTest.java | 357 ++
.../apache/cloudstack/utils/qemu/QemuImgTest.java | 207 +-
plugins/hypervisors/ovm/pom.xml | 2 +-
plugins/hypervisors/ovm3/pom.xml | 2 +-
.../com/cloud/hypervisor/ovm3/objects/Network.java | 2 +-
.../com/cloud/hypervisor/ovm3/objects/Xen.java | 2 +-
.../ovm3/resources/helpers/Ovm3StoragePool.java | 6 +-
plugins/hypervisors/simulator/pom.xml | 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 +-
.../cloud/resource/SimulatorStorageProcessor.java | 6 +-
plugins/hypervisors/ucs/pom.xml | 2 +-
.../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 +-
plugins/hypervisors/vmware/pom.xml | 2 +-
.../api/commands/DisableCiscoNexusVSMCmd.java | 2 +-
.../cloud/api/response/CiscoNexusVSMResponse.java | 18 +-
.../java/com/cloud/hypervisor/guru/VMwareGuru.java | 35 +-
.../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 | 25 +-
.../java/com/cloud/network/VmwareTrafficLabel.java | 2 +-
.../motion/VmwareStorageMotionStrategy.java | 1 +
.../com/cloud/hypervisor/guru/VMwareGuruTest.java | 21 +
.../motion/VmwareStorageMotionStrategyTest.java | 4 +-
plugins/hypervisors/xenserver/pom.xml | 2 +-
.../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 +-
plugins/integrations/cloudian/pom.xml | 2 +-
.../cloudstack/cloudian/CloudianConnectorImpl.java | 8 +-
.../cloudian/response/CloudianEnabledResponse.java | 4 +-
.../response/CloudianSsoLoginResponse.java | 2 +-
.../cloudian/client/CloudianClientTest.java | 34 +-
plugins/integrations/kubernetes-service/pom.xml | 2 +-
.../cluster/KubernetesClusterManagerImpl.java | 116 +-
.../cluster/KubernetesClusterService.java | 2 +-
.../kubernetes/cluster/KubernetesClusterVO.java | 11 +
.../KubernetesClusterActionWorker.java | 49 +-
.../KubernetesClusterDestroyWorker.java | 3 +
...ernetesClusterResourceModifierActionWorker.java | 65 +-
.../KubernetesClusterScaleWorker.java | 28 +-
.../KubernetesClusterStartWorker.java | 11 +-
.../version/KubernetesVersionManagerImpl.java | 96 +-
.../version/KubernetesVersionService.java | 3 +
.../version/AddKubernetesSupportedVersionCmd.java | 14 +-
.../DeleteKubernetesSupportedVersionCmd.java | 2 +-
...oadParamsForKubernetesSupportedVersionCmd.java} | 72 +-
.../UpdateKubernetesSupportedVersionCmd.java | 4 +-
.../AddVirtualMachinesToKubernetesClusterCmd.java | 4 +-
.../cluster/CreateKubernetesClusterCmd.java | 39 +-
.../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 | 8 +-
.../response/KubernetesClusterConfigResponse.java | 4 +-
.../api/response/KubernetesClusterResponse.java | 78 +-
.../KubernetesSupportedVersionResponse.java | 24 +-
...rtualMachinesFromKubernetesClusterResponse.java | 2 +-
.../src/main/resources/conf/k8s-control-node.yml | 5 +
.../script/delete-pv-reclaimpolicy-delete | 156 +
.../src/main/resources/script/deploy-csi-driver | 46 +
.../cluster/KubernetesClusterManagerImplTest.java | 4 +-
.../KubernetesClusterScaleWorkerTest.java | 66 +-
plugins/integrations/prometheus/pom.xml | 2 +-
plugins/maintenance/pom.xml | 2 +-
.../api/command/BaseMSMaintenanceActionCmd.java | 2 +-
plugins/metrics/pom.xml | 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 | 108 +-
.../response/ClusterMetricsResponse.java | 36 +-
.../cloudstack/response/DbMetricsResponse.java | 20 +-
.../cloudstack/response/HostMetricsResponse.java | 36 +-
.../response/InfrastructureResponse.java | 8 +
.../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 +-
.../cloudstack/metrics/MetricsServiceImplTest.java | 163 +-
plugins/network-elements/bigswitch/pom.xml | 2 +-
.../api/commands/AddBigSwitchBcfDeviceCmd.java | 8 +-
.../api/commands/ListBigSwitchBcfDevicesCmd.java | 4 +-
.../api/response/BigSwitchBcfDeviceResponse.java | 14 +-
plugins/network-elements/brocade-vcs/pom.xml | 2 +-
.../cloud/api/commands/AddBrocadeVcsDeviceCmd.java | 4 +-
.../commands/ListBrocadeVcsDeviceNetworksCmd.java | 4 +-
.../api/commands/ListBrocadeVcsDevicesCmd.java | 2 +-
.../api/response/BrocadeVcsDeviceResponse.java | 10 +-
plugins/network-elements/cisco-vnmc/pom.xml | 2 +-
.../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 +-
plugins/network-elements/dns-notifier/pom.xml | 2 +-
.../network-elements/elastic-loadbalancer/pom.xml | 2 +-
.../network/lb/ElasticLoadBalancerManagerImpl.java | 48 +-
.../cloud/network/lb/LoadBalanceRuleHandler.java | 22 +-
plugins/network-elements/globodns/pom.xml | 2 +-
.../cloudstack/api/AddGloboDnsHostCmd.java | 2 +-
.../cloudstack/resource/GloboDnsResource.java | 8 +-
.../network-elements/internal-loadbalancer/pom.xml | 2 +-
.../element/InternalLoadBalancerElement.java | 24 +-
.../lb/InternalLoadBalancerVMManagerImpl.java | 85 +-
.../internallbvmmgr/LbChildTestConfiguration.java | 6 +
plugins/network-elements/juniper-contrail/pom.xml | 2 +-
.../api/response/ServiceInstanceResponse.java | 18 +-
.../contrail/management/ContrailElementImpl.java | 4 +-
.../network/contrail/management/ContrailGuru.java | 2 +-
.../contrail/management/ServerDBSyncImpl.java | 4 +-
.../contrail/management/MockAccountManager.java | 4 +-
plugins/network-elements/netris/pom.xml | 2 +-
plugins/network-elements/netscaler/pom.xml | 2 +-
.../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 +-
plugins/network-elements/nicira-nvp/pom.xml | 2 +-
.../cloud/api/commands/AddNiciraNvpDeviceCmd.java | 2 +-
.../commands/ListNiciraNvpDeviceNetworksCmd.java | 2 +-
.../api/commands/ListNiciraNvpDevicesCmd.java | 2 +-
.../api/response/NiciraNvpDeviceResponse.java | 16 +-
plugins/network-elements/nsx/pom.xml | 2 +-
plugins/network-elements/opendaylight/pom.xml | 2 +-
.../api/commands/AddOpenDaylightControllerCmd.java | 2 +-
.../commands/ListOpenDaylightControllersCmd.java | 4 +-
.../responses/OpenDaylightControllerResponse.java | 10 +-
plugins/network-elements/ovs/pom.xml | 2 +-
plugins/network-elements/palo-alto/pom.xml | 2 +-
.../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 +-
plugins/network-elements/stratosphere-ssp/pom.xml | 2 +-
.../apache/cloudstack/api/commands/AddSspCmd.java | 12 +-
.../cloudstack/api/commands/DeleteSspCmd.java | 2 +-
.../cloudstack/api/response/SspResponse.java | 8 +-
plugins/network-elements/tungsten/pom.xml | 2 +-
...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 +-
plugins/network-elements/vxlan/pom.xml | 2 +-
.../outofbandmanagement-drivers/ipmitool/pom.xml | 2 +-
.../nested-cloudstack/pom.xml | 2 +-
.../outofbandmanagement-drivers/redfish/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/storage-allocators/random/pom.xml | 2 +-
plugins/storage/image/default/pom.xml | 2 +-
plugins/storage/image/s3/pom.xml | 2 +-
plugins/storage/image/sample/pom.xml | 2 +-
plugins/storage/image/swift/pom.xml | 2 +-
plugins/storage/object/ceph/pom.xml | 2 +-
plugins/storage/object/cloudian/README.md | 19 +
plugins/storage/object/cloudian/pom.xml | 2 +-
plugins/storage/object/minio/pom.xml | 2 +-
plugins/storage/object/simulator/pom.xml | 2 +-
plugins/storage/sharedfs/storagevm/pom.xml | 2 +-
plugins/storage/volume/adaptive/README.md | 19 +
plugins/storage/volume/adaptive/pom.xml | 2 +-
.../adapter/ProviderAdapterDiskOffering.java | 8 +-
.../driver/AdaptiveDataStoreDriverImpl.java | 1 +
plugins/storage/volume/cloudbyte/pom.xml | 2 +-
.../driver/ElastistorPrimaryDataStoreDriver.java | 2 +-
.../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 +-
plugins/storage/volume/datera/pom.xml | 2 +-
plugins/storage/volume/default/pom.xml | 2 +-
.../CloudStackPrimaryDataStoreDriverImpl.java | 9 +-
.../CloudStackPrimaryDataStoreLifeCycleImpl.java | 40 +-
plugins/storage/volume/flasharray/pom.xml | 2 +-
plugins/storage/volume/linstor/CHANGELOG.md | 40 +-
plugins/storage/volume/linstor/pom.xml | 2 +-
.../LinstorRevertBackupSnapshotCommandWrapper.java | 22 +-
.../kvm/storage/LinstorStorageAdaptor.java | 48 +-
.../driver/LinstorPrimaryDataStoreDriverImpl.java | 1 +
.../storage/datastore/util/LinstorUtil.java | 69 +-
plugins/storage/volume/nexenta/pom.xml | 2 +-
plugins/storage/volume/primera/pom.xml | 2 +-
plugins/storage/volume/sample/pom.xml | 2 +-
plugins/storage/volume/scaleio/pom.xml | 2 +-
.../datastore/client/ScaleIOGatewayClientImpl.java | 8 +-
.../driver/ScaleIOPrimaryDataStoreDriver.java | 10 +-
.../datastore/manager/ScaleIOSDCManager.java | 2 +-
.../datastore/manager/ScaleIOSDCManagerImpl.java | 9 -
plugins/storage/volume/solidfire/pom.xml | 2 +-
.../driver/SolidFirePrimaryDataStoreDriver.java | 8 +-
.../SolidFirePrimaryDataStoreLifeCycle.java | 4 +-
.../storage/datastore/util/SolidFireUtil.java | 2 +-
plugins/storage/volume/storpool/README.md | 21 +-
plugins/storage/volume/storpool/pom.xml | 2 +-
.../kvm/storage/StorPoolStorageAdaptor.java | 22 +-
.../datastore/driver/StorPoolStatsCollector.java | 4 +-
.../storage/motion/StorPoolDataMotionStrategy.java | 5 +-
.../storage/snapshot/StorPoolSnapshotStrategy.java | 4 +-
.../snapshot/StorPoolVMSnapshotStrategy.java | 32 +-
plugins/user-authenticators/ldap/pom.xml | 2 +-
.../api/command/LdapAddConfigurationCmd.java | 2 +-
.../api/command/LdapCreateAccountCmd.java | 2 +-
.../api/command/LdapDeleteConfigurationCmd.java | 4 +-
.../cloudstack/api/command/LdapImportUsersCmd.java | 2 +-
.../api/command/LdapListConfigurationCmd.java | 2 +-
.../cloudstack/api/command/LdapListUsersCmd.java | 2 +-
.../cloudstack/api/command/LdapUserSearchCmd.java | 2 +-
.../api/command/LinkAccountToLdapCmd.java | 10 +-
.../api/command/LinkDomainToLdapCmd.java | 10 +-
.../api/response/LdapConfigurationResponse.java | 6 +-
.../api/response/LinkAccountToLdapResponse.java | 8 +-
.../api/response/LinkDomainToLdapResponse.java | 10 +-
.../cloudstack/ldap/ADLdapUserManagerImpl.java | 18 +-
.../cloudstack/ldap/OpenLdapUserManagerImpl.java | 139 +-
.../cloudstack/ldap/ADLdapUserManagerImplTest.java | 5 +-
plugins/user-authenticators/md5/pom.xml | 2 +-
plugins/user-authenticators/oauth2/pom.xml | 2 +-
plugins/user-authenticators/pbkdf2/pom.xml | 2 +-
plugins/user-authenticators/plain-text/pom.xml | 2 +-
plugins/user-authenticators/saml2/pom.xml | 2 +-
.../api/response/SamlAuthorizationResponse.java | 6 +-
plugins/user-authenticators/sha256salted/pom.xml | 2 +-
.../static-pin/pom.xml | 2 +-
.../user-two-factor-authenticators/totp/pom.xml | 2 +-
.../auth/TotpUserTwoFactorAuthenticator.java | 2 +-
pom.xml | 21 +-
python/lib/cloudutils/configFileOps.py | 8 +-
python/lib/cloudutils/networkConfig.py | 13 +-
python/lib/cloudutils/utilities.py | 2 +-
quickcloud/pom.xml | 2 +-
scripts/installer/createtmplt.sh | 2 +
scripts/installer/createvolume.sh | 2 +
scripts/storage/qcow2/createtmplt.sh | 2 +
scripts/storage/qcow2/createvolume.sh | 2 +
scripts/storage/secondary/createtmplt.sh | 4 +
scripts/storage/secondary/createvolume.sh | 4 +
scripts/util/create-kubernetes-binaries-iso.sh | 9 +
scripts/vm/hypervisor/kvm/nasbackup.sh | 9 +-
scripts/vm/network/security_group.py | 2 +-
server/pom.xml | 4 +-
.../src/main/java/com/cloud/acl/DomainChecker.java | 2 +-
server/src/main/java/com/cloud/api/ApiDBUtils.java | 12 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 117 +-
server/src/main/java/com/cloud/api/ApiServer.java | 28 +-
.../auth/SetupUserTwoFactorAuthenticationCmd.java | 4 +-
...ValidateUserTwoFactorAuthenticationCodeCmd.java | 2 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 5 +-
.../cloud/api/query/dao/AccountJoinDaoImpl.java | 5 +-
.../cloud/api/query/dao/AsyncJobJoinDaoImpl.java | 5 +-
.../com/cloud/api/query/dao/DomainJoinDaoImpl.java | 5 +-
.../api/query/dao/DomainRouterJoinDaoImpl.java | 4 -
.../api/query/dao/ProjectAccountJoinDaoImpl.java | 3 +-
.../query/dao/ProjectInvitationJoinDaoImpl.java | 3 +-
.../api/query/dao/ResourceTagJoinDaoImpl.java | 4 -
.../api/query/dao/StoragePoolJoinDaoImpl.java | 5 +
.../cloud/api/query/dao/TemplateJoinDaoImpl.java | 15 -
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 10 +-
.../main/java/com/cloud/configuration/Config.java | 21 +-
.../configuration/ConfigurationManagerImpl.java | 102 +-
.../cloud/consoleproxy/ConsoleProxyManager.java | 6 +
.../consoleproxy/ConsoleProxyManagerImpl.java | 33 +-
.../com/cloud/ha/HighAvailabilityManagerImpl.java | 6 +-
.../main/java/com/cloud/hypervisor/KVMGuru.java | 9 +-
.../kvm/discoverer/LibvirtServerDiscoverer.java | 8 +-
.../java/com/cloud/network/NetworkModelImpl.java | 2 +-
.../java/com/cloud/network/NetworkServiceImpl.java | 136 +-
.../com/cloud/network/as/AutoScaleManagerImpl.java | 20 +-
.../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/CommandSetupHelper.java | 5 +-
.../cloud/network/router/NetworkHelperImpl.java | 24 +-
.../router/VirtualNetworkApplianceManager.java | 6 +
.../router/VirtualNetworkApplianceManagerImpl.java | 19 +-
.../VpcVirtualNetworkApplianceManagerImpl.java | 2 +-
.../network/security/SecurityGroupManagerImpl.java | 8 +-
.../security/SecurityGroupManagerImpl2.java | 6 +-
.../cloud/network/vpc/NetworkACLServiceImpl.java | 3 +
.../com/cloud/resource/ResourceManagerImpl.java | 58 +-
.../com/cloud/server/ManagementServerImpl.java | 407 +-
.../api/response/BaremetalTemplateResponse.java | 2 +-
.../java/com/cloud/storage/StorageManagerImpl.java | 38 +-
.../cloud/storage/StoragePoolAutomationImpl.java | 506 ++-
.../com/cloud/storage/VolumeApiServiceImpl.java | 44 +-
.../storage/listener/VolumeStateListener.java | 2 +-
.../secondary/SecondaryStorageVmManager.java | 7 +
.../cloud/storage/snapshot/SnapshotManager.java | 5 +-
.../storage/snapshot/SnapshotManagerImpl.java | 81 +-
.../storage/snapshot/SnapshotSchedulerImpl.java | 6 +-
.../com/cloud/tags/ResourceManagerUtilImpl.java | 11 +
.../cloud/template/HypervisorTemplateAdapter.java | 17 +-
.../com/cloud/template/TemplateAdapterBase.java | 36 +-
.../com/cloud/template/TemplateManagerImpl.java | 269 +-
.../main/java/com/cloud/test/DatabaseConfig.java | 2 +-
.../java/com/cloud/user/AccountManagerImpl.java | 21 +-
.../java/com/cloud/user/DomainManagerImpl.java | 25 +-
.../src/main/java/com/cloud/vm/UserVmManager.java | 16 +
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 418 +-
.../cloud/vm/snapshot/VMSnapshotManagerImpl.java | 122 +-
.../cloudstack/backup/BackupManagerImpl.java | 109 +-
.../cloudstack/cluster/ClusterDrsServiceImpl.java | 288 +-
.../command/ReconcileCommandServiceImpl.java | 2 +
.../diagnostics/DiagnosticsServiceImpl.java | 4 +-
.../cloudstack/network/RoutedIpv4ManagerImpl.java | 42 +-
.../volume/VolumeImportUnmanageManagerImpl.java | 2 +-
.../cloudstack/user/UserPasswordResetManager.java | 11 +
.../user/UserPasswordResetManagerImpl.java | 6 +
.../cloudstack/vm/ImportVmTasksManagerImpl.java | 248 ++
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 347 +-
.../spring-server-compute-context.xml | 2 +
.../src/test/java/com/cloud/api/LoginResponse.java | 18 +-
.../ConfigurationManagerImplTest.java | 40 +-
.../java/com/cloud/hypervisor/KVMGuruTest.java | 4 +-
.../cloud/network/DedicateGuestVlanRangesTest.java | 2 +-
.../com/cloud/network/NetworkServiceImplTest.java | 31 +
.../com/cloud/server/ManagementServerImplTest.java | 210 +-
.../cloud/storage/VolumeApiServiceImplTest.java | 8 +-
.../storage/snapshot/SnapshotManagerImplTest.java | 125 +
.../storage/snapshot/SnapshotManagerTest.java | 6 +-
.../com/cloud/user/AccountManagerImplTest.java | 16 +
.../java/com/cloud/vm/UserVmManagerImplTest.java | 201 +-
.../java/com/cloud/vpc/dao/MockNetworkDaoImpl.java | 15 +
.../cloudstack/backup/BackupManagerTest.java | 81 +-
.../cluster/ClusterDrsServiceImplTest.java | 506 ++-
.../network/RoutedIpv4ManagerImplTest.java | 4 +-
.../VolumeImportUnmanageManagerImplTest.java | 2 +-
.../cloudstack/vm/UnmanagedVMsManagerImplTest.java | 236 +-
.../vm/schedule/VMSchedulerImplTest.java | 2 +-
.../src/test/resources/createNetworkOffering.xml | 166 +-
services/console-proxy/pom.xml | 2 +-
services/console-proxy/rdpconsole/pom.xml | 2 +-
services/console-proxy/server/pom.xml | 2 +-
services/pom.xml | 2 +-
services/secondary-storage/controller/pom.xml | 2 +-
.../SecondaryStorageManagerImpl.java | 27 +-
services/secondary-storage/pom.xml | 2 +-
services/secondary-storage/server/pom.xml | 2 +-
.../resource/NfsSecondaryStorageResource.java | 78 +-
.../storage/template/DownloadManagerImpl.java | 12 +-
.../resource/NfsSecondaryStorageResourceTest.java | 2 +-
setup/bindir/cloud-setup-databases.in | 12 +-
systemvm/agent/images/bright-green.png | Bin 3903 -> 352 bytes
systemvm/agent/images/gray-green.png | Bin 3833 -> 264 bytes
systemvm/agent/images/left.png | Bin 3024 -> 321 bytes
systemvm/agent/images/right.png | Bin 3131 -> 413 bytes
systemvm/agent/images/right2.png | Bin 3156 -> 434 bytes
systemvm/agent/images/winlog.png | Bin 2629 -> 2314 bytes
systemvm/agent/noVNC/app/images/alt.png | Bin 335 -> 241 bytes
systemvm/agent/noVNC/app/images/clipboard.png | Bin 220 -> 157 bytes
systemvm/agent/noVNC/app/images/connect.png | Bin 424 -> 304 bytes
systemvm/agent/noVNC/app/images/ctrl.png | Bin 399 -> 263 bytes
systemvm/agent/noVNC/app/images/ctrlaltdel.png | Bin 191 -> 134 bytes
systemvm/agent/noVNC/app/images/disconnect.png | Bin 442 -> 331 bytes
systemvm/agent/noVNC/app/images/drag.png | Bin 336 -> 238 bytes
systemvm/agent/noVNC/app/images/error.png | Bin 348 -> 279 bytes
systemvm/agent/noVNC/app/images/esc.png | Bin 365 -> 267 bytes
systemvm/agent/noVNC/app/images/expander.png | Bin 167 -> 127 bytes
systemvm/agent/noVNC/app/images/fullscreen.png | Bin 280 -> 200 bytes
systemvm/agent/noVNC/app/images/handle.png | Bin 126 -> 93 bytes
systemvm/agent/noVNC/app/images/handle_bg.png | Bin 123 -> 91 bytes
.../agent/noVNC/app/images/icons/novnc-120x120.png | Bin 4028 -> 2771 bytes
.../agent/noVNC/app/images/icons/novnc-144x144.png | Bin 4582 -> 3095 bytes
.../agent/noVNC/app/images/icons/novnc-152x152.png | Bin 5216 -> 3657 bytes
.../agent/noVNC/app/images/icons/novnc-16x16.png | Bin 675 -> 439 bytes
.../agent/noVNC/app/images/icons/novnc-192x192.png | Bin 5787 -> 4024 bytes
.../agent/noVNC/app/images/icons/novnc-24x24.png | Bin 1000 -> 730 bytes
.../agent/noVNC/app/images/icons/novnc-32x32.png | Bin 1064 -> 809 bytes
.../agent/noVNC/app/images/icons/novnc-48x48.png | Bin 1397 -> 1147 bytes
.../agent/noVNC/app/images/icons/novnc-60x60.png | Bin 1932 -> 1608 bytes
.../agent/noVNC/app/images/icons/novnc-64x64.png | Bin 1946 -> 1677 bytes
.../agent/noVNC/app/images/icons/novnc-72x72.png | Bin 2699 -> 1786 bytes
.../agent/noVNC/app/images/icons/novnc-76x76.png | Bin 2874 -> 1982 bytes
.../agent/noVNC/app/images/icons/novnc-96x96.png | Bin 2351 -> 2060 bytes
systemvm/agent/noVNC/app/images/info.png | Bin 448 -> 296 bytes
systemvm/agent/noVNC/app/images/keyboard.png | Bin 308 -> 217 bytes
systemvm/agent/noVNC/app/images/power.png | Bin 421 -> 300 bytes
systemvm/agent/noVNC/app/images/settings.png | Bin 379 -> 241 bytes
systemvm/agent/noVNC/app/images/shift.png | Bin 212 -> 135 bytes
systemvm/agent/noVNC/app/images/tab.png | Bin 190 -> 144 bytes
.../agent/noVNC/app/images/toggleextrakeys.png | Bin 353 -> 238 bytes
systemvm/agent/noVNC/app/images/warning.png | Bin 319 -> 216 bytes
systemvm/agent/noVNC/app/images/windows.png | Bin 219 -> 158 bytes
systemvm/agent/noVNC/vendor/pako/README.md | 19 +
systemvm/debian/opt/cloud/bin/cs/CsAddress.py | 2 +-
systemvm/debian/opt/cloud/bin/cs/CsRoute.py | 2 +-
systemvm/debian/opt/cloud/bin/setup/init.sh | 2 +
systemvm/debian/opt/cloud/bin/setup/postinit.sh | 95 +
systemvm/pom.xml | 2 +-
systemvm/systemvm-agent-descriptor.xml | 1 +
.../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 +-
.../component/test_rootvolume_resize.py | 2 +-
test/integration/plugins/linstor/README.md | 25 +-
test/integration/plugins/scaleio/README.md | 25 +-
test/integration/smoke/test_direct_download.py | 5 +-
test/integration/smoke/test_routers.py | 4 +-
test/integration/smoke/test_ssvm.py | 27 +-
test/integration/smoke/test_systemvm_userdata.py | 410 ++
...py => test_vm_lifecycle_unmanage_kvm_import.py} | 268 +-
test/pom.xml | 2 +-
test/systemvm/README.md | 35 +-
tools/apidoc/gen_toc.py | 3 +-
tools/apidoc/generatetoc_header.xsl | 2 +-
tools/apidoc/images/cloudstack.png | Bin 8575 -> 5300 bytes
tools/apidoc/pom.xml | 2 +-
tools/appliance/README.md | 4 +-
.../systemvmtemplate/scripts/configure_locale.sh | 4 +-
.../scripts/configure_systemvm_services.sh | 4 +-
.../template-base_aarch64-target_aarch64.json | 4 +-
.../template-base_x86_64-target_aarch64.json | 4 +-
.../template-base_x86_64-target_x86_64.json | 4 +-
tools/checkstyle/pom.xml | 2 +-
tools/devcloud-kvm/README.md | 4 +-
tools/devcloud-kvm/pom.xml | 2 +-
tools/devcloud4/README.md | 19 +
tools/devcloud4/advanced/README.md | 19 +
tools/devcloud4/basic/README.md | 19 +
.../devcloud4/common/binary-installation/README.md | 18 +
.../common/development-installation/README.md | 18 +
.../files/default/createtmplt.sh | 4 +
tools/devcloud4/pom.xml | 2 +-
tools/docker/Dockerfile | 2 +-
tools/docker/Dockerfile.marvin | 4 +-
tools/docker/README.md | 19 +
tools/logo/apache_cloudstack.png | Bin 155790 -> 81454 bytes
tools/marvin/marvin/lib/base.py | 5 +-
tools/marvin/marvin/misc/build/CI.md | 29 +-
tools/marvin/pom.xml | 2 +-
tools/marvin/setup.py | 2 +-
.../bootstrap/img/glyphicons-halflings-white.png | Bin 8777 -> 8660 bytes
.../static/bootstrap/img/glyphicons-halflings.png | Bin 12799 -> 12020 bytes
tools/pom.xml | 2 +-
ui/README.md | 19 +
ui/docs/customize.md | 19 +
ui/docs/development.md | 19 +
ui/docs/screenshot-dashboard.png | Bin 377788 -> 205830
bytes
ui/public/assets/403.png | Bin 39320 -> 27688 bytes
ui/public/assets/404.png | Bin 33621 -> 22689 bytes
ui/public/assets/500.png | Bin 28168 -> 20340 bytes
ui/public/assets/bg-what-is-cloudstack.png | Bin 36116 -> 27854 bytes
ui/public/assets/error.png | Bin 24973 -> 18884 bytes
ui/public/assets/success.png | Bin 17274 -> 11590 bytes
ui/public/config.json | 1 +
ui/public/locales/en.json | 45 +-
ui/public/locales/pt_BR.json | 3 +-
ui/src/components/view/BackupMetadata.vue | 22 +-
ui/src/components/view/DateTimeFilter.vue | 43 +-
ui/src/components/view/DeployVMFromBackup.vue | 35 +
ui/src/components/view/DetailsTab.vue | 7 +
.../components/view/ImageDeployInstanceButton.vue | 35 +-
ui/src/components/view/InfoCard.vue | 40 +-
ui/src/components/view/ListView.vue | 86 +-
ui/src/components/view/SearchView.vue | 50 +-
ui/src/components/view/SettingsTab.vue | 3 +-
ui/src/components/view/TestWebhookDeliveryView.vue | 2 +-
ui/src/components/widgets/Console.vue | 44 +-
ui/src/components/widgets/DetailsInput.vue | 4 +-
ui/src/components/widgets/InfiniteScrollSelect.vue | 24 +-
ui/src/config/section/compute.js | 2 +-
ui/src/config/section/config.js | 46 -
ui/src/config/section/image.js | 9 +
ui/src/config/section/infra.js | 2 +
ui/src/config/section/infra/backupRepositories.js | 63 +
ui/src/config/section/storage.js | 90 +
ui/src/store/modules/user.js | 4 +-
ui/src/style/README.md | 19 +
ui/src/utils/request.js | 2 +-
ui/src/utils/util.js | 21 +
ui/src/views/AutogenView.vue | 31 +-
ui/src/views/compute/BackupScheduleWizard.vue | 30 +-
ui/src/views/compute/CreateKubernetesCluster.vue | 10 +
ui/src/views/compute/DeployVM.vue | 26 +-
ui/src/views/compute/EditVM.vue | 25 +-
ui/src/views/compute/backup/BackupSchedule.vue | 3 +-
.../views/compute/backup/CreateBackupSchedule.vue | 183 +
ui/src/views/compute/backup/FormSchedule.vue | 92 +-
.../wizard/DeployInstanceBackupSelection.vue | 4 +-
.../compute/wizard/ZoneBlockRadioGroupSelect.vue | 2 +-
ui/src/views/extension/CreateExtension.vue | 12 +-
ui/src/views/iam/EditAccount.vue | 6 +-
.../views/image/AddKubernetesSupportedVersion.vue | 169 +-
ui/src/views/infra/ClusterAdd.vue | 11 +-
ui/src/views/infra/HostAdd.vue | 456 +--
ui/src/views/infra/HostUpdate.vue | 4 +-
ui/src/views/infra/InfraSummary.vue | 9 +-
ui/src/views/infra/network/IpRangesTabPublic.vue | 26 +-
.../views/infra/network/providers/ProviderItem.vue | 28 +-
.../views/infra/zone/AdvancedGuestTrafficForm.vue | 59 +-
ui/src/views/infra/zone/ZoneWizardAddResources.vue | 2 +-
ui/src/views/infra/zone/ZoneWizardLaunchZone.vue | 4 +-
.../zone/ZoneWizardPhysicalNetworkSetupStep.vue | 2 +-
ui/src/views/network/CreateVpc.vue | 4 +-
ui/src/views/network/IpAddressesTab.vue | 84 +-
ui/src/views/network/LoadBalancing.vue | 35 +-
ui/src/views/network/NicsTab.vue | 65 +-
ui/src/views/network/VpnDetails.vue | 250 +-
ui/src/views/offering/AddComputeOffering.vue | 3 +
ui/src/views/offering/AddDiskOffering.vue | 5 +-
ui/src/views/setting/ConfigurationTable.vue | 6 +-
ui/src/views/setting/ConfigurationValue.vue | 16 +
ui/src/views/storage/CreateVMFromBackup.vue | 33 +-
ui/src/views/storage/FormSchedule.vue | 79 +-
ui/src/views/storage/RecurringSnapshotVolume.vue | 153 +-
ui/src/views/tools/CreateWebhook.vue | 2 +-
ui/src/views/tools/ImportUnmanagedInstance.vue | 75 +-
ui/src/views/tools/ImportVmTasks.vue | 205 +
ui/src/views/tools/ManageInstances.vue | 379 +-
usage/pom.xml | 2 +-
.../java/com/cloud/usage/UsageManagerImpl.java | 251 +-
.../usage/parser/VMSnapshotOnPrimaryParser.java | 4 +-
.../cloud/usage/parser/VMSnapshotUsageParser.java | 2 +-
.../com/cloud/usage/parser/VolumeUsageParser.java | 23 +-
.../java/com/cloud/usage/UsageSanityCheckerIT.java | 8 +-
utils/pom.xml | 2 +-
utils/src/main/java/com/cloud/utils/EnumUtils.java | 2 +-
utils/src/main/java/com/cloud/utils/UriUtils.java | 2 +-
.../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 +-
.../main/java/com/cloud/utils/script/Script.java | 45 +-
.../java/com/cloud/utils/ssh/SSHCmdHelper.java | 8 +-
.../utils/storage/TemplateDownloaderUtil.java | 61 +
.../utils/imagestore/ImageStoreUtil.java | 4 +-
.../utils/jsinterpreter/JsInterpreter.java | 169 +-
.../utils/jsinterpreter/TagAsRuleHelper.java | 7 +-
.../cloudstack/utils/process/ProcessRunner.java | 11 +-
.../cloudstack/utils/security/DigestHelper.java | 20 +-
.../com/cloud/utils/UriUtilsParametrizedTest.java | 2 +-
.../test/java/com/cloud/utils/UriUtilsTest.java | 1 +
.../utils/jsinterpreter/JsInterpreterTest.java | 81 +-
.../utils/process/ProcessRunnerTest.java | 12 +
.../ReflectionToStringBuilderUtilsTest.java | 2 +-
vmware-base/pom.xml | 2 +-
.../hypervisor/vmware/mo/VirtualMachineMO.java | 156 +-
.../hypervisor/vmware/util/VmwareContext.java | 8 +-
1780 files changed, 55211 insertions(+), 43929 deletions(-)
copy LICENSE.header => .github/workflows/license-templates/LICENSE.txt (100%)
create mode 100644 .markdownlintignore
create mode 100644 PRE-COMMIT.md
copy client/conf/environment.properties.in => agent/conf/uefi.properties.in
(75%)
rename
api/src/main/java/org/apache/cloudstack/api/command/admin/user/{RegisterCmd.java
=> RegisterUserKeyCmd.java} (93%)
copy
api/src/main/java/org/apache/cloudstack/api/command/admin/vm/{ListVmsForImportCmd.java
=> ListImportVMTasksCmd.java} (56%)
create mode 100644
api/src/main/java/org/apache/cloudstack/api/response/ImportVMTaskResponse.java
rename
api/src/main/java/org/apache/cloudstack/api/response/{RegisterResponse.java =>
RegisterUserKeyResponse.java} (87%)
copy api/src/main/java/org/apache/cloudstack/{cluster/ClusterDrsPlan.java =>
vm/ImportVmTask.java} (61%)
create mode 100644
api/src/main/java/org/apache/cloudstack/vm/ImportVmTasksManager.java
create mode 100644
api/src/test/java/org/apache/cloudstack/api/command/user/backup/ListBackupScheduleCmdTest.java
create mode 100644
api/src/test/java/org/apache/cloudstack/api/command/user/snapshot/ListSnapshotPoliciesCmdTest.java
create mode 100644
api/src/test/java/org/apache/cloudstack/config/ApiServiceConfigurationTest.java
copy core/src/main/java/com/cloud/agent/api/{MaintainCommand.java =>
UnmanageInstanceAnswer.java} (81%)
copy core/src/main/java/com/cloud/agent/api/{GetExternalConsoleCommand.java =>
UnmanageInstanceCommand.java} (61%)
copy
engine/schema/src/main/java/com/cloud/upgrade/dao/{Upgrade42100to42200.java =>
Upgrade42200to42210.java} (87%)
create mode 100644 engine/schema/src/main/java/com/cloud/vm/ImportVMTaskVO.java
copy engine/schema/src/main/java/com/cloud/{gpu/dao/VgpuProfileDao.java =>
vm/dao/ImportVMTaskDao.java} (67%)
create mode 100644
engine/schema/src/main/java/com/cloud/vm/dao/ImportVMTaskDaoImpl.java
copy
engine/schema/src/main/resources/META-INF/db/procedures/{cloud.idempotent_drop_index.sql
=> cloud.idempotent_drop_column.sql} (70%)
copy
engine/schema/src/main/resources/META-INF/db/procedures/{cloud.idempotent_drop_foreign_key.sql
=> cloud.idempotent_drop_unique_key.sql} (68%)
copy engine/schema/src/main/resources/META-INF/db/{schema-40to410-cleanup.sql
=> schema-42200to42210-cleanup.sql} (93%)
copy
engine/schema/src/main/resources/META-INF/db/{schema-41310to41400-cleanup.sql
=> schema-42200to42210.sql} (57%)
create mode 100644
engine/schema/src/test/java/com/cloud/upgrade/DatabaseUpgradeCheckerDoUpgradesTest.java
create mode 100644
engine/schema/src/test/java/com/cloud/upgrade/dao/Upgrade42100to42200Test.java
create mode 100755 extensions/MaaS/maas.py
create mode 100644
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUnmanageInstanceCommandWrapper.java
create mode 100644
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtUnmanageInstanceCommandWrapperTest.java
copy
plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/admin/kubernetes/version/{AddKubernetesSupportedVersionCmd.java
=> GetUploadParamsForKubernetesSupportedVersionCmd.java} (71%)
create mode 100755
plugins/integrations/kubernetes-service/src/main/resources/script/delete-pv-reclaimpolicy-delete
create mode 100644
plugins/integrations/kubernetes-service/src/main/resources/script/deploy-csi-driver
create mode 100644
server/src/main/java/org/apache/cloudstack/vm/ImportVmTasksManagerImpl.java
create mode 100644 test/integration/smoke/test_systemvm_userdata.py
copy test/integration/smoke/{test_vm_lifecycle_unmanage_import.py =>
test_vm_lifecycle_unmanage_kvm_import.py} (51%)
create mode 100644 ui/src/config/section/infra/backupRepositories.js
create mode 100644 ui/src/views/compute/backup/CreateBackupSchedule.vue
create mode 100644 ui/src/views/tools/ImportVmTasks.vue
create mode 100644
utils/src/main/java/com/cloud/utils/storage/TemplateDownloaderUtil.java
