This is an automated email from the ASF dual-hosted git repository.
DaanHoogland pushed a change to branch fix-ldapconf-list-pagination
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
discard 6f432d1f199 fix ui
discard 6bb9dff72de API: Fix pagination issue with listing LDAP configuration
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 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 b394b5ba74e Fix terms, typos and grammar mistakes in the API, error
messages, events, etc. (#7857)
add 432a3065bc8 api: fix response annotation for createBackupSchedule
(#11950)
add 56a39e6be75 Add 'dataDiskController' VM setting/detail for KVM
hypervisor (#12334)
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 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 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 db1c7d678cc Updated protobuf version to 3.25.5, and protobuf & jackson
maven dependencies (#12389)
add 0e6d2d986b7 ui: prevent calling listConfigurations when not allowed
(#11704)
add c7cfeb5caa1 fix location constraint ceph error (#12285)
add 2b373a46595 [UI] Fix primary storage details display when the uuid has
divergent pattern (#12307)
add 8dcfc7c7678 Linstor fix host picking (#12047)
add 8627c60b951 ui: option to migrate vm with volumes to same pool (#11703)
add 9e86fdf1b67 Fix cloud-sysvmadmin hang (#12355)
add 6a324da27a6 MAC address assignment improvements (#12349)
add 5c1f9315ced Remove transaction from updateCapacityForHost cal (#12421)
add aba3285c3c8 [Usage] Include accounts uuid on the cloud_usage accounts
initial saving (#12420)
add f1f779a08d9 Cleanup snapshot files in datastores for Error-ed
snapshots, and some code improvements (#12347)
add 76e6de7f90e ui: fix form data double fetch/reset form data by
ownership selection (#11705)
add a4b1a27c7d2 ui: fix 404 on login after forgot password (#12448)
add 42f1e19362a Mask vncPasswd being logged in agent.log (#12404)
add 2a6ce0c8a81 Adds url kubernetes iso (#10862)
add 03d24ff851d Fix NPE on primary storage delete (#11817)
add da518e90362 CKS: Add image store validation for Kubernetes version
registration (#12418)
add cf36fb00008 Set nfsVersion in ssvm agent.properties only if it is not
null (#12445)
add 496bc0329cd Fix: Condition for aborting migration, resume paused VMs
on destination (#12331)
add 8db7cab7ba4 Storage pool monitor disconnect improvements (#12398)
add 6e5d78a8a78 Fix NPE on adding new columns in the tables (#12464)
add b5e9178078f UI: fix issues when deploy VNF applicance on network with
SG (#12436)
add cd5bb09d0d1 Fix potential leaks in executePipedCommands (#12478)
add d1eb2822d9d Remove redundant Exceptions from logs for vm schedules
(#12428)
add 6846619a6f1 Fix update network offering domainids size limitation
(#12431)
add 6a9835904cb Fix for zoneids parameters length on updateAPIs (#12440)
add bce3e54a7e4 improve error handling for template upload notifications
(#12412)
add 8db065a14eb limit iso filename to have 251 chars at max (#12430)
add c8cadcb56e5 NPE fix while deleting storage pool when pool has detached
volumes (#12451)
add 4adb7195701 Allow modification of user vm details if
user.vm.readonly.details is empty (#10456)
add 0958dfc1386 Fix: proper permissions for systemvm template
registrations on hardened systems (#12098)
add d010e9fcf29 Notify user if template upgrade is not required (#12483)
add 63bdc2b9903 Add log for null templateVO (#12406)
add 097c3a018ba ConfigDrive: use file absolute path instead of canonical
path to create ISO (#11623)
add 36edd92e480 Fix snapshot physical size after migration (#12166)
add 44793da58f2 fix Sensitive Data Exposure Through Exception Logging in
OVM Hypervis… (#12032)
add bbc23a74683 fix install path for systemvm templates when introducing
new sec storage (#11605)
add 7536516e416 add missing label text for label.aclname (#12511)
add 63c8b5fc562 api/server: support deploy-as-is template as VNF template
(#12499)
add fa3dee886ed do not add disk cache mode from an empty string (#12248)
add 5bb5af4c480 4.20: Fix unit test failure (#12520)
add f73362ae48a Fix saml bug unable to login (#10868)
add ff0cfc9148a Add ability to filter by version for listHosts and
listMgmtServers APIs (#12472)
add fce69fbfe0b VM Power state optimization (#12463)
add 0458c5328bf Consider secondary storage selectors during template
synchronization (#10956)
add b6134418eaf server: do not run dhcp and dns check if VR is not
provider (#12272)
add ca5232778da CKS: Use Zone MTUs when network is created at the time of
CKS cluster creation (#12228)
add af9d68630f7 Initialize template status='Processing' (#11970)
add c0b5358d8eb fix Host Password Exposed in Command-Line Logging (#12016)
add dd0b863e225 sensitive information leak to log (#12018)
add 70d4c9d1baa Consider secondary storage selectors during cold volume
migration (#10957)
add 0dcbe57a478 Fix that Sensitive information logged in
SshHelper.sshExecute method (#12026)
add 6932cacabc1 Allow copy of templates from secondary storages of other
zone when adding a new secondary storage (#12296)
add ff7ec0cd229 Update alert id for VR public and private interface
(#12527)
add 83ce0067b82 Update the snapshot physical size for the primary storage
resource after snapshot creation and during resource count recalculation
(#12481)
add 35e6d7c5ba8 fix that log sensitive infomation in cmd of script (#12024)
add 95de88a8ffe Usage server should takeover immediately if the other
Usage server has been stopped gracefully (#12507)
add 1300fc5e91a Fix keyword parameter filtering in listBackupOfferings API
(#12540)
add 243872a7710 Use infinite scroll select (#11991)
add b7fc7179fca Add batch deletion support to `removeRawUsageRecords`
(#12522)
add 664f76c7e4b Fix KvmSshToAgentEnabled setting description and make it
dynamic (#12533)
add 26b57655ece Deployment plan fixes for VM with last host, and last host
in maintenance (#12062)
add 6ba5e082217 Linstor: support live migration from other primary storage
(#12532)
add 3ba5c2b610f Fix logs mismatch between Network GC wait and interval
(#10776)
add aef3df75771 server: pass network label of physical network when plug
nic for private gateway on hypervisor (#11846)
add 7d52cd0e43a Fix calculation of the next time that Usage will execute
in `removeRawUsageRecords` (#12518)
add 0e94f7d7717 UI: Show applied search filters (#9520)
add a6ccde44c4b kvm: honour disk controller for vm during attach volume
(#12452)
add 45d623ec0d8 Update search filter size dynamically (#12552)
add 25eacaa1ff1 set `displayName` to `name` by default (#9719)
add d0e21a7dba8 UI: Prevent extra API calls in search filter on scrolling
(#12553)
add d98511dddd8 Update physical size for the snapshots of the volumes on
ceph primary storage (#12465)
add 6bed3d4e641 Update storage usage / size in backup usage response
(#12539)
add ce42ce54c2d Fix template details deletion while updating template from
UI (#12559)
add 9ae696d1c82 Preserve VM settings on Instance Snapshot revert for
Custom Service Offering (#12555)
add 349eea501ab Mvn updates (#12575)
add 3d7d412d5be UI: Add comprehensive domain deletion confirmation dialog
(Feature Request #11497) (#12380)
add a0f35a186d8 Fixes issue with loading Capacity dashboard when mulitple
backup providers configured (#12550)
add b45726f7b12 ssvm: delete temp directory while deleting entity download
url (#12562)
add 4de8c2b6f68 Add a Prometheus metric to track host certificate expiry
(#12613)
add b7c970f45f1 Fix issue with multiple KVM Host entries in host table
(#12589)
add 34f6f413a1f Fix injection of preset variables into the JS interpreter
(#12515)
add 18d66595b39 engine/schema: fix cluster/zone settings with encrypted
values (#12626)
add e22f842ed8d Allow limit queries without random ordering (#12598)
add d8230c9598f Usage: Heartbeat should not schedule usage job when a job
is already running (#12616)
add ae5308bdd20 Fix issue when restoring backup after migration of volume
(#12549)
add 8c12a13216e Fix NPE during reset password (#12585)
add 9dd93cef760 Support for custom SSH port for KVM hosts from the host
url on add host and the configuration (#12571)
add 8b38cea33cd Fix NPE while stopping the RabbitMQEventBus bean when
there is no connection established with RabbitMQ Event Bus (#12635)
add 32c0cdbed98 Add volumes in 'Expunging' state to storage cleanup thread
and during delete storage pool (#12602)
add 87c8e746423 Fix github action workflow (#12675)
add da7ac80dc41 prevent user.uuid from being regenerated on each operation
by reading it from the DB (#12632)
add d0543449a66 Changes to the error message displayed during the removal
of public templates that are used (#12373)
add cf71938473b [UI] Allow change password for native users only. (#12584)
add c748b69e70c Fix NPE during public IP listing when a removed network or
VPC ID is informed for associatenetworkid parameter (#12372)
add 744c8afcf15 fix primary storage maintenance on xcpng (#12694)
add 56dc11980f6 test_accounts.py failure fix - keep the camelCase
parameter "domainId" (#12689)
add 89df3181648 [20.3] resource allocation
add 4dd91feb277 [20.3] resource instance limits
add 1593944553f [20.3] Implement/fix limit validation for projects
add 7faa1b650b9 [20.3] resource allocation vpc
add b025e85fc57 Check resource reservation on volume creation
add 0edd577f4bb Fix: KVM Direct Download URL injection
add 3b987f21afb [20.3] handle user's canned policy when a bucket is deleted
add e0ef3a69472 Check resource reservation on volume snapshot creation
add 06ee2fea76d Implement/fix limit validation for secondary storage
add 4bcd509193f Fix resource limit reservation and check during
StartVirtualMachine
add 03dfe4d1f3e secondary storage resource limit for download
add d0f67301579 volume download fix
add 81a8ac8e1ff secondary storage resource limit for upload
add 360b64ce1e3 Consider infinite resources when calculating secondary
storage limit for upload operations
add 0a4b4c6af05 [20.3] Address limit checks for VM, CPU, memory, volume,
and primary storage
add 497266270b9 Cleanup imported VM from disk on failure due to volume
allocation + prevent duplicate volume and primary storage increment on import
add e8f8aca694f Fix failing tests
add dc7068a1351 Address public IP limit validations
add 23b19a9776d review comments
add 61afb4cb782 fix identation
add 7cdcf571fac Fix xcpng test failures (#12812)
add b497f58022c Fix K8s scaling and deletion issue if firewall rule is for
ALL ports (#12806)
add c19630f0a4f Fix snapshot copy resource limit concurrency
add 4b7370a6017 upgrade: skip the upgrade paths which are not needed
(#12881)
add b22dbbe2d7a Fix Revert Instance to Snapshot with custom service
offering (#12885)
add 2416db2a443 Fix NPE on external/unmanaged instance import using custom
offerings (#12884)
add d38c1f8d125 Fix error message while creating local storage pool
(#12767)
add e2497cfc4df backport: default system vm template update implementation
(#12935)
add 6f1aa96b4cd engine/schema: fix new systemvm template is not registered
during upgrade if hypervisor is not KVM (#12952)
add c8599040b47 Updating pom.xml version numbers for release 4.20.3.0
add 8eb162cb996 Updating pom.xml version numbers for release
4.20.4.0-SNAPSHOT
add c6936889f5c server: prevent adding vm compute details when not
applicable (#12637)
add 1fc4cb90bff Routed VR: accept packets from related and established
connections (#12986)
add 9f96c9d5eb9 Flexibilize public IP selection (#11076)
add 08b1d387557 adaptive: honor user-provided capacityBytes when provider
stats are unavailable (#13059)
add a7c2a059f5d Update mysql java connector version to 8.4.0 (matching
version for MySQL 8.4) (#12640)
add c165806d3b8 Fix VPC network offerings listing in isolated network
creation form (#12645)
add c267ad39bcd Fix/flasharray delete rename destroy patch conflict
(#13049)
add ff9ee24d125 Fix local upload from browser failing due to ssvm cert not
trusted (#13204)
add b642bbe38e1 Fix the validation of CPVMs states in multiple zones
(#13021)
add 357186d64d0 flasharray: fall back to array capacity when pod has no
quota (#13050)
add a3970bb1530 Fix convert command's timeout for snapshot commands
(#13210)
add 7bc458ff85e Fix for usage server getting stuck due to duplicate VM
events (#13019)
add d35c1cd3ffe Remove the duplicate configkey json.content.type (#13264)
add 0bbea200626 server: fix NPE when migrate vm away with volumes (#13131)
add b26b70c40d6 Fix public IP range addition form (#13356)
add 4244c2cc102 UI: Allow selecting network for VNF nics if template is a
non deploy-as-is template (#13423)
add 78d9cb5abd6 dynamic vm.network.throttling.rate global configuration
(#12567)
add b36f06482fa fix misleading error message (#13450)
add 2eb9820f3cb framework-jobs,server: fix password obfuscation for job
result and password with display=false (#13388)
add c8b7816d5ee marvin: install mysql-connector-python >= 8.4.0 (#13482)
add a4b102fb3f9 Fix skip DRS for a VM (#12994)
add ec2d3ea1e6d Fix `findHostsForMigration` never returning hosts from
other clusters (#13452)
add e8df87e89be flasharray: authenticate via REST 2.x api-token and
discover API version (#13060)
add 549daae01ff correction in vpc limit assignment (#13627)
add 31c47f028fb API: Fix pagination issue with listing LDAP configuration
add 57f1529e0f8 fix ui
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (6f432d1f199)
\
N -- N -- N refs/heads/fix-ldapconf-list-pagination (57f1529e0f8)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.github/workflows/ci.yml | 2 +-
.github/workflows/merge-conflict-checker.yml | 4 +-
agent/pom.xml | 2 +-
.../consoleproxy/ConsoleProxyResource.java | 6 +-
api/pom.xml | 2 +-
.../com/cloud/agent/api/storage/OVFHelper.java | 18 +-
.../main/java/com/cloud/agent/api/to/BucketTO.java | 7 +
.../commands/ListRecurringSnapshotScheduleCmd.java | 4 +-
api/src/main/java/com/cloud/host/Host.java | 3 +
.../main/java/com/cloud/network/Ipv6Service.java | 2 +-
api/src/main/java/com/cloud/network/Network.java | 6 +-
.../main/java/com/cloud/network/NetworkModel.java | 8 +
.../java/com/cloud/network/NetworkService.java | 6 +-
.../com/cloud/network/as/AutoScaleVmGroup.java | 2 +-
.../java/com/cloud/projects/ProjectService.java | 4 +-
.../storage/VMTemplateStorageResourceAssoc.java | 3 +-
.../java/com/cloud/user/ResourceLimitService.java | 21 +-
.../main/java/com/cloud/vm/VmDetailConstants.java | 3 +
.../java/com/cloud/vm/snapshot/VMSnapshot.java | 4 +-
.../java/org/apache/cloudstack/acl/RoleType.java | 4 +-
.../cloudstack/affinity/AffinityGroupResponse.java | 20 +-
.../affinity/AffinityGroupTypeResponse.java | 2 +-
.../org/apache/cloudstack/alert/AlertService.java | 4 +-
.../cloudstack/api/AbstractGetUploadParamsCmd.java | 14 +-
.../org/apache/cloudstack/api/ApiConstants.java | 1 +
.../apache/cloudstack/api/ApiServerService.java | 2 +
.../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 | 30 +-
.../api/BaseUpdateTemplateOrIsoPermissionsCmd.java | 16 +-
.../command/admin/account/CreateAccountCmd.java | 18 +-
.../command/admin/account/DeleteAccountCmd.java | 6 +-
.../command/admin/account/DisableAccountCmd.java | 10 +-
.../command/admin/account/EnableAccountCmd.java | 6 +-
.../admin/account/ListAccountsCmdByAdmin.java | 2 +-
.../api/command/admin/account/LockAccountCmd.java | 6 +-
.../command/admin/account/UpdateAccountCmd.java | 16 +-
.../api/command/admin/acl/CreateRoleCmd.java | 2 +-
.../api/command/admin/acl/UpdateRoleCmd.java | 2 +-
.../command/admin/acl/UpdateRolePermissionCmd.java | 2 +-
.../admin/acl/project/CreateProjectRoleCmd.java | 2 +-
.../admin/acl/project/UpdateProjectRoleCmd.java | 2 +-
.../project/UpdateProjectRolePermissionCmd.java | 2 +-
.../admin/address/AcquirePodIpCmdByAdmin.java | 2 +-
.../admin/address/AssociateIPAddrCmdByAdmin.java | 2 +-
.../address/ListPublicIpAddressesCmdByAdmin.java | 2 +-
.../admin/address/ReleasePodIpCmdByAdmin.java | 2 +-
.../UpdateVMAffinityGroupCmdByAdmin.java | 2 +-
.../command/admin/annotation/AddAnnotationCmd.java | 10 +-
.../admin/annotation/ListAnnotationsCmd.java | 10 +-
.../admin/annotation/RemoveAnnotationCmd.java | 4 +-
.../annotation/UpdateAnnotationVisibilityCmd.java | 6 +-
.../command/admin/autoscale/CreateCounterCmd.java | 4 +-
.../command/admin/autoscale/DeleteCounterCmd.java | 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 | 19 +-
.../command/admin/host/AddSecondaryStorageCmd.java | 28 +-
.../admin/host/CancelHostAsDegradedCmd.java | 2 +-
.../command/admin/host/CancelMaintenanceCmd.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 | 35 +-
.../admin/host/PrepareForMaintenanceCmd.java | 2 +-
.../api/command/admin/host/ReconnectHostCmd.java | 2 +-
.../admin/host/ReleaseHostReservationCmd.java | 2 +-
.../api/command/admin/host/UpdateHostCmd.java | 8 +-
.../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 | 12 +-
.../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 | 23 +-
.../network/UpdateNetworkServiceProviderCmd.java | 4 +-
.../admin/network/UpdatePhysicalNetworkCmd.java | 8 +-
.../network/UpdateStorageNetworkIpRangeCmd.java | 6 +-
.../admin/offering/CreateDiskOfferingCmd.java | 54 +-
.../admin/offering/CreateServiceOfferingCmd.java | 78 +--
.../admin/offering/DeleteServiceOfferingCmd.java | 2 +-
.../admin/offering/UpdateDiskOfferingCmd.java | 41 +-
.../admin/offering/UpdateServiceOfferingCmd.java | 17 +-
.../ChangeOutOfBandManagementPasswordCmd.java | 4 +-
.../ConfigureOutOfBandManagementCmd.java | 12 +-
.../DisableOutOfBandManagementForClusterCmd.java | 2 +-
.../DisableOutOfBandManagementForHostCmd.java | 2 +-
.../DisableOutOfBandManagementForZoneCmd.java | 2 +-
.../EnableOutOfBandManagementForClusterCmd.java | 2 +-
.../EnableOutOfBandManagementForHostCmd.java | 2 +-
.../EnableOutOfBandManagementForZoneCmd.java | 2 +-
.../IssueOutOfBandManagementPowerActionCmd.java | 6 +-
.../api/command/admin/pod/CreatePodCmd.java | 12 +-
.../api/command/admin/pod/DeletePodCmd.java | 2 +-
.../api/command/admin/pod/ListPodsByCmd.java | 10 +-
.../api/command/admin/pod/UpdatePodCmd.java | 12 +-
.../admin/region/CreatePortableIpRangeCmd.java | 10 +-
.../admin/region/DeletePortableIpRangeCmd.java | 2 +-
.../admin/region/ListPortableIpRangesCmd.java | 2 +-
.../api/command/admin/region/UpdateRegionCmd.java | 4 +-
.../command/admin/resource/ArchiveAlertsCmd.java | 8 +-
.../admin/resource/CleanVMReservationsCmd.java | 6 +-
.../command/admin/resource/DeleteAlertsCmd.java | 8 +-
.../api/command/admin/resource/ListAlertsCmd.java | 6 +-
.../command/admin/resource/ListCapacityCmd.java | 10 +-
.../admin/resource/StartRollingMaintenanceCmd.java | 14 +-
.../admin/resource/icon/DeleteResourceIconCmd.java | 6 +-
.../admin/resource/icon/ListResourceIconCmd.java | 4 +-
.../admin/resource/icon/UploadResourceIconCmd.java | 4 +-
.../admin/router/ConfigureOvsElementCmd.java | 2 +-
.../router/ConfigureVirtualRouterElementCmd.java | 2 +-
.../router/CreateVirtualRouterElementCmd.java | 2 +-
.../api/command/admin/router/DestroyRouterCmd.java | 2 +-
.../router/GetRouterHealthCheckResultsCmd.java | 4 +-
.../command/admin/router/ListOvsElementsCmd.java | 6 +-
.../api/command/admin/router/ListRoutersCmd.java | 24 +-
.../admin/router/ListVirtualRouterElementsCmd.java | 6 +-
.../api/command/admin/router/RebootRouterCmd.java | 2 +-
.../api/command/admin/router/StartRouterCmd.java | 2 +-
.../api/command/admin/router/StopRouterCmd.java | 4 +-
.../api/command/admin/router/UpgradeRouterCmd.java | 2 +-
.../admin/router/UpgradeRouterTemplateCmd.java | 18 +-
.../command/admin/storage/AddImageStoreCmd.java | 10 +-
.../CancelPrimaryStorageMaintenanceCmd.java | 2 +-
.../storage/CreateSecondaryStagingStoreCmd.java | 12 +-
.../admin/storage/CreateStoragePoolCmd.java | 24 +-
.../storage/DeleteSecondaryStagingStoreCmd.java | 2 +-
.../storage/FindStoragePoolsForMigrationCmd.java | 2 +-
.../command/admin/storage/ListImageStoresCmd.java | 12 +-
.../storage/ListSecondaryStagingStoresCmd.java | 10 +-
.../command/admin/storage/ListStoragePoolsCmd.java | 18 +-
.../admin/storage/ListStorageProvidersCmd.java | 2 +-
.../storage/MigrateSecondaryStorageDataCmd.java | 6 +-
.../storage/UpdateCloudToUseObjectStoreCmd.java | 8 +-
.../admin/storage/UpdateStoragePoolCmd.java | 8 +-
.../api/command/admin/swift/AddSwiftCmd.java | 6 +-
.../api/command/admin/swift/ListSwiftsCmd.java | 2 +-
.../command/admin/systemvm/DestroySystemVmCmd.java | 6 +-
.../command/admin/systemvm/ListSystemVMsCmd.java | 18 +-
.../command/admin/systemvm/MigrateSystemVMCmd.java | 16 +-
.../command/admin/systemvm/PatchSystemVMCmd.java | 2 +-
.../command/admin/systemvm/RebootSystemVmCmd.java | 4 +-
.../command/admin/systemvm/ScaleSystemVMCmd.java | 4 +-
.../command/admin/systemvm/StartSystemVMCmd.java | 4 +-
.../command/admin/systemvm/StopSystemVmCmd.java | 6 +-
.../command/admin/systemvm/UpgradeSystemVMCmd.java | 6 +-
.../admin/template/CopyTemplateCmdByAdmin.java | 2 +-
.../admin/template/CreateTemplateCmdByAdmin.java | 4 +-
.../ListTemplatePermissionsCmdByAdmin.java | 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/ListUsersCmd.java | 2 +-
.../api/command/admin/user/MoveUserCmd.java | 2 +-
.../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 +-
.../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 | 6 +-
.../admin/vm/UpdateDefaultNicForVMCmdByAdmin.java | 2 +-
.../api/command/admin/vm/UpdateVMCmdByAdmin.java | 6 +-
.../api/command/admin/vm/UpgradeVMCmdByAdmin.java | 4 +-
.../vmsnapshot/RevertToVMSnapshotCmdByAdmin.java | 2 +-
.../admin/volume/AttachVolumeCmdByAdmin.java | 2 +-
.../admin/volume/CreateVolumeCmdByAdmin.java | 2 +-
.../admin/volume/DetachVolumeCmdByAdmin.java | 2 +-
.../admin/vpc/CreatePrivateGatewayByAdminCmd.java | 6 +-
.../command/admin/vpc/CreateVPCOfferingCmd.java | 20 +-
.../command/admin/vpc/DeletePrivateGatewayCmd.java | 2 +-
.../command/admin/vpc/DeleteVPCOfferingCmd.java | 2 +-
.../command/admin/vpc/UpdateVPCOfferingCmd.java | 15 +-
.../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 | 17 +-
.../command/user/account/AddUserToProjectCmd.java | 17 +-
.../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 | 6 +-
.../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 +-
.../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 | 4 +-
.../api/command/user/guest/ListGuestOsCmd.java | 6 +-
.../user/ipv6/CreateIpv6FirewallRuleCmd.java | 26 +-
.../user/ipv6/DeleteIpv6FirewallRuleCmd.java | 2 +-
.../user/ipv6/ListIpv6FirewallRulesCmd.java | 8 +-
.../user/ipv6/UpdateIpv6FirewallRuleCmd.java | 20 +-
.../api/command/user/iso/AttachIsoCmd.java | 10 +-
.../api/command/user/iso/DeleteIsoCmd.java | 4 +-
.../api/command/user/iso/DetachIsoCmd.java | 8 +-
.../api/command/user/iso/ExtractIsoCmd.java | 8 +-
.../command/user/iso/GetUploadParamsForIsoCmd.java | 14 +-
.../command/user/iso/ListIsoPermissionsCmd.java | 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 | 42 +-
.../user/network/MoveNetworkAclItemCmd.java | 4 +-
.../user/network/RemoveNetworkPermissionsCmd.java | 12 +-
.../user/network/ReplaceNetworkACLListCmd.java | 6 +-
.../user/network/ResetNetworkPermissionsCmd.java | 6 +-
.../command/user/network/RestartNetworkCmd.java | 2 +-
.../user/network/UpdateNetworkACLItemCmd.java | 22 +-
.../user/network/UpdateNetworkACLListCmd.java | 6 +-
.../api/command/user/network/UpdateNetworkCmd.java | 24 +-
.../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 | 27 +-
.../snapshot/CreateSnapshotFromVMSnapshotCmd.java | 30 +-
.../user/snapshot/CreateSnapshotPolicyCmd.java | 16 +-
.../command/user/snapshot/DeleteSnapshotCmd.java | 8 +-
.../user/snapshot/DeleteSnapshotPoliciesCmd.java | 8 +-
.../user/snapshot/ListSnapshotPoliciesCmd.java | 8 +-
.../command/user/snapshot/ListSnapshotsCmd.java | 16 +-
.../command/user/snapshot/RevertSnapshotCmd.java | 8 +-
.../user/snapshot/UpdateSnapshotPolicyCmd.java | 16 +-
.../api/command/user/ssh/CreateSSHKeyPairCmd.java | 6 +-
.../api/command/user/ssh/DeleteSSHKeyPairCmd.java | 6 +-
.../api/command/user/ssh/ListSSHKeyPairsCmd.java | 2 +-
.../command/user/ssh/RegisterSSHKeyPairCmd.java | 6 +-
.../api/command/user/tag/CreateTagsCmd.java | 6 +-
.../api/command/user/tag/ListTagsCmd.java | 10 +-
.../api/command/user/template/CopyTemplateCmd.java | 18 +-
.../command/user/template/CreateTemplateCmd.java | 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 | 8 +-
.../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 | 125 ++--
.../api/command/user/vm/DeployVnfApplianceCmd.java | 2 +-
.../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 | 54 +-
.../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 | 6 +-
.../api/command/user/vpc/CreateVPCCmd.java | 38 +-
.../api/command/user/vpc/DeleteStaticRouteCmd.java | 2 +-
.../api/command/user/vpc/DeleteVPCCmd.java | 2 +-
.../command/user/vpc/ListPrivateGatewaysCmd.java | 10 +-
.../api/command/user/vpc/ListStaticRoutesCmd.java | 8 +-
.../api/command/user/vpc/ListVPCOfferingsCmd.java | 16 +-
.../api/command/user/vpc/ListVPCsCmd.java | 24 +-
.../api/command/user/vpc/RestartVPCCmd.java | 4 +-
.../api/command/user/vpc/UpdateVPCCmd.java | 12 +-
.../api/command/user/vpn/AddVpnUserCmd.java | 18 +-
.../command/user/vpn/CreateRemoteAccessVpnCmd.java | 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 | 32 +-
.../api/response/AutoScalePolicyResponse.java | 22 +-
.../api/response/AutoScaleVmGroupResponse.java | 50 +-
.../api/response/AutoScaleVmProfileResponse.java | 30 +-
.../api/response/BackupOfferingResponse.java | 14 +-
.../api/response/BackupProviderResponse.java | 4 +-
.../cloudstack/api/response/BackupResponse.java | 36 +-
.../api/response/BackupRestorePointResponse.java | 6 +-
.../api/response/BackupScheduleResponse.java | 10 +-
.../api/response/BaseRolePermissionResponse.java | 6 +-
.../cloudstack/api/response/BaseRoleResponse.java | 8 +-
.../api/response/CAProviderResponse.java | 4 +-
.../api/response/CapabilitiesResponse.java | 46 +-
.../api/response/CapabilityResponse.java | 6 +-
.../cloudstack/api/response/CapacityResponse.java | 24 +-
.../api/response/ChildTemplateResponse.java | 8 +-
.../api/response/CloudIdentifierResponse.java | 6 +-
.../cloudstack/api/response/ClusterResponse.java | 24 +-
.../cloudstack/api/response/ConditionResponse.java | 18 +-
.../api/response/ConfigurationGroupResponse.java | 8 +-
.../api/response/ConfigurationResponse.java | 30 +-
.../response/ConfigurationSubGroupResponse.java | 4 +-
.../response/ConsoleEndpointWebsocketResponse.java | 10 +-
.../cloudstack/api/response/CounterResponse.java | 4 +-
.../response/CreateConsoleEndpointResponse.java | 8 +-
.../api/response/CustomCertificateResponse.java | 2 +-
.../DataCenterGuestIpv6PrefixResponse.java | 14 +-
...irectDownloadCertificateHostStatusResponse.java | 8 +-
.../DirectDownloadCertificateResponse.java | 22 +-
.../api/response/DiskOfferingResponse.java | 66 +-
.../cloudstack/api/response/DomainResponse.java | 96 +--
.../api/response/DomainRouterResponse.java | 100 +--
.../cloudstack/api/response/EventResponse.java | 34 +-
.../cloudstack/api/response/ExceptionResponse.java | 8 +-
.../api/response/ExternalFirewallResponse.java | 22 +-
.../api/response/ExternalLoadBalancerResponse.java | 14 +-
.../cloudstack/api/response/ExtractResponse.java | 26 +-
.../cloudstack/api/response/FirewallResponse.java | 30 +-
.../api/response/FirewallRuleResponse.java | 34 +-
.../api/response/GetUploadParamsResponse.java | 8 +-
.../api/response/GetVMPasswordResponse.java | 2 +-
.../api/response/GlobalLoadBalancerResponse.java | 26 +-
.../cloudstack/api/response/GpuResponse.java | 2 +-
.../api/response/GuestOSCategoryResponse.java | 4 +-
.../cloudstack/api/response/GuestOSResponse.java | 14 +-
.../api/response/GuestOsMappingResponse.java | 14 +-
.../api/response/GuestVlanRangeResponse.java | 18 +-
.../cloudstack/api/response/GuestVlanResponse.java | 30 +-
.../api/response/HAProviderResponse.java | 4 +-
.../api/response/HostForMigrationResponse.java | 2 +-
.../cloudstack/api/response/HostHAResponse.java | 10 +-
.../cloudstack/api/response/HostResponse.java | 114 +--
.../cloudstack/api/response/HostTagResponse.java | 6 +-
.../response/HypervisorCapabilitiesResponse.java | 18 +-
.../response/HypervisorGuestOsNamesResponse.java | 8 +-
.../api/response/HypervisorGuestOsResponse.java | 4 +-
.../cloudstack/api/response/IPAddressResponse.java | 68 +-
.../api/response/ImageStoreDetailResponse.java | 4 +-
.../api/response/ImageStoreResponse.java | 22 +-
.../api/response/InstanceGroupResponse.java | 16 +-
.../InternalLoadBalancerElementResponse.java | 4 +-
.../api/response/IpForwardingRuleResponse.java | 20 +-
.../cloudstack/api/response/IpRangeResponse.java | 12 +-
.../cloudstack/api/response/Ipv6RouteResponse.java | 4 +-
...ntAllowedToCreateOfferingsWithTagsResponse.java | 2 +-
.../cloudstack/api/response/IsoVmResponse.java | 22 +-
.../api/response/LBHealthCheckPolicyResponse.java | 14 +-
.../api/response/LBHealthCheckResponse.java | 12 +-
.../api/response/LBStickinessPolicyResponse.java | 14 +-
.../api/response/LBStickinessResponse.java | 18 +-
.../api/response/LoadBalancerResponse.java | 42 +-
.../response/LoadBalancerRuleVmMapResponse.java | 4 +-
.../cloudstack/api/response/LoginCmdResponse.java | 14 +-
.../api/response/ManagementServerResponse.java | 24 +-
.../cloudstack/api/response/MigrationResponse.java | 2 +-
.../api/response/NetworkACLItemResponse.java | 28 +-
.../api/response/NetworkACLResponse.java | 6 +-
.../api/response/NetworkDeviceResponse.java | 2 +-
.../api/response/NetworkOfferingResponse.java | 58 +-
.../api/response/NetworkPermissionsResponse.java | 14 +-
.../cloudstack/api/response/NetworkResponse.java | 138 ++--
.../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 +-
.../cloudstack/api/response/RegisterResponse.java | 6 +-
.../api/response/RemoteAccessVpnResponse.java | 26 +-
.../api/response/ResourceCountResponse.java | 16 +-
.../api/response/ResourceDetailResponse.java | 6 +-
.../api/response/ResourceIconResponse.java | 6 +-
.../api/response/ResourceLimitResponse.java | 18 +-
.../api/response/ResourceTagResponse.java | 22 +-
.../api/response/RolePermissionResponse.java | 6 +-
.../cloudstack/api/response/RoleResponse.java | 4 +-
.../RollingMaintenanceHostSkippedResponse.java | 6 +-
.../RollingMaintenanceHostUpdatedResponse.java | 10 +-
.../api/response/RollingMaintenanceResponse.java | 8 +-
.../response/RouterHealthCheckResultResponse.java | 10 +-
.../RouterHealthCheckResultsListResponse.java | 4 +-
.../api/response/RunDiagnosticsResponse.java | 6 +-
.../api/response/SSHKeyPairResponse.java | 12 +-
.../api/response/SecurityGroupResponse.java | 26 +-
.../api/response/SecurityGroupRuleResponse.java | 20 +-
.../api/response/ServiceOfferingResponse.java | 102 +--
.../cloudstack/api/response/ServiceResponse.java | 6 +-
.../response/Site2SiteCustomerGatewayResponse.java | 32 +-
.../response/Site2SiteVpnConnectionResponse.java | 40 +-
.../api/response/Site2SiteVpnGatewayResponse.java | 22 +-
.../api/response/SnapshotPolicyResponse.java | 14 +-
.../cloudstack/api/response/SnapshotResponse.java | 40 +-
.../api/response/SnapshotScheduleResponse.java | 8 +-
.../cloudstack/api/response/SslCertResponse.java | 18 +-
.../api/response/StaticRouteResponse.java | 18 +-
.../cloudstack/api/response/StatsResponse.java | 28 +-
.../response/StorageNetworkIpRangeResponse.java | 18 +-
.../api/response/StoragePoolResponse.java | 46 +-
.../api/response/StorageProviderResponse.java | 4 +-
.../api/response/StorageTagResponse.java | 6 +-
.../cloudstack/api/response/SuccessResponse.java | 4 +-
.../api/response/SystemVmInstanceResponse.java | 12 +-
.../cloudstack/api/response/SystemVmResponse.java | 74 +-
.../api/response/TemplateOVFPropertyResponse.java | 20 +-
.../api/response/TemplatePermissionsResponse.java | 10 +-
.../cloudstack/api/response/TemplateResponse.java | 100 +--
.../api/response/TrafficMonitorResponse.java | 10 +-
.../response/TrafficTypeImplementorResponse.java | 4 +-
.../api/response/TrafficTypeResponse.java | 16 +-
.../api/response/UnmanageVMInstanceResponse.java | 4 +-
.../response/UnmanagedInstanceDiskResponse.java | 22 +-
.../api/response/UnmanagedInstanceResponse.java | 26 +-
.../response/UpgradeRouterTemplateResponse.java | 2 +-
.../api/response/UsageRecordResponse.java | 64 +-
.../cloudstack/api/response/UserDataResponse.java | 18 +-
.../cloudstack/api/response/UserResponse.java | 48 +-
.../UserTwoFactorAuthenticationSetupResponse.java | 8 +-
...UserTwoFactorAuthenticatorProviderResponse.java | 4 +-
.../cloudstack/api/response/UserVmResponse.java | 162 ++---
.../api/response/VMScheduleResponse.java | 8 +-
.../api/response/VMSnapshotResponse.java | 42 +-
.../api/response/VMUserDataResponse.java | 4 +-
.../cloudstack/api/response/VgpuResponse.java | 6 +-
.../response/VirtualRouterProviderResponse.java | 16 +-
.../api/response/VlanIpRangeResponse.java | 50 +-
.../api/response/VmwareDatacenterResponse.java | 2 +-
.../cloudstack/api/response/VolumeResponse.java | 114 +--
.../api/response/VpcOfferingResponse.java | 34 +-
.../cloudstack/api/response/VpcResponse.java | 60 +-
.../cloudstack/api/response/VpnUsersResponse.java | 18 +-
.../response/VsphereStoragePoliciesResponse.java | 10 +-
.../cloudstack/api/response/ZoneResponse.java | 44 +-
.../apache/cloudstack/backup/BackupManager.java | 16 +-
.../org/apache/cloudstack/query/QueryService.java | 6 +-
.../apache/cloudstack/resourcelimit/Reserver.java} | 16 +-
.../storage/template/VnfTemplateManager.java | 4 +-
.../storage/template/VnfTemplateUtils.java | 18 +
.../com/cloud/agent/api/storage/OVFHelperTest.java | 14 +-
.../admin/vlan/UpdateVlanIpRangeCmdTest.java | 2 +-
.../vm/MigrateVirtualMachineWithVolumeCmdTest.java | 8 +-
.../command/test/AddAccountToProjectCmdTest.java | 3 +
.../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 +-
client/pom.xml | 2 +-
core/pom.xml | 2 +-
.../cloud/agent/api/ModifyStoragePoolAnswer.java | 4 +
.../cloud/agent/api/storage/DownloadAnswer.java | 2 +-
.../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 | 18 +-
.../download/DirectTemplateDownloaderImpl.java | 19 +-
.../download/HttpDirectTemplateDownloader.java | 6 +-
.../download/HttpsDirectTemplateDownloader.java | 4 +-
.../download/MetalinkDirectTemplateDownloader.java | 12 +-
.../download/NfsDirectTemplateDownloader.java | 2 +-
.../command/TemplateOrVolumePostUploadCommand.java | 8 +
.../storage/command/UploadStatusCommand.java | 10 +
.../cloudstack/storage/to/SnapshotObjectTO.java | 2 -
debian/changelog | 12 +
debian/rules | 3 +-
developer/pom.xml | 2 +-
engine/api/pom.xml | 2 +-
.../service/NetworkOrchestrationService.java | 13 +-
.../service/StorageOrchestrationService.java | 5 +
.../service/VolumeOrchestrationService.java | 2 +-
.../api/storage/ObjectInDataStoreStateMachine.java | 8 +-
.../subsystem/api/storage/SnapshotDataFactory.java | 2 +
.../engine/subsystem/api/storage/SnapshotInfo.java | 2 +-
.../subsystem/api/storage/TemplateService.java | 6 +-
engine/components-api/pom.xml | 2 +-
.../main/java/com/cloud/agent/AgentManager.java | 6 +
.../main/java/com/cloud/alert/AlertManager.java | 1 -
.../main/java/com/cloud/network/addr/PublicIp.java | 8 +-
.../java/com/cloud/resource/ResourceManager.java | 6 +-
.../java/com/cloud/storage/StorageManager.java | 5 +
.../java/com/cloud/template/TemplateManager.java | 4 +-
engine/orchestration/pom.xml | 2 +-
.../com/cloud/agent/manager/AgentManagerImpl.java | 23 +-
.../agent/manager/ClusteredAgentManagerImpl.java | 4 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 97 +--
.../cloud/vm/VirtualMachinePowerStateSyncImpl.java | 6 +-
.../engine/orchestration/DataMigrationUtility.java | 90 ++-
.../engine/orchestration/NetworkOrchestrator.java | 708 ++++++++++---------
.../engine/orchestration/StorageOrchestrator.java | 167 ++++-
.../engine/orchestration/VolumeOrchestrator.java | 34 +-
.../cloud/agent/manager/AgentManagerImplTest.java | 34 +
.../orchestration/NetworkOrchestratorTest.java | 1 +
engine/pom.xml | 2 +-
engine/schema/pom.xml | 2 +-
.../com/cloud/capacity/dao/CapacityDaoImpl.java | 11 +
.../java/com/cloud/dc/ClusterDetailsDaoImpl.java | 2 +-
.../java/com/cloud/dc/dao/AccountVlanMapDao.java | 2 +-
.../com/cloud/dc/dao/AccountVlanMapDaoImpl.java | 4 +-
.../com/cloud/dc/dao/DataCenterDetailsDaoImpl.java | 2 +-
.../cloud/dc/dao/DataCenterIpAddressDaoImpl.java | 10 +-
.../dao/DataCenterLinkLocalIpAddressDaoImpl.java | 2 +-
.../java/com/cloud/dc/dao/DomainVlanMapDao.java | 2 +-
.../com/cloud/dc/dao/DomainVlanMapDaoImpl.java | 4 +-
.../main/java/com/cloud/host/dao/HostDaoImpl.java | 2 +-
.../java/com/cloud/network/dao/NetworkDaoImpl.java | 4 +-
.../dao/PhysicalNetworkTrafficTypeDaoImpl.java | 4 +-
.../cloud/network/dao/PublicIpQuarantineDao.java | 12 +
.../network/dao/PublicIpQuarantineDaoImpl.java | 22 +
.../cloud/storage/dao/LaunchPermissionDaoImpl.java | 2 +-
.../java/com/cloud/storage/dao/SnapshotDao.java | 2 +
.../com/cloud/storage/dao/SnapshotDaoImpl.java | 7 +
.../com/cloud/storage/dao/VMTemplateDaoImpl.java | 10 +-
.../main/java/com/cloud/storage/dao/VolumeDao.java | 8 +-
.../java/com/cloud/storage/dao/VolumeDaoImpl.java | 33 +-
.../java/com/cloud/upgrade/DatabaseCreator.java | 2 +-
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 115 ++-
.../cloud/upgrade/DatabaseVersionHierarchy.java | 5 +-
.../upgrade/SystemVmTemplateRegistration.java | 50 +-
.../upgrade/dao/DbUpgradeSystemVmTemplate.java | 16 +-
.../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 +-
...pshot223to224.java => Upgrade42020to42030.java} | 34 +-
...pshot217to224.java => Upgrade42030to42040.java} | 38 +-
.../main/java/com/cloud/usage/dao/UsageDao.java | 2 +-
.../java/com/cloud/usage/dao/UsageDaoImpl.java | 58 +-
.../main/java/com/cloud/usage/dao/UsageJobDao.java | 2 +
.../java/com/cloud/usage/dao/UsageJobDaoImpl.java | 3 +-
.../cloud/usage/dao/UsageVMInstanceDaoImpl.java | 4 +-
.../src/main/java/com/cloud/user/UserVO.java | 2 +-
.../main/java/com/cloud/user/dao/AccountDao.java | 2 -
.../java/com/cloud/user/dao/AccountDaoImpl.java | 60 +-
.../src/main/java/com/cloud/vm/dao/NicDao.java | 2 +-
.../src/main/java/com/cloud/vm/dao/NicDaoImpl.java | 3 +-
.../main/java/com/cloud/vm/dao/UserVmDaoImpl.java | 2 +-
.../main/java/com/cloud/vm/dao/VMInstanceDao.java | 3 +
.../java/com/cloud/vm/dao/VMInstanceDaoImpl.java | 39 +-
.../cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java | 2 +-
.../resourcedetail/ResourceDetailsDao.java | 2 +
.../resourcedetail/ResourceDetailsDaoBase.java | 14 +
.../storage/datastore/db/ImageStoreDaoImpl.java | 2 +-
.../storage/datastore/db/SnapshotDataStoreDao.java | 16 +
.../datastore/db/SnapshotDataStoreDaoImpl.java | 36 +-
.../vm/schedule/dao/VMScheduledJobDao.java | 2 +
.../vm/schedule/dao/VMScheduledJobDaoImpl.java | 15 +
.../resources/META-INF/db/schema-42000to42010.sql | 2 +-
...to41400-cleanup.sql => schema-42020to42030.sql} | 12 +-
.../DatabaseUpgradeCheckerDoUpgradesTest.java | 173 +++++
.../cloud/upgrade/DatabaseUpgradeCheckerTest.java | 113 ++-
.../upgrade/SystemVmTemplateRegistrationTest.java | 6 +-
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 | 8 +-
.../configdrive/ConfigDriveBuilderTest.java | 12 +-
engine/storage/datamotion/pom.xml | 2 +-
.../storage/motion/AncientDataMotionStrategy.java | 17 +-
.../motion/StorageSystemDataMotionStrategy.java | 12 +-
engine/storage/image/pom.xml | 2 +-
.../storage/image/SecondaryStorageServiceImpl.java | 6 +-
.../storage/image/TemplateDataFactoryImpl.java | 3 +
.../storage/image/TemplateServiceImpl.java | 352 ++++++++--
.../storage/image/TemplateServiceImplTest.java | 312 ++++++++-
engine/storage/integration-test/pom.xml | 2 +-
.../cloudstack/storage/test/SnapshotTest.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 | 6 +-
.../storage/snapshot/DefaultSnapshotStrategy.java | 6 +-
.../storage/snapshot/SnapshotDataFactoryImpl.java | 22 +-
.../storage/snapshot/SnapshotObject.java | 5 +-
.../storage/snapshot/SnapshotServiceImpl.java | 21 +-
.../snapshot/StorageSystemSnapshotStrategy.java | 3 +-
.../vmsnapshot/DefaultVMSnapshotStrategy.java | 34 +-
.../vmsnapshot/ScaleIOVMSnapshotStrategy.java | 44 +-
.../vmsnapshot/StorageVMSnapshotStrategy.java | 36 +-
.../storage/datastore/DataObjectManagerImpl.java | 8 +-
.../datastore/ObjectInDataStoreManagerImpl.java | 19 +-
.../storage/helper/VMSnapshotHelperImpl.java | 6 +-
.../storage/image/BaseImageStoreDriverImpl.java | 26 +-
engine/storage/volume/pom.xml | 2 +-
.../storage/datastore/PrimaryDataStoreImpl.java | 2 +-
.../cloudstack/storage/volume/VolumeObject.java | 2 +-
.../storage/volume/VolumeServiceImpl.java | 55 +-
.../storage/volume/VolumeObjectTest.java | 4 +-
engine/userdata/cloud-init/pom.xml | 2 +-
engine/userdata/pom.xml | 2 +-
framework/agent-lb/pom.xml | 2 +-
framework/ca/pom.xml | 2 +-
framework/cluster/pom.xml | 2 +-
.../java/com/cloud/cluster/ClusterManagerImpl.java | 2 +-
framework/config/pom.xml | 2 +-
.../cloudstack/framework/config/ConfigKey.java | 28 +-
.../framework/config/ValidatedConfigKey.java | 28 +-
framework/db/pom.xml | 6 +-
.../src/main/java/com/cloud/utils/db/Filter.java | 14 +-
.../java/com/cloud/utils/db/GenericDaoBase.java | 21 +-
.../test/java/com/cloud/utils/db/FilterTest.java | 58 ++
.../com/cloud/utils/db/GenericDaoBaseTest.java | 68 ++
framework/direct-download/pom.xml | 2 +-
framework/events/pom.xml | 2 +-
framework/ipc/pom.xml | 2 +-
framework/jobs/pom.xml | 2 +-
.../framework/jobs/impl/AsyncJobManagerImpl.java | 38 +-
.../framework/jobs/AsyncJobManagerTest.java | 20 +
framework/managed-context/pom.xml | 2 +-
framework/pom.xml | 2 +-
framework/quota/pom.xml | 2 +-
.../apache/cloudstack/quota/QuotaManagerImpl.java | 12 +-
.../activationrule/presetvariables/Account.java | 1 -
.../presetvariables/BackupOffering.java | 1 -
.../presetvariables/ComputeOffering.java | 1 -
.../activationrule/presetvariables/Domain.java | 1 -
.../presetvariables/GenericPresetVariable.java | 18 +-
.../quota/activationrule/presetvariables/Host.java | 2 -
.../presetvariables/PresetVariableHelper.java | 10 +-
.../quota/activationrule/presetvariables/Role.java | 9 +-
.../activationrule/presetvariables/Storage.java | 11 +-
.../activationrule/presetvariables/Tariff.java | 1 -
.../activationrule/presetvariables/Value.java | 40 +-
.../cloudstack/quota/QuotaManagerImplTest.java | 24 +-
.../presetvariables/AccountTest.java | 34 -
.../presetvariables/BackupOfferingTest.java | 36 -
.../presetvariables/ComputeOfferingTest.java | 35 -
.../presetvariables/ComputingResourcesTest.java | 40 --
.../activationrule/presetvariables/DomainTest.java | 35 -
.../presetvariables/GenericPresetVariableTest.java | 73 --
.../activationrule/presetvariables/HostTest.java | 34 -
.../presetvariables/PresetVariableHelperTest.java | 68 +-
.../presetvariables/ResourceTest.java | 40 --
.../activationrule/presetvariables/RoleTest.java | 34 -
.../presetvariables/StorageTest.java | 41 --
.../activationrule/presetvariables/ValueTest.java | 175 -----
framework/rest/pom.xml | 2 +-
framework/security/pom.xml | 2 +-
framework/spring/lifecycle/pom.xml | 2 +-
framework/spring/module/pom.xml | 2 +-
packaging/el8/cloud.spec | 5 +-
packaging/systemd/cloudstack-management.default | 2 +-
packaging/systemd/cloudstack-usage.default | 2 +-
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 +-
.../apache/cloudstack/sioc/SiocManagerImpl.java | 2 +-
plugins/backup/dummy/pom.xml | 2 +-
plugins/backup/nas/pom.xml | 2 +-
.../cloudstack/backup/NASBackupProvider.java | 24 +-
plugins/backup/networker/pom.xml | 2 +-
.../cloudstack/backup/NetworkerBackupProvider.java | 17 +-
plugins/backup/veeam/pom.xml | 2 +-
.../cloudstack/backup/veeam/VeeamClient.java | 2 +-
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/QuotaCreditsResponse.java | 8 +-
.../api/response/QuotaEnabledResponse.java | 2 +-
.../api/response/QuotaStatementItemResponse.java | 14 +-
.../api/response/QuotaStatementResponse.java | 16 +-
.../api/response/QuotaSummaryResponse.java | 22 +-
.../api/response/QuotaTariffResponse.java | 20 +-
.../cloudstack/api/response/QuotaTypeResponse.java | 4 +-
.../api/response/QuotaUpdateResponse.java | 2 +-
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 +-
plugins/drs/cluster/condensed/pom.xml | 2 +-
plugins/event-bus/inmemory/pom.xml | 2 +-
plugins/event-bus/kafka/pom.xml | 2 +-
plugins/event-bus/rabbitmq/pom.xml | 2 +-
.../cloudstack/mom/rabbitmq/RabbitMQEventBus.java | 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 +-
.../manager/BareMetalTemplateAdapter.java | 1 -
.../networkservice/BaremetalDhcpResponse.java | 10 +-
.../networkservice/BaremetalDnsmasqResource.java | 4 +-
.../BaremetalKickStartPxeResource.java | 6 +-
.../BaremetalKickStartServiceImpl.java | 8 +-
.../networkservice/BaremetalPingPxeResource.java | 10 +-
.../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/hyperv/pom.xml | 2 +-
.../resource/HypervDirectConnectResource.java | 20 +-
plugins/hypervisors/kvm/pom.xml | 27 +-
.../hypervisor/kvm/resource/BridgeVifDriver.java | 2 +-
.../kvm/resource/LibvirtComputingResource.java | 94 ++-
.../kvm/resource/LibvirtDomainXMLParser.java | 4 +-
.../hypervisor/kvm/resource/LibvirtVMDef.java | 9 +
.../LibvirtBackupSnapshotCommandWrapper.java | 2 +-
.../LibvirtCreateVMSnapshotCommandWrapper.java | 6 +-
.../LibvirtDeleteVMSnapshotCommandWrapper.java | 12 +-
.../LibvirtHandleConfigDriveCommandWrapper.java | 2 +-
.../wrapper/LibvirtMigrateCommandWrapper.java | 72 +-
.../LibvirtMigrateVolumeCommandWrapper.java | 9 +-
.../LibvirtRestoreBackupCommandWrapper.java | 50 +-
.../LibvirtRestoreVMSnapshotCommandWrapper.java | 6 +-
.../LibvirtRevertToVMSnapshotCommandWrapper.java | 4 +-
.../wrapper/LibvirtStartCommandWrapper.java | 5 +-
.../LibvirtUpdateHostPasswordCommandWrapper.java | 3 +-
.../kvm/storage/KVMStoragePoolManager.java | 4 +-
.../kvm/storage/KVMStorageProcessor.java | 206 +++---
.../org/apache/cloudstack/utils/qemu/QemuImg.java | 6 +-
.../kvm/resource/LibvirtComputingResourceTest.java | 65 +-
.../wrapper/LibvirtMigrateCommandWrapperTest.java | 26 +-
plugins/hypervisors/ovm/pom.xml | 2 +-
.../com/cloud/ovm/hypervisor/OvmResourceBase.java | 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 +-
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 +-
.../hypervisor/vmware/VmwareServerDiscoverer.java | 4 +-
.../manager/CleanupFullyClonedTemplatesTask.java | 8 +-
.../hypervisor/vmware/manager/VmwareManager.java | 2 +-
.../vmware/manager/VmwareManagerImpl.java | 26 +-
.../vmware/manager/VmwareStorageManagerImpl.java | 12 +-
.../hypervisor/vmware/resource/VmwareResource.java | 8 +-
.../java/com/cloud/network/VmwareTrafficLabel.java | 2 +-
.../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 +-
.../CitrixModifyStoragePoolCommandWrapper.java | 12 +-
.../wrapper/xenbase/CitrixReadyCommandWrapper.java | 10 +-
.../CitrixRevertToVMSnapshotCommandWrapper.java | 2 +-
.../wrapper/xenbase/CitrixStartCommandWrapper.java | 4 +-
.../CitrixUpdateHostPasswordCommandWrapper.java | 4 +-
plugins/integrations/cloudian/pom.xml | 2 +-
.../cloudstack/cloudian/CloudianConnectorImpl.java | 8 +-
.../cloudian/response/CloudianEnabledResponse.java | 4 +-
.../response/CloudianSsoLoginResponse.java | 2 +-
plugins/integrations/kubernetes-service/pom.xml | 2 +-
.../cluster/KubernetesClusterManagerImpl.java | 13 +-
.../KubernetesClusterActionWorker.java | 2 +-
...ernetesClusterResourceModifierActionWorker.java | 3 +-
.../KubernetesClusterScaleWorker.java | 8 +-
.../version/KubernetesVersionManagerImpl.java | 52 +-
.../version/AddKubernetesSupportedVersionCmd.java | 14 +-
.../DeleteKubernetesSupportedVersionCmd.java | 2 +-
.../UpdateKubernetesSupportedVersionCmd.java | 4 +-
.../AddVirtualMachinesToKubernetesClusterCmd.java | 4 +-
.../cluster/CreateKubernetesClusterCmd.java | 32 +-
.../cluster/DeleteKubernetesClusterCmd.java | 2 +-
.../cluster/GetKubernetesClusterConfigCmd.java | 2 +-
.../cluster/ListKubernetesClustersCmd.java | 8 +-
...oveVirtualMachinesFromKubernetesClusterCmd.java | 4 +-
.../cluster/ScaleKubernetesClusterCmd.java | 8 +-
.../cluster/StartKubernetesClusterCmd.java | 2 +-
.../cluster/StopKubernetesClusterCmd.java | 2 +-
.../cluster/UpgradeKubernetesClusterCmd.java | 4 +-
.../ListKubernetesSupportedVersionsCmd.java | 8 +-
.../response/KubernetesClusterConfigResponse.java | 4 +-
.../api/response/KubernetesClusterResponse.java | 56 +-
.../KubernetesSupportedVersionResponse.java | 36 +-
...rtualMachinesFromKubernetesClusterResponse.java | 2 +-
.../version/KubernetesVersionManagerImplTest.java | 78 ++-
.../version/KubernetesVersionServiceTest.java | 99 ++-
plugins/integrations/prometheus/pom.xml | 2 +-
.../cloudstack/metrics/PrometheusExporterImpl.java | 43 ++
.../metrics/PrometheusExporterImplTest.java | 108 +++
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 | 48 +-
.../response/ClusterMetricsResponse.java | 36 +-
.../cloudstack/response/DbMetricsResponse.java | 20 +-
.../cloudstack/response/HostMetricsResponse.java | 38 +-
.../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 +-
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 | 28 +-
.../cloud/network/lb/LoadBalanceRuleHandler.java | 22 +-
plugins/network-elements/globodns/pom.xml | 6 +-
.../cloudstack/api/AddGloboDnsHostCmd.java | 2 +-
.../cloudstack/resource/GloboDnsResource.java | 8 +-
.../network-elements/internal-loadbalancer/pom.xml | 2 +-
.../element/InternalLoadBalancerElement.java | 24 +-
.../lb/InternalLoadBalancerVMManagerImpl.java | 66 +-
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 +-
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 | 6 +-
...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/shutdown/pom.xml | 2 +-
.../api/command/BaseShutdownActionCmd.java | 2 +-
.../api/command/ReadyForShutdownCmd.java | 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 +-
.../driver/CephObjectStoreDriverImpl.java | 2 +-
plugins/storage/object/minio/pom.xml | 2 +-
.../driver/MinIOObjectStoreDriverImpl.java | 81 ++-
.../driver/MinIOObjectStoreDriverImplTest.java | 7 +-
plugins/storage/object/simulator/pom.xml | 2 +-
plugins/storage/sharedfs/storagevm/pom.xml | 2 +-
plugins/storage/volume/adaptive/pom.xml | 2 +-
.../lifecycle/AdaptiveDataStoreLifeCycleImpl.java | 13 +-
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 +-
.../driver/DateraPrimaryDataStoreDriver.java | 2 +-
.../datastore/provider/DateraHostListener.java | 4 +-
plugins/storage/volume/default/pom.xml | 2 +-
.../CloudStackPrimaryDataStoreDriverImpl.java | 8 +-
plugins/storage/volume/flasharray/pom.xml | 2 +-
.../adapter/flasharray/FlashArrayAdapter.java | 289 ++++++--
plugins/storage/volume/linstor/CHANGELOG.md | 23 +-
plugins/storage/volume/linstor/pom.xml | 2 +-
.../kvm/storage/LinstorStorageAdaptor.java | 7 +-
.../driver/LinstorPrimaryDataStoreDriverImpl.java | 417 +++--------
.../storage/datastore/util/LinstorUtil.java | 328 ++++++++-
.../storage/motion/LinstorDataMotionStrategy.java | 437 ++++++++++++
.../spring-storage-volume-linstor-context.xml | 2 +
.../LinstorPrimaryDataStoreDriverImplTest.java | 7 +-
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 +-
plugins/storage/volume/solidfire/pom.xml | 2 +-
.../driver/SolidFirePrimaryDataStoreDriver.java | 10 +-
.../SolidFirePrimaryDataStoreLifeCycle.java | 4 +-
.../datastore/provider/SolidFireHostListener.java | 4 +-
.../storage/datastore/util/SolidFireUtil.java | 2 +-
plugins/storage/volume/storpool/pom.xml | 2 +-
.../driver/StorPoolPrimaryDataStoreDriver.java | 2 +-
.../datastore/driver/StorPoolStatsCollector.java | 4 +-
.../storage/datastore/util/StorPoolHelper.java | 2 +-
.../storage/motion/StorPoolDataMotionStrategy.java | 4 +-
.../storage/snapshot/StorPoolSnapshotStrategy.java | 6 +-
.../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 +-
plugins/user-authenticators/md5/pom.xml | 2 +-
plugins/user-authenticators/oauth2/pom.xml | 2 +-
.../api/command/OauthLoginAPIAuthenticatorCmd.java | 12 +-
.../command/OauthLoginAPIAuthenticatorCmdTest.java | 19 +
plugins/user-authenticators/pbkdf2/pom.xml | 2 +-
plugins/user-authenticators/plain-text/pom.xml | 2 +-
plugins/user-authenticators/saml2/pom.xml | 2 +-
.../api/command/SAML2LoginAPIAuthenticatorCmd.java | 10 +-
.../api/response/SamlAuthorizationResponse.java | 6 +-
.../apache/cloudstack/saml/SAML2AuthManager.java | 3 +
.../cloudstack/saml/SAML2AuthManagerImpl.java | 9 +-
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 | 34 +-
quickcloud/pom.xml | 2 +-
scripts/storage/secondary/cloud-install-sys-tmplt | 1 +
scripts/storage/secondary/setup-sysvm-tmplt | 1 +
scripts/vm/network/security_group.py | 2 +-
server/pom.xml | 2 +-
.../src/main/java/com/cloud/acl/DomainChecker.java | 2 +-
.../java/com/cloud/alert/AlertManagerImpl.java | 9 +-
server/src/main/java/com/cloud/api/ApiDBUtils.java | 4 +
.../main/java/com/cloud/api/ApiResponseHelper.java | 7 +-
server/src/main/java/com/cloud/api/ApiServer.java | 35 +-
server/src/main/java/com/cloud/api/ApiServlet.java | 33 +-
.../DefaultForgotPasswordAPIAuthenticatorCmd.java | 6 +-
.../api/auth/DefaultLoginAPIAuthenticatorCmd.java | 17 +-
.../DefaultResetPasswordAPIAuthenticatorCmd.java | 1 -
.../auth/SetupUserTwoFactorAuthenticationCmd.java | 4 +-
...ValidateUserTwoFactorAuthenticationCodeCmd.java | 2 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 18 +
.../cloud/api/query/dao/TemplateJoinDaoImpl.java | 79 ++-
.../main/java/com/cloud/configuration/Config.java | 29 +-
.../configuration/ConfigurationManagerImpl.java | 185 +++--
.../consoleproxy/ConsoleProxyManagerImpl.java | 17 +-
.../deploy/DeploymentPlanningManagerImpl.java | 80 ++-
.../main/java/com/cloud/event/AlertGenerator.java | 5 +-
.../com/cloud/ha/HighAvailabilityManagerImpl.java | 10 +-
.../main/java/com/cloud/hypervisor/KVMGuru.java | 3 +-
.../kvm/discoverer/LibvirtServerDiscoverer.java | 18 +-
.../com/cloud/network/IpAddressManagerImpl.java | 95 +--
.../com/cloud/network/Ipv6AddressManagerImpl.java | 2 +-
.../java/com/cloud/network/NetworkModelImpl.java | 48 +-
.../java/com/cloud/network/NetworkServiceImpl.java | 162 +++--
.../com/cloud/network/as/AutoScaleManagerImpl.java | 2 +-
.../network/element/ConfigDriveNetworkElement.java | 32 +-
.../network/element/VirtualRouterElement.java | 24 +-
.../com/cloud/network/guru/DirectNetworkGuru.java | 16 +-
.../network/guru/ExternalGuestNetworkGuru.java | 8 +-
.../com/cloud/network/guru/GuestNetworkGuru.java | 2 +-
.../cloud/network/guru/PodBasedNetworkGuru.java | 5 +-
.../com/cloud/network/guru/PrivateNetworkGuru.java | 8 +-
.../com/cloud/network/guru/PublicNetworkGuru.java | 2 +-
.../com/cloud/network/guru/StorageNetworkGuru.java | 6 +-
.../network/lb/LoadBalancingRulesManagerImpl.java | 36 +-
.../cloud/network/router/NetworkHelperImpl.java | 24 +-
.../com/cloud/network/router/NicProfileHelper.java | 3 +-
.../cloud/network/router/NicProfileHelperImpl.java | 11 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 6 +-
.../VpcVirtualNetworkApplianceManagerImpl.java | 2 +-
.../network/security/SecurityGroupManagerImpl.java | 8 +-
.../security/SecurityGroupManagerImpl2.java | 6 +-
.../java/com/cloud/network/vpc/VpcManagerImpl.java | 35 +-
.../com/cloud/projects/ProjectManagerImpl.java | 149 ++--
.../com/cloud/resource/ResourceManagerImpl.java | 44 +-
.../cloud/resourcelimit/CheckedReservation.java | 117 +++-
.../com/cloud/resourcelimit/ReservationHelper.java | 16 +-
.../resourcelimit/ResourceLimitManagerImpl.java | 196 +++---
.../com/cloud/server/ManagementServerImpl.java | 171 +++--
.../main/java/com/cloud/server/StatsCollector.java | 2 +-
.../api/response/BaremetalTemplateResponse.java | 2 +-
.../com/cloud/storage/ImageStoreDetailsUtil.java | 11 +
.../cloud/storage/ImageStoreUploadMonitorImpl.java | 161 ++++-
.../java/com/cloud/storage/StorageManagerImpl.java | 150 ++--
.../cloud/storage/StoragePoolAutomationImpl.java | 2 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 634 +++++++++--------
.../storage/download/DownloadActiveState.java | 5 +
.../cloud/storage/download/DownloadErrorState.java | 5 +
.../storage/download/DownloadInactiveState.java | 6 +
...edState.java => DownloadLimitReachedState.java} | 21 +-
.../cloud/storage/download/DownloadListener.java | 92 ++-
.../com/cloud/storage/download/DownloadState.java | 6 +-
.../cloud/storage/listener/StoragePoolMonitor.java | 28 +-
.../storage/snapshot/SnapshotManagerImpl.java | 222 +++---
.../storage/snapshot/SnapshotSchedulerImpl.java | 6 +-
.../cloud/template/HypervisorTemplateAdapter.java | 62 +-
.../com/cloud/template/TemplateAdapterBase.java | 39 +-
.../com/cloud/template/TemplateManagerImpl.java | 541 +++++++++------
.../main/java/com/cloud/test/DatabaseConfig.java | 2 +-
.../java/com/cloud/usage/UsageServiceImpl.java | 61 +-
.../java/com/cloud/user/AccountManagerImpl.java | 146 ++--
.../java/com/cloud/user/DomainManagerImpl.java | 25 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 673 +++++++++---------
.../cloud/vm/snapshot/VMSnapshotManagerImpl.java | 207 +++---
.../cloudstack/backup/BackupManagerImpl.java | 15 +-
.../cloudstack/cluster/ClusterDrsServiceImpl.java | 34 +-
.../diagnostics/DiagnosticsServiceImpl.java | 4 +-
.../storage/heuristics/HeuristicRuleHelper.java | 34 +-
.../heuristics/presetvariables/Account.java | 2 -
.../storage/heuristics/presetvariables/Domain.java | 1 -
.../GenericHeuristicPresetVariable.java | 17 +-
.../presetvariables/SecondaryStorage.java | 4 -
.../heuristics/presetvariables/Snapshot.java | 10 +-
.../heuristics/presetvariables/Template.java | 24 +-
.../storage/heuristics/presetvariables/Volume.java | 10 +-
.../storage/template/VnfTemplateManagerImpl.java | 21 +-
.../volume/VolumeImportUnmanageManagerImpl.java | 37 +-
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 520 ++++++++------
.../cloudstack/vm/schedule/VMSchedulerImpl.java | 8 +-
.../src/test/java/com/cloud/api/LoginResponse.java | 18 +-
.../java/com/cloud/hypervisor/KVMGuruTest.java | 54 +-
.../cloud/network/DedicateGuestVlanRangesTest.java | 2 +-
.../com/cloud/network/IpAddressManagerTest.java | 1 +
.../com/cloud/network/Ipv6AddressManagerTest.java | 2 +
.../com/cloud/network/MockNetworkModelImpl.java | 18 +
.../com/cloud/network/vpc/VpcManagerImplTest.java | 8 +-
.../cloud/resource/MockResourceManagerImpl.java | 5 +
.../cloud/resource/ResourceManagerImplTest.java | 28 +-
.../resourcelimit/CheckedReservationTest.java | 17 +-
.../ResourceLimitManagerImplTest.java | 99 +--
.../com/cloud/server/ManagementServerImplTest.java | 61 +-
.../com/cloud/storage/StorageManagerImplTest.java | 56 +-
.../cloud/storage/VolumeApiServiceImplTest.java | 52 +-
.../storage/snapshot/SnapshotManagerImplTest.java | 8 +-
.../storage/snapshot/SnapshotManagerTest.java | 11 +-
.../template/HypervisorTemplateAdapterTest.java | 27 +-
.../cloud/template/TemplateManagerImplTest.java | 402 ++---------
...tBase.java => AccountManagentImplTestBase.java} | 8 +-
.../com/cloud/user/AccountManagerImplTest.java | 128 ++--
.../AccountManagerImplVolumeDeleteEventTest.java | 2 +-
.../java/com/cloud/vm/UserVmManagerImplTest.java | 199 ++++--
.../cloud/vm/snapshot/VMSnapshotManagerTest.java | 96 ++-
.../java/com/cloud/vpc/MockNetworkManagerImpl.java | 9 +-
.../java/com/cloud/vpc/MockNetworkModelImpl.java | 18 +
.../cloud/vpc/MockResourceLimitManagerImpl.java | 36 +-
.../cluster/ClusterDrsServiceImplTest.java | 46 +-
.../heuristics/HeuristicRuleHelperTest.java | 16 +
.../heuristics/presetvariables/AccountTest.java | 46 --
.../heuristics/presetvariables/DomainTest.java | 41 --
.../GenericHeuristicPresetVariableTest.java | 40 --
.../presetvariables/SecondaryStorageTest.java | 45 --
.../heuristics/presetvariables/SnapshotTest.java | 44 --
.../heuristics/presetvariables/TemplateTest.java | 46 --
.../heuristics/presetvariables/VolumeTest.java | 44 --
.../template/VnfTemplateManagerImplTest.java | 8 +-
.../VolumeImportUnmanageManagerImplTest.java | 3 -
.../cloudstack/vm/UnmanagedVMsManagerImplTest.java | 167 +++--
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 | 12 +-
services/secondary-storage/pom.xml | 2 +-
services/secondary-storage/server/pom.xml | 2 +-
.../storage/resource/HttpUploadServerHandler.java | 2 +
.../resource/NfsSecondaryStorageResource.java | 111 +--
.../storage/template/DownloadManagerImpl.java | 14 +-
.../storage/template/UploadManagerImpl.java | 50 +-
.../resource/NfsSecondaryStorageResourceTest.java | 2 +-
.../storage/template/UploadManagerImplTest.java | 85 +++
setup/bindir/cloud-sysvmadm.in | 129 +---
setup/db/deploy-db-dev.sh | 5 +-
systemvm/debian/opt/cloud/bin/cs/CsNetfilter.py | 2 +
systemvm/debian/opt/cloud/bin/cs/CsRoute.py | 2 +-
systemvm/pom.xml | 2 +-
.../test_redundant_router_deployment_planning.py | 770 +++++++++++----------
.../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/smoke/test_public_ip_range.py | 68 +-
test/integration/smoke/test_quarantined_ips.py | 8 +-
test/integration/smoke/test_routers.py | 4 +-
test/integration/smoke/test_ssvm.py | 18 +-
test/pom.xml | 2 +-
tools/apidoc/pom.xml | 2 +-
tools/checkstyle/pom.xml | 2 +-
tools/checkstyle/src/main/resources/cloud-pmd.xml | 53 +-
tools/devcloud-kvm/pom.xml | 2 +-
tools/devcloud4/pom.xml | 2 +-
tools/docker/Dockerfile | 4 +-
tools/docker/Dockerfile.marvin | 4 +-
tools/marvin/marvin/lib/base.py | 3 +-
tools/marvin/pom.xml | 2 +-
tools/marvin/setup.py | 4 +-
tools/pom.xml | 2 +-
ui/public/config.json | 3 +-
ui/public/locales/en.json | 23 +-
ui/public/locales/pt_BR.json | 2 +
ui/src/components/view/DateTimeFilter.vue | 43 +-
ui/src/components/view/DedicateDomain.vue | 129 ++--
ui/src/components/view/DomainDeleteConfirm.vue | 155 +++++
ui/src/components/view/InfoCard.vue | 2 +-
.../InstanceVolumesStoragePoolSelectListView.vue | 12 +-
ui/src/components/view/ListView.vue | 4 +-
ui/src/components/view/SearchFilter.vue | 561 +++++++++++++++
ui/src/components/view/TestWebhookDeliveryView.vue | 2 +-
.../view/VolumeStoragePoolSelectForm.vue | 16 +-
ui/src/components/view/VolumesTab.vue | 2 +-
ui/src/components/widgets/Breadcrumb.vue | 2 +-
ui/src/components/widgets/InfiniteScrollSelect.vue | 91 ++-
ui/src/config/router.js | 4 +-
ui/src/config/section/image.js | 6 +-
ui/src/config/section/network.js | 5 +-
ui/src/config/section/user.js | 4 +
ui/src/store/modules/user.js | 18 +-
ui/src/style/vars.less | 2 +-
ui/src/utils/plugins.js | 13 +-
ui/src/utils/{permissions.js => ssvmProbe.js} | 13 +-
ui/src/views/AutogenView.vue | 60 +-
ui/src/views/auth/ForgotPassword.vue | 2 +-
ui/src/views/compute/DeployVM.vue | 4 +-
ui/src/views/compute/DeployVnfAppliance.vue | 16 +-
ui/src/views/compute/MigrateWizard.vue | 60 +-
ui/src/views/compute/wizard/OwnershipSelection.vue | 30 +-
ui/src/views/compute/wizard/VnfNicsSelection.vue | 5 +
ui/src/views/iam/AddUser.vue | 121 ++--
ui/src/views/iam/DomainView.vue | 56 +-
ui/src/views/iam/EditAccount.vue | 6 +-
ui/src/views/image/IsoZones.vue | 2 +-
ui/src/views/image/RegisterOrUploadIso.vue | 50 +-
ui/src/views/image/RegisterOrUploadTemplate.vue | 54 +-
ui/src/views/image/TemplateZones.vue | 2 +-
ui/src/views/image/UpdateTemplate.vue | 47 +-
ui/src/views/infra/AddSecondaryStorage.vue | 82 ++-
ui/src/views/infra/UsageRecords.vue | 112 +--
ui/src/views/infra/network/IpRangesTabPublic.vue | 30 +-
ui/src/views/infra/zone/ZoneWizardAddResources.vue | 25 +-
ui/src/views/infra/zone/ZoneWizardLaunchZone.vue | 5 +
ui/src/views/network/CreateIsolatedNetworkForm.vue | 30 +-
ui/src/views/network/CreateL2NetworkForm.vue | 2 +-
ui/src/views/network/VnfAppliancesTab.vue | 2 +-
ui/src/views/storage/CreateSharedFS.vue | 8 +-
ui/src/views/storage/CreateTemplate.vue | 111 ++-
ui/src/views/storage/CreateVolume.vue | 4 +-
ui/src/views/storage/SnapshotZones.vue | 2 +-
ui/src/views/storage/UploadLocalVolume.vue | 348 +++++-----
ui/src/views/storage/UploadVolume.vue | 216 +++---
ui/src/views/tools/CreateWebhook.vue | 126 ++--
ui/src/views/tools/ManageVolumes.vue | 157 ++---
ui/tests/unit/views/AutogenView.spec.js | 4 +
ui/tests/unit/views/compute/MigrateWizard.spec.js | 52 +-
usage/pom.xml | 2 +-
.../java/com/cloud/usage/UsageManagerImpl.java | 178 ++---
.../java/com/cloud/usage/UsageSanityChecker.java | 2 +-
.../com/cloud/usage/parser/BackupUsageParser.java | 3 +-
.../usage/parser/VMSnapshotOnPrimaryParser.java | 6 +-
.../cloud/usage/parser/VMSnapshotUsageParser.java | 2 +-
.../java/com/cloud/usage/UsageSanityCheckerIT.java | 8 +-
utils/pom.xml | 7 +-
utils/src/main/java/com/cloud/utils/FileUtil.java | 15 +
utils/src/main/java/com/cloud/utils/UriUtils.java | 8 +-
.../cloud/utils/cisco/n1kv/vsm/NetconfHelper.java | 2 +-
.../com/cloud/utils/cisco/n1kv/vsm/VsmCommand.java | 23 +-
.../main/java/com/cloud/utils/net/NetUtils.java | 20 +-
.../main/java/com/cloud/utils/script/Script.java | 121 ++--
.../java/com/cloud/utils/ssh/SSHCmdHelper.java | 10 +-
.../main/java/com/cloud/utils/ssh/SshHelper.java | 73 +-
.../utils/imagestore/ImageStoreUtil.java | 4 +-
.../utils/jsinterpreter/JsInterpreter.java | 33 +-
.../utils/jsinterpreter/TagAsRuleHelper.java | 21 +-
.../cloudstack/utils/security/DigestHelper.java | 2 +-
.../apache/cloudstack/utils/usage/UsageUtils.java | 51 ++
.../java/com/cloud/utils/script/ScriptTest.java | 30 +
.../java/com/cloud/utils/ssh/SshHelperTest.java | 60 ++
.../utils/jsinterpreter/JsInterpreterTest.java | 18 -
.../cloudstack/utils/usage/UsageUtilsTest.java | 135 ++++
vmware-base/pom.xml | 2 +-
.../hypervisor/vmware/mo/VirtualMachineMO.java | 156 +++--
.../hypervisor/vmware/util/VmwareContext.java | 8 +-
1645 files changed, 18387 insertions(+), 13903 deletions(-)
copy api/src/main/java/{com/cloud/network/rules/LoadBalancer.java =>
org/apache/cloudstack/resourcelimit/Reserver.java} (68%)
copy
engine/schema/src/main/java/com/cloud/upgrade/dao/{UpgradeSnapshot223to224.java
=> Upgrade42020to42030.java} (86%)
copy
engine/schema/src/main/java/com/cloud/upgrade/dao/{UpgradeSnapshot217to224.java
=> Upgrade42030to42040.java} (70%)
copy
engine/schema/src/main/resources/META-INF/db/{schema-41310to41400-cleanup.sql
=> schema-42020to42030.sql} (57%)
create mode 100644
engine/schema/src/test/java/com/cloud/upgrade/DatabaseUpgradeCheckerDoUpgradesTest.java
copy
api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/ListVPCsCmdByAdmin.java
=>
framework/config/src/main/java/org/apache/cloudstack/framework/config/ValidatedConfigKey.java
(57%)
delete mode 100644
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/AccountTest.java
delete mode 100644
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/BackupOfferingTest.java
delete mode 100644
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/ComputeOfferingTest.java
delete mode 100644
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/ComputingResourcesTest.java
delete mode 100644
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/DomainTest.java
delete mode 100644
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/GenericPresetVariableTest.java
delete mode 100644
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/HostTest.java
delete mode 100644
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/ResourceTest.java
delete mode 100644
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/RoleTest.java
delete mode 100644
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/StorageTest.java
delete mode 100644
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/ValueTest.java
create mode 100644
plugins/integrations/prometheus/src/test/java/org/apache/cloudstack/metrics/PrometheusExporterImplTest.java
create mode 100644
plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/motion/LinstorDataMotionStrategy.java
copy api/src/main/java/com/cloud/exception/InvalidParameterValueException.java
=> server/src/main/java/com/cloud/resourcelimit/ReservationHelper.java (72%)
copy
server/src/main/java/com/cloud/storage/download/{DownloadAbandonedState.java =>
DownloadLimitReachedState.java} (67%)
rename server/src/test/java/com/cloud/user/{AccountManagetImplTestBase.java =>
AccountManagentImplTestBase.java} (98%)
delete mode 100644
server/src/test/java/org/apache/cloudstack/storage/heuristics/presetvariables/AccountTest.java
delete mode 100644
server/src/test/java/org/apache/cloudstack/storage/heuristics/presetvariables/DomainTest.java
delete mode 100644
server/src/test/java/org/apache/cloudstack/storage/heuristics/presetvariables/GenericHeuristicPresetVariableTest.java
delete mode 100644
server/src/test/java/org/apache/cloudstack/storage/heuristics/presetvariables/SecondaryStorageTest.java
delete mode 100644
server/src/test/java/org/apache/cloudstack/storage/heuristics/presetvariables/SnapshotTest.java
delete mode 100644
server/src/test/java/org/apache/cloudstack/storage/heuristics/presetvariables/TemplateTest.java
delete mode 100644
server/src/test/java/org/apache/cloudstack/storage/heuristics/presetvariables/VolumeTest.java
create mode 100644
services/secondary-storage/server/src/test/java/org/apache/cloudstack/storage/template/UploadManagerImplTest.java
create mode 100644 ui/src/components/view/DomainDeleteConfirm.vue
create mode 100644 ui/src/components/view/SearchFilter.vue
copy ui/src/utils/{permissions.js => ssvmProbe.js} (69%)
create mode 100644
utils/src/test/java/org/apache/cloudstack/utils/usage/UsageUtilsTest.java
